Changeset 544 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer.cpp

Timestamp:

May 4, 2008, 2:06:23 AM (17 years ago)

Author:

dai_9181

Message:

CollectTypeDefsメソッドからbasbufを排除。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer.cpp (modified) (6 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer.cpp

@@ -329 +329 @@
     char temporary[VN_SIZE];
     while(1){
-        extern char *basbuf;
 
         i++;
 
-        if( basbuf[i] == 1 && basbuf[i+1] == ESC_NAMESPACE ){
+        if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
             for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( basbuf[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=basbuf[i];
+                if( IsCommandDelimitation( source[i] ) ){
+                    temporary[i2]=0;
+                    break;
+                }
+                temporary[i2]=source[i];
             }
             namespaceScopes.push_back( temporary );
@@ -345 +344 @@
             continue;
         }
-        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_ENDNAMESPACE ){
+        else if( source[i] == 1 && source[i+1] == ESC_ENDNAMESPACE ){
             if( namespaceScopes.size() <= 0 ){
                 compiler.errorMessenger.Output(12, "End Namespace", i );
@@ -356 +355 @@
             continue;
         }
-        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_IMPORTS ){
+        else if( source[i] == 1 && source[i+1] == ESC_IMPORTS ){
             for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( basbuf[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=basbuf[i];
+                if( IsCommandDelimitation( source[i] ) ){
+                    temporary[i2]=0;
+                    break;
+                }
+                temporary[i2]=source[i];
             }
             if( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ) )
@@ -371 +370 @@
             continue;
         }
-        else if( basbuf[i] == 1 && basbuf[i+1] == ESC_CLEARNAMESPACEIMPORTED ){
+        else if( source[i] == 1 && source[i+1] == ESC_CLEARNAMESPACEIMPORTED ){
             importedNamespaces.clear();
             continue;
         }
 
-        if( basbuf[i]==1 ){
+        if( source[i]==1 ){
             char temporary[VN_SIZE];
-            if(basbuf[i+1]==ESC_TYPEDEF){
+            if(source[i+1]==ESC_TYPEDEF){
                 int i2 = 0;
                 for(i+=2;;i2++,i++){
-                    if(basbuf[i]=='\n'){
+                    if(source[i]=='\n'){
                         temporary[i2]=0;
                         break;
                     }
-                    temporary[i2]=basbuf[i];
-                    if(basbuf[i]=='\0') break;
+                    temporary[i2]=source[i];
+                    if(source[i]=='\0') break;
                 }
                 AddTypeDef( typeDefs, namespaceScopes, temporary, i );
@@ -392 +391 @@
                 continue;
             }
-            else if( basbuf[i+1] == ESC_CONST && basbuf[i+2] == 1 && basbuf[i+3] == ESC_ENUM ){
+            else if( source[i+1] == ESC_CONST && source[i+2] == 1 && source[i+3] == ESC_ENUM ){
                 int i2 = 0;
                 for(i+=4;;i2++,i++){
-                    if(!IsVariableChar(basbuf[i])){
+                    if(!IsVariableChar(source[i])){
                         temporary[i2]=0;
                         break;
                     }
-                    temporary[i2]=basbuf[i];
-                    if(basbuf[i]=='\0') break;
+                    temporary[i2]=source[i];
+                    if(source[i]=='\0') break;
                 }
 
@@ -422 +421 @@
         //次の行
         for(;;i++){
-            if(IsCommandDelimitation(basbuf[i])) break;
-        }
-        if(basbuf[i]=='\0') break;
+            if(IsCommandDelimitation(source[i])) break;
+        }
+        if(source[i]=='\0') break;
     }
 }