Changeset 684 in dev for trunk/ab5.0/abdev/BasicCompiler_Common

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• Compile.cpp (modified) (2 diffs)
• VariableOpe.cpp (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() );
+    }
 }