Changeset 261 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

• Compile.cpp (modified) (3 diffs)
• include/CodeGenerator.h (modified) (2 diffs)

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;