Changeset 279 in dev for trunk/abdev/BasicCompiler32

Timestamp:

Aug 14, 2007, 3:22:02 AM (17 years ago)

Author:

dai_9181

Message:

sourceをObjectModuleに入れた

File:

• trunk/abdev/BasicCompiler32/MakePeHdr.cpp (modified) (6 diffs)

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -174 +174 @@
     // 名前空間情報を取得
     NamespaceSupporter::CollectNamespaces(
-        compiler.source.GetBuffer(),
+        compiler.GetObjectModule().source.GetBuffer(),
         compiler.GetObjectModule().meta.GetNamespaces()
     );
@@ -181 +181 @@
     //   CollectProcedures関数の中で参照されるオブジェクト名を事前に取得する。
     //     ※オブジェクトの内容までは取得しない
-    compiler.GetObjectModule().meta.GetClasses().CollectClassesForNameOnly( compiler.source );
+    compiler.GetObjectModule().meta.GetClasses().CollectClassesForNameOnly( compiler.GetObjectModule().source );
 
     //TypeDef情報を初期化
@@ -192 +192 @@
     compiler.pCompilingClass = NULL;
     CollectProcedures(
-        compiler.source,
+        compiler.GetObjectModule().source,
         compiler.GetObjectModule().meta.GetUserProcs(),
         compiler.GetObjectModule().meta.GetDllProcs()
@@ -203 +203 @@
     compiler.GetObjectModule().meta.GetUserProcs().Iterator_Init();
     compiler.GetObjectModule().meta.GetDllProcs().Iterator_Init();
-
-/*
-    if( !compiler.GetObjectModule().WriteXml( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.xml" ) )
-    {
-        MessageBox(0,"XML書き込みに失敗","test",0);
-    }
-    ObjectModule *pTempObjectModule = new ObjectModule();
-    if( !pTempObjectModule->ReadXml( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.xml" ) )
-    {
-        MessageBox(0,"XML読み込みに失敗","test",0);
-    }
-
-    if( !compiler.GetObjectModule().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.GetObjectModule().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);
-    }
-    compiler.objectModule = (*pTempObjectModule);*/
 
 
@@ -526 +495 @@
         // 静的リンクライブラリ
 
-        if( !compiler.GetObjectModule().WriteText( OutputFileName ) )
+        if( !compiler.GetObjectModule().Write( OutputFileName ) )
         {
             MessageBox(0,"XML書き込みに失敗","test",0);
@@ -537 +506 @@
 
     oldSourceLines = compiler.linker.GetNativeCode().GetSourceLines();
-
-/*
-    int t,t2;
-    t=GetTickCount();
-    if( !compiler.GetObjectModule().WriteText( Jenga::Common::Environment::GetAppDir() + "\\objectModule_test.xml" ) )
-    {
-        MessageBox(0,"XML書き込みに失敗","test",0);
-    }
-    if( !compiler.GetObjectModule().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.GetObjectModule().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.GetObjectModule().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);
-    }*/