Changeset 260 in dev for trunk/abdev/BasicCompiler32/Compile_Statement.cpp

Timestamp:

Aug 3, 2007, 11:28:19 AM (17 years ago)

Author:

dai_9181

Message:

Labelクラスをリファクタリング

File:

• trunk/abdev/BasicCompiler32/Compile_Statement.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ -279 +279 @@
 
 int GetLabelAddress(char *LabelName,int LineNum){
-    extern int MaxLabelNum;
-    extern LABEL *pLabelNames;
-    int i;
+    extern Labels labels;
 
     if(LabelName){
-        for(i=0;i<MaxLabelNum;i++){
-            if(pLabelNames[i].pName){
-                if(lstrcmp(LabelName,pLabelNames[i].pName)==0) return pLabelNames[i].address;
+        BOOST_FOREACH( const Label &label, labels )
+        {
+            if( label.name.size() > 0 )
+            {
+                if( label.name == LabelName )
+                {
+                    return label.address;
+                }
             }
         }
     }
     else{
-        for(i=0;i<MaxLabelNum;i++){
-            if(pLabelNames[i].pName==0){
-                if(LineNum==pLabelNames[i].line) return pLabelNames[i].address;
+        BOOST_FOREACH( const Label &label, labels )
+        {
+            if( label.name.size() == 0 )
+            {
+                if( label.line == LineNum )
+                {
+                    return label.address;
+                }
             }
         }
@@ -309 +317 @@
         {
             //jmp ...(schedule)
-            extern int obp;
             compiler.codeGenerator.op_jmp_goto_schedule( (const std::string)(Parameter + 1), 0, cp );
         }
@@ -326 +333 @@
         {
             //jmp ...(schedule)
-            extern int obp;
             compiler.codeGenerator.op_jmp_goto_schedule( "", LineNum, cp );
         }