Changeset 268 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Aug 8, 2007, 3:22:49 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

• DebugMiddleFile.cpp (modified) (3 diffs)
• Enum.cpp (modified) (1 diff)
• MakeExe.cpp (modified) (3 diffs)
• include/Compiler.h (modified) (1 diff)
• include/Linker.h (modified) (2 diffs)
• include/Source.h (modified) (3 diffs)

trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -102 +102 @@
     }
 
+    // ソースコード
+    {
+        int length = compiler.source.GetLength();
+        if(BufferSize<i2+(int)length+32768){
+            while( BufferSize<i2+(int)length+32768 )
+            {
+                BufferSize+=32768;
+            }
+
+            buffer=(char *)HeapReAlloc(hHeap,0,buffer,BufferSize);
+        }
+
+        // バッファ
+        lstrcpy( buffer + i2, compiler.source.GetBuffer() );
+        i2 += lstrlen(buffer + i2) + 1;
+    }
 
     //インクルード情報
@@ -215 +231 @@
     }
 
+    // ソースコード
+    {
+        // バッファ
+        compiler.source.SetBuffer(buffer+i2);
+        i2 += lstrlen( buffer+i2 ) + 1;
+    }
+
     //インクルード情報
     _IncludeFileInfo.FilesNum=*(long *)(buffer+i2);
@@ -225 +248 @@
         i2+=lstrlen(buffer+i2)+1;
     }
-    for(i2++,i3=0;;i2++,i3++){
-        _IncludeFileInfo.LineOfFile[i3]=(long)buffer[i2];
+    for(i3=0;;i3++){
+        _IncludeFileInfo.LineOfFile[i3]=(long)buffer[i2++];
         if(_IncludeFileInfo.LineOfFile[i3]==-1) break;
     }
 
     //コードと行番号の関係
-    int maxLineInfoNum;
-    maxLineInfoNum=*(long *)(buffer+i2);
+    int maxLineInfoNum = *(long *)(buffer+i2);
     i2+=sizeof(long);
     for(i3=0;i3<maxLineInfoNum;i3++){

trunk/abdev/BasicCompiler_Common/Enum.cpp

@@ -115 +115 @@
     iEnumParentNum=0;
 
-    const char *source = compiler.GetObjectModule().source.GetBuffer();
+    const char *source = compiler.source.GetBuffer();
 
     // 名前空間管理

trunk/abdev/BasicCompiler_Common/MakeExe.cpp

@@ -24 +24 @@
 
     //最後尾に貼り付け
-    compiler.GetObjectModule().source.Addition( temp );
+    compiler.source.Addition( temp );
 
     HeapDefaultFree(temp);
@@ -57 +57 @@
     //プログラムをファイルから読み込む
     extern char SourceFileName[MAX_PATH];
-    if( !compiler.GetObjectModule().source.ReadFile( SourceFileName ) ){
+    if( !compiler.source.ReadFile( SourceFileName ) ){
         SetError(201,SourceFileName,-1);
         goto EndCompile;
@@ -143 +143 @@
     AllInitGlobalVarSize=0;
 
-
-    /*
-    int t,t2;
-    t=GetTickCount();
-    Compile();
-    t2=GetTickCount();
-    t2-=t;
-    char s[100];
-    sprintf(s,"%d",t2);
-    MessageBox(0,s,"test",0);*/
     Compile();
 

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -34 +34 @@
         return namespaceSupporter;
     }
+
+    // ソースコード
+    BasicSource source;
 
     // コード生成機構

trunk/abdev/BasicCompiler_Common/include/Linker.h

@@ -12 +12 @@
     // データテーブル
     DataTable dataTable;
-
-    // ソースコード
-    BasicSource source;
 
     // XMLシリアライズ用
@@ -30 +27 @@
         ar & BOOST_SERIALIZATION_NVP( globalNativeCode );
         ar & BOOST_SERIALIZATION_NVP( dataTable );
-        ar & BOOST_SERIALIZATION_NVP( source );
     }
 };

trunk/abdev/BasicCompiler_Common/include/Source.h

@@ -25 +25 @@
     int length;
 
-    // XMLシリアライズ用
-private:
-    friend class boost::serialization::access;
-    BOOST_SERIALIZATION_SPLIT_MEMBER();
-    template<class Archive> void load(Archive& ar, const unsigned int version)
-    {
-        trace_for_serialize( "serializing(load) - Text" );
-
-        std::string str;
-        ar & BOOST_SERIALIZATION_NVP( str );
-
-        // 読み込み後の処理
-        Clear();
-        Add( str );
-    }
-    template<class Archive> void save(Archive& ar, const unsigned int version) const
-    {
-        trace_for_serialize( "serializing(save) - Text" );
-
-        // 保存準備
-        std::string str( buffer, length );
-
-        ar & BOOST_SERIALIZATION_NVP( str );
-    }
 public:
 
@@ -68 +44 @@
         length += (int)str.size();
     }
+    void Add( const std::vector<char> &str )
+    {
+        buffer = (char *)realloc( buffer, length + str.size() + 1 );
+        lstrcpy( buffer + length, &str[0] );
+        length += (int)str.size();
+    }
 
     bool ReadFile( const string &filePath );
@@ -82 +64 @@
 class BasicSource : public Text
 {
-    // XMLシリアライズ用
-private:
-    friend class boost::serialization::access;
-    template<class Archive> void serialize(Archive& ar, const unsigned int version)
-    {
-        trace_for_serialize( "serializing - BasicSource" );
-
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Text );
-    }
-
     static const string generateDirectiveName;