Changeset 254 in dev for trunk/abdev/BasicCompiler64/MakePeHdr.cpp

Timestamp:

Jul 31, 2007, 4:30:31 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler64/MakePeHdr.cpp (modified) (4 diffs)

trunk/abdev/BasicCompiler64/MakePeHdr.cpp

@@ -5 +5 @@
 #include <jenga/include/smoothie/Smoothie.h>
 
-#include <LexicalScopingImpl.h>
 #include <Class.h>
 #include <Compiler.h>
@@ -334 +333 @@
 
     //レキシカルスコープ情報を初期化
-    GetLexicalScopes().Init(obp);
+    compiler.codeGenerator.lexicalScopes.Init(obp);
 
 
@@ -369 +368 @@
 
         //Gotoラベルスケジュール
-        extern GOTOLABELSCHEDULE *pGotoLabelSchedule;
-        extern int GotoLabelScheduleNum;
-        pGotoLabelSchedule=(GOTOLABELSCHEDULE *)HeapAlloc(hHeap,0,1);
-        GotoLabelScheduleNum=0;
+        compiler.codeGenerator.gotoLabelSchedules.clear();
 
         //With情報のメモリを確保
@@ -424 +420 @@
         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 *pGotoLabelSchedule, compiler.codeGenerator.gotoLabelSchedules )
+        {
+            if(pGotoLabelSchedule->GetName().size()>0){
+                SetError(6,pGotoLabelSchedule->GetName(),pGotoLabelSchedule->GetSourceCodePos());
             }
             else{
-                sprintf(temporary,"%d",pGotoLabelSchedule[i].line);
-                SetError(6,temporary,pGotoLabelSchedule[i].now_cp);
+                sprintf(temporary,"%d",pGotoLabelSchedule->GetLineNum());
+                SetError(6,temporary,pGotoLabelSchedule->GetSourceCodePos());
             }
         }
-        HeapDefaultFree(pGotoLabelSchedule);