Changeset 246 in dev for trunk/abdev/BasicCompiler_Common/Compile.cpp

Timestamp:

Jul 28, 2007, 1:30:22 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/Compile.cpp (modified) (4 diffs)

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ -32 +32 @@
 DWORD *pExitSubSchedule;
 int ExitSubScheduleNum;
-
-//Goto未知ラベル スケジュール
-GOTOLABELSCHEDULE *pGotoLabelSchedule;
-int GotoLabelScheduleNum;
 
 //グローバル変数初期バッファ
@@ -123 +119 @@
 void ChangeOpcode(char *Command){
     extern HANDLE hHeap;
-    int i,i2;
 
     if(Command[0]=='\0')
@@ -141 +136 @@
 
         //書き込みスケジュール
-        for(i=0;i<GotoLabelScheduleNum;i++){
-            if(lstrcmp(pGotoLabelSchedule[i].pName,Command+1)==0){
-                *((long *)(OpBuffer+pGotoLabelSchedule[i].pos))=obp-(pGotoLabelSchedule[i].pos+sizeof(long));
-
-                HeapDefaultFree(pGotoLabelSchedule[i].pName);
-
+        std::vector<GotoLabelSchedule>::iterator it = compiler.codeGenerator.gotoLabelSchedules.begin();
+        while( it != compiler.codeGenerator.gotoLabelSchedules.end() )
+        {
+            if( it->GetName() == Command+1 )
+            {
+                *((long *)( OpBuffer + it->GetNativeCodePos() ))=obp-(it->GetNativeCodePos()+sizeof(long));
+                
                 //詰める
-                GotoLabelScheduleNum--;
-                for(i2=i;i2<GotoLabelScheduleNum;i2++){
-                    pGotoLabelSchedule[i2].pName=pGotoLabelSchedule[i2+1].pName;
-                    pGotoLabelSchedule[i2].line=pGotoLabelSchedule[i2+1].line;
-                    pGotoLabelSchedule[i2].pos=pGotoLabelSchedule[i2+1].pos;
-                }
-                i--;
-                continue;
+                it = compiler.codeGenerator.gotoLabelSchedules.erase( it );
+            }
+            else
+            {
+                it++;
             }
         }
@@ -552 +545 @@
 
                 //書き込みスケジュール
-                for(i=0;i<GotoLabelScheduleNum;i++){
-                    if(pGotoLabelSchedule[i].pName==0&&
-                        pGotoLabelSchedule[i].line==i3){
-                        *((long *)(OpBuffer+pGotoLabelSchedule[i].pos))=obp-(pGotoLabelSchedule[i].pos+sizeof(long));
-
+                std::vector<GotoLabelSchedule>::iterator it = compiler.codeGenerator.gotoLabelSchedules.begin();
+                while( it != compiler.codeGenerator.gotoLabelSchedules.end() )
+                {
+                    if( it->GetName().size() == 0 && it->GetLineNum() == i3 )
+                    {
+                        *((long *)( OpBuffer + it->GetNativeCodePos() ))=obp-(it->GetNativeCodePos()+sizeof(long));
+                        
                         //詰める
-                        GotoLabelScheduleNum--;
-                        for(i2=i;i2<GotoLabelScheduleNum;i2++){
-                            pGotoLabelSchedule[i2].pName=pGotoLabelSchedule[i2+1].pName;
-                            pGotoLabelSchedule[i2].line=pGotoLabelSchedule[i2+1].line;
-                            pGotoLabelSchedule[i2].pos=pGotoLabelSchedule[i2+1].pos;
-                        }
-                        i--;
+                        it = compiler.codeGenerator.gotoLabelSchedules.erase( it );
+                    }
+                    else
+                    {
+                        it++;
                     }
                 }