Changeset 99 in dev for BasicCompiler_Common

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

BasicCompiler_Common

Files:

• BasicFixed.h (modified) (1 diff)
• Compile.cpp (modified) (1 diff)
• Intermediate_Step1.cpp (modified) (7 diffs)
• Subroutine.cpp (modified) (2 diffs)

BasicCompiler_Common/BasicFixed.h

@@ -129 +129 @@
 
 //以下制御用エスケープシーケンス
-#define ESC_MOD         '1' //MOD 演算子
-#define ESC_AND         '&' //AND 演算子
-#define ESC_OR          '3' //OR 演算子
-#define ESC_XOR         '4' //XOR 演算子
-#define ESC_NOT         '5' //NOT 演算子
-#define ESC_AS          '6' //AS（区切り文字）
-#define ESC_THEN        2   //Then
-#define ESC_ELSE        3   //Else
-#define ESC_IF          'A' //If
-#define ESC_ELSEIF      'B' //ElseIf
-#define ESC_ENDIF       'C' //End If
-#define ESC_DEF         'D' //Def
-#define ESC_DECLARE     'E' //Declare
-#define ESC_SUB         'F' //Sub
-#define ESC_ENDSUB      'G' //End Sub
-#define ESC_EXITSUB     'H' //Exit Sub
-#define ESC_FUNCTION    'I' //Function
-#define ESC_ENDFUNCTION 'J' //End Function
-#define ESC_EXITFUNCTION 'K'//Exit Function
-#define ESC_BYVAL       'L' //ByVal
-#define ESC_BYREF       'M' //ByRef
-#define ESC_TYPE        'N' //Type
-#define ESC_ENDTYPE     'O' //End Type
-#define ESC_EXITFOR     'P' //Exit For
-#define ESC_EXITWHILE   'Q' //Exit Wend
-#define ESC_EXITDO      'R' //Exit Do
-#define ESC_SELECTCASE  'S' //Select Case
-#define ESC_CASE        'T' //Case
-#define ESC_CASEELSE    'U' //Case Else
-#define ESC_ENDSELECT   'V' //End Select
-#define ESC_CONST       'W' //Const
-#define ESC_WITH        'X' //With
-#define ESC_ENDWITH     'Y' //End With
-#define ESC_CDECL       'Z' //cdecl規約
-#define ESC_MACRO       'a' //Macro
-#define ESC_ENDMACRO    'b' //End Macro
-#define ESC_EXITMACRO   'c' //Exit Macro
-#define ESC_EXPORT      'd' //Export
-#define ESC_CONTINUE    'e' //Continue
-#define ESC_PSMEM       'f' //"->" Member of Pointer Struct（構造体ポインタのメンバ参照）
-#define ESC_STATIC      'g' //Static
-#define ESC_TYPEDEF     'h' //TypeDef
-#define ESC_TRY         'i' //Try
-#define ESC_CATCH       'j' //Catch
-#define ESC_FINALLY     'k' //Finally
-#define ESC_THROW       'l' //Throw
-#define ESC_ENDTRY      'm' //End Try
+#define ESC_MOD             '1'     // MOD 演算子
+#define ESC_AND             '&'     // AND 演算子
+#define ESC_OR              '3'     // OR 演算子
+#define ESC_XOR             '4'     // XOR 演算子
+#define ESC_NOT             '5'     // NOT 演算子
+#define ESC_AS              '6'     // AS（区切り文字）
+#define ESC_THEN            2       // Then
+#define ESC_ELSE            3       // Else
+#define ESC_IF              'A'     // If
+#define ESC_ELSEIF          'B'     // ElseIf
+#define ESC_ENDIF           'C'     // End If
+#define ESC_DEF             'D'     // Def
+#define ESC_DECLARE         'E'     // Declare
+#define ESC_SUB             'F'     // Sub
+#define ESC_ENDSUB          'G'     // End Sub
+#define ESC_EXITSUB         'H'     // Exit Sub
+#define ESC_FUNCTION        'I'     // Function
+#define ESC_ENDFUNCTION     'J'     // End Function
+#define ESC_EXITFUNCTION    'K'     // Exit Function
+#define ESC_BYVAL           'L'     // ByVal
+#define ESC_BYREF           'M'     // ByRef
+#define ESC_TYPE            'N'     // Type
+#define ESC_ENDTYPE         'O'     // End Type
+#define ESC_EXITFOR         'P'     // Exit For
+#define ESC_EXITWHILE       'Q'     // Exit Wend
+#define ESC_EXITDO          'R'     // Exit Do
+#define ESC_SELECTCASE      'S'     // Select Case
+#define ESC_CASE            'T'     // Case
+#define ESC_CASEELSE        'U'     // Case Else
+#define ESC_ENDSELECT       'V'     // End Select
+#define ESC_CONST           'W'     // Const
+#define ESC_WITH            'X'     // With
+#define ESC_ENDWITH         'Y'     // End With
+#define ESC_CDECL           'Z'     // cdecl規約
+#define ESC_MACRO           'a'     // Macro
+#define ESC_ENDMACRO        'b'     // End Macro
+#define ESC_EXITMACRO       'c'     // Exit Macro
+#define ESC_EXPORT          'd'     // Export
+#define ESC_CONTINUE        'e'     // Continue
+#define ESC_PSMEM           'f'     // "->" Member of Pointer Struct（構造体ポインタのメンバ参照）
+#define ESC_STATIC          'g'     // Static
+#define ESC_TYPEDEF         'h'     // TypeDef
+#define ESC_TRY             'i'     // Try
+#define ESC_CATCH           'j'     // Catch
+#define ESC_FINALLY         'k'     // Finally
+#define ESC_THROW           'l'     // Throw
+#define ESC_ENDTRY          'm'     // End Try
+#define ESC_NAMESPACE       'o'     // Namespace
+#define ESC_ENDNAMESPACE    'p'     // End Namespace
 //EXEファイル用制御エスケープシーケンス
-#define ESC_USING       'o' //Print命令語のUsing
-#define ESC_FOR         'p' //Open命令語のFor
-#define ESC_LINENUM     'q' //行番号を示す
+#define ESC_USING           'q'     // Print命令語のUsing
+#define ESC_FOR             'r'     // Open命令語のFor
+#define ESC_LINENUM         's'     // 行番号を示す
 
 //オブジェクト指向エスケープシーケンス

BasicCompiler_Common/Compile.cpp

@@ -219 +219 @@
                 break;
             case ESC_DECLARE:
+                break;
+
+            case ESC_NAMESPACE:
+            case ESC_ENDNAMESPACE:
                 break;
 

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;

BasicCompiler_Common/Subroutine.cpp

@@ -659 +659 @@
     MacroNum=0;
 
+    // 名前空間管理
+    vector<string> namespaceScopes;
+
     i=-1;
     while(1){
@@ -679 +682 @@
         }
 
+        if( basbuf[i] == 1 && basbuf[i+1] == ESC_NAMESPACE ){
+            for(i+=2,i2=0;;i2++,i++){
+                if( IsCommandDelimitation( basbuf[i] ) ){
+                    temporary[i2]=0;
+                    break;
+                }
+                temporary[i2]=basbuf[i];
+            }
+            namespaceScopes.push_back( temporary );
+
+            continue;
+        }
+        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_ENDNAMESPACE ){
+            if( namespaceScopes.size() <= 0 ){
+                SetError(12, "End Namespace", i );
+            }
+            else{
+                namespaceScopes.pop_back();
+            }
+
+            i += 2;
+            continue;
+        }
+
         if(basbuf[i]==1&&basbuf[i+1]==ESC_DECLARE){
             for(i+=2,i2=0;;i2++,i++){