Changeset 261 in dev for trunk

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_ProcOp.cpp (modified) (1 diff)
• BasicCompiler32/Compile_Statement.cpp (modified) (2 diffs)
• BasicCompiler32/MakePeHdr.cpp (modified) (1 diff)
• BasicCompiler32/Opcode.h (modified) (1 diff)
• BasicCompiler_Common/Compile.cpp (modified) (3 diffs)
• BasicCompiler_Common/include/CodeGenerator.h (modified) (2 diffs)

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;
 
 //プロシージャの種類

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ -19 +19 @@
 
 #include <Exception.h>
-
-//ラベルアドレス
-Labels labels;
 
 //グローバル変数初期バッファ
@@ -122 +119 @@
         //Goto先ラベル
         extern int obp;
-        labels.push_back( Label( Command + 1, obp ) );
+        compiler.codeGenerator.gotoLabels.push_back( GotoLabel( Command + 1, obp ) );
 
         //書き込みスケジュール
@@ -534 +531 @@
                 //Goto先ラベル
                 extern int obp;
-                labels.push_back( Label( (long)i3, obp ) );
+                compiler.codeGenerator.gotoLabels.push_back( GotoLabel( (long)i3, obp ) );
 
                 //書き込みスケジュール

trunk/abdev/BasicCompiler_Common/include/CodeGenerator.h

@@ -81 +81 @@
 typedef std::vector<const GotoLabelSchedule *> GotoLabelSchedules;
 
+//ラベルアドレス
+class GotoLabel
+{
+public:
+    std::string name;
+    int line;
+    DWORD address;
+
+    GotoLabel( const std::string &name, long nativeCodePos )
+        : name( name )
+        , line( -1 )
+        , address( nativeCodePos )
+    {
+    }
+    GotoLabel( int line, long nativeCodePos )
+        : name( "" )
+        , line( line )
+        , address( nativeCodePos )
+    {
+    }
+};
+typedef std::vector<GotoLabel> GotoLabels;
+
 class LexicalScope
 {
@@ -190 +213 @@
 
     // Gotoスケジュールの管理
+    GotoLabels gotoLabels;
     GotoLabelSchedules gotoLabelSchedules;