Changeset 16 in dev

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

BasicCompiler_Common

Files:

• Compile.cpp (modified) (2 diffs)
• DebugMiddleFile.cpp (modified) (1 diff)
• Intermediate_Step2.cpp (modified) (2 diffs)
• common.h (modified) (2 diffs)

BasicCompiler_Common/Compile.cpp

@@ -48 +48 @@
 //With情報
 WITHINFO WithInfo;
+
+
+///////////////////////////////////////////////////
+// 対になっているステートメントを飛び越す
+// ※グローバル領域用
+///////////////////////////////////////////////////
+int JumpStatement(const char *source, int &pos){
+    if( source[pos] != 1 ) return 0;
+
+    if( ! IsCommandDelimitation( source[pos - 1] ) ){
+        //直前がコマンド区切りではない場合
+        return 0;
+    }
+
+    char cStatement = source[pos + 1];
+
+    char cEnd = GetEndXXXCommand( cStatement );
+    if( cEnd == 0 ) return 0;
+
+    pos += 2;
+    while( ! ( source[pos] == 1 && source[pos + 1] == cEnd ) ){
+
+        if( source[pos] == '\0' ){
+            char temporary[64];
+            GetDefaultNameFromES( cStatement, temporary );
+            SetError( 22, temporary, pos );
+            return -1;
+        }
+
+        pos++;
+    }
+    if( ! ( source[pos] == '\0' || source[pos + 2] == '\0' ) ){
+        pos += 2;
+    }
+
+    return 1;
+}
 
 
@@ -392 +429 @@
     BufferSize=128;
     Command=(char *)HeapAlloc(hHeap,0,BufferSize);
-/*
-    i = CSource::obj.GetTokenIndex(cp);
-    CToken *ptoken;
-    do{
-        //次のトークン
-        ptoken = CSource::obj.GetToken(i++);
-
-        //ステップ区切り（改行またはコロン）の場合
-        while(ptoken->GetType() == TOKEN_DELIMITATION){
-            ptoken = CSource::obj.GetToken(i++);
-            continue;
-        }
-
-        if(ptoken->GetType() == TOKEN_ESCAPESEQUENCE){
-            ////////////////////////////
-            // 特殊記号
-            ////////////////////////////
-
-            if(ptoken->GetExtended() == ESC_LINENUM){
-
-                //行番号
-                ptoken = CSource::obj.GetToken(i++);
-
-                i3=atoi(ptoken->ToString());
-                i4=i+1;
-
-                //Goto先ラベル
-                pLabelNames=(LABEL *)HeapReAlloc(hHeap,0,pLabelNames,(MaxLabelNum+1)*sizeof(LABEL));
-                pLabelNames[MaxLabelNum].pName=0;
-                pLabelNames[MaxLabelNum].line=i3;
-                pLabelNames[MaxLabelNum].address=obp;
-                MaxLabelNum++;
-
-                //書き込みスケジュール
-                for(i=0;i<GotoLabelScheduleNum;i++){
-                    if(pGotoLabelSchedule[i].pName==0&&
-                        pGotoLabelSchedule[i].line==i3){
-                        *((long *)(OpBuffer+pGotoLabelSchedule[i].pos))=obp-(pGotoLabelSchedule[i].pos+sizeof(long));
-
-                        //詰める
-                        GotoLabelScheduleNum--;
-                        for(i2=i;i2<GotoLabelScheduleNum;i2++){
-                            pGotoLabelSchedule[i2].pName=pGotoLabelSchedule[i2+1].pName;
-                            pGotoLabelSchedule[i2].line=pGotoLabelSchedule[i2+1].line;
-                            pGotoLabelSchedule[i2].pos=pGotoLabelSchedule[i2+1].pos;
-                        }
-                        i--;
-                    }
-                }
-
-                //カンマ
-                i++;
-
-                //次のトークン
-                ptoken = CSource::obj.GetToken(i++);
-            }
-        }
-    }while(ptoken->GetType() == TOKEN_EOF);
-*/
+
     for(cp++,i2=0;;cp++,i2++){
         if(i2>=BufferSize){

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -441 +441 @@
     char temp2[MAX_PATH],*temp5;
 
+    extern CClass *pobj_CompilingClass;
+    pobj_CompilingClass=0;
+
     i2=0;
 

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;
 }
 

BasicCompiler_Common/common.h

@@ -471 +471 @@
 
 //Intermediate_Step2.cpp
-void GetConstInfo(void);
+bool GetConstInfo(void);
 void ChangeCommandToCode(char *buffer);
 
@@ -575 +575 @@
 
 //Compile.cpp
+int JumpStatement(const char *source, int &pos);
 void DebugVariable(void);
 void Compile(void);