Changeset 684 in dev for trunk

Timestamp:

Jul 13, 2008, 2:23:09 AM (16 years ago)

Author:

dai_9181

Message:

・WithInfo周りをリファクタリング。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/Compile.cpp (modified) (2 diffs)
• BasicCompiler_Common/VariableOpe.cpp (modified) (1 diff)
• compiler_x86/Compile_ProcOp.cpp (modified) (2 diffs)
• compiler_x86/MakePeHdr.cpp (modified) (5 diffs)
• compiler_x86/Opcode.h (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/Compile.cpp

@@ -14 +14 @@
 
 //With情報
-WITHINFO WithInfo;
+WithInfos withInfos;
 
 //デバッグ用行番号情報
@@ -318 +318 @@
 
             case ESC_WITH:
-                extern WITHINFO WithInfo;
-
-                WithInfo.ppName=(char **)HeapReAlloc(hHeap,0,WithInfo.ppName,(WithInfo.num+1)*sizeof(char **));
-                WithInfo.ppName[WithInfo.num]=(char *)HeapAlloc(hHeap,0,lstrlen(Command+2)+1);
-                lstrcpy(WithInfo.ppName[WithInfo.num],Command+2);
-
-                WithInfo.pWithCp=(int *)HeapReAlloc(hHeap,0,WithInfo.pWithCp,(WithInfo.num+1)*sizeof(int));
-                WithInfo.pWithCp[WithInfo.num]=cp;
-
-                WithInfo.num++;
-                break;
+                {
+                    extern WithInfos withInfos;
+                    withInfos.push_back( WithInfo( Command+2, cp ) );
+                    break;
+                }
             case ESC_ENDWITH:
-                if(WithInfo.num<=0){
-                    compiler.errorMessenger.Output(12,"End With",cp);
-                    return;
-                }
-                WithInfo.num--;
-                HeapDefaultFree(WithInfo.ppName[WithInfo.num]);
-                break;
+                {
+                    extern WithInfos withInfos;
+                    if( withInfos.size() <= 0 )
+                    {
+                        compiler.errorMessenger.Output(12,"End With",cp);
+                        return;
+                    }
+
+                    withInfos.pop_back();
+                    break;
+                }
             case ESC_DECLARE:
                 if( compiler.IsLocalAreaCompiling() ){

trunk/ab5.0/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ -180 +180 @@
 
 void GetWithName(char *buffer){
-    extern WITHINFO WithInfo;
-    int i;
-
+    extern WithInfos withInfos;
     buffer[0]=0;
-    for(i=0;i<WithInfo.num;i++)
-        lstrcat(buffer,WithInfo.ppName[i]);
+    BOOST_FOREACH( const WithInfo &withInfo, withInfos )
+    {
+        lstrcat( buffer, withInfo.name.c_str() );
+    }
 }
 

trunk/ab5.0/abdev/compiler_x86/Compile_ProcOp.cpp

@@ -433 +433 @@
     compiler.codeGenerator.gotoLabelSchedules.clear();
 
-    //With情報のメモリを確保
-    extern WITHINFO WithInfo;
-    WithInfo.ppName=(char **)HeapAlloc(hHeap,0,1);
-    WithInfo.pWithCp=(int *)HeapAlloc(hHeap,0,1);
-    WithInfo.num=0;
+    //With情報を初期化
+    extern WithInfos withInfos;
+    withInfos.clear();
 
     // 重複エラー情報をクリア
@@ -590 +588 @@
     }
 
-    //With情報のメモリを解放
-    for(i3=0;i3<WithInfo.num;i3++){
-        compiler.errorMessenger.Output(22,"With",WithInfo.pWithCp[i3]);
-        HeapDefaultFree(WithInfo.ppName[i3]);
-    }
-    HeapDefaultFree(WithInfo.ppName);
-    HeapDefaultFree(WithInfo.pWithCp);
-
     //push ebp
     AllLocalVarSize+=sizeof(long);

trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp

@@ -370 +370 @@
     //compiler.codeGenerator.lexicalScopes.Init( compiler.codeGenerator.GetNativeCodeSize() );
 
+    // 名前空間が初期化されているかをチェック
+    if( compiler.GetNamespaceSupporter().GetLivingNamespaceScopes().size() )
+    {
+        compiler.errorMessenger.OutputFatalError();
+    }
+
 
     /////////////////////////////////////////////////////////////////
@@ -394 +400 @@
     compiler.StartGlobalAreaCompile();
 
-    if( !compiler.IsDll() ){
-        // 名前空間が初期化されているかをチェック
-        if( compiler.GetNamespaceSupporter().GetLivingNamespaceScopes().size() ){
-            compiler.errorMessenger.OutputFatalError();
-        }
-
+    if( !compiler.IsDll() )
+    {
         //ラベル管理オブジェクトを初期化
         compiler.codeGenerator.gotoLabels.clear();
@@ -406 +408 @@
         compiler.codeGenerator.gotoLabelSchedules.clear();
 
-        //With情報のメモリを確保
-        extern WITHINFO WithInfo;
-        WithInfo.ppName=(char **)HeapAlloc(hHeap,0,1);
-        WithInfo.pWithCp=(int *)HeapAlloc(hHeap,0,1);
-        WithInfo.num=0;
+        //With情報を初期化
+        extern WithInfos withInfos;
+        withInfos.clear();
 
         //Continueアドレスを初期化
@@ -419 +419 @@
 
         trace_for_sourcecodestep( "★★★ グローバル領域のコンパイルを開始" );
-
-
-        //未完成
-        //breakpoint;
-
 
         if( compiler.IsCore() )
@@ -472 +467 @@
         extern int GlobalOpBufferSize;
         GlobalOpBufferSize = compiler.linker.GetNativeCode().GetSize();
-
-        //With情報のメモリを解放
-        for(i=0;i<WithInfo.num;i++){
-            compiler.errorMessenger.Output(22,"With",WithInfo.pWithCp[i]);
-            HeapDefaultFree(WithInfo.ppName[i]);
-        }
-        HeapDefaultFree(WithInfo.ppName);
-        HeapDefaultFree(WithInfo.pWithCp);
 
         // 名前空間が正しく閉じられているかをチェック

trunk/ab5.0/abdev/compiler_x86/Opcode.h

@@ -28 +28 @@
 
 //With情報
-struct WITHINFO{
-    char **ppName;
-    int *pWithCp;
-    int num;
+struct WithInfo
+{
+    std::string name;
+    int sourceCodePos;
+
+    WithInfo( const std::string &name, int sourceCodePos )
+        : name( name )
+        , sourceCodePos( sourceCodePos )
+    {
+    }
 };
+typedef std::vector<WithInfo> WithInfos;