Changeset 256 in dev

Timestamp:

Aug 1, 2007, 11:19:01 PM (17 years ago)

Author:

dai_9181

Message:

MetaImplを廃止し、Metaにした。
ObjectModuleクラス、Linkerクラスを用意。

Location:

trunk/abdev

Files:

• BasicCompiler32/BasicCompiler.vcproj (modified) (3 diffs)
• BasicCompiler32/Compile_Calc.cpp (modified) (2 diffs)
• BasicCompiler32/Compile_CallProc.cpp (modified) (1 diff)
• BasicCompiler32/Compile_Func.cpp (modified) (2 diffs)
• BasicCompiler32/Compile_ProcOp.cpp (modified) (6 diffs)
• BasicCompiler32/Compile_Var.cpp (modified) (9 diffs)
• BasicCompiler32/MakePeHdr.cpp (modified) (18 diffs)
• BasicCompiler32/NumOpe.cpp (modified) (12 diffs)
• BasicCompiler_Common/BreakPoint.cpp (modified) (3 diffs)
• BasicCompiler_Common/BreakPoint.h (modified) (2 diffs)
• BasicCompiler_Common/Debug.cpp (modified) (1 diff)
• BasicCompiler_Common/DebugMiddleFile.cpp (modified) (18 diffs)
• BasicCompiler_Common/Diagnose.cpp (modified) (3 diffs)
• BasicCompiler_Common/Intermediate_Step2.cpp (modified) (3 diffs)
• BasicCompiler_Common/MakeExe.cpp (modified) (1 diff)
• BasicCompiler_Common/NumOpe_GetType.cpp (modified) (7 diffs)
• BasicCompiler_Common/Subroutine.cpp (modified) (2 diffs)
• BasicCompiler_Common/VarList.cpp (modified) (4 diffs)
• BasicCompiler_Common/VariableOpe.cpp (modified) (13 diffs)
• BasicCompiler_Common/WatchList.cpp (modified) (1 diff)
• BasicCompiler_Common/calculation.cpp (modified) (4 diffs)
• BasicCompiler_Common/hash.cpp (modified) (4 diffs)
• BasicCompiler_Common/include/BoostSerializationSupport.h (modified) (1 diff)
• BasicCompiler_Common/include/Compiler.h (modified) (3 diffs)
• BasicCompiler_Common/include/DataTable.h (modified) (1 diff)
• BasicCompiler_Common/include/Linker.h (added)
• BasicCompiler_Common/include/Meta.h (moved) (moved from trunk/abdev/BasicCompiler_Common/include/MetaImpl.h ) (3 diffs)
• BasicCompiler_Common/include/NativeCode.h (modified) (8 diffs)
• BasicCompiler_Common/include/SmoothieImpl.h (modified) (1 diff)
• BasicCompiler_Common/src/BoostSerializationSupport.cpp (modified) (4 diffs)
• BasicCompiler_Common/src/Class.cpp (modified) (11 diffs)
• BasicCompiler_Common/src/Compiler.cpp (modified) (5 diffs)
• BasicCompiler_Common/src/Const.cpp (modified) (3 diffs)
• BasicCompiler_Common/src/DataTable.cpp (modified) (2 diffs)
• BasicCompiler_Common/src/LexicalScope.cpp (modified) (2 diffs)
• BasicCompiler_Common/src/NamespaceSupporter.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/BasicCompiler.vcproj

@@ -1254 +1254 @@
                 </File>
                 <Filter
+                    Name="CoreClasses"
+                    >
+                    <File
+                        RelativePath="..\BasicCompiler_Common\src\CommonCodeGenerator.cpp"
+                        >
+                    </File>
+                </Filter>
+            </Filter>
+            <Filter
+                Name="Compiler Classes"
+                >
+                <Filter
                     Name="Langauge Classes"
                     >
@@ -1326 +1338 @@
                     <File
                         RelativePath="..\BasicCompiler_Common\src\Variable.cpp"
-                        >
-                    </File>
-                </Filter>
-                <Filter
-                    Name="CoreClasses"
-                    >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\src\CommonCodeGenerator.cpp"
                         >
                     </File>
@@ -1392 +1396 @@
             </Filter>
             <Filter
-                Name="Language Classes"
-                >
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Class.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\CodeGenerator.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Compiler.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Const.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\DataTable.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Exception.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\LexicalScope.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Member.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\MetaImpl.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Method.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Namespace.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\NamespaceSupporter.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\NativeCode.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Parameter.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Procedure.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Program.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Prototype.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\SmoothieImpl.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Symbol.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Type.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\TypeDef.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Variable.h"
+                Name="Common Classes"
+                >
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\BoostSerializationSupport.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\Hashmap.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\logger.h"
                     >
                 </File>
             </Filter>
             <Filter
-                Name="Common Classes"
-                >
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\BoostSerializationSupport.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\Hashmap.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\include\logger.h"
-                    >
-                </File>
+                Name="Compiler Classes"
+                >
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\CodeGenerator.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\Compiler.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\Linker.h"
+                    >
+                </File>
+                <Filter
+                    Name="Language Classes"
+                    >
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Class.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Const.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\DataTable.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Exception.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\LexicalScope.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Member.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Meta.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Method.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Namespace.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\NamespaceSupporter.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\NativeCode.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Parameter.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Procedure.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Program.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Prototype.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\SmoothieImpl.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Symbol.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Type.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\TypeDef.h"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\include\Variable.h"
+                        >
+                    </File>
+                </Filter>
             </Filter>
         </Filter>

trunk/abdev/BasicCompiler32/Compile_Calc.cpp

@@ -461 +461 @@
             }
             else{
-                if( compiler.GetMeta().GetGlobalConsts().IsExist(variable)
-                    || compiler.GetMeta().GetGlobalConstMacros().IsExist(variable) )
+                if( compiler.objectModule.meta.GetGlobalConsts().IsExist(variable)
+                    || compiler.objectModule.meta.GetGlobalConstMacros().IsExist(variable) )
                 {
                     //定数リストに該当したとき
@@ -606 +606 @@
 
 
-    if( varType.IsObject() && compiler.GetMeta().GetBlittableTypes().IsExist( calcType ) ){
+    if( varType.IsObject() && compiler.objectModule.meta.GetBlittableTypes().IsExist( calcType ) ){
         // Blittable型をオブジェクトとして扱う
         vector<const UserProc *> userProcs;
-        compiler.GetMeta().GetBlittableTypes().GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );
+        compiler.objectModule.meta.GetBlittableTypes().GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );
         if( userProcs.size() != 1 ){
             SetError();

trunk/abdev/BasicCompiler32/Compile_CallProc.cpp

@@ -117 +117 @@
                 pobj_c = &varType.GetClass();
                 if( NATURAL_TYPE( varType.GetBasicType() ) != DEF_OBJECT ){
-                    pobj_c=compiler.GetMeta().GetClasses().Find(ObjectName);
+                    pobj_c=compiler.objectModule.meta.GetClasses().Find(ObjectName);
                     if( pobj_c ){
                         isStatic = true;

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -185 +185 @@
         tempParm=temp2;
 
-        type.SetType( DEF_OBJECT, compiler.GetMeta().GetClasses().GetStringClassPtr() );
+        type.SetType( DEF_OBJECT, compiler.objectModule.meta.GetClasses().GetStringClassPtr() );
     }
 
@@ -235 +235 @@
 
         //オーバーロードを解決
-        pUserProc=OverloadSolution(name,subs,compiler.GetMeta().GetProcPointers()[ProcPtr_BaseIndex]->Params(), Type() );
+        pUserProc=OverloadSolution(name,subs,compiler.objectModule.meta.GetProcPointers()[ProcPtr_BaseIndex]->Params(), Type() );
 
         if(!pUserProc){

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -58 +58 @@
 
         //クラスに属する静的メンバを定義
-        compiler.GetMeta().GetClasses().InitStaticMember();
+        compiler.objectModule.meta.GetClasses().InitStaticMember();
 
         GetGlobalDataForDll();
@@ -71 +71 @@
         //静的ローカルオブジェクトのコンストラクタ呼び出し
 
-        BOOST_FOREACH( Variable *pVar, compiler.GetMeta().GetGlobalVars() ){
+        BOOST_FOREACH( Variable *pVar, compiler.objectModule.meta.GetGlobalVars() ){
             if(memicmp(pVar->GetName().c_str(),"Static%",7)==0){
                 //コンストラクタ呼び出し
@@ -219 +219 @@
         && userProc.GetParentClass().GetName() == "_System_TypeBase" ){
 
-            compiler.GetMeta().GetClasses().Compile_System_InitializeUserTypes();
+            compiler.objectModule.meta.GetClasses().Compile_System_InitializeUserTypes();
     }
     else if( userProc.GetName() == "RegisterGlobalRoots"
@@ -270 +270 @@
 
     //コンパイルスタートをクラス管理クラスに追加
-    compiler.GetMeta().GetClasses().StartCompile( pUserProc );
+    compiler.objectModule.meta.GetClasses().StartCompile( pUserProc );
 
     //コンパイル中の関数
@@ -789 +789 @@
 
 repeat:
-    compiler.GetMeta().GetUserProcs().Iterator_Reset();
-    while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+    compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
+    while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
     {
-        UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+        UserProc *pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
         CompileBufferInProcedure( *pUserProc );
     }
@@ -808 +808 @@
         //プロシージャコンパイルによって、プロシージャコンパイルが必要になる場合
 
-        compiler.GetMeta().GetUserProcs().Iterator_Reset();
-        while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+        compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
+        while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
         {
-            UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+            UserProc *pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
             CompileBufferInProcedure( *pUserProc );
         }

trunk/abdev/BasicCompiler32/Compile_Var.cpp

@@ -362 +362 @@
     // 名前空間を分離
     char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE];
-    compiler.GetMeta().GetNamespaces().SplitNamespace( variable, namespaceStr, simpleName );
+    compiler.objectModule.meta.GetNamespaces().SplitNamespace( variable, namespaceStr, simpleName );
 
     // 先頭オブジェクトまたはクラス名と入れ子メンバに分割
@@ -456 +456 @@
         //Const修飾子のメソッド内でメンバ書き込みアクセスが発生したとき
         //（コンストラクタ、デストラクタ内を除く）
-        const CMethod *pMethod = compiler.GetMeta().GetClasses().GetNowCompilingMethodInfo();
+        const CMethod *pMethod = compiler.objectModule.meta.GetClasses().GetNowCompilingMethodInfo();
         if( isWriteAccess &&
             pMethod->IsConst() &&
@@ -496 +496 @@
             GetNowStaticVarFullName(VarName,temporary);
 
-            pVar = compiler.GetMeta().GetGlobalVars().Find( Symbol( temporary ) );
+            pVar = compiler.objectModule.meta.GetGlobalVars().Find( Symbol( temporary ) );
             if( pVar ){
                 goto GlobalOk;
@@ -519 +519 @@
             }
 
-            int typeDefIndex = compiler.GetMeta().GetTypeDefs().GetIndex( VarName );
+            int typeDefIndex = compiler.objectModule.meta.GetTypeDefs().GetIndex( VarName );
             if( typeDefIndex != -1 ){
                 // TypeDef後の型名だったとき
-                lstrcpy( VarName, compiler.GetMeta().GetTypeDefs()[typeDefIndex].GetBaseName().c_str() );
+                lstrcpy( VarName, compiler.objectModule.meta.GetTypeDefs()[typeDefIndex].GetBaseName().c_str() );
             }
 
             char temp2[VN_SIZE];
             sprintf(temp2,"%s.%s",VarName,temporary);
-            pVar = compiler.GetMeta().GetGlobalVars().Find( Symbol( temp2 ) );
+            pVar = compiler.objectModule.meta.GetGlobalVars().Find( Symbol( temp2 ) );
             if( pVar ){
                 lstrcpy(member,tempMember);
@@ -539 +539 @@
             char temp2[VN_SIZE];
             sprintf(temp2,"%s.%s",compiler.pCompilingClass->GetName().c_str(),VarName);
-            pVar = compiler.GetMeta().GetGlobalVars().Find( Symbol( temp2 ) );
+            pVar = compiler.objectModule.meta.GetGlobalVars().Find( Symbol( temp2 ) );
             if( pVar ){
                 goto GlobalOk;
@@ -549 +549 @@
         /////////////////////
 
-        pVar = compiler.GetMeta().GetGlobalVars().BackSearch( Symbol( VarName ) );
+        pVar = compiler.objectModule.meta.GetGlobalVars().BackSearch( Symbol( VarName ) );
         if( pVar ){
             goto GlobalOk;
@@ -837 +837 @@
             char *temp;
             temp=(char *)i64data;
-            i2=compiler.GetDataTable().AddString(temp,lstrlen(temp));
+            i2=compiler.objectModule.dataTable.AddString(temp,lstrlen(temp));
             HeapDefaultFree(temp);
 
@@ -1010 +1010 @@
             char *temp;
             temp=(char *)i64data;
-            i2=compiler.GetDataTable().AddString(temp,lstrlen(temp));
+            i2=compiler.objectModule.dataTable.AddString(temp,lstrlen(temp));
             HeapDefaultFree(temp);
 
@@ -1267 +1267 @@
     }
 
-    BOOST_FOREACH( const Variable *pVar, compiler.GetMeta().GetGlobalVars() ){
+    BOOST_FOREACH( const Variable *pVar, compiler.objectModule.meta.GetGlobalVars() ){
         if( pVar->GetType().IsObject() || pVar->GetType().IsPointer() || pVar->GetType().IsStruct() ){
             // オブジェクトまたはポインタだったとき

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -146 +146 @@
     //////////////////
     // データテーブル
-    compiler.GetDataTable().Init();
+    compiler.objectModule.dataTable.Clear();
     if(bDebugCompile){
-        compiler.GetDataTable().Add( (long)0x00000002 );
+        compiler.objectModule.dataTable.Add( (long)0x00000002 );
     }
 
@@ -172 +172 @@
 
     //関数ポインタ情報を初期化
-    compiler.GetMeta().GetProcPointers().clear();
+    compiler.objectModule.meta.GetProcPointers().clear();
 
     // 名前空間情報を取得
     NamespaceSupporter::CollectNamespaces(
         Smoothie::Lexical::source.GetBuffer(),
-        compiler.GetMeta().GetNamespaces()
+        compiler.objectModule.meta.GetNamespaces()
     );
 
@@ -183 +183 @@
     //   CollectProcedures関数の中で参照されるオブジェクト名を事前に取得する。
     //     ※オブジェクトの内容までは取得しない
-    compiler.GetMeta().GetClasses().CollectClassesForNameOnly( Smoothie::Lexical::source );
+    compiler.objectModule.meta.GetClasses().CollectClassesForNameOnly( Smoothie::Lexical::source );
 
     //TypeDef情報を初期化
-    compiler.GetMeta().GetTypeDefs().Init();
+    compiler.objectModule.meta.GetTypeDefs().Init();
 
     //定数情報を取得
@@ -195 +195 @@
     CollectProcedures(
         Smoothie::Lexical::source,
-        compiler.GetMeta().GetUserProcs(),
-        compiler.GetMeta().GetDllProcs()
+        compiler.objectModule.meta.GetUserProcs(),
+        compiler.objectModule.meta.GetDllProcs()
     );
 
     // クラス情報を取得（※注 - CollectProceduresの後に呼び出す）
-    compiler.GetMeta().GetClasses().GetAllClassInfo();
+    compiler.objectModule.meta.GetClasses().GetAllClassInfo();
 
     // サブルーチン（ユーザー定義、DLL関数）のイテレータの準備
-    compiler.GetMeta().GetUserProcs().Iterator_Init();
-    compiler.GetMeta().GetDllProcs().Iterator_Init();
+    compiler.objectModule.meta.GetUserProcs().Iterator_Init();
+    compiler.objectModule.meta.GetDllProcs().Iterator_Init();
 
 /*
-    if( !compiler.GetMeta().WriteXml( Jenga::Common::Environment::GetAppDir() + "\\meta_test.xml" ) )
+    if( !compiler.objectModule.WriteXml( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.xml" ) )
     {
         MessageBox(0,"XML書き込みに失敗","test",0);
     }
-    MetaImpl *pTempMeta = new MetaImpl();
-    if( !pTempMeta->ReadXml( Jenga::Common::Environment::GetAppDir() + "\\meta_test.xml" ) )
+    ObjectModule *pTempObjectModule = new ObjectModule();
+    if( !pTempObjectModule->ReadXml( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.xml" ) )
     {
         MessageBox(0,"XML読み込みに失敗","test",0);
     }
 
-    if( !compiler.GetMeta().WriteBinaly( Jenga::Common::Environment::GetAppDir() + "\\meta_test.dat" ) )
+    if( !compiler.objectModule.meta.WriteBinary( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.dat" ) )
     {
         MessageBox(0,"バイナリ書き込みに失敗","test",0);
     }
-    MetaImpl *pTempMeta = new MetaImpl();
-    if( !pTempMeta->ReadBinaly( Jenga::Common::Environment::GetAppDir() + "\\meta_test.dat" ) )
+    Meta *pTempMeta = new Meta();
+    if( !pTempMeta->ReadBinary( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.dat" ) )
     {
         MessageBox(0,"バイナリ読み込みに失敗","test",0);
     }
-    if( !compiler.GetMeta().WriteText( Jenga::Common::Environment::GetAppDir() + "\\meta_test.dat" ) )
+    if( !compiler.objectModule.meta.WriteText( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.dat" ) )
     {
         MessageBox(0,"バイナリ書き込みに失敗","test",0);
     }
-    MetaImpl *pTempMeta = new MetaImpl();
-    if( !pTempMeta->ReadText( Jenga::Common::Environment::GetAppDir() + "\\meta_test.dat" ) )
+    Meta *pTempMeta = new Meta();
+    if( !pTempMeta->ReadText( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.dat" ) )
     {
         MessageBox(0,"バイナリ読み込みに失敗","test",0);
     }
-    compiler.GetMeta() = (*pTempMeta);*/
+    compiler.objectModule = (*pTempObjectModule);*/
 
 
@@ -436 +436 @@
 
         // コード生成対象を選択
-        compiler.codeGenerator.Select( compiler.globalNativeCode );
+        compiler.codeGenerator.Select( compiler.objectModule.globalNativeCode );
 
         trace_for_sourcecodestep( "★★★ グローバル領域のコンパイルを開始" );
@@ -461 +461 @@
 
         //クラスに属する静的メンバを定義
-        compiler.GetMeta().GetClasses().InitStaticMember();
+        compiler.objectModule.meta.GetClasses().InitStaticMember();
 
         //グローバル実行領域をコンパイル開始
@@ -550 +550 @@
 
 
+    trace( "コード生成が終了しました。" );
+
+
+/*
+    int t,t2;
+    t=GetTickCount();
+    if( !compiler.objectModule.WriteText( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.xml" ) )
+    {
+        MessageBox(0,"XML書き込みに失敗","test",0);
+    }
+    if( !compiler.objectModule.ReadText( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.xml" ) )
+    {
+        MessageBox(0,"XML読み込みに失敗","test",0);
+    }
+    t2=GetTickCount();
+    t2-=t;
+    char s[100];
+    sprintf(s,"%d",t2);
+    MessageBox(0,s,"test",0);
+    
+    if( !compiler.objectModule.meta.WriteBinary( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.dat" ) )
+    {
+        MessageBox(0,"バイナリ書き込みに失敗","test",0);
+    }
+    Meta *pTempMeta = new Meta();
+    if( !pTempMeta->ReadBinary( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.dat" ) )
+    {
+        MessageBox(0,"バイナリ読み込みに失敗","test",0);
+    }
+    if( !compiler.objectModule.meta.WriteText( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.dat" ) )
+    {
+        MessageBox(0,"バイナリ書き込みに失敗","test",0);
+    }
+    Meta *pTempMeta = new Meta();
+    if( !pTempMeta->ReadText( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.dat" ) )
+    {
+        MessageBox(0,"バイナリ読み込みに失敗","test",0);
+    }*/
+
+
 
     ////////////////////////////////
@@ -561 +601 @@
     // 使用するDLL関数のチェック
     ////////////////////////////////
-    compiler.GetMeta().GetDllProcs().Iterator_Reset();
-    while( compiler.GetMeta().GetDllProcs().Iterator_HasNext() )
+    compiler.objectModule.meta.GetDllProcs().Iterator_Reset();
+    while( compiler.objectModule.meta.GetDllProcs().Iterator_HasNext() )
     {
-        const DllProc *pDllProc = compiler.GetMeta().GetDllProcs().Iterator_GetNext();
+        const DllProc *pDllProc = compiler.objectModule.meta.GetDllProcs().Iterator_GetNext();
 
         if( !pDllProc->IsUsing() ){
@@ -634 +674 @@
             //辞書順にサーチ
             temporary[0]=0;
-            compiler.GetMeta().GetUserProcs().Iterator_Reset();
-            while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+            compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
+            while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
             {
-                pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+                pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
                 if(pUserProc->IsExport()){
                     if(temporary[0]=='\0'){
@@ -724 +764 @@
     int ImportDllNum=0;
 
-    compiler.GetMeta().GetDllProcs().Iterator_Reset();
-    while( compiler.GetMeta().GetDllProcs().Iterator_HasNext() )
+    compiler.objectModule.meta.GetDllProcs().Iterator_Reset();
+    while( compiler.objectModule.meta.GetDllProcs().Iterator_HasNext() )
     {
-        const DllProc *pDllProc = compiler.GetMeta().GetDllProcs().Iterator_GetNext();
+        const DllProc *pDllProc = compiler.objectModule.meta.GetDllProcs().Iterator_GetNext();
 
         if( !pDllProc->IsUsing() ){
@@ -764 +804 @@
         pImportTable[i].Name=i3+i*0x10;
 
-        compiler.GetMeta().GetDllProcs().Iterator_Reset();
-        while( compiler.GetMeta().GetDllProcs().Iterator_HasNext() )
+        compiler.objectModule.meta.GetDllProcs().Iterator_Reset();
+        while( compiler.objectModule.meta.GetDllProcs().Iterator_HasNext() )
         {
-            const DllProc *pDllProc = compiler.GetMeta().GetDllProcs().Iterator_GetNext();
+            const DllProc *pDllProc = compiler.objectModule.meta.GetDllProcs().Iterator_GetNext();
 
             if( !pDllProc->IsUsing() ){
@@ -793 +833 @@
     i3+=ImportDllNum*0x10;
     for(i=0,i5=0;i<ImportDllNum;i++){
-        compiler.GetMeta().GetDllProcs().Iterator_Reset();
-        while( compiler.GetMeta().GetDllProcs().Iterator_HasNext() )
+        compiler.objectModule.meta.GetDllProcs().Iterator_Reset();
+        while( compiler.objectModule.meta.GetDllProcs().Iterator_HasNext() )
         {
-            DllProc *pDllProc = compiler.GetMeta().GetDllProcs().Iterator_GetNext();
+            DllProc *pDllProc = compiler.objectModule.meta.GetDllProcs().Iterator_GetNext();
 
             if( !pDllProc->IsUsing() ){
@@ -839 +879 @@
     //（デバッグ情報で利用される）
     extern int AllInitGlobalVarSize;
-    BOOST_FOREACH( Variable *pVar, compiler.GetMeta().GetGlobalVars() ){
+    BOOST_FOREACH( Variable *pVar, compiler.objectModule.meta.GetGlobalVars() ){
         if(pVar->GetOffsetAddress()&0x80000000){
             pVar->SetOffsetAddress( (pVar->GetOffsetAddress()&0x7FFFFFFF)+AllInitGlobalVarSize );
@@ -921 +961 @@
 
     //データセクションのファイル上のサイズ
-    if(compiler.GetDataTable().GetSize()%FILE_ALIGNMENT) FileSize_DataSection=compiler.GetDataTable().GetSize()+(FILE_ALIGNMENT-compiler.GetDataTable().GetSize()%FILE_ALIGNMENT);
-    else FileSize_DataSection=compiler.GetDataTable().GetSize();
+    if(compiler.objectModule.dataTable.GetSize()%FILE_ALIGNMENT) FileSize_DataSection=compiler.objectModule.dataTable.GetSize()+(FILE_ALIGNMENT-compiler.objectModule.dataTable.GetSize()%FILE_ALIGNMENT);
+    else FileSize_DataSection=compiler.objectModule.dataTable.GetSize();
     if(FileSize_DataSection) bUse_DataSection=1;
     else bUse_DataSection=0;
@@ -1084 +1124 @@
             HintSize;           //ヒント名（関数名）テーブル
 
-        compiler.GetMeta().GetDllProcs().Iterator_Reset();
-        while( compiler.GetMeta().GetDllProcs().Iterator_HasNext() )
+        compiler.objectModule.meta.GetDllProcs().Iterator_Reset();
+        while( compiler.objectModule.meta.GetDllProcs().Iterator_HasNext() )
         {
-            const DllProc *pDllProc = compiler.GetMeta().GetDllProcs().Iterator_GetNext();
+            const DllProc *pDllProc = compiler.objectModule.meta.GetDllProcs().Iterator_GetNext();
 
             if( !pDllProc->IsUsing() ){
@@ -1105 +1145 @@
     ////////////////////////////////////////
     //仮想関数データテーブルスケジュール
-    compiler.GetMeta().GetClasses().ActionVtblSchedule(ImageBase,MemPos_CodeSection);
+    compiler.objectModule.meta.GetClasses().ActionVtblSchedule(ImageBase,MemPos_CodeSection);
 
 
@@ -1640 +1680 @@
     if(bUse_DataSection){
         //データ テーブル
-        WriteFile(hFile,compiler.GetDataTable().GetPtr(),compiler.GetDataTable().GetSize(),(DWORD *)&i2,NULL);
+        WriteFile(hFile,compiler.objectModule.dataTable.GetPtr(),compiler.objectModule.dataTable.GetSize(),(DWORD *)&i2,NULL);
         i+=i2;
     }
@@ -1752 +1792 @@
 
     //クラスに関するメモリを解放
-    compiler.GetMeta().GetClasses().Clear();
+    compiler.objectModule.meta.GetClasses().Clear();
 }

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -76 +76 @@
     SetStringQuotes( parameter );
 
-    Operator_New( *compiler.GetMeta().GetClasses().GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *compiler.GetMeta().GetClasses().GetStringClassPtr() ) );
+    Operator_New( *compiler.objectModule.meta.GetClasses().GetStringClassPtr(), "", parameter, Type( DEF_OBJECT, *compiler.objectModule.meta.GetClasses().GetStringClassPtr() ) );
 
     free( parameter );
@@ -254 +254 @@
         Type leftType;
         if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
-            if( isClassName == false && compiler.GetMeta().GetBlittableTypes().IsExist( leftType ) ){
+            if( isClassName == false && compiler.objectModule.meta.GetBlittableTypes().IsExist( leftType ) ){
                 // 左側のオブジェクト部分がBlittable型のとき
 
@@ -260 +260 @@
                 lstrcpy( temporary, termLeft );
                 sprintf( termLeft, "%s(%s)",
-                    compiler.GetMeta().GetBlittableTypes().Find( leftType ).GetCreateStaticMethodFullName().c_str(),
+                    compiler.objectModule.meta.GetBlittableTypes().Find( leftType ).GetCreateStaticMethodFullName().c_str(),
                     temporary );
             }
@@ -289 +289 @@
 
     if( pIsClassName ){
-        if( compiler.GetMeta().GetClasses().Find( termFull ) ){
+        if( compiler.objectModule.meta.GetClasses().Find( termFull ) ){
             *pIsClassName = true;
             return true;
@@ -380 +380 @@
         }
 
-        ConstMacro *pConstMacro = compiler.GetMeta().GetGlobalConstMacros().Find( procName );
+        ConstMacro *pConstMacro = compiler.objectModule.meta.GetGlobalConstMacros().Find( procName );
         if( pConstMacro )
         {
@@ -582 +582 @@
         }
 
-        i2 = compiler.GetDataTable().AddBinary( binary, num * tempBaseType.GetSize() );
+        i2 = compiler.objectModule.dataTable.AddBinary( binary, num * tempBaseType.GetSize() );
 
         //mov eax,i2
@@ -784 +784 @@
 
                         type_stack[sp]=DEF_OBJECT;
-                        index_stack[sp]=(LONG_PTR)compiler.GetMeta().GetClasses().GetStringClassPtr();
+                        index_stack[sp]=(LONG_PTR)compiler.objectModule.meta.GetClasses().GetStringClassPtr();
                         bLiteralCalculation=0;
 
@@ -795 +795 @@
                     bLiteralCalculation=0;
 
-                    i2=compiler.GetDataTable().AddString(term,i3);
+                    i2=compiler.objectModule.dataTable.AddString(term,i3);
 
                     //push DataSize
@@ -879 +879 @@
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)compiler.GetMeta().GetClasses().GetObjectClassPtr();
+                            index_stack[sp] = (LONG_PTR)compiler.objectModule.meta.GetClasses().GetObjectClassPtr();
                         }
 
@@ -896 +896 @@
                     //////////////
 
-                    i3 = compiler.GetMeta().GetGlobalConsts().GetBasicType(term);
+                    i3 = compiler.objectModule.meta.GetGlobalConsts().GetBasicType(term);
                     if(i3){
-                        if( compiler.GetMeta().GetGlobalConsts().IsStringPtr( term ) ){
+                        if( compiler.objectModule.meta.GetGlobalConsts().IsStringPtr( term ) ){
                             //リテラル文字列
 
-                            double dbl = compiler.GetMeta().GetGlobalConsts().GetDoubleData(term);
+                            double dbl = compiler.objectModule.meta.GetGlobalConsts().GetDoubleData(term);
                             memcpy(&i64data,&dbl,sizeof(double));
 
@@ -915 +915 @@
                         if(IsRealNumberType(i3)){
                             //実数
-                            double dbl = compiler.GetMeta().GetGlobalConsts().GetDoubleData(term);
+                            double dbl = compiler.objectModule.meta.GetGlobalConsts().GetDoubleData(term);
                             memcpy(&i64data,&dbl,sizeof(double));
                             goto Literal;
@@ -921 +921 @@
                         else if(IsWholeNumberType(i3)){
                             //整数
-                            i64data = compiler.GetMeta().GetGlobalConsts().GetWholeData(term);
+                            i64data = compiler.objectModule.meta.GetGlobalConsts().GetWholeData(term);
                             goto Literal;
                         }

trunk/abdev/BasicCompiler_Common/BreakPoint.cpp

@@ -42 +42 @@
 }
 
-void CFileBreakPoint::update(char *OpBuffer){
+void CFileBreakPoint::update(char *nativeCodeBuffer){
     extern INCLUDEFILEINFO IncludeFileInfo;
 
@@ -85 +85 @@
             }
 
-            OpBuffer[pLineInfo[i3].TopObp]=(char)0xCC;
+            nativeCodeBuffer[pLineInfo[i3].TopObp]=(char)0xCC;
 
             nCount++;
@@ -177 +177 @@
 }
 
-char *CDBBreakPoint::update(char *OpBuffer,int SizeOf_CodeSection){
+char *CDBBreakPoint::update(char *nativeCodeBuffer,int SizeOf_CodeSection){
     char *buffer;
     buffer=(char *)HeapAlloc(hHeap,0,SizeOf_CodeSection);
-    memcpy(buffer,OpBuffer,SizeOf_CodeSection);
+    memcpy(buffer,nativeCodeBuffer,SizeOf_CodeSection);
 
     int i;

trunk/abdev/BasicCompiler_Common/BreakPoint.h

@@ -14 +14 @@
     void remove(int iLineNum);
 
-    void update(char *OpBuffer);
+    void update(char *nativeCodeBuffer);
 };
 
@@ -28 +28 @@
     void remove(char *lpszFileName,int iLineNum);
 
-    char *update(char *OpBuffer,int SizeOf_CodeSection);
+    char *update(char *nativeCodeBuffer,int SizeOf_CodeSection);
 };
 

trunk/abdev/BasicCompiler_Common/Debug.cpp

@@ -230 +230 @@
 }
 UserProc *GetSubFromObp(ULONG_PTR pos){
-    compiler.GetMeta().GetUserProcs().Iterator_Reset();
-    while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+    compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
+    while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
     {
-        UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+        UserProc *pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
 
         if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pos  &&

trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -37 +37 @@
         (*p)+=lstrlen(buffer+(*p))+1;
 
-        type.SetClassPtr( compiler.GetMeta().GetClasses().Find(szClassName) );
+        type.SetClassPtr( compiler.objectModule.meta.GetClasses().Find(szClassName) );
     }
     else{
@@ -121 +121 @@
 
     //イテレータをリセット
-    compiler.GetMeta().GetClasses().Iterator_Reset();
+    compiler.objectModule.meta.GetClasses().Iterator_Reset();
 
     //個数
-    *(long *)(buffer+i2)=compiler.GetMeta().GetClasses().Iterator_GetMaxCount();
-    i2+=sizeof(long);
-
-    while(compiler.GetMeta().GetClasses().Iterator_HasNext()){
+    *(long *)(buffer+i2)=compiler.objectModule.meta.GetClasses().Iterator_GetMaxCount();
+    i2+=sizeof(long);
+
+    while(compiler.objectModule.meta.GetClasses().Iterator_HasNext()){
         CClass *pobj_c;
-        pobj_c=compiler.GetMeta().GetClasses().Iterator_GetNext();
+        pobj_c=compiler.objectModule.meta.GetClasses().Iterator_GetNext();
 
         //クラス名
@@ -141 +141 @@
     // TypeDef情報
     //////////////////
-    *(long *)(buffer+i2)=(int)compiler.GetMeta().GetTypeDefs().size();
-    i2+=sizeof(long);
-    for(i3=0;i3<(int)compiler.GetMeta().GetTypeDefs().size();i3++){
-        lstrcpy(buffer+i2,compiler.GetMeta().GetTypeDefs()[i3].GetName().c_str() );
-        i2+=lstrlen(buffer+i2)+1;
-
-        lstrcpy(buffer+i2,compiler.GetMeta().GetTypeDefs()[i3].GetBaseName().c_str() );
+    *(long *)(buffer+i2)=(int)compiler.objectModule.meta.GetTypeDefs().size();
+    i2+=sizeof(long);
+    for(i3=0;i3<(int)compiler.objectModule.meta.GetTypeDefs().size();i3++){
+        lstrcpy(buffer+i2,compiler.objectModule.meta.GetTypeDefs()[i3].GetName().c_str() );
+        i2+=lstrlen(buffer+i2)+1;
+
+        lstrcpy(buffer+i2,compiler.objectModule.meta.GetTypeDefs()[i3].GetBaseName().c_str() );
         i2+=lstrlen(buffer+i2)+1;
 
@@ -159 +159 @@
 
     //グローバル変数情報
-    *(long *)(buffer+i2)=(int)compiler.GetMeta().GetGlobalVars().size();
-    i2+=sizeof(long);
-    BOOST_FOREACH( Variable *pVar, compiler.GetMeta().GetGlobalVars() ){
+    *(long *)(buffer+i2)=(int)compiler.objectModule.meta.GetGlobalVars().size();
+    i2+=sizeof(long);
+    BOOST_FOREACH( Variable *pVar, compiler.objectModule.meta.GetGlobalVars() ){
         //変数名
         lstrcpy(buffer+i2,pVar->GetName().c_str());
@@ -212 +212 @@
 
     //プロシージャ情報
-    *(long *)(buffer+i2) = compiler.GetMeta().GetUserProcs().Iterator_GetMaxCount();
-    i2+=sizeof(long);
-    compiler.GetMeta().GetUserProcs().Iterator_Reset();
-    while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+    *(long *)(buffer+i2) = compiler.objectModule.meta.GetUserProcs().Iterator_GetMaxCount();
+    i2+=sizeof(long);
+    compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
+    while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
     {
-        UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+        UserProc *pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
 
         if(pUserProc->GetParentClassPtr()){
@@ -309 +309 @@
 
     //イテレータをリセット
-    compiler.GetMeta().GetClasses().Iterator_Reset();
-
-    while(compiler.GetMeta().GetClasses().Iterator_HasNext()){
+    compiler.objectModule.meta.GetClasses().Iterator_Reset();
+
+    while(compiler.objectModule.meta.GetClasses().Iterator_HasNext()){
         CClass *pobj_c;
-        pobj_c=compiler.GetMeta().GetClasses().Iterator_GetNext();
+        pobj_c=compiler.objectModule.meta.GetClasses().Iterator_GetNext();
 
 
@@ -510 +510 @@
     }
 
-    compiler.GetMeta().SetClasses( this->pobj_DBClass );
+    compiler.objectModule.meta.SetClasses( this->pobj_DBClass );
 
 
@@ -518 +518 @@
 
     //初期化
-    compiler.GetMeta().GetTypeDefs().clear();
+    compiler.objectModule.meta.GetTypeDefs().clear();
 
     //個数を取得
@@ -528 +528 @@
 
         // 名前空間に未対応
-        compiler.GetMeta().GetTypeDefs().push_back( TypeDef( NamespaceScopes(), temp5, buffer+i2, -1 ) );
+        compiler.objectModule.meta.GetTypeDefs().push_back( TypeDef( NamespaceScopes(), temp5, buffer+i2, -1 ) );
 
         i2+=lstrlen(buffer+i2)+1;
@@ -535 +535 @@
     //定数を取得
     GetConstInfo();
-    this->globalConsts = compiler.GetMeta().GetGlobalConsts();
-    this->globalConstMacros = compiler.GetMeta().GetGlobalConstMacros();
+    this->globalConsts = compiler.objectModule.meta.GetGlobalConsts();
+    this->globalConstMacros = compiler.objectModule.meta.GetGlobalConstMacros();
 
     //グローバル変数情報
-    compiler.GetMeta().GetGlobalVars().clear();
+    compiler.objectModule.meta.GetGlobalVars().clear();
     int maxGlobalVars=*(long *)(buffer+i2);
     i2+=sizeof(long);
@@ -586 +586 @@
 
         //変数を追加
-        compiler.GetMeta().GetGlobalVars().push_back( pVar );
+        compiler.objectModule.meta.GetGlobalVars().push_back( pVar );
     }
 
@@ -604 +604 @@
         const CClass *pClass = NULL;
         if(szParentClassName[0]){
-            pClass=compiler.GetMeta().GetClasses().Find(szParentClassName);
+            pClass=compiler.objectModule.meta.GetClasses().Find(szParentClassName);
         }
 
@@ -698 +698 @@
         i2+=lstrlen(buffer+i2)+1;
 
-        pobj_c =  const_cast<CClass *>( compiler.GetMeta().GetClasses().Find(szClassName) );
+        pobj_c =  const_cast<CClass *>( compiler.objectModule.meta.GetClasses().Find(szClassName) );
 
         //仮想関数の数
@@ -755 +755 @@
             const CClass *pobj_InheritsClass = NULL;
             if(szInherits[0]){
-                pobj_InheritsClass=compiler.GetMeta().GetClasses().Find(szInherits);
+                pobj_InheritsClass=compiler.objectModule.meta.GetClasses().Find(szInherits);
             }
 
@@ -765 +765 @@
             if(pobj_temp_c==0) pobj_temp_c=pobj_c;
 
-            UserProc *pUserProc = compiler.GetMeta().GetUserProcs().GetHashArrayElement( temp2 );
+            UserProc *pUserProc = compiler.objectModule.meta.GetUserProcs().GetHashArrayElement( temp2 );
             while(pUserProc){
                 if( pUserProc->GetName() == temp2 &&pUserProc->GetParentClassPtr()==pobj_temp_c)
@@ -821 +821 @@
 
 
-    compiler.GetMeta().GetUserProcs() = userProcs;
+    compiler.objectModule.meta.GetUserProcs() = userProcs;
     pSub_DebugSys_EndProc=GetSubHash("_DebugSys_EndProc");
 
@@ -962 +962 @@
 
     // クラス情報
-    compiler.GetMeta().SetClasses( this->pobj_DBClass );
+    compiler.objectModule.meta.SetClasses( this->pobj_DBClass );
 
     //定数を取得
-    compiler.GetMeta().GetGlobalConsts() = this->globalConsts;
-    compiler.GetMeta().GetGlobalConstMacros() = this->globalConstMacros;
+    compiler.objectModule.meta.GetGlobalConsts() = this->globalConsts;
+    compiler.objectModule.meta.GetGlobalConstMacros() = this->globalConstMacros;
 
     //グローバル実行領域のサイズ
@@ -973 +973 @@
 
     //プロシージャ
-    compiler.GetMeta().GetUserProcs() = userProcs;
+    compiler.objectModule.meta.GetUserProcs() = userProcs;
 
     extern const UserProc *pSub_DebugSys_EndProc;

trunk/abdev/BasicCompiler_Common/Diagnose.cpp

@@ -40 +40 @@
         int codeSizeOfGlobalProc = 0;
         int codeSizeOfClassMethod = 0;
-        compiler.GetMeta().GetUserProcs().Iterator_Reset();
-        while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+        compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
+        while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
         {
-            UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+            UserProc *pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
             if( pUserProc->IsCompiled() ){
                 if( pUserProc->HasParentClass() ){
@@ -68 +68 @@
         // イテレータをリセット
         extern Classes *pobj_DBClass;
-        compiler.GetMeta().GetClasses().Iterator_Reset();
+        compiler.objectModule.meta.GetClasses().Iterator_Reset();
 
-        while( compiler.GetMeta().GetClasses().Iterator_HasNext() ){
+        while( compiler.objectModule.meta.GetClasses().Iterator_HasNext() ){
             int codeSizeOfClass = 0;
 
-            CClass &objClass = *compiler.GetMeta().GetClasses().Iterator_GetNext();
+            CClass &objClass = *compiler.objectModule.meta.GetClasses().Iterator_GetNext();
 
             if( !objClass.IsEnum() ){
@@ -108 +108 @@
         // イテレータをリセット
         extern Classes *pobj_DBClass;
-        compiler.GetMeta().GetClasses().Iterator_Reset();
+        compiler.objectModule.meta.GetClasses().Iterator_Reset();
 
-        while( compiler.GetMeta().GetClasses().Iterator_HasNext() ){
+        while( compiler.objectModule.meta.GetClasses().Iterator_HasNext() ){
             int codeSizeOfClass = 0;
 
-            CClass &objClass = *compiler.GetMeta().GetClasses().Iterator_GetNext();
+            CClass &objClass = *compiler.objectModule.meta.GetClasses().Iterator_GetNext();
 
             // 動的メソッド

trunk/abdev/BasicCompiler_Common/Intermediate_Step2.cpp

@@ -79 +79 @@
 
         //定数を追加
-        compiler.GetMeta().GetGlobalConsts().Add( namespaceScopes, temporary, NextValue);
+        compiler.objectModule.meta.GetGlobalConsts().Add( namespaceScopes, temporary, NextValue);
     }
 }
@@ -95 +95 @@
 
     //定数に関する情報を初期化
-    compiler.GetMeta().GetGlobalConsts().Clear();
-    compiler.GetMeta().GetGlobalConstMacros().Clear();
+    compiler.objectModule.meta.GetGlobalConsts().Clear();
+    compiler.objectModule.meta.GetGlobalConstMacros().Clear();
 
     extern char *basbuf;
@@ -172 +172 @@
 
     // イテレータを初期化
-    compiler.GetMeta().GetGlobalConsts().Iterator_Init();
-    compiler.GetMeta().GetGlobalConstMacros().Iterator_Init();
+    compiler.objectModule.meta.GetGlobalConsts().Iterator_Init();
+    compiler.objectModule.meta.GetGlobalConstMacros().Iterator_Init();
 
     return true;

trunk/abdev/BasicCompiler_Common/MakeExe.cpp

@@ -137 +137 @@
     extern int AllGlobalVarSize;
     extern int AllInitGlobalVarSize;
-    compiler.GetMeta().GetGlobalVars().clear();
+    compiler.objectModule.meta.GetGlobalVars().clear();
     AllGlobalVarSize=0;
     AllInitGlobalVarSize=0;

trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -330 +330 @@
         Type leftType;
         if( GetTermType( termLeft, leftType, isLiteral, &isClassName ) ){
-            if( isClassName == false && compiler.GetMeta().GetBlittableTypes().IsExist( leftType ) ){
+            if( isClassName == false && compiler.objectModule.meta.GetBlittableTypes().IsExist( leftType ) ){
                 // 左側のオブジェクト部分がBlittable型のとき
 
@@ -336 +336 @@
                 lstrcpy( temporary, termLeft );
                 sprintf( termLeft, "%s(%s)",
-                    compiler.GetMeta().GetBlittableTypes().Find( leftType ).GetCreateStaticMethodFullName().c_str(),
+                    compiler.objectModule.meta.GetBlittableTypes().Find( leftType ).GetCreateStaticMethodFullName().c_str(),
                     temporary );
 
@@ -398 +398 @@
 
     if( pIsClassName ){
-        if( compiler.GetMeta().GetClasses().Find( termFull ) ){
+        if( compiler.objectModule.meta.GetClasses().Find( termFull ) ){
             *pIsClassName = true;
             return true;
@@ -457 +457 @@
         else
         {
-            ConstMacro *pConstMacro = compiler.GetMeta().GetGlobalConstMacros().Find( procName );
+            ConstMacro *pConstMacro = compiler.objectModule.meta.GetGlobalConstMacros().Find( procName );
             if( pConstMacro )
             {
@@ -689 +689 @@
                         //要求タイプがオブジェクト、または未定のとき
                         type_stack[sp]=DEF_OBJECT;
-                        index_stack[sp]=(LONG_PTR)compiler.GetMeta().GetClasses().GetStringClassPtr();
+                        index_stack[sp]=(LONG_PTR)compiler.objectModule.meta.GetClasses().GetStringClassPtr();
                         *pIsLiteralCalculation = false;
 
@@ -734 +734 @@
                         }
                         else{
-                            index_stack[sp] = (LONG_PTR)compiler.GetMeta().GetClasses().GetObjectClassPtr();
+                            index_stack[sp] = (LONG_PTR)compiler.objectModule.meta.GetClasses().GetObjectClassPtr();
                         }
                         *pIsLiteralCalculation = false;
@@ -746 +746 @@
                     //////////////
 
-                    i3 = compiler.GetMeta().GetGlobalConsts().GetBasicType(term);
+                    i3 = compiler.objectModule.meta.GetGlobalConsts().GetBasicType(term);
                     if(i3){
-                        if( compiler.GetMeta().GetGlobalConsts().IsStringPtr( term ) ){
+                        if( compiler.objectModule.meta.GetGlobalConsts().IsStringPtr( term ) ){
                             //リテラル文字列
                             goto StrLiteral;

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ -168 +168 @@
         GetVarType(fullCallName,type,false);
 
-        ProcPointer *pProcPtr = compiler.GetMeta().GetProcPointers()[type.GetIndex()];
+        ProcPointer *pProcPtr = compiler.objectModule.meta.GetProcPointers()[type.GetIndex()];
         resultType = pProcPtr->ReturnType();
 
@@ -451 +451 @@
 
 bool IsNeedProcCompile(){
-    compiler.GetMeta().GetUserProcs().Iterator_Reset();
-    while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+    compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
+    while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
     {
-        UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+        UserProc *pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
         if( pUserProc->IsUsing() && pUserProc->IsCompiled() == false ){
             return true;

trunk/abdev/BasicCompiler_Common/VarList.cpp

@@ -275 +275 @@
     extern int MemPos_RWSection;
 
-    BOOST_FOREACH( Variable *pVar, compiler.GetMeta().GetGlobalVars() ){
+    BOOST_FOREACH( Variable *pVar, compiler.objectModule.meta.GetGlobalVars() ){
 
         //スコープ外の場合は無視
@@ -358 +358 @@
 
     UserProc *pUserProc = NULL;
-    compiler.GetMeta().GetUserProcs().Iterator_Reset();
-    while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+    compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
+    while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
     {
-        pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+        pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
         if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
             pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress())){
@@ -605 +605 @@
 
         UserProc *pUserProc = NULL;
-        compiler.GetMeta().GetUserProcs().Iterator_Reset();
-        while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+        compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
+        while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
         {
-            pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+            pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
 
             if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
@@ -718 +718 @@
 
         UserProc *pUserProc = NULL;
-        compiler.GetMeta().GetUserProcs().Iterator_Reset();
-        while( compiler.GetMeta().GetUserProcs().Iterator_HasNext() )
+        compiler.objectModule.meta.GetUserProcs().Iterator_Reset();
+        while( compiler.objectModule.meta.GetUserProcs().Iterator_HasNext() )
         {
-            pUserProc = compiler.GetMeta().GetUserProcs().Iterator_GetNext();
+            pUserProc = compiler.objectModule.meta.GetUserProcs().Iterator_GetNext();
 
             if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&

trunk/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ -220 +220 @@
         if(lpIndex==-1) lstrcpy(name,"VoidPtr");
         else{
-            if( compiler.GetMeta().GetProcPointers()[lpIndex]->ReturnType().IsNull() )
+            if( compiler.objectModule.meta.GetProcPointers()[lpIndex]->ReturnType().IsNull() )
                 lstrcpy(name,"*Sub");
             else lstrcpy(name,"*Function");
@@ -235 +235 @@
 
 Type GetStringTypeInfo(){
-    Type type( DEF_OBJECT, *compiler.GetMeta().GetClasses().GetStringClassPtr() );
+    Type type( DEF_OBJECT, *compiler.objectModule.meta.GetClasses().GetStringClassPtr() );
     return type;
 }
@@ -575 +575 @@
     // 名前空間を分離
     char namespaceStr[VN_SIZE]="", simpleName[VN_SIZE];
-    compiler.GetMeta().GetNamespaces().SplitNamespace( variable, namespaceStr, simpleName );
+    compiler.objectModule.meta.GetNamespaces().SplitNamespace( variable, namespaceStr, simpleName );
 
     // 先頭オブジェクトまたはクラス名と入れ子メンバに分割
@@ -647 +647 @@
         GetNowStaticVarFullName(VarName,temporary);
 
-        pVar = compiler.GetMeta().GetGlobalVars().Find( Symbol( temporary ) );
+        pVar = compiler.objectModule.meta.GetGlobalVars().Find( Symbol( temporary ) );
         if( pVar ){
             goto ok;
@@ -667 +667 @@
         }
 
-        int typeDefIndex = compiler.GetMeta().GetTypeDefs().GetIndex( VarName );
+        int typeDefIndex = compiler.objectModule.meta.GetTypeDefs().GetIndex( VarName );
         if( typeDefIndex != -1 ){
             // TypeDef後の型名だったとき
-            lstrcpy( VarName, compiler.GetMeta().GetTypeDefs()[typeDefIndex].GetBaseName().c_str() );
+            lstrcpy( VarName, compiler.objectModule.meta.GetTypeDefs()[typeDefIndex].GetBaseName().c_str() );
         }
 
@@ -676 +676 @@
         sprintf(temp2,"%s.%s",VarName,temporary);
 
-        pVar = compiler.GetMeta().GetGlobalVars().Find( Symbol( temp2 ) );
+        pVar = compiler.objectModule.meta.GetGlobalVars().Find( Symbol( temp2 ) );
         if( pVar ){
             lstrcpy(member,tempMember);
@@ -689 +689 @@
         sprintf(temp2,"%s.%s",compiler.pCompilingClass->GetName().c_str(),VarName);
 
-        pVar = compiler.GetMeta().GetGlobalVars().Find( Symbol( temp2 ) );
+        pVar = compiler.objectModule.meta.GetGlobalVars().Find( Symbol( temp2 ) );
         if( pVar ){
             goto ok;
@@ -700 +700 @@
     ////////////////////
 
-    pVar = compiler.GetMeta().GetGlobalVars().BackSearch( Symbol( VarName ) );
+    pVar = compiler.objectModule.meta.GetGlobalVars().BackSearch( Symbol( VarName ) );
     if( pVar ){
         goto ok;
@@ -973 +973 @@
     extern int AllGlobalVarSize;
 
-    if( compiler.GetMeta().GetGlobalVars().DuplicateCheck( Symbol( name ) ) ){
+    if( compiler.objectModule.meta.GetGlobalVars().DuplicateCheck( Symbol( name ) ) ){
         //２重定義のエラー
         SetError(15,name,cp);
@@ -997 +997 @@
 
     // 変数を追加
-    compiler.GetMeta().GetGlobalVars().push_back( pVar );
+    compiler.objectModule.meta.GetGlobalVars().push_back( pVar );
 
     //アラインメントを考慮
@@ -1105 +1105 @@
 
         //定数と２重定義されていないる場合は抜け出す
-        if(compiler.GetMeta().GetGlobalConsts().GetBasicType(VarName)){
+        if(compiler.objectModule.meta.GetGlobalConsts().GetBasicType(VarName)){
             return;
         }
 
         //定数マクロとして定義されている場合は抜け出す
-        if( compiler.GetMeta().GetGlobalConstMacros().IsExist( VarName ) )
+        if( compiler.objectModule.meta.GetGlobalConstMacros().IsExist( VarName ) )
         {
             return;
@@ -1126 +1126 @@
 
     //定数と２重定義されていないかを調べる
-    if(compiler.GetMeta().GetGlobalConsts().GetBasicType(VarName)){
+    if(compiler.objectModule.meta.GetGlobalConsts().GetBasicType(VarName)){
         SetError(15,VarName,cp);
         return;
@@ -1132 +1132 @@
 
     //定数マクロとして定義されている場合
-    if( compiler.GetMeta().GetGlobalConstMacros().IsExist( VarName ) ){
+    if( compiler.objectModule.meta.GetGlobalConstMacros().IsExist( VarName ) ){
         SetError(15,VarName,cp);
         return;

trunk/abdev/BasicCompiler_Common/WatchList.cpp

@@ -440 +440 @@
         ///////////////////
 
-        const Variable *pVar = compiler.GetMeta().GetGlobalVars().Find( VarName );
+        const Variable *pVar = compiler.objectModule.meta.GetGlobalVars().Find( VarName );
         if( !pVar ){
             //一致しないとき

trunk/abdev/BasicCompiler_Common/calculation.cpp

@@ -500 +500 @@
                         //定数関数
 
-                        ConstMacro *pConstMacro = compiler.GetMeta().GetGlobalConstMacros().Find( temporary );
+                        ConstMacro *pConstMacro = compiler.objectModule.meta.GetGlobalConstMacros().Find( temporary );
                         if( !pConstMacro )
                         {
@@ -665 +665 @@
                         /////////
                         StrPtr[pnum]=0;
-                        type[pnum] = compiler.GetMeta().GetGlobalConsts().GetBasicType(Parms);
+                        type[pnum] = compiler.objectModule.meta.GetGlobalConsts().GetBasicType(Parms);
                         if(type[pnum]){
                             if(IsRealNumberType(type[pnum])){
                                 //実数型
-                                nums[pnum] = compiler.GetMeta().GetGlobalConsts().GetDoubleData(Parms);
+                                nums[pnum] = compiler.objectModule.meta.GetGlobalConsts().GetDoubleData(Parms);
                             }
                             else if(IsWholeNumberType(type[pnum])){
                                 //整数
-                                i64nums[pnum] = compiler.GetMeta().GetGlobalConsts().GetWholeData(Parms);
+                                i64nums[pnum] = compiler.objectModule.meta.GetGlobalConsts().GetWholeData(Parms);
                             }
 /*                          else if(type[pnum]==DEF_STRING){
@@ -1221 +1221 @@
 
                     //定数
-                    ConstMacro *pConstMacro = compiler.GetMeta().GetGlobalConstMacros().Find( temporary );
+                    ConstMacro *pConstMacro = compiler.objectModule.meta.GetGlobalConstMacros().Find( temporary );
                     if(pConstMacro){
                         //マクロ関数の場合
@@ -1231 +1231 @@
 
                 //定数
-                i3 = compiler.GetMeta().GetGlobalConsts().GetBasicType(Command+i2);
+                i3 = compiler.objectModule.meta.GetGlobalConsts().GetBasicType(Command+i2);
                 if(i3==DEF_STRING) return 1;    //文字列
                 if(i3) return 0;            //数値

trunk/abdev/BasicCompiler_Common/hash.cpp

@@ -33 +33 @@
 
     // ハッシュ値を取得
-    DllProc *pDllProc = compiler.GetMeta().GetDllProcs().GetHashArrayElement( simpleName );
+    DllProc *pDllProc = compiler.objectModule.meta.GetDllProcs().GetHashArrayElement( simpleName );
     while(pDllProc){
         if( pDllProc->IsEqualSymbol( fullName ) ){
@@ -74 +74 @@
             }
             else{
-                pobj_c=compiler.GetMeta().GetClasses().Find(ObjName);
+                pobj_c=compiler.objectModule.meta.GetClasses().Find(ObjName);
                 if( pobj_c ){
                     isStatic = true;
@@ -107 +107 @@
 
     // グローバル関数を検索
-    compiler.GetMeta().GetUserProcs().EnumGlobalProcs( NestMember, name, subs );
+    compiler.objectModule.meta.GetUserProcs().EnumGlobalProcs( NestMember, name, subs );
 }
 
@@ -151 +151 @@
 
 const UserProc *GetClassMethod( const char *className, const char *methodName ){
-    const CClass *pClass = compiler.GetMeta().GetClasses().Find( className );
+    const CClass *pClass = compiler.objectModule.meta.GetClasses().Find( className );
     if( pClass ){
         vector<const UserProc *> userProcs;

trunk/abdev/BasicCompiler_Common/include/BoostSerializationSupport.h

@@ -26 +26 @@
     bool WriteXml( const string &xmlFilePath, bool isShowExceptionMessage = true ) const;
 
-    bool ReadBinaly( const string &filePath, bool isShowExceptionMessage = true );
-    bool WriteBinaly( const string &filePath, bool isShowExceptionMessage = true ) const;
+    bool ReadBinary( const string &filePath, bool isShowExceptionMessage = true );
+    bool WriteBinary( const string &filePath, bool isShowExceptionMessage = true ) const;
 
     bool ReadText( const string &filePath, bool isShowExceptionMessage = true );

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -3 +3 @@
 #include <CodeGenerator.h>
 #include <NamespaceSupporter.h>
-#include <MetaImpl.h>
+#include <Meta.h>
 #include <DataTable.h>
 #include <CodeGenerator.h>
+#include <Linker.h>
 
 class Compiler
@@ -11 +12 @@
     // 名前空間サポート
     NamespaceSupporter namespaceSupporter;
-
-    // メタ情報
-    MetaImpl metaImpl;
-
-    // データテーブル
-    DataTable dataTable;
 
 public:
@@ -25 +20 @@
     }
 
-    MetaImpl &GetMeta()
-    {
-        return metaImpl;
-    }
-
-    DataTable &GetDataTable()
-    {
-        return dataTable;
-    }
-
-    // グローバル領域のネイティブコード
-    NativeCode globalNativeCode;
+    // オブジェクトモジュール
+    ObjectModule objectModule;
 
     // コード生成機構
     CodeGenerator codeGenerator;
+
+    // リンカ
+    Linker linker;
 
     static bool StringToType( const std::string &typeName, Type &type );

trunk/abdev/BasicCompiler_Common/include/DataTable.h

@@ -1 +1 @@
 #pragma once
+
+#include <BoostSerializationSupport.h>
 
 //DataTable.cpp
 class DataTable{
-    void *pdata;
+    char *buffer;
     int size;
 
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    BOOST_SERIALIZATION_SPLIT_MEMBER();
+    template<class Archive> void load(Archive& ar, const unsigned int version)
+    {
+        std::string _buffer;
+        ar & BOOST_SERIALIZATION_NVP( _buffer );
+        ar & BOOST_SERIALIZATION_NVP( size );
+
+        // 読み込み後の処理
+        Realloc( size );
+        for( int i=0; i<size; i++ )
+        {
+            if( _buffer[i*3+2] != ',' )
+            {
+                //エラー
+                DebugBreak();
+            }
+            ULONG_PTR l;
+            sscanf( _buffer.c_str() + i*3, "%02x,", &l );
+            buffer[i] = (char)l;
+        }
+    }
+    template<class Archive> void save(Archive& ar, const unsigned int version) const
+    {
+        // 保存準備
+        char *tempCode = (char *)calloc( (size+1) * 3, 1 );
+        for( int i=0; i<size; i++ )
+        {
+            char temp[32];
+            sprintf( temp, "%02x,", (unsigned char)buffer[i] );
+            tempCode[i*3] = temp[0];
+            tempCode[i*3+1] = temp[1];
+            tempCode[i*3+2] = temp[2];
+        }
+
+        std::string _buffer = tempCode;
+        free( tempCode );
+
+        ar & BOOST_SERIALIZATION_NVP( _buffer );
+        ar & BOOST_SERIALIZATION_NVP( size );
+    }
+
 public:
-    DataTable();
-    ~DataTable();
-    void Init();
+    DataTable()
+        : buffer( (char *)malloc(100) )
+        , size( 0 )
+    {
+        lstrcpy( buffer, "initialized!!!" );
+    }
+    DataTable( const DataTable &dataTable )
+        : buffer( (char *)malloc(100) )
+        , size( 0 )
+    {
+        lstrcpy( buffer, "initialized!!!" );
+        AddBinary( dataTable.GetPtr(), dataTable.GetSize() );
+    }
+    ~DataTable()
+    {
+        free( buffer );
+    }
+    void Clear()
+    {
+        size = 0;
+    }
 
-    int AddBinary( const void *pdata, int size );
+    void operator =( const DataTable &dataTable )
+    {
+        Clear();
+        AddBinary( dataTable.GetPtr(), dataTable.GetSize() );
+    }
+
+    void Realloc( int size );
+    int AddBinary( const void *buffer, int size );
     int Add( _int64 i64data );
     int Add( int i32data );

trunk/abdev/BasicCompiler_Common/include/Meta.h

@@ -11 +11 @@
 #include <Const.h>
 
-class MetaImpl : public Jenga::Common::BoostSerializationSupport<MetaImpl>
+class Meta
 {
     // 名前空間
@@ -45 +45 @@
     // XMLシリアライズ用
 private:
-    virtual const char *RootTagName() const
-    {
-        return "metaImpl";
-    }
     friend class boost::serialization::access;
     template<class Archive> void serialize(Archive& ar, const unsigned int version)
     {
-        trace_for_serialize( "serializing - MetaImpl" );
+        trace_for_serialize( "serializing - Meta" );
 
         ar & BOOST_SERIALIZATION_NVP( namespaceScopesCollection );
@@ -69 +65 @@
 
 public:
-    MetaImpl()
+    Meta()
         : classesImpl()
         , pNowClassesForDebugger( &classesImpl )

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -39 +39 @@
     template<class Archive> void serialize(Archive& ar, const unsigned int version)
     {
+        trace_for_serialize( "serializing - Schedule" );
+
         ar & BOOST_SERIALIZATION_NVP( type );
         ar & BOOST_SERIALIZATION_NVP( offset );
@@ -94 +96 @@
     template<class Archive> void load(Archive& ar, const unsigned int version)
     {
+        trace_for_serialize( "serializing(load) - NativeCode" );
+
         std::string code;
         ar & BOOST_SERIALIZATION_NVP( code );
@@ -103 +107 @@
         for( int i=0; i<size; i++ )
         {
-            char c;
-            sscanf( code.c_str() + i*3, "%02x,", &c );
-            codeBuffer[i] = c;
+            ULONG_PTR l;
+            sscanf( code.c_str() + i*3, "%02x,", &l );
+            codeBuffer[i] = (char)l;
         }
     }
     template<class Archive> void save(Archive& ar, const unsigned int version) const
     {
+        trace_for_serialize( "serializing(save) - NativeCode" );
+
         // 保存準備
-        char *tempCode = (char *)malloc( (size+1) * 3 );
+        char *tempCode = (char *)calloc( (size+1) * 3, 1 );
         for( int i=0; i<size; i++ )
         {
             char temp[32];
-            sprintf( temp, "%02x,", codeBuffer[i] );
+            sprintf( temp, "%02x,", (unsigned char)codeBuffer[i] );
             tempCode[i*3] = temp[0];
             tempCode[i*3+1] = temp[1];
@@ -130 +136 @@
 
 
-    void Realloc( int additionSize = 0 )
-    {
-        if( allocateSize < size + 8192 + additionSize )
-        {
-            while( allocateSize < size + 8192 + additionSize )
+    void Realloc( int newSize )
+    {
+        if( allocateSize < newSize + 8192 )
+        {
+            while( allocateSize < newSize + 8192 )
             {
                 allocateSize += 8192;
@@ -149 +155 @@
     {
     }
+    NativeCode( const NativeCode &nativeCode )
+        : allocateSize( 8192 )
+        , codeBuffer( (char *)malloc( allocateSize ) )
+        , size( 0 )
+    {
+        Put( nativeCode );
+    }
     NativeCode( const char *codeBuffer, int size )
         : allocateSize( 8192 )
@@ -165 +178 @@
     }
 
+    void operator =( const NativeCode &nativeCode )
+    {
+        Clear();
+        Put( nativeCode );
+    }
+
     int GetSize() const
     {
@@ -203 +222 @@
     void Put( const char *codeBuffer, int size )
     {
-        Realloc( size );
+        Realloc( this->size + size );
 
         memcpy( this->codeBuffer + this->size, codeBuffer, size );
@@ -268 +287 @@
     void Put( char c )
     {
+        Realloc( size + 1 );
         codeBuffer[size++] = c;
-        Realloc();
 
 

trunk/abdev/BasicCompiler_Common/include/SmoothieImpl.h

@@ -3 +3 @@
 #include <jenga/include/smoothie/Smoothie.h>
 
-#include <MetaImpl.h>
+#include <Meta.h>
 
 class SmoothieImpl : public Smoothie

trunk/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp

@@ -17 +17 @@
 #include <BoostSerializationSupport.h>
 
-#include <MetaImpl.h>
-#include <logger.h>
-
 #include <windows.h>
 
@@ -119 +116 @@
 }
 
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadBinaly( const string &filePath, bool isShowExceptionMessage )
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadBinary( const string &filePath, bool isShowExceptionMessage )
 {
     // 入力アーカイブの作成
@@ -157 +154 @@
     return true;
 }
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteBinaly( const string &filePath, bool isShowExceptionMessage ) const
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteBinary( const string &filePath, bool isShowExceptionMessage ) const
 {
     // 出力アーカイブの作成
@@ -301 +298 @@
 
 
-template class Jenga::Common::BoostSerializationSupport<MetaImpl>;
+#include <Compiler.h>
+#include <logger.h>
+
+template class Jenga::Common::BoostSerializationSupport<ObjectModule>;
 template class Jenga::Common::BoostSerializationSupport<LoggerSetting>;

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -189 +189 @@
 
         //継承元クラスを取得
-        const CClass *pInheritsClass = compiler.GetMeta().GetClasses().Find(temporary);
+        const CClass *pInheritsClass = compiler.objectModule.meta.GetClasses().Find(temporary);
         if( !pInheritsClass ){
             SmoothieException::Throw(106,temporary,nowLine);
@@ -219 +219 @@
     if( !isInheritsClass ){
         // クラスを一つも継承していないとき
-        const CClass *pObjectClass = compiler.GetMeta().GetClasses().Find("Object");
+        const CClass *pObjectClass = compiler.objectModule.meta.GetClasses().Find("Object");
         if( !pObjectClass ){
             SmoothieException::Throw(106,"Object",i);
@@ -243 +243 @@
 
         //継承元クラスを取得
-        const CClass *pInheritsClass = compiler.GetMeta().GetClasses().Find(temporary);
+        const CClass *pInheritsClass = compiler.objectModule.meta.GetClasses().Find(temporary);
         if( !pInheritsClass ){
             SmoothieException::Throw(106,temporary,nowLine);
@@ -282 +282 @@
         //継承先が読み取られていないとき
         pobj_LoopRefCheck->add(this->GetName().c_str());
-        compiler.GetMeta().GetClasses().GetClass_recur(inheritsClass.GetName().c_str());
+        compiler.objectModule.meta.GetClasses().GetClass_recur(inheritsClass.GetName().c_str());
         pobj_LoopRefCheck->del(this->GetName().c_str());
     }
@@ -344 +344 @@
         //継承先が読み取られていないとき
         pobj_LoopRefCheck->add(this->GetName().c_str());
-        compiler.GetMeta().GetClasses().GetClass_recur(inheritsInterface.GetName().c_str());
+        compiler.objectModule.meta.GetClasses().GetClass_recur(inheritsInterface.GetName().c_str());
         pobj_LoopRefCheck->del(this->GetName().c_str());
     }
@@ -427 +427 @@
 
     //関数ハッシュへ登録
-    UserProc *pUserProc = compiler.GetMeta().GetUserProcs().Add( NamespaceScopes(), NamespaceScopesCollection(), buffer,nowLine,isVirtual,pobj_c, (bStatic!=0) );
+    UserProc *pUserProc = compiler.objectModule.meta.GetUserProcs().Add( NamespaceScopes(), NamespaceScopesCollection(), buffer,nowLine,isVirtual,pobj_c, (bStatic!=0) );
     if(!pUserProc) return;
 
@@ -716 +716 @@
     }
 
-    vtbl_offset=compiler.GetDataTable().AddBinary((void *)ppsi,GetVtblNum()*sizeof(LONG_PTR));
+    vtbl_offset=compiler.objectModule.dataTable.AddBinary((void *)ppsi,GetVtblNum()*sizeof(LONG_PTR));
 
     for( int i=0; i < GetVtblNum(); i++ ){
@@ -730 +730 @@
 
     LONG_PTR *pVtbl;
-    pVtbl=(LONG_PTR *)((char *)compiler.GetDataTable().GetPtr()+vtbl_offset);
+    pVtbl=(LONG_PTR *)((char *)compiler.objectModule.dataTable.GetPtr()+vtbl_offset);
 
     int i;
@@ -831 +831 @@
 
     // Blittable型管理オブジェクトを初期化
-    compiler.GetMeta().GetBlittableTypes().clear();
+    compiler.objectModule.meta.GetBlittableTypes().clear();
 
     // 名前空間管理
@@ -951 +951 @@
 
                     // Blittable型として登録
-                    compiler.GetMeta().GetBlittableTypes().push_back( BlittableType( blittableType, pClass ) );
+                    compiler.objectModule.meta.GetBlittableTypes().push_back( BlittableType( blittableType, pClass ) );
                 }
         }
@@ -1656 +1656 @@
 
     // TypeDefも見る
-    int index = compiler.GetMeta().GetTypeDefs().GetIndex( namespaceScopes, name );
+    int index = compiler.objectModule.meta.GetTypeDefs().GetIndex( namespaceScopes, name );
     if( index != -1 ){
-        Type type = compiler.GetMeta().GetTypeDefs()[index].GetBaseType();
+        Type type = compiler.objectModule.meta.GetTypeDefs()[index].GetBaseType();
         if( type.IsObject() ){
             return &type.GetClass();

trunk/abdev/BasicCompiler_Common/src/Compiler.cpp

@@ -16 +16 @@
                 //関数ポインタ（*Function）
                 type.SetBasicType( DEF_PTR_PROC );
-                type.SetIndex( compiler.GetMeta().GetProcPointers().Add( typeName ) );
+                type.SetIndex( compiler.objectModule.meta.GetProcPointers().Add( typeName ) );
                 return true;
         }
@@ -42 +42 @@
     // Object型だったとき
     if( typeName == "Object" ){
-        type.SetType( DEF_OBJECT, compiler.GetMeta().GetClasses().GetObjectClassPtr() );
+        type.SetType( DEF_OBJECT, compiler.objectModule.meta.GetClasses().GetObjectClassPtr() );
         return true;
     }
@@ -48 +48 @@
     // String型だったとき
     if( typeName == "String" ){
-        type.SetType( DEF_OBJECT, compiler.GetMeta().GetClasses().GetStringClassPtr() );
+        type.SetType( DEF_OBJECT, compiler.objectModule.meta.GetClasses().GetStringClassPtr() );
         return true;
     }
@@ -56 +56 @@
     // TypeDefされた型
     ////////////////////
-    int i=compiler.GetMeta().GetTypeDefs().GetIndex( typeName );
+    int i=compiler.objectModule.meta.GetTypeDefs().GetIndex( typeName );
     if(i!=-1){
-        type = compiler.GetMeta().GetTypeDefs()[i].GetBaseType();
+        type = compiler.objectModule.meta.GetTypeDefs()[i].GetBaseType();
         return true;
     }
 
     //クラス
-    const CClass *pobj_c = compiler.GetMeta().GetClasses().Find( typeName );
+    const CClass *pobj_c = compiler.objectModule.meta.GetClasses().Find( typeName );
     if(pobj_c){
         type.SetClassPtr( pobj_c );
@@ -104 +104 @@
         }
         else{
-            if( compiler.GetMeta().GetProcPointers()[type.GetIndex()]->ReturnType().IsNull() ){
+            if( compiler.objectModule.meta.GetProcPointers()[type.GetIndex()]->ReturnType().IsNull() ){
                 return "*Sub";
             }

trunk/abdev/BasicCompiler_Common/src/Const.cpp

@@ -28 +28 @@
 
     //重複チェック
-    if( compiler.GetMeta().GetGlobalConstMacros().IsExist( name )
-        || compiler.GetMeta().GetGlobalConsts().IsExist( name ) )
+    if( compiler.objectModule.meta.GetGlobalConstMacros().IsExist( name )
+        || compiler.objectModule.meta.GetGlobalConsts().IsExist( name ) )
     {
         SetError(15,name,cp);
@@ -38 +38 @@
         //定数マクロ
 
-        compiler.GetMeta().GetGlobalConstMacros().Add( namespaceScopes, name, buffer + i );
+        compiler.objectModule.meta.GetGlobalConstMacros().Add( namespaceScopes, name, buffer + i );
     }
     else{
@@ -44 +44 @@
         char *expression = buffer + i + 1;
 
-        compiler.GetMeta().GetGlobalConsts().Add( namespaceScopes, name, expression );
+        compiler.objectModule.meta.GetGlobalConsts().Add( namespaceScopes, name, expression );
     }
 }

trunk/abdev/BasicCompiler_Common/src/DataTable.cpp

@@ -8 +8 @@
 #include <stdlib.h>
 
-DataTable::DataTable(){
-    pdata = malloc( 1 );
-    size = 0;
-}
-DataTable::~DataTable(){
-    free( pdata );
+void DataTable::Realloc( int size )
+{
+    this->buffer = (char *)realloc( this->buffer, size + 100 );
+    this->size = size;
 }
 
-void DataTable::Init(){
-    free( pdata );
-
-    pdata = malloc( 1 );
-    size = 0;
-}
-
-int DataTable::AddBinary( const void *pdata, int size ){
+int DataTable::AddBinary( const void *buffer, int size ){
     int retSize = this->size;
 
-    this->pdata = realloc( this->pdata, this->size + size );
-    memcpy( (char *)this->pdata + this->size, pdata, size );
-    this->size += size;
+    Realloc( this->size + size );
+    memcpy( (char *)this->buffer + retSize, buffer, size );
 
     return retSize;
@@ -89 +79 @@
 const void *DataTable::GetPtr() const
 {
-    return pdata;
+    return buffer;
 }
 int DataTable::GetSize() const

trunk/abdev/BasicCompiler_Common/src/LexicalScope.cpp

@@ -72 +72 @@
 
     Variables &vars = UserProc::IsGlobalAreaCompiling() ?
-        compiler.GetMeta().GetGlobalVars() :
+        compiler.objectModule.meta.GetGlobalVars() :
         UserProc::CompilingUserProc().GetLocalVars();
 
@@ -98 +98 @@
 
     Variables &vars = UserProc::IsGlobalAreaCompiling() ?
-        compiler.GetMeta().GetGlobalVars() :
+        compiler.objectModule.meta.GetGlobalVars() :
         UserProc::CompilingUserProc().GetLocalVars();
 

trunk/abdev/BasicCompiler_Common/src/NamespaceSupporter.cpp

@@ -9 +9 @@
 {
     NamespaceScopes namespaceScopes( namespaceStr );
-    if( !compiler.GetMeta().GetNamespaces().IsExist( namespaceScopes ) ){
+    if( !compiler.objectModule.meta.GetNamespaces().IsExist( namespaceScopes ) ){
         return false;
     }