Changeset 16 in dev for BasicCompiler_Common/Intermediate_Step2.cpp

Timestamp:

Dec 12, 2006, 4:11:11 AM (17 years ago)

Author:

dai_9181

Message:

グローバル領域外のConst定義を初期段階で収集しないようにしました。

File:

• BasicCompiler_Common/Intermediate_Step2.cpp (modified) (2 diffs)

BasicCompiler_Common/Intermediate_Step2.cpp

@@ -237 +237 @@
     }
 }
-void GetConstInfo(void){
+bool GetConstInfo(void){
     ////////////////////////////////////////////
     // Const命令の情報を取得
@@ -251 +251 @@
     extern char *basbuf;
     for(i=0;;i++){
-        if(basbuf[i]=='\0') break;
-        else if(basbuf[i]==1&&basbuf[i+1]==ESC_CONST){
-            i+=2;
-
-            extern int cp;
-            cp=i;   //エラー用
-
-
-            if(basbuf[i]==1&&basbuf[i+1]==ESC_ENUM){
-                AddConstEnum(basbuf+i);
-                continue;
-            }
-
-            for(i2=0;;i++,i2++){
-                if(basbuf[i]=='\"'){
+        if( basbuf[i] == '\0' ) break;
+        if( basbuf[i] == 1 ){
+            if(basbuf[i]==1&&basbuf[i+1]==ESC_CONST){
+                i+=2;
+
+                extern int cp;
+                cp=i;   //エラー用
+
+
+                if(basbuf[i]==1&&basbuf[i+1]==ESC_ENUM){
+                    AddConstEnum(basbuf+i);
+                    continue;
+                }
+
+                for(i2=0;;i++,i2++){
+                    if(basbuf[i]=='\"'){
+                        temporary[i2]=basbuf[i];
+                        for(i++,i2++;;i++,i2++){
+                            temporary[i2]=basbuf[i];
+                            if(basbuf[i]=='\"') break;
+                        }
+                        continue;
+                    }
+                    if(IsCommandDelimitation(basbuf[i])){
+                        temporary[i2]=0;
+                        break;
+                    }
                     temporary[i2]=basbuf[i];
-                    for(i++,i2++;;i++,i2++){
-                        temporary[i2]=basbuf[i];
-                        if(basbuf[i]=='\"') break;
-                    }
-                    continue;
-                }
-                if(IsCommandDelimitation(basbuf[i])){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=basbuf[i];
-            }
-            CDBConst::obj.Add(temporary);
-            if(basbuf[i]=='\0') break;
-        }
-    }
+                }
+                CDBConst::obj.Add(temporary);
+                if(basbuf[i]=='\0') break;
+            }
+            else{
+                int result = JumpStatement( basbuf, i );
+                if( result == -1 ){
+                    //エラー
+                    return false;
+                }
+                else if( result == 1 ){
+                    //ジャンプした場合
+                    i--;
+                }
+            }
+        }
+    }
+    return true;
 }