Changeset 246 in dev for trunk/abdev/BasicCompiler32/MakePeHdr.cpp

Timestamp:

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

Author:

dai_9181

Message:

 

File:

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

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -422 +422 @@
 
         //Gotoラベルスケジュール
-        extern GOTOLABELSCHEDULE *pGotoLabelSchedule;
-        extern int GotoLabelScheduleNum;
-        pGotoLabelSchedule=(GOTOLABELSCHEDULE *)HeapAlloc(hHeap,0,1);
-        GotoLabelScheduleNum=0;
+        compiler.codeGenerator.gotoLabelSchedules.clear();
 
         //With情報のメモリを確保
@@ -473 +470 @@
         HeapDefaultFree(pLabelNames);
 
-        //Goto未知ラベルスケジュールを解放
-        for(i=0;i<GotoLabelScheduleNum;i++){
-            if(pGotoLabelSchedule[i].pName){
-                SetError(6,pGotoLabelSchedule[i].pName,pGotoLabelSchedule[i].now_cp);
-                HeapDefaultFree(pGotoLabelSchedule[i].pName);
+        //Goto未知ラベルスケジュールが存在したらエラーにする
+        BOOST_FOREACH( const GotoLabelSchedule &gotoLabelSchedule, compiler.codeGenerator.gotoLabelSchedules )
+        {
+            if(gotoLabelSchedule.GetName().size()>0){
+                SetError(6,gotoLabelSchedule.GetName(),gotoLabelSchedule.GetSourceCodePos());
             }
             else{
-                sprintf(temporary,"%d",pGotoLabelSchedule[i].line);
-                SetError(6,temporary,pGotoLabelSchedule[i].now_cp);
+                sprintf(temporary,"%d",gotoLabelSchedule.GetLineNum());
+                SetError(6,temporary,gotoLabelSchedule.GetSourceCodePos());
             }
         }
-        HeapDefaultFree(pGotoLabelSchedule);