Changeset 182 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Jun 24, 2007, 6:49:13 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

• BasicCompiler.cpp (modified) (4 diffs)
• BasicCompiler.h (modified) (1 diff)
• Class.cpp (deleted)
• Class.h (deleted)
• Compile.cpp (modified) (7 diffs)
• Const.cpp (modified) (2 diffs)
• Const.h (modified) (1 diff)
• DataTable.cpp (deleted)
• DebugMiddleFile.cpp (modified) (24 diffs)
• DebugSection.h (modified) (1 diff)
• Diagnose.cpp (modified) (6 diffs)
• Enum.cpp (modified) (2 diffs)
• Enum.h (modified) (1 diff)
• Intermediate_Step1.cpp (modified) (1 diff)
• Intermediate_Step2.cpp (modified) (2 diffs)
• LexicalScoping.cpp (deleted)
• LexicalScoping.h (deleted)
• LoopRefCheck.cpp (deleted)
• MakeExe.cpp (modified) (2 diffs)
• NumOpe_GetType.cpp (modified) (8 diffs)
• Object.cpp (modified) (1 diff)
• Overload.cpp (modified) (1 diff)
• PESchedule.h (modified) (1 diff)
• ParamImpl.cpp (modified) (3 diffs)
• Parameter.h (deleted)
• Procedure.h (deleted)
• Resource.cpp (modified) (1 diff)
• StrOperation.cpp (modified) (2 diffs)
• Subroutine.cpp (modified) (7 diffs)
• Type.cpp (deleted)
• Type.h (deleted)
• TypeDef.cpp (deleted)
• TypeDef.h (deleted)
• VarList.cpp (modified) (4 diffs)
• Variable.cpp (deleted)
• Variable.h (deleted)
• VariableOpe.cpp (modified) (20 diffs)
• VariableOpe.h (modified) (2 diffs)
• WatchList.cpp (modified) (5 diffs)
• calculation.cpp (modified) (1 diff)
• common.h (modified) (13 diffs)
• error.cpp (modified) (1 diff)
• hash.cpp (modified) (7 diffs)
• include/Member.h (deleted)
• include/Method.h (deleted)
• include/Namespace.h (deleted)
• include/ObjectModule.h (deleted)
• include/Prototype.h (deleted)
• include/Smoothie.h (deleted)
• include/Source.h (deleted)
• include/Symbol.h (deleted)
• include/option.h (modified) (1 diff)
• src/Member.cpp (deleted)
• src/Method.cpp (deleted)
• src/Namespace.cpp (deleted)
• src/Prototype.cpp (deleted)
• src/Smoothie.cpp (deleted)
• src/Source.cpp (deleted)
• src/Symbol.cpp (deleted)

trunk/abdev/BasicCompiler_Common/BasicCompiler.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
 #include <Program.h>
 
@@ -185 +187 @@
     }
 
-    i3=baseDirPath.size();i4=0;
+    i3=(int)baseDirPath.size();i4=0;
     while(i4<i2){
         for(i3--;;i3--){
@@ -550 +552 @@
     char temporary[1024],temp2[MAX_PATH];
 
-    //MessageBox(0,"starting compiler/debugger","ActiveBasic",MB_OK);
+    MessageBox(0,"starting compiler/debugger","ActiveBasic",MB_OK);
     trace( "Start ActiveBasic Compiler!" );
 
@@ -702 +704 @@
         //Unicode
         else if( lstrcmp( temp2, "unicode" ) ==0 ){
-            isUnicode = true;
+            Smoothie::SetUnicodeMark( true );
             typeOfPtrChar = MAKE_PTR_TYPE(DEF_WORD,1);
             typeOfPtrUChar = MAKE_PTR_TYPE(DEF_WORD,1);

trunk/abdev/BasicCompiler_Common/BasicCompiler.h

@@ -79 +79 @@
 
 BOOL bDll;
-bool isUnicode = false;
 int typeOfPtrChar = MAKE_PTR_TYPE(DEF_SBYTE,1);
 int typeOfPtrUChar = MAKE_PTR_TYPE(DEF_BYTE,1);

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+#include <jenga/include/smoothie/SmoothieException.h>
+
+#include <LexicalScopingImpl.h>
+#include <CodeGenerator.h>
+
 #include "../BasicCompiler_Common/common.h"
 
@@ -7 +14 @@
 #endif
 
+#include <Exception.h>
+
 //ラベルアドレス
 LABEL *pLabelNames;
@@ -33 +42 @@
 WITHINFO WithInfo;
 
-
-int obp,obp_AllocSize;
-int GlobalOpBufferSize;
-char *OpBuffer;
-void ReallocNativeCodeBuffer(){
-    if(obp_AllocSize<obp+8192){
-        obp_AllocSize+=8192;
-        OpBuffer=(char *)HeapReAlloc(hHeap,0,OpBuffer,obp_AllocSize); //matea
-    }
-}
 
 
@@ -177 +176 @@
                 break;
             case ESC_EXITWHILE:
-                obj_LexScopes.ExitWhile();
+                {
+                    CScope *pScope = GetLexicalScopes().SearchScope( SCOPE_TYPE_WHILE );
+                    if( !pScope ){
+                        SetError(12,"Exit While",cp);
+                        return;
+                    }
+                    pScope->Break();
+                }
                 break;
             case ESC_EXITFOR:
-                obj_LexScopes.ExitFor();
+                {
+                    CScope *pScope = GetLexicalScopes().SearchScope( SCOPE_TYPE_FOR );
+                    if( !pScope ){
+                        SetError(12,"Exit For",cp);
+                        return;
+                    }
+                    pScope->Break();
+                }
                 break;
             case ESC_EXITDO:
-                obj_LexScopes.ExitDo();
+                {
+                    CScope *pScope = GetLexicalScopes().SearchScope( SCOPE_TYPE_DO );
+                    if( !pScope ){
+                        SetError(12,"Exit Do",cp);
+                        return;
+                    }
+                    pScope->Break();
+                }
                 break;
             case ESC_CONTINUE:
@@ -231 +251 @@
 
             case ESC_NAMESPACE:
-                Smoothie::Lexical::liveingNamespaceScopes.push_back( Command + 2 );
+                Smoothie::Temp::liveingNamespaceScopes.push_back( Command + 2 );
                 break;
             case ESC_ENDNAMESPACE:
-                if( Smoothie::Lexical::liveingNamespaceScopes.size() <= 0 ){
+                if( Smoothie::Temp::liveingNamespaceScopes.size() <= 0 ){
                     SetError(12,"End Namespace",cp);
                 }
-                Smoothie::Lexical::liveingNamespaceScopes.pop_back();
+                Smoothie::Temp::liveingNamespaceScopes.pop_back();
                 break;
             case ESC_IMPORTS:
@@ -641 +661 @@
             }
 
-            ChangeOpcode(Command);
+            try
+            {
+                ChangeOpcode(Command);
+            }
+            catch( const SmoothieException &smoothieException )
+            {
+                SetError(
+                    smoothieException.GetErrorCode(),
+                    smoothieException.GetKeyword(),
+                    smoothieException.GetNowLine()
+                );
+            }
 
 #ifdef _DEBUG
@@ -651 +682 @@
             if(bStopCompile) return 0;
 
-            if(obp_AllocSize<obp+8192){
-                obp_AllocSize+=8192;
-                OpBuffer=(char *)HeapReAlloc(hHeap,0,OpBuffer,obp_AllocSize);
-            }
+            ReallocNativeCodeBuffer();
 
             if(basbuf[cp]=='\0'){

trunk/abdev/BasicCompiler_Common/Const.cpp

@@ -18 +18 @@
     char AreaName[VN_SIZE] = "";        //オブジェクト変数
     char NestName[VN_SIZE] = "";        //入れ子メンバ
-    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
+    bool isNest = CClass::SplitName( fullName.c_str(), AreaName, NestName );
 
     return IsEqualSymbol( NamespaceScopes( AreaName ), NestName );
@@ -180 +180 @@
     char ObjName[VN_SIZE];      //オブジェクト変数
     char NestMember[VN_SIZE];   //入れ子メンバ
-    bool isObjectMember = SplitMemberName( name.c_str(), ObjName, NestMember );
+    bool isObjectMember = CClass::SplitName( name.c_str(), ObjName, NestMember );
 
     //ハッシュ値を取得

trunk/abdev/BasicCompiler_Common/Const.h

@@ +1 @@
+#pragma once
 
+#include <jenga/include/smoothie/Type.h>
 
 //定数の基底クラス

trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
+#include <ClassImpl.h>
+
 #include "../BasicCompiler_Common/common.h"
 
@@ -28 +32 @@
         (*p)+=lstrlen(buffer+(*p))+1;
 
-        type.SetIndex( (LONG_PTR)pobj_DBClass->Find(szClassName) );
+        type.SetIndex( (LONG_PTR)Smoothie::GetMeta().GetClasses().Find(szClassName) );
     }
     else{
@@ -115 +119 @@
 
     //イテレータをリセット
-    extern Classes *pobj_DBClass;
-    pobj_DBClass->Iterator_Reset();
+    Smoothie::GetMeta().GetClasses().Iterator_Reset();
 
     //個数
-    *(long *)(buffer+i2)=pobj_DBClass->Iterator_GetMaxCount();
-    i2+=sizeof(long);
-
-    while(pobj_DBClass->Iterator_HasNext()){
+    *(long *)(buffer+i2)=Smoothie::GetMeta().GetClasses().Iterator_GetMaxCount();
+    i2+=sizeof(long);
+
+    while(Smoothie::GetMeta().GetClasses().Iterator_HasNext()){
         CClass *pobj_c;
-        pobj_c=pobj_DBClass->Iterator_GetNext();
+        pobj_c=Smoothie::GetMeta().GetClasses().Iterator_GetNext();
 
         //クラス名
@@ -136 +139 @@
     // TypeDef情報
     //////////////////
-    *(long *)(buffer+i2)=(int)Smoothie::meta.typeDefs.size();
-    i2+=sizeof(long);
-    for(i3=0;i3<(int)Smoothie::meta.typeDefs.size();i3++){
-        lstrcpy(buffer+i2,Smoothie::meta.typeDefs[i3].GetName().c_str() );
-        i2+=lstrlen(buffer+i2)+1;
-
-        lstrcpy(buffer+i2,Smoothie::meta.typeDefs[i3].GetBaseName().c_str() );
+    *(long *)(buffer+i2)=(int)Smoothie::GetMeta().typeDefs.size();
+    i2+=sizeof(long);
+    for(i3=0;i3<(int)Smoothie::GetMeta().typeDefs.size();i3++){
+        lstrcpy(buffer+i2,Smoothie::GetMeta().typeDefs[i3].GetName().c_str() );
+        i2+=lstrlen(buffer+i2)+1;
+
+        lstrcpy(buffer+i2,Smoothie::GetMeta().typeDefs[i3].GetBaseName().c_str() );
         i2+=lstrlen(buffer+i2)+1;
 
@@ -156 +159 @@
     *(long *)(buffer+i2)=(int)::globalVars.size();
     i2+=sizeof(long);
-    foreach( Variable *pVar, ::globalVars ){
+    BOOST_FOREACH( Variable *pVar, ::globalVars ){
         //変数名
         lstrcpy(buffer+i2,pVar->GetName().c_str());
@@ -245 +248 @@
             }
 
-            foreach( Variable *pVar, pUserProc->localVars ){
+            BOOST_FOREACH( Variable *pVar, pUserProc->localVars ){
                 lstrcpy(buffer+i2,pVar->GetName().c_str());
                 i2+=lstrlen(buffer+i2)+1;
@@ -304 +307 @@
 
     //イテレータをリセット
-    pobj_DBClass->Iterator_Reset();
-
-    while(pobj_DBClass->Iterator_HasNext()){
+    Smoothie::GetMeta().GetClasses().Iterator_Reset();
+
+    while(Smoothie::GetMeta().GetClasses().Iterator_HasNext()){
         CClass *pobj_c;
-        pobj_c=pobj_DBClass->Iterator_GetNext();
+        pobj_c=Smoothie::GetMeta().GetClasses().Iterator_GetNext();
 
 
@@ -324 +327 @@
 
         //メンバ
-        *(long *)(buffer+i2)=(int)pobj_c->dynamicMembers.size();
-        i2+=sizeof(long);
-        foreach( CMember *member, pobj_c->dynamicMembers ){
+        *(long *)(buffer+i2)=(int)pobj_c->GetDynamicMembers().size();
+        i2+=sizeof(long);
+        BOOST_FOREACH( CMember *member, pobj_c->GetDynamicMembers() ){
             // 名前
             lstrcpy(buffer+i2,member->GetName().c_str());
@@ -353 +356 @@
 
         //メソッド
-        *(long *)(buffer+i2)=(long)pobj_c->methods.size();
-        i2+=sizeof(long);
-        foreach( const CMethod *pMethod, pobj_c->methods ){
+        *(long *)(buffer+i2)=(long)pobj_c->GetMethods().size();
+        i2+=sizeof(long);
+        BOOST_FOREACH( const CMethod *pMethod, pobj_c->GetMethods() ){
             *(Prototype::Accessibility *)(buffer+i2)=pMethod->GetAccessibility();
             i2+=sizeof(Prototype::Accessibility);
@@ -371 +374 @@
 
         //静的メンバ
-        *(long *)(buffer+i2)=(long)pobj_c->staticMembers.size();
-        i2+=sizeof(long);
-        foreach( CMember *member, pobj_c->staticMembers ){
+        *(long *)(buffer+i2)=(long)pobj_c->GetStaticMembers().size();
+        i2+=sizeof(long);
+        BOOST_FOREACH( CMember *member, pobj_c->GetStaticMembers() ){
             // 名前
             lstrcpy(buffer+i2,member->GetName().c_str());
@@ -432 +435 @@
     char temp2[MAX_PATH],*temp5;
 
-    pobj_CompilingClass = NULL;
+    Smoothie::Temp::pCompilingClass = NULL;
 
     i2=0;
@@ -482 +485 @@
     ///////////////////////////////////////////
 
-    this->pobj_DBClass=new Classes();
+    this->pobj_DBClass=new ClassesImpl();
 
     int iMaxClassCount;
@@ -490 +493 @@
         //クラス名
         // TODO: 名前空間が未完成
-        pobj_DBClass->AddClass(NamespaceScopes(),NamespaceScopesCollection(),buffer+i2,0);
-        i2+=lstrlen(buffer+i2)+1;
-    }
-
-    extern Classes *pobj_DBClass;
-    pobj_DBClass=this->pobj_DBClass;
+        this->pobj_DBClass->Add(NamespaceScopes(),NamespaceScopesCollection(),buffer+i2,0);
+        i2+=lstrlen(buffer+i2)+1;
+    }
+
+    Smoothie::GetMeta().SetClasses( this->pobj_DBClass );
 
 
@@ -503 +505 @@
 
     //初期化
-    Smoothie::meta.typeDefs.clear();
+    Smoothie::GetMeta().typeDefs.clear();
 
     //個数を取得
@@ -513 +515 @@
 
         // 名前空間に未対応
-        Smoothie::meta.typeDefs.push_back( TypeDef( NamespaceScopes(), temp5, buffer+i2 ) );
+        Smoothie::GetMeta().typeDefs.push_back( TypeDef( NamespaceScopes(), temp5, buffer+i2, -1 ) );
 
         i2+=lstrlen(buffer+i2)+1;
@@ -590 +592 @@
         const CClass *pClass = NULL;
         if(szParentClassName[0]){
-            pClass=pobj_DBClass->Find(szParentClassName);
+            pClass=Smoothie::GetMeta().GetClasses().Find(szParentClassName);
         }
 
@@ -695 +697 @@
         i2+=lstrlen(buffer+i2)+1;
 
-        pobj_c =  const_cast<CClass *>( pobj_DBClass->Find(szClassName) );
+        pobj_c =  const_cast<CClass *>( Smoothie::GetMeta().GetClasses().Find(szClassName) );
 
         //仮想関数の数
@@ -724 +726 @@
             i2+=sizeof(Prototype::Accessibility);
 
-            CMember *member=new CMember( accessibility, name, type, false );
+            CMember *member=new CMember( accessibility, name, type, false, "", "" );
 
             memcpy(member->SubScripts,buffer+i2,sizeof(int)*MAX_ARRAYDIM);
             i2+=sizeof(int)*MAX_ARRAYDIM;
 
-            pobj_c->dynamicMembers.push_back( member );
+            pobj_c->GetDynamicMembers().push_back( member );
         }
 
@@ -746 +748 @@
             const CClass *pobj_InheritsClass = NULL;
             if(szInherits[0]){
-                pobj_InheritsClass=pobj_DBClass->Find(szInherits);
+                pobj_InheritsClass=Smoothie::GetMeta().GetClasses().Find(szInherits);
             }
 
@@ -764 +766 @@
             CMethod *pMethod = new DynamicMethod( pUserProc, accessibility, 0,0,false, pobj_InheritsClass);
 
-            pobj_c->methods.push_back( pMethod );
+            pobj_c->GetMethods().push_back( pMethod );
         }
 
@@ -786 +788 @@
             i2+=sizeof(Prototype::Accessibility);
 
-            CMember *member=new CMember( accessibility, name, type, false );
+            CMember *member=new CMember( accessibility, name, type, false, "", "" );
 
             memcpy(member->SubScripts,buffer+i2,sizeof(int)*MAX_ARRAYDIM);
             i2+=sizeof(int)*MAX_ARRAYDIM;
 
-            pobj_c->staticMembers.push_back( member );
+            pobj_c->GetStaticMembers().push_back( member );
         }
     }
@@ -943 +945 @@
 
     // クラス情報
-    extern Classes *pobj_DBClass;
-    pobj_DBClass=this->pobj_DBClass;
+    Smoothie::GetMeta().SetClasses( this->pobj_DBClass );
 
     //定数を取得
@@ -979 +980 @@
 
     //クラスに関するメモリを解放
-    delete pobj_DBClass;
-    pobj_DBClass=0;
+    delete this->pobj_DBClass;
+    this->pobj_DBClass=0;
 
     //サブルーチン情報のメモリ解放
@@ -992 +993 @@
 
     //コードバッファを解放
-    HeapDefaultFree(OpBuffer);
+    free(OpBuffer);
     OpBuffer=0;
 

trunk/abdev/BasicCompiler_Common/DebugSection.h

@@ +1 @@
+#pragma once
+
+#include <jenga/include/smoothie/Source.h>
+#include <jenga/include/smoothie/Class.h>
+
+#include <ProcedureImpl.h>
+
 
 class CDebugSection{

trunk/abdev/BasicCompiler_Common/Diagnose.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
 #include <Program.h>
 
@@ -66 +68 @@
         // イテレータをリセット
         extern Classes *pobj_DBClass;
-        pobj_DBClass->Iterator_Reset();
+        Smoothie::GetMeta().GetClasses().Iterator_Reset();
 
-        while( pobj_DBClass->Iterator_HasNext() ){
+        while( Smoothie::GetMeta().GetClasses().Iterator_HasNext() ){
             int codeSizeOfClass = 0;
 
-            CClass &objClass = *pobj_DBClass->Iterator_GetNext();
+            CClass &objClass = *Smoothie::GetMeta().GetClasses().Iterator_GetNext();
 
             if( !objClass.IsEnum() ){
@@ -79 +81 @@
 
             // 動的メソッド
-            foreach( const CMethod *pMethod, objClass.GetMethods() ){
+            BOOST_FOREACH( const CMethod *pMethod, objClass.GetMethods() ){
                 if( pMethod->pUserProc->IsCompiled() ){
                     codeSizeOfClass += pMethod->pUserProc->GetCodeSize();
@@ -86 +88 @@
 
             // 静的メソッド
-            foreach( const CMethod *pMethod, objClass.GetStaticMethods() ){
+            BOOST_FOREACH( const CMethod *pMethod, objClass.GetStaticMethods() ){
                     codeSizeOfClass += pMethod->pUserProc->GetCodeSize();
             }
@@ -106 +108 @@
         // イテレータをリセット
         extern Classes *pobj_DBClass;
-        pobj_DBClass->Iterator_Reset();
+        Smoothie::GetMeta().GetClasses().Iterator_Reset();
 
-        while( pobj_DBClass->Iterator_HasNext() ){
+        while( Smoothie::GetMeta().GetClasses().Iterator_HasNext() ){
             int codeSizeOfClass = 0;
 
-            CClass &objClass = *pobj_DBClass->Iterator_GetNext();
+            CClass &objClass = *Smoothie::GetMeta().GetClasses().Iterator_GetNext();
 
             // 動的メソッド
-            foreach( const CMethod *pMethod, objClass.GetMethods() ){
+            BOOST_FOREACH( const CMethod *pMethod, objClass.GetMethods() ){
                 if( pMethod->pUserProc->IsCompiled() ){
                     codeSizeOfClass += pMethod->pUserProc->GetCodeSize();
@@ -121 +123 @@
 
             // 静的メソッド
-            foreach( const CMethod *pMethod, objClass.GetStaticMethods() ){
+            BOOST_FOREACH( const CMethod *pMethod, objClass.GetStaticMethods() ){
                     codeSizeOfClass += pMethod->pUserProc->GetCodeSize();
             }

trunk/abdev/BasicCompiler_Common/Enum.cpp

@@ -1 +1 @@
 #include <jenga/include/common/logger.h>
+
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include "common.h"
@@ -112 +115 @@
 
     // 名前空間管理
-    NamespaceScopes &namespaceScopes = Smoothie::Lexical::liveingNamespaceScopes;
+    NamespaceScopes &namespaceScopes = Smoothie::Temp::liveingNamespaceScopes;
     namespaceScopes.clear();
 

trunk/abdev/BasicCompiler_Common/Enum.h

@@ +1 @@
+#pragma once
 
+#include <jenga/include/smoothie/Namespace.h>
 
 class CEnumMember{

trunk/abdev/BasicCompiler_Common/Intermediate_Step1.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include "../BasicCompiler_Common/common.h"
 

trunk/abdev/BasicCompiler_Common/Intermediate_Step2.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include "../BasicCompiler_Common/common.h"
 
@@ -247 +250 @@
 
     // 名前空間管理
-    NamespaceScopes &namespaceScopes = Smoothie::Lexical::liveingNamespaceScopes;
+    NamespaceScopes &namespaceScopes = Smoothie::Temp::liveingNamespaceScopes;
     namespaceScopes.clear();
 

trunk/abdev/BasicCompiler_Common/MakeExe.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
 #include "common.h"
 
@@ -202 +204 @@
     DeleteDeclareInfo();
 
-    //関数ポインタ情報のメモリ解放
-    DeleteProcPtrInfo();
-
     //定数に関する情報を解放
     extern CONSTINFO **ppConstHash;

trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include "common.h"
 
@@ -311 +314 @@
     char member[VN_SIZE];
     CClass::RefType refType;
-    if( SplitMemberName( termFull, termLeft, member, refType ) ){
+    if( CClass::SplitName( termFull, termLeft, member, refType ) ){
         ///////////////////////////////////////////////////////////////////
         // オブジェクトとメンバに分解できるとき
@@ -323 +326 @@
         Type leftType;
         if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
-            if( isClassName == false && Smoothie::meta.blittableTypes.IsExist( leftType ) ){
+            if( isClassName == false && Smoothie::GetMeta().blittableTypes.IsExist( leftType ) ){
                 // 左側のオブジェクト部分がBlittable型のとき
 
@@ -329 +332 @@
                 lstrcpy( temporary, termLeft );
                 sprintf( termLeft, "%s(%s)",
-                    Smoothie::meta.blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
+                    Smoothie::GetMeta().blittableTypes.Find( leftType ).GetCreateStaticMethodFullName().c_str(),
                     temporary );
 
@@ -393 +396 @@
 
     if( pIsClassName ){
-        if( pobj_DBClass->Find( termFull ) ){
+        if( Smoothie::GetMeta().GetClasses().Find( termFull ) ){
             *pIsClassName = true;
             return true;
@@ -408 +411 @@
     if(lstrcmpi(termFull,"This")==0){
         //Thisオブジェクト
-        resultType.SetType( DEF_OBJECT, pobj_CompilingClass );
+        resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
         isLiteral = false;
         return true;
@@ -670 +673 @@
                         //要求タイプがオブジェクト、または未定のとき
                         type_stack[sp]=DEF_OBJECT;
-                        index_stack[sp]=(LONG_PTR)pobj_DBClass->GetStringClassPtr();
+                        index_stack[sp]=(LONG_PTR)Smoothie::GetMeta().GetClasses().GetStringClassPtr();
                         bLiteralCalculation=0;
 
@@ -715 +718 @@
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)pobj_DBClass->GetObjectClassPtr();
+                            index_stack[sp] = (LONG_PTR)Smoothie::GetMeta().GetClasses().GetObjectClassPtr();
                         }
                         bLiteralCalculation = 0;

trunk/abdev/BasicCompiler_Common/Object.cpp

@@ +1 @@
+#include <CodeGenerator.h>
+
 #include "../BasicCompiler_Common/common.h"
 

trunk/abdev/BasicCompiler_Common/Overload.cpp

@@ -26 +26 @@
 
         char MethodName[VN_SIZE];
-        if( !SplitMemberName( name, NULL, MethodName ) ) lstrcpy( MethodName, name );
+        if( !CClass::SplitName( name, NULL, MethodName ) ) lstrcpy( MethodName, name );
 /*
         //メソッドの場合は静的かどうかを調べる

trunk/abdev/BasicCompiler_Common/PESchedule.h

@@ +1 @@
+#pragma once
 
+#include <jenga/include/smoothie/Procedure.h>
 
 ///////////////////////

trunk/abdev/BasicCompiler_Common/ParamImpl.cpp

@@ -78 +78 @@
 {
     ParmsNum = 0;
-    foreach( Parameter *pParam, params ){
+    BOOST_FOREACH( Parameter *pParam, params ){
         Parms[ParmsNum]=0;
         ParmsNum++;
@@ -204 +204 @@
     for( int level=OVERLOAD_MIN_LEVEL; level<=OVERLOAD_MAX_LEVEL; level++ ){
 
-        foreach( UserProc *pTempUserProc, subs ){
+        BOOST_FOREACH( UserProc *pTempUserProc, subs ){
 
             if(EvaluateOverloadScore( level, pTempUserProc->Params(), isEnabledReturnType?pTempUserProc->ReturnType():Type() )){
@@ -237 +237 @@
 
     if(!sw){
-        foreach( UserProc *pTempUserProc, subs ){
+        BOOST_FOREACH( UserProc *pTempUserProc, subs ){
 
             //エラーチェック

trunk/abdev/BasicCompiler_Common/Resource.cpp

@@ +1 @@
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include "common.h"
 

trunk/abdev/BasicCompiler_Common/StrOperation.cpp

@@ +1 @@
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include "../BasicCompiler_Common/common.h"
 
@@ -167 +169 @@
     free(temp);
 }
-_int8 IsCommandDelimitation(char c){
-    if(c=='\n'||c==':'||c=='\0') return 1;
-    return 0;
-}
-BOOL IsBlank(char c){
-    if(c==' '||c=='\t') return 1;
-    return 0;
-}
-int GetOneParameter(const char *Parameter,int pos,char *retAns){
-    int i,i2,i3,IsStr;
-    for(i=pos,i2=0,IsStr=0;;i++,i2++){
-        if(Parameter[i]=='\"') IsStr^=1;
-        else if(Parameter[i]=='('&&IsStr==0){
-            i3=GetStringInPare(retAns+i2,Parameter+i);
-            i+=i3-1;
-            i2+=i3-1;
-            continue;
-        }
-        else if(Parameter[i]=='['&&IsStr==0){
-            i3=GetStringInBracket(retAns+i2,Parameter+i);
-            i+=i3-1;
-            i2+=i3-1;
-            continue;
-        }
-        else if(Parameter[i]==','&&IsStr==0){
-            retAns[i2]=0;
-            i++;
-            break;
-        }
-
-        if(IsCommandDelimitation(Parameter[i])&&IsStr==0
-            || Parameter[i] == ')' && IsStr == 0 ){
-                retAns[i2]=0;
-                break;
-        }
-
-        retAns[i2]=Parameter[i];
-    }
-    return i;
-}
-int JumpOneParameter(char *Parameter,int i){
-    int i2,IsStr;
-    for(i2=0,IsStr=0;;i++,i2++){
-        if(Parameter[i]=='\"') IsStr^=1;
-        else if(Parameter[i]=='('&&IsStr==0){
-            i=JumpStringInPare(Parameter,i+1);
-            continue;
-        }
-        else if(Parameter[i]=='['&&IsStr==0){
-            i=JumpStringInBracket(Parameter,i+1);
-            continue;
-        }
-        else if(Parameter[i]==','&&IsStr==0){
-            i++;
-            break;
-        }
-        if(IsCommandDelimitation(Parameter[i])) break;
-    }
-    return i;
-}
-int GetStringInQuotation(char *buffer,char *ReadBuffer){
-    int i;
-
-    if(ReadBuffer[0]=='\"'){
-        buffer[0]=ReadBuffer[0];
-        i=1;
-    }
-    else i=0;
-
-    for(;;i++){
-        buffer[i]=ReadBuffer[i];
-        if(IsDBCSLeadByte(ReadBuffer[i])){
-            i++;
-            buffer[i]=ReadBuffer[i];
-            continue;
-        }
-        if(ReadBuffer[i]=='\"'){
-            i++;
-            buffer[i]=0;
-            break;
-        }
-        if(ReadBuffer[i]=='\0') return 0;
-    }
-    return i;
-}
-int GetStringInPare(char *buffer,const char *ReadBuffer){
-    int i,IsStr,PareNum;
-    for(i=0,IsStr=0,PareNum=0;;i++){
-        buffer[i]=ReadBuffer[i];
-        if(IsDBCSLeadByte(ReadBuffer[i])){
-            i++;
-            buffer[i]=ReadBuffer[i];
-            continue;
-        }
-        if(ReadBuffer[i]=='\"') IsStr^=1;
-        else if(ReadBuffer[i]=='('&&IsStr==0) PareNum++;
-        else if(ReadBuffer[i]==')'&&IsStr==0){
-            PareNum--;
-            if(PareNum==0){
-                i++;
-                buffer[i]=0;
-                break;
-            }
-        }
-        else if(ReadBuffer[i]=='\0') return 0;
-    }
-    return i;
-}
-int GetStringInPare_RemovePare(char *buffer,char *ReadBuffer){
-    int i,IsStr,PareNum;
-    for(i=0,IsStr=0,PareNum=1;;i++){
-        buffer[i]=ReadBuffer[i];
-        if(IsDBCSLeadByte(ReadBuffer[i])){
-            i++;
-            buffer[i]=ReadBuffer[i];
-            continue;
-        }
-        if(ReadBuffer[i]=='\"') IsStr^=1;
-        else if(ReadBuffer[i]=='('&&IsStr==0) PareNum++;
-        else if(ReadBuffer[i]==')'&&IsStr==0){
-            PareNum--;
-            if(PareNum==0){
-                buffer[i]=0;
-                break;
-            }
-        }
-        else if(ReadBuffer[i]=='\0') return 0;
-    }
-    return i;
-}
-int GetStringInBracket(char *buffer,const char *ReadBuffer){
-    int i,IsStr,PareNum;
-    for(i=0,IsStr=0,PareNum=0;;i++){
-        buffer[i]=ReadBuffer[i];
-        if(IsDBCSLeadByte(ReadBuffer[i])){
-            i++;
-            buffer[i]=ReadBuffer[i];
-            continue;
-        }
-        if(ReadBuffer[i]=='\"') IsStr^=1;
-        else if(ReadBuffer[i]=='['&&IsStr==0) PareNum++;
-        else if(ReadBuffer[i]==']'&&IsStr==0){
-            PareNum--;
-            if(PareNum==0){
-                i++;
-                buffer[i]=0;
-                break;
-            }
-        }
-        else if(ReadBuffer[i]=='\0') return 0;
-    }
-    return i;
-}
-int JumpStringInPare(const char *buffer,int pos){
-    int PareNum;
-    for(PareNum=1;;pos++){
-        if(buffer[pos]=='\"'){
-            for(pos++;;pos++){
-                if(buffer[pos]=='\"') break;
-            }
-            continue;
-        }
-        else if(buffer[pos]=='(') PareNum++;
-        else if(buffer[pos]==')'){
-            PareNum--;
-            if(PareNum==0) return pos;
-        }
-        else if(buffer[pos]=='\0') break;
-    }
-    return 0;
-}
-int JumpStringInBracket(const char *buffer,int pos){
-    int PareNum;
-    for(PareNum=1;;pos++){
-        if(buffer[pos]=='\"'){
-            for(pos++;;pos++){
-                if(buffer[pos]=='\"') break;
-            }
-            continue;
-        }
-        else if(buffer[pos]=='[') PareNum++;
-        else if(buffer[pos]==']'){
-            PareNum--;
-            if(PareNum==0) return pos;
-        }
-        else if(buffer[pos]=='\0') break;
-    }
-    return 0;
-}
 
 int GetCpFromLine(int LineNum){

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <ProcedureImpl.h>
+
 #include "../BasicCompiler_Common/common.h"
 
@@ -83 +88 @@
     }
 }
-bool SplitMemberName( const char *desc, char *object, char *member, CClass::RefType &refType ){
-    int lastIndex = -1;
-    for( int i=0; desc[i]; i++ ){
-        if( desc[i] == '(' ){
-            i=JumpStringInPare(desc,i+1);
-            continue;
-        }
-        else if( desc[i] == '[' ){
-            i=JumpStringInBracket(desc,i+1);
-            continue;
-        }
-        else if(desc[i]=='.'||(desc[i]==1&&desc[i+1]==ESC_PSMEM)){
-            lastIndex = i;
-        }
-    }
-    if( lastIndex == -1 ){
-        lstrcpy( member, desc );
-        return false;
-    }
-
-    if(desc[lastIndex]=='.'){
-        lstrcpy(member,desc+lastIndex+1);
-        refType = CClass::Dot;
-    }
-    else{
-        lstrcpy(member,desc+lastIndex+2);
-        refType = CClass::Pointer;
-    }
-
-    if( object ){
-        lstrcpy( object, desc );
-        object[lastIndex]=0;
-    }
-
-    return true;
-}
-bool SplitMemberName( const char *desc, char *object, char *member ){
-    CClass::RefType dummyRefType;
-    return SplitMemberName( desc, object, member, dummyRefType );
-}
 
 bool CallProc( int kind, const void *pProc, const char *fullCallName, const char *lpszParms, Type &resultType, bool isCallOn ){
@@ -199 +164 @@
         GetVarType(fullCallName,type,false);
 
-        ProcPointer *pProcPtr = Smoothie::meta.procPointers[type.GetIndex()];
+        ProcPointer *pProcPtr = Smoothie::GetMeta().GetProcPointers()[type.GetIndex()];
         resultType = pProcPtr->ReturnType();
 
@@ -402 +367 @@
 
     // オブジェクトを生成
-    DllProc *pDllProc = new DllProc( namespaceScopes, procName, kind, isCdecl, dllFileName, alias );
+    DllProc *pDllProc = new DllProcImpl( namespaceScopes, procName, kind, isCdecl, dllFileName, alias );
 
     // パラメータを解析
@@ -409 +374 @@
 
     // パラメータのエラーチェック
-    foreach( const Parameter *pParam, pDllProc->Params() ){
+    BOOST_FOREACH( const Parameter *pParam, pDllProc->Params() ){
         if( pParam->IsObject() ){
             SetError(25,pParam->GetVarName(),nowLine);
@@ -662 +627 @@
 
     // 名前空間管理
-    NamespaceScopes &namespaceScopes = Smoothie::Lexical::liveingNamespaceScopes;
+    NamespaceScopes &namespaceScopes = Smoothie::Temp::liveingNamespaceScopes;
     namespaceScopes.clear();
 
@@ -852 +817 @@
 }
 
-
-
-///////////////////////
-// 関数ポインタの管理
-///////////////////////
-
-int AddProcPtrInfo( const string &typeExpression, int nowLine ){
-    DWORD dwProcType = (DWORD)typeExpression[2];
-    const string &paramStr = typeExpression.substr( 3 );
-
-    Procedure::Kind kind = Procedure::Sub;
-    if( dwProcType == ESC_FUNCTION ){
-        kind = Procedure::Function;
-    }
-
-    ProcPointer *pProcPointer = new ProcPointer( kind );
-
-    //buffer[0]は'('となっている
-    pProcPointer->SetParamsAndReturnType( paramStr.c_str(), nowLine );
-
-    Smoothie::meta.procPointers.push_back( pProcPointer );
-
-    return (int)Smoothie::meta.procPointers.size()-1;
-}
-void DeleteProcPtrInfo(void){
-    BOOST_FOREACH( ProcPointer *pProcPointer, Smoothie::meta.procPointers ){
-        delete pProcPointer;
-    }
-
-    Smoothie::meta.procPointers.clear();
-}
-
-
-
 bool IsNeedProcCompile(){
     for(int i2=0;i2<MAX_HASH;i2++){

trunk/abdev/BasicCompiler_Common/VarList.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
 #include "../BasicCompiler_Common/common.h"
 
@@ -266 +268 @@
     extern int MemPos_RWSection;
 
-    foreach( Variable *pVar, globalVars ){
+    BOOST_FOREACH( Variable *pVar, globalVars ){
 
         //スコープ外の場合は無視
@@ -362 +364 @@
     if(!pUserProc) return;
 
-    foreach( Variable *pVar, pUserProc->localVars ){
+    BOOST_FOREACH( Variable *pVar, pUserProc->localVars ){
 
         //スコープ外の場合は無視
@@ -725 +727 @@
 
         if(pUserProc){
-            pobj_CompilingClass = pUserProc->GetParentClassPtr();
+            Smoothie::Temp::pCompilingClass = pUserProc->GetParentClassPtr();
             UserProc::CompileStartForUserProc( pUserProc );
         }

trunk/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <LexicalScopingImpl.h>
+
 #include "../BasicCompiler_Common/common.h"
 
@@ -7 +12 @@
 #endif
 
-BOOL IsVariableTopChar(char c){
-    if((c>='A'&&c<='Z')||(c>='a'&&c<='z')||c=='_') return 1;
-    return 0;
-}
-BOOL IsVariableChar(char c){
-    if((c>='A'&&c<='Z')||(c>='a'&&c<='z')||(c>='0'&&c<='9')||
-        c=='%'||c=='!'||c=='#'||c=='$'||
-        c=='_'||c=='.') return 1;
-    return 0;
-}
 BOOL IsPtrType(int type){
     if(type==-1) return 0;
@@ -119 +114 @@
             return DEF_QWORD;
         case DEF_CHAR:
-            if( isUnicode ) return DEF_WORD;
+            if( Smoothie::IsUnicode() ) return DEF_WORD;
             return DEF_BYTE;
     }
@@ -150 +145 @@
     //文字型
     else if( type == DEF_CHAR ){
-        if( isUnicode ) return sizeof( WORD );
+        if( Smoothie::IsUnicode() ) return sizeof( WORD );
         return sizeof( BYTE );
     }
@@ -220 +215 @@
         if(lpIndex==-1) lstrcpy(name,"VoidPtr");
         else{
-            if( Smoothie::meta.procPointers[lpIndex]->ReturnType().IsNull() )
+            if( Smoothie::GetMeta().GetProcPointers()[lpIndex]->ReturnType().IsNull() )
                 lstrcpy(name,"*Sub");
             else lstrcpy(name,"*Function");
@@ -235 +230 @@
 
 Type GetStringTypeInfo(){
-    Type type( DEF_OBJECT, *pobj_DBClass->GetStringClassPtr() );
+    Type type( DEF_OBJECT, *Smoothie::GetMeta().GetClasses().GetStringClassPtr() );
     return type;
 }
@@ -248 +243 @@
 }
 
-/*TODO: 消す
-bool FormatUseProcReturnObject( const char *term, char *procName, char *parameter, CClass::RefType &refType, char *member ){
-    int p1 = 0, p2 = 0;
-
-    for( int i=0; term[i]!='\0' ; i++ ){
-
-        if( term[i] == '[' ){
-            i = JumpStringInBracket( term, i + 1 );
-            if( term[i] == '\0' ) break;
-            continue;
-        }
-        if( term[i] == '(' ){
-            int temp_p = i;
-            i = JumpStringInPare( term, i + 1 ) + 1;
-            if( term[i] == '\0' ) break;
-            if( term[i] == '.'
-                || term[i] == 1 && term[i] == ESC_PSMEM ){
-                    p1 = temp_p;
-                    p2 = i;
-            }
-            continue;
-        }
-    }
-    if( !p1 ) return false;
-
-    //メソッド名
-    memcpy( procName, term, p1 );
-    procName[p1] = 0;
-
-    //パラメータ
-    memcpy( parameter, term + p1 + 1, p2 - p1 - 2 );
-    parameter[ p2 - p1 - 2 ] = 0;
-
-    //参照タイプ
-    if( term[p2] == '.' ){
-        refType = CClass::Dot;
-    }
-    else{
-        refType = CClass::Pointer;
-        p2++;
-    }
-
-    //メンバ
-    lstrcpy( member, term + p2 + 1 );
-
-    return true;
-}*/
+
+void GetArrange(char *variable,char *variAnswer,int *SubScripts){
+    extern int cp;
+    int i,i2,i3,i4;
+    double dbl;
+    _int64 i64data;
+    BOOL bBracket;
+    char temporary[VN_SIZE];
+
+    for(i=0;;i++){
+        if(variable[i]=='('||variable[i]=='['){
+            if(variable[i]=='[') bBracket=1;
+            else bBracket=0;
+
+            variAnswer[i]=0;
+            for(i++,i2=0,i3=0;;i++,i2++){
+                if(variable[i]==','){
+                    temporary[i2]=0;
+
+                    Type resultType;
+                    if( !StaticCalculation(true, temporary,0,&i64data,resultType) ){
+                        return;
+                    }
+                    if(resultType.IsReal()){
+                        memcpy(&dbl,&i64data,sizeof(double));
+                        i64data=(_int64)dbl;
+                    }
+
+                    if(i64data<0){
+                        //error
+                        SubScripts[i3]=0;
+                    }
+                    else SubScripts[i3]=(int)i64data;
+                    i3++;
+                    i2=-1;
+                    continue;
+                }
+                if(variable[i]=='('){
+                    i4=GetStringInPare(temporary+i2,variable+i);
+                    i2+=i4-1;
+                    i+=i4-1;
+                    continue;
+                }
+                if(variable[i]=='['){
+                    i4=GetStringInBracket(temporary+i2,variable+i);
+                    i2+=i4-1;
+                    i+=i4-1;
+                    continue;
+                }
+                if(variable[i]==')'&&bBracket==0||
+                    variable[i]==']'&&bBracket){
+                    temporary[i2]=0;
+                    if(i2==0){
+                        SubScripts[i3]=-2;
+                        break;
+                    }
+
+                    Type resultType;
+                    if( !StaticCalculation(true, temporary,0,&i64data,resultType) ){
+                        return;
+                    }
+                    if(resultType.IsReal()){
+                        memcpy(&dbl,&i64data,sizeof(double));
+                        i64data=(_int64)dbl;
+                    }
+
+                    if(i64data<0){
+                        //error
+                        SubScripts[i3]=0;
+                    }
+                    else SubScripts[i3]=(int)i64data;
+                    SubScripts[i3+1]=-1;
+                    break;
+                }
+                if(variable[i]=='\"'){
+                    SetError(1,NULL,cp);
+                    return;
+                }
+                temporary[i2]=variable[i];
+            }
+            break;
+        }
+        variAnswer[i]=variable[i];
+        if(variable[i]=='\0'){
+            SubScripts[0]=-1;
+            break;
+        }
+    }
+}
+
 
 BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember,CClass::RefType &refType){
@@ -427 +465 @@
     return i2;
 }
-void GetArrange(char *variable,char *variAnswer,int *SubScripts){
-    extern int cp;
-    int i,i2,i3,i4;
-    double dbl;
-    _int64 i64data;
-    BOOL bBracket;
-    char temporary[VN_SIZE];
-
-    for(i=0;;i++){
-        if(variable[i]=='('||variable[i]=='['){
-            if(variable[i]=='[') bBracket=1;
-            else bBracket=0;
-
-            variAnswer[i]=0;
-            for(i++,i2=0,i3=0;;i++,i2++){
-                if(variable[i]==','){
-                    temporary[i2]=0;
-
-                    Type resultType;
-                    if( !StaticCalculation(true, temporary,0,&i64data,resultType) ){
-                        return;
-                    }
-                    if(resultType.IsReal()){
-                        memcpy(&dbl,&i64data,sizeof(double));
-                        i64data=(_int64)dbl;
-                    }
-
-                    if(i64data<0){
-                        //error
-                        SubScripts[i3]=0;
-                    }
-                    else SubScripts[i3]=(int)i64data;
-                    i3++;
-                    i2=-1;
-                    continue;
-                }
-                if(variable[i]=='('){
-                    i4=GetStringInPare(temporary+i2,variable+i);
-                    i2+=i4-1;
-                    i+=i4-1;
-                    continue;
-                }
-                if(variable[i]=='['){
-                    i4=GetStringInBracket(temporary+i2,variable+i);
-                    i2+=i4-1;
-                    i+=i4-1;
-                    continue;
-                }
-                if(variable[i]==')'&&bBracket==0||
-                    variable[i]==']'&&bBracket){
-                    temporary[i2]=0;
-                    if(i2==0){
-                        SubScripts[i3]=-2;
-                        break;
-                    }
-
-                    Type resultType;
-                    if( !StaticCalculation(true, temporary,0,&i64data,resultType) ){
-                        return;
-                    }
-                    if(resultType.IsReal()){
-                        memcpy(&dbl,&i64data,sizeof(double));
-                        i64data=(_int64)dbl;
-                    }
-
-                    if(i64data<0){
-                        //error
-                        SubScripts[i3]=0;
-                    }
-                    else SubScripts[i3]=(int)i64data;
-                    SubScripts[i3+1]=-1;
-                    break;
-                }
-                if(variable[i]=='\"'){
-                    SetError(1,NULL,cp);
-                    return;
-                }
-                temporary[i2]=variable[i];
-            }
-            break;
-        }
-        variAnswer[i]=variable[i];
-        if(variable[i]=='\0'){
-            SubScripts[0]=-1;
-            break;
-        }
-    }
-}
-
-int GetTypeFromSimpleName(char *variable){
-    extern char DefIntVari[26],DefSngVari[26],DefStrVari[26],divNum,dsvNum,dStrvNum;
-    int i;
-    char name[VN_SIZE];
-
-    //構造体メンバの場合を考慮
-    for(i=lstrlen(variable);i>0;i--){
-        if(variable[i]=='.'){
-            i++;
-            break;
-        }
-    }
-
-    for(;;i++){
-        if(variable[i]=='('||variable[i]=='\0'){
-            name[i]=0;
-            break;
-        }
-        name[i]=variable[i];
-    }
-    //変数名から選択
-    i--;
-    if(name[i]=='#') return DEF_DOUBLE;
-    if(name[i]=='!') return DEF_SINGLE;
-    if(name[i]=='%') return DEF_INTEGER;
-    return DEF_DOUBLE;
-}
 
 
@@ -571 +493 @@
 
     //アクセシビリティをチェック
-    if( &objClass == pobj_CompilingClass ){
+    if( &objClass == Smoothie::Temp::pCompilingClass ){
         //同一クラスオブジェクトの場合はプライベートアクセスを容認する
         if( pMember->IsNoneAccess() ){
@@ -645 +567 @@
     // 名前空間を分離
     char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE];
-    Smoothie::meta.namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );
+    Smoothie::GetMeta().namespaceScopesCollection.SplitNamespace( variable, namespaceStr, simpleName );
 
     // 先頭オブジェクトまたはクラス名と入れ子メンバに分割
@@ -675 +597 @@
     }
 
-    if(pobj_CompilingClass){
+    if(Smoothie::Temp::pCompilingClass){
         ///////////////////////
         // クラスメンバの参照
@@ -682 +604 @@
         if(lstrcmpi(variable,"This")==0){
             //Thisオブジェクト
-            resultType.SetType( DEF_OBJECT, pobj_CompilingClass );
+            resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
             return true;
         }
@@ -695 +617 @@
 
             bool isFound = false;
-            BOOST_FOREACH( CMember *pMember, pobj_CompilingClass->GetDynamicMembers() ){
+            BOOST_FOREACH( CMember *pMember, Smoothie::Temp::pCompilingClass->GetDynamicMembers() ){
                 if( pMember->GetName() == VarName ){
                     isFound = true;
@@ -704 +626 @@
         }
 
-        return GetMemberType(*pobj_CompilingClass,variable,resultType,1,isErrorEnabled);
+        return GetMemberType(*Smoothie::Temp::pCompilingClass,variable,resultType,1,isErrorEnabled);
     }
 
@@ -738 +660 @@
         }
 
-        int typeDefIndex = Smoothie::meta.typeDefs.GetIndex( VarName );
+        int typeDefIndex = Smoothie::GetMeta().typeDefs.GetIndex( VarName );
         if( typeDefIndex != -1 ){
             // TypeDef後の型名だったとき
-            lstrcpy( VarName, Smoothie::meta.typeDefs[typeDefIndex].GetBaseName().c_str() );
+            lstrcpy( VarName, Smoothie::GetMeta().typeDefs[typeDefIndex].GetBaseName().c_str() );
         }
 
@@ -755 +677 @@
     }
 
-    if(pobj_CompilingClass){
+    if(Smoothie::Temp::pCompilingClass){
         //自身のクラスから静的メンバを参照する場合
         char temp2[VN_SIZE];
-        sprintf(temp2,"%s.%s",pobj_CompilingClass->GetName().c_str(),VarName);
+        sprintf(temp2,"%s.%s",Smoothie::Temp::pCompilingClass->GetName().c_str(),VarName);
 
         pVar = globalVars.Find( Symbol( temp2 ) );
@@ -972 +894 @@
         if( InitBuf[0] == '\0' ){
             //As指定も、初期値指定もない場合
-            type.SetBasicType( GetTypeFromSimpleName(variable) );
+            type.SetBasicType( Type::GetBasicTypeFromSimpleName(variable) );
 
             i2=lstrlen(variable)-1;
@@ -1015 +937 @@
 
     //クラス名
-    if(pobj_CompilingClass){
-        lstrcat(FullName,pobj_CompilingClass->GetName().c_str());
+    if(Smoothie::Temp::pCompilingClass){
+        lstrcat(FullName,Smoothie::Temp::pCompilingClass->GetName().c_str());
         lstrcat(FullName,"%");
     }
@@ -1052 +974 @@
     bool isConst = ( dwFlag & DIMFLAG_CONST ) ? true:false;
 
-    Variable *pVar = new Variable( Smoothie::Lexical::liveingNamespaceScopes, name, type, isConst );
+    Variable *pVar = new Variable( Smoothie::Temp::liveingNamespaceScopes, name, type, isConst );
 
     if( SubScripts[0] != -1 ){
@@ -1063 +985 @@
 
     //レキシカルスコープ
-    pVar->ScopeLevel=obj_LexScopes.GetNowLevel();
-    pVar->ScopeStartAddress=obj_LexScopes.GetStartAddress();
+    pVar->ScopeLevel=GetLexicalScopes().GetNowLevel();
+    pVar->ScopeStartAddress=GetLexicalScopes().GetStartAddress();
     pVar->bLiving=TRUE;
 

trunk/abdev/BasicCompiler_Common/VariableOpe.h

@@ -1 +1 @@
 
 
-BOOL IsVariableTopChar(char c);
-BOOL IsVariableChar(char c);
 BOOL IsPtrType(int type);
 BOOL IsSignedType(int type);
@@ -19 +17 @@
 BOOL CheckVarNameError(char *name,int nowLine);
 int JumpSubScripts(const int *ss);
-void GetArrange(char *variable,char *variAnswer,int *SubScripts);
-int GetTypeFromSimpleName(char *variable);
 bool GetMemberType( const CClass &objClass, const char *lpszMember, Type &resultType, BOOL bPrivateAccess, bool isErrorEnabled);
 bool GetVarType( const char *nameBuffer, Type &resultType, bool isError);

trunk/abdev/BasicCompiler_Common/WatchList.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
 #include "common.h"
 
@@ -316 +318 @@
     GlobalProc *pUserProc = GetSubFromObp(obp_Rip);
 
-    foreach( Variable *pVar, pUserProc->localVars ){
+    BOOST_FOREACH( Variable *pVar, pUserProc->localVars ){
         if( pVar->GetName() == "_System_LocalThis" ){
             return pVar->offset;
@@ -369 +371 @@
     }
 
-    if(pobj_CompilingClass){
+    if(Smoothie::Temp::pCompilingClass){
         ///////////////////////
         // クラスメンバの参照
@@ -383 +385 @@
 
             bool isFound = false;
-            BOOST_FOREACH( CMember *pMember, pobj_CompilingClass->GetDynamicMembers() ){
+            BOOST_FOREACH( CMember *pMember, Smoothie::Temp::pCompilingClass->GetDynamicMembers() ){
                 if( pMember->GetName() == VarName ){
                     isFound = true;
@@ -412 +414 @@
         pRelativeVar->dwKind=VAR_DIRECTMEM;
 
-        i3=Debugging_GetMember(*pobj_CompilingClass,variable,pRelativeVar,resultType,1);
+        i3=Debugging_GetMember(*Smoothie::Temp::pCompilingClass,variable,pRelativeVar,resultType,1);
         if(i3==0){
             //式エラー

trunk/abdev/BasicCompiler_Common/calculation.cpp

@@ +1 @@
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include "../BasicCompiler_Common/common.h"
 

trunk/abdev/BasicCompiler_Common/common.h

@@ -19 +19 @@
 #include <boost/foreach.hpp>
 
-#define foreach BOOST_FOREACH
-
 using namespace std;
 
@@ -39 +37 @@
 #include "../BasicCompiler_Common/psapi.h"
 #include "../BasicCompiler_Common/BreakPoint.h"
-#include "../BasicCompiler_Common/LexicalScoping.h"
 
 
@@ -56 +53 @@
 
 #define MAX_LEN         65535
-#define VN_SIZE         512
 #define DIGIT_SIZE      128
 #define MAX_PARMS       64
@@ -91 +87 @@
 extern HANDLE hHeap;
 extern int cp;
-extern bool isUnicode;
 extern int typeOfPtrChar;
 extern int typeOfPtrUChar;
@@ -144 +139 @@
 
 
-// クラス管理用のクラス
-#include "Class.h"
-
 // 列挙体管理用のクラス
 #include "Enum.h"
@@ -152 +144 @@
 // 定数管理用のクラス
 #include "Const.h"
-
-// 変数管理用のクラス
-#include "Variable.h"
-
-// パラメータ管理用のクラス
-#include "Parameter.h"
-
-// プロシージャ管理用のクラス
-#include "Procedure.h"
-
-// コンパイラが必要とするデータハウス
-#include <Smoothie.h>
 
 
@@ -170 +150 @@
     char *FileName;
     int line;
-};
-struct INCLUDEFILEINFO{
-    char **ppFileNames;
-    int FilesNum;
-    int LineOfFile[MAX_LEN];
 };
 
@@ -272 +247 @@
 #include "../BasicCompiler_Common/DebugSection.h"
 #include "../BasicCompiler_Common/VariableOpe.h"
-#include <Exception.h>
 
 
@@ -388 +362 @@
 void SlideString(char *str,int slide);
 void SlideBuffer(char *buffer,int length,int slide);
-_int8 IsCommandDelimitation(char c);
-BOOL IsBlank(char c);
-int GetOneParameter(const char *Parameter,int pos,char *retAns);
-int JumpOneParameter(char *Parameter,int i);
-int GetStringInQuotation(char *buffer,char *ReadBuffer);
-int GetStringInPare(char *buffer,const char *ReadBuffer);
-int GetStringInPare_RemovePare(char *buffer,char *ReadBuffer);
-int GetStringInBracket(char *buffer,const char *ReadBuffer);
-int JumpStringInPare(const char *buffer,int pos);
-int JumpStringInBracket(const char *buffer,int pos);
 int GetCpFromLine(int LineNum);
 BOOL GetLineNum(int pos,int *pLine,char *FileName);
@@ -435 +399 @@
 int GetProc(char *name,void **ppInfo);
 void SplitObjectName(const char *name,char *ObjectName,int *pRefType);
-bool SplitMemberName( const char *desc, char *object, char *member, CClass::RefType &refType );
-bool SplitMemberName( const char *desc, char *object, char *member );
 bool CallProc( int kind, const void *pProc, const char *fullCallName, const char *lpszParms, Type &resultType, bool isCallOn = true );
 bool CallPropertyMethod( const char *variable, const char *rightSide, Type &resultType);
@@ -446 +408 @@
 void DeleteDeclareInfo(void);
 int AddProcPtrInfo( const string &typeExpression, int nowLine );
-void DeleteProcPtrInfo(void);
 bool IsNeedProcCompile();
 
@@ -452 +413 @@
 void Opcode_Input(const char *Parameter);
 void Opcode_Print(const char *Parameter,BOOL bWrite);
-
-//LoopRefCheck.cpp
-class CLoopRefCheck{
-    char **names;
-    int num;
-    void init();
-public:
-    CLoopRefCheck();
-    ~CLoopRefCheck();
-    void add(const char *lpszInheritsClass);
-    void del(const char *lpszInheritsClass);
-    BOOL check(const CClass &inheritsClass) const;
-};
-extern CLoopRefCheck *pobj_LoopRefCheck;
-
-//DataTable.cpp
-class DataTable{
-    void *pdata;
-    int size;
-
-public:
-    DataTable();
-    ~DataTable();
-    void Init();
-
-    int AddBinary( const void *pdata, int size );
-    int Add( _int64 i64data );
-    int Add( int i32data );
-    int Add( double dbl );
-    int Add( float flt );
-    int AddString( const char *str, int length );
-    int AddString( const char *str );
-
-    const void *GetPtr() const;
-    int GetSize() const;
-};
-extern DataTable dataTable;
 
 //error.cpp
@@ -499 +423 @@
 
 //Compile.cpp
-void ReallocNativeCodeBuffer();
 void GetIdentifierToken( char *token, const char *source, int &pos );
 int JumpStatement(const char *source, int &pos);

trunk/abdev/BasicCompiler_Common/error.cpp

@@ +1 @@
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
 #include <Program.h>
 

trunk/abdev/BasicCompiler_Common/hash.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+
 #include "../BasicCompiler_Common/common.h"
 
@@ -38 +40 @@
     char ObjName[VN_SIZE];      //オブジェクト変数
     char NestMember[VN_SIZE];   //入れ子メンバ
-    bool isObjectMember = SplitMemberName( fullName, ObjName, NestMember );
+    bool isObjectMember = CClass::SplitName( fullName, ObjName, NestMember );
 
     //ハッシュ値を取得
@@ -71 +73 @@
     char ObjName[VN_SIZE];      //オブジェクト変数
     char NestMember[VN_SIZE];   //入れ子メンバ
-    bool isObjectMember = SplitMemberName( name, ObjName, NestMember );
+    bool isObjectMember = CClass::SplitName( name, ObjName, NestMember );
 
     if(isObjectMember){
@@ -80 +82 @@
         if(lstrcmpi(ObjName,"Super")==0){
             //クラスメンバ関数内から基底クラスの呼び出し
-            pobj_c=pobj_CompilingClass;
+            pobj_c=Smoothie::Temp::pCompilingClass;
         }
         else{
@@ -89 +91 @@
             }
             else{
-                pobj_c=pobj_DBClass->Find(ObjName);
+                pobj_c=Smoothie::GetMeta().GetClasses().Find(ObjName);
                 if( pobj_c ){
                     isStatic = true;
@@ -110 +112 @@
 
 
-    if(pobj_CompilingClass){
+    if(Smoothie::Temp::pCompilingClass){
         //自身のオブジェクトのメンバ関数を検索
 
         // 静的メソッド
-        pobj_CompilingClass->GetStaticMethods().Enum( name, subs );
+        Smoothie::Temp::pCompilingClass->GetStaticMethods().Enum( name, subs );
 
         // 動的メソッド
-        pobj_CompilingClass->GetMethods().Enum( name, subs );
+        Smoothie::Temp::pCompilingClass->GetMethods().Enum( name, subs );
     }
 
@@ -187 +189 @@
 
 UserProc *GetClassMethod( const char *className, const char *methodName ){
-    const CClass *pClass = pobj_DBClass->Find( className );
+    const CClass *pClass = Smoothie::GetMeta().GetClasses().Find( className );
     if( pClass ){
         vector<UserProc *> userProcs;

trunk/abdev/BasicCompiler_Common/include/option.h

@@ -23 +23 @@
 
 // ログ生成しない場合はこの下の行をコメントアウトする
-#define USE_TRACE
+//#define USE_TRACE
 
 // オーバーロードに関するログを生成する