Changeset 99 in dev for BasicCompiler_Common/Intermediate_Step1.cpp

Timestamp:

Apr 19, 2007, 3:09:55 AM (17 years ago)

Author:

dai_9181

Message:

Namespaceステートメントのエスケープシーケンス化を行った。
[IDE]バックアップに失敗したときにエラーメッセージを出さないようにした。

File:

• BasicCompiler_Common/Intermediate_Step1.cpp (modified) (7 diffs)

BasicCompiler_Common/Intermediate_Step1.cpp

@@ -320 +320 @@
     char *temporary,temp2[VN_SIZE];
 
+    bool isBeforeCharDelimitation = false;
     temporary=(char *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,lstrlen(buffer)*2);
     for(i=0,i2=0,IsStr=0;;i++,i2++){
@@ -327 +328 @@
             buffer[i+1]=ESC_PSMEM;
         }
+
+        if( buffer[i] && IsCommandDelimitation( buffer[i] ) ){
+            isBeforeCharDelimitation = true;
+
+            temporary[i2]=buffer[i];
+            continue;
+        }
+
         if(IsVariableChar(buffer[i])&&IsStr==0){
+
             i3=i2;
             for(;;i++,i2++){
@@ -336 +346 @@
                 temporary[i2]=buffer[i];
             }
+
+            bool isAfterCharBlank = false;
+            if( IsBlank( buffer[i] ) ){
+                isAfterCharBlank = true;
+            }
+
             if(lstrcmpi(temporary+i3,"End")==0) i6=1;
             else if(lstrcmpi(temporary+i3,"Exit")==0) i6=2;
@@ -389 +405 @@
                             if(lstrcmpi(temp2,"Macro")==0) sw1=1;
                             break;
+                        case 'n':
+                        case 'N':
+                            if(lstrcmpi(temp2,"Namespace")==0) sw1=1;
+                            break;
                         case 's':
                         case 'S':
@@ -642 +662 @@
                             temporary[i2]=ESC_ENDMACRO;
                         }
+                        else if(lstrcmpi(temporary+i3,"EndNamespace")==0){
+                            i2=i3;
+                            temporary[i2++]=1;
+                            temporary[i2]=ESC_ENDNAMESPACE;
+                        }
                         else if(lstrcmpi(temporary+i3,"EndClass")==0){
                             i2=i3;
@@ -757 +782 @@
                 case 'n':
                 case 'N':
-                    if(lstrcmpi(temporary+i3,"New")==0){
+                    if(isBeforeCharDelimitation
+                        && lstrcmpi(temporary+i3,"Namespace")==0
+                        && isAfterCharBlank ){
+                        i2=i3;
+                        temporary[i2++]=1;
+                        temporary[i2]=ESC_NAMESPACE;
+                    }
+                    else if(lstrcmpi(temporary+i3,"New")==0){
                         i2=i3;
                         temporary[i2++]=1;
@@ -868 +900 @@
             continue;
         }
+
+        if( !IsBlank( buffer[i] ) ){
+            isBeforeCharDelimitation = false;
+        }
+
         temporary[i2]=buffer[i];
         if(buffer[i]=='\0') break;