Changeset 108 in dev for BasicCompiler_Common/Subroutine.cpp

Timestamp:

May 6, 2007, 6:52:10 PM (17 years ago)

Author:

dai_9181

Message:

関数、クラスメソッドにImports機構を適用。

File:

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

BasicCompiler_Common/Subroutine.cpp

@@ -463 +463 @@
 }
 
-GlobalProc *AddSubData( const NamespaceScopes &namespaceScopes, char *buffer,int nowLine,BOOL bVirtual,CClass *pobj_c, bool isStatic){
+GlobalProc *AddSubData( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,BOOL bVirtual,CClass *pobj_c, bool isStatic){
     int i2,i3;
     char temporary[8192];
@@ -584 +584 @@
     SubNum++;
 
-    GlobalProc *pUserProc = new GlobalProc( namespaceScopes, temporary, kind, isMacro, isCdecl, isExport );
+    GlobalProc *pUserProc = new GlobalProc( namespaceScopes, importedNamespaces, temporary, kind, isMacro, isCdecl, isExport );
     pUserProc->SetParentClass( pobj_c );
 
@@ -664 +664 @@
     namespaceScopes.clear();
 
+    // Importsされた名前空間の管理
+    NamespaceScopesCollection &importedNamespaces = Smoothie::Meta::importedNamespaces;
+    importedNamespaces.clear();
+
     i=-1;
     while(1){
@@ -707 +711 @@
             continue;
         }
+        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_IMPORTS ){
+            for(i+=2,i2=0;;i2++,i++){
+                if( IsCommandDelimitation( basbuf[i] ) ){
+                    temporary[i2]=0;
+                    break;
+                }
+                temporary[i2]=basbuf[i];
+            }
+            importedNamespaces.Imports( temporary );
+
+            continue;
+        }
+        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_CLEARNAMESPACEIMPORTED ){
+            importedNamespaces.clear();
+            continue;
+        }
 
         if(basbuf[i]==1&&basbuf[i+1]==ESC_DECLARE){
@@ -722 +742 @@
         }
         if(basbuf[i]==1&&(basbuf[i+1]==ESC_SUB||basbuf[i+1]==ESC_FUNCTION||basbuf[i+1]==ESC_MACRO)){
+            char statementChar = basbuf[i+1];
+
             for(i2=0;;i2++,i++){
                 if(IsCommandDelimitation(basbuf[i])){
@@ -730 +752 @@
                 if(basbuf[i]=='\0') break;
             }
-            AddSubData(namespaceScopes,temporary,i,0,0);
-
+            AddSubData(namespaceScopes, importedNamespaces, temporary,i,0,0);
+
+            /*  Sub ～ End Sub
+                Function ～ End Function
+                Macro ～ End Macro
+                を飛び越す           */
+            char endStatementChar = GetEndXXXCommand( statementChar );
+            for(i2=0;;i++,i2++){
+                if( basbuf[i] == '\0' ) break;
+                if( basbuf[i] == 1 && basbuf[i+1] == endStatementChar ){
+                    i++;
+                    break;
+                }
+            }
+            if(basbuf[i]=='\0') break;
             continue;
         }
@@ -746 +781 @@
     ////////////
     namespaceScopes.clear();
+    importedNamespaces.clear();
 
     sprintf(temporary,"%c%c_allrem()",1,ESC_SUB);
-    AddSubData( namespaceScopes, temporary,0,0,0);
+    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
 
     sprintf(temporary,"%c%c_aullrem()",1,ESC_SUB);
-    AddSubData( namespaceScopes, temporary,0,0,0);
+    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
 
     sprintf(temporary,"%c%c_allmul()",1,ESC_SUB);
-    AddSubData( namespaceScopes, temporary,0,0,0);
+    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
 
     sprintf(temporary,"%c%c_alldiv()",1,ESC_SUB);
-    AddSubData( namespaceScopes, temporary,0,0,0);
+    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
 
     sprintf(temporary,"%c%c_aulldiv()",1,ESC_SUB);
-    AddSubData( namespaceScopes, temporary,0,0,0);
+    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
 
     sprintf(temporary,"%c%c_allshl()",1,ESC_SUB);
-    AddSubData( namespaceScopes, temporary,0,0,0);
+    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
 
     sprintf(temporary,"%c%c_allshr()",1,ESC_SUB);
-    AddSubData( namespaceScopes, temporary,0,0,0);
+    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
 
     sprintf(temporary,"%c%c_aullshr()",1,ESC_SUB);
-    AddSubData( namespaceScopes, temporary,0,0,0);
+    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
 
     sprintf(temporary,"%c%c_System_InitStaticLocalVariables()",1,ESC_SUB);
-    AddSubData( namespaceScopes, temporary,0,0,0);
+    AddSubData( namespaceScopes, importedNamespaces, temporary,0,0,0);
 }
 void Delete_si(GlobalProc *pUserProc){