Changeset 261 in dev for trunk/abdev/BasicCompiler32

Timestamp:

Aug 3, 2007, 11:53:50 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler32

Files:

• Compile_ProcOp.cpp (modified) (1 diff)
• Compile_Statement.cpp (modified) (2 diffs)
• MakePeHdr.cpp (modified) (1 diff)
• Opcode.h (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -403 +403 @@
 
     //ラベル管理オブジェクトを初期化
-    extern Labels labels;
-    labels.clear();
+    compiler.codeGenerator.gotoLabels.clear();
 
     //Gotoラベルスケジュール

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ -279 +279 @@
 
 int GetLabelAddress(char *LabelName,int LineNum){
-    extern Labels labels;
-
     if(LabelName){
-        BOOST_FOREACH( const Label &label, labels )
+        BOOST_FOREACH( const GotoLabel &label, compiler.codeGenerator.gotoLabels )
         {
             if( label.name.size() > 0 )
@@ -294 +292 @@
     }
     else{
-        BOOST_FOREACH( const Label &label, labels )
+        BOOST_FOREACH( const GotoLabel &label, compiler.codeGenerator.gotoLabels )
         {
             if( label.name.size() == 0 )

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -418 +418 @@
 
         //ラベル管理オブジェクトを初期化
-        extern Labels labels;
-        labels.clear();
+        compiler.codeGenerator.gotoLabels.clear();
 
         //Gotoラベルスケジュール

trunk/abdev/BasicCompiler32/Opcode.h

@@ -19 +19 @@
 #define breakpoint compiler.codeGenerator.PutOld( (char)0xCC );
 
-
-//ラベルアドレス
-class Label
-{
-public:
-    std::string name;
-    int line;
-    DWORD address;
-
-    Label( const std::string &name, long nativeCodePos )
-        : name( name )
-        , line( -1 )
-        , address( nativeCodePos )
-    {
-    }
-    Label( int line, long nativeCodePos )
-        : name( "" )
-        , line( line )
-        , address( nativeCodePos )
-    {
-    }
-};
-typedef std::vector<Label> Labels;
 
 //プロシージャの種類