Changeset 42 in dev for BasicCompiler_Common/Intermediate_Step2.cpp

Timestamp:

Jan 29, 2007, 2:56:22 AM (18 years ago)

Author:

dai_9181

Message:

EnumメンバにOpenやPrintを指定できないバグを修正。
DLLコンパイル時に静的メンバが認識されないバグを修正。

File:

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

BasicCompiler_Common/Intermediate_Step2.cpp

@@ -365 +365 @@
     char com[8192],pam[8192];
 
+    static int nCountOfNonGlobalScope = 0;
+
     if(Command[0]==1){
         switch(Command[1]){
@@ -408 +410 @@
                 KillStringSpaces(Command+2);
                 break;
+
             case ESC_ENUM:
+                nCountOfNonGlobalScope++;
+                KillStringSpaces(Command+2);
+                break;
+
+            case ESC_ENDENUM:
+                nCountOfNonGlobalScope--;
+                break;
+
             case ESC_INHERITS:
             case ESC_VIRTUAL:
@@ -441 +452 @@
     //マクロによるコマンド
     i2=1;
-    if(lstrcmpi(com,"Open")==0) ComOpen(Command+i,pam,NowLine);
-    else if(lstrcmpi(com,"Close")==0) ComClose(Command+i,pam);
-    else if(lstrcmpi(com,"Field")==0||
-        lstrcmpi(com,"Get")==0||
-        lstrcmpi(com,"Put")==0) ComField(Command+i,pam);
-    else if(lstrcmpi(com,"Line")==0) ComLine(Command+i,pam,NowLine);
-    else if(lstrcmpi(com,"Circle")==0) ComCircle(Command+i,pam,NowLine);
-    else if(lstrcmpi(com,"PSet")==0) ComPSet(Command+i,pam,NowLine);
-    else if(lstrcmpi(com,"Paint")==0) ComPaint(Command+i,pam,NowLine);
-
-    else if(
-        lstrcmpi(com,"EXEC")==0||
-        lstrcmpi(com,"INPUT")==0||
-        lstrcmpi(com,"PRINT")==0||
-        lstrcmpi(com,"RANDOMIZE")==0||
-        ( lstrcmpi(com,"WRITE")==0 && isPare == false )||
-        lstrcmpi(com,"MSGBOX")==0||
-        lstrcmpi(com,"WINDOW")==0||
-        lstrcmpi(com,"DELWND")==0||
-        lstrcmpi(com,"INSMENU")==0||
-        lstrcmpi(com,"CHDIR")==0||
-        lstrcmpi(com,"MKDIR")==0||
-        lstrcmpi(com,"KILL")==0||
-        lstrcmpi(com,"CLS")==0||
-        lstrcmpi(com,"COLOR")==0||
-        lstrcmpi(com,"LOCATE")==0
-        ){
-        KillSpaces(Command+i,pam);
-
-        //大文字に変換
-        CharUpper(com);
-
-        sprintf(Command,"%s(%s)",com,pam);
-        return;
-    }
-
+    if( nCountOfNonGlobalScope == 0 ){
+        //グローバル
+        if(lstrcmpi(com,"Open")==0) ComOpen(Command+i,pam,NowLine);
+        else if(lstrcmpi(com,"Close")==0) ComClose(Command+i,pam);
+        else if(lstrcmpi(com,"Field")==0||
+            lstrcmpi(com,"Get")==0||
+            lstrcmpi(com,"Put")==0) ComField(Command+i,pam);
+        else if(lstrcmpi(com,"Line")==0) ComLine(Command+i,pam,NowLine);
+        else if(lstrcmpi(com,"Circle")==0) ComCircle(Command+i,pam,NowLine);
+        else if(lstrcmpi(com,"PSet")==0) ComPSet(Command+i,pam,NowLine);
+        else if(lstrcmpi(com,"Paint")==0) ComPaint(Command+i,pam,NowLine);
+
+        else if(
+            lstrcmpi(com,"EXEC")==0||
+            lstrcmpi(com,"INPUT")==0||
+            lstrcmpi(com,"PRINT")==0||
+            lstrcmpi(com,"RANDOMIZE")==0||
+            ( lstrcmpi(com,"WRITE")==0 && isPare == false )||
+            lstrcmpi(com,"MSGBOX")==0||
+            lstrcmpi(com,"WINDOW")==0||
+            lstrcmpi(com,"DELWND")==0||
+            lstrcmpi(com,"INSMENU")==0||
+            lstrcmpi(com,"CHDIR")==0||
+            lstrcmpi(com,"MKDIR")==0||
+            lstrcmpi(com,"KILL")==0||
+            lstrcmpi(com,"CLS")==0||
+            lstrcmpi(com,"COLOR")==0||
+            lstrcmpi(com,"LOCATE")==0
+            ){
+            KillSpaces(Command+i,pam);
+
+            //大文字に変換
+            CharUpper(com);
+
+            sprintf(Command,"%s(%s)",com,pam);
+            return;
+        }
+
+        else i2=0;
+    }
     else i2=0;
     if(i2){