Changeset 506 in dev

Timestamp:

Apr 28, 2008, 7:52:46 PM (16 years ago)

Author:

dai_9181

Message:

LexicalAnalyzerクラスを追加。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/include/LexicalAnalyzer.h (added)
• BasicCompiler_Common/include/NamespaceSupporter.h (modified) (1 diff)
• BasicCompiler_Common/src/LexicalAnalyzer.cpp (added)
• BasicCompiler_Common/src/NamespaceSupporter.cpp (modified) (1 diff)
• compiler_x86/MakePeHdr.cpp (modified) (1 diff)
• compiler_x86/compiler_x86.vcproj (modified) (3 diffs)
• compiler_x86/stdafx.h (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/include/NamespaceSupporter.h

@@ -97 +97 @@
         return false;
     }
-
-    static bool CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection );
 };

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

@@ -14 +14 @@
     return true;
 }
-
-bool NamespaceSupporter::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection )
-{
-    int i, i2;
-    char temporary[1024];
-
-    bool isSuccessful = true;
-
-    // 名前空間管理
-    NamespaceScopes namespaceScopes;
-
-    for(i=0;;i++){
-        if(source[i]=='\0') break;
-
-        if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
-            }
-            namespaceScopes.push_back( temporary );
-
-            if( !namespaceScopesCollection.IsExist( namespaceScopes ) ){
-                namespaceScopesCollection.push_back( namespaceScopes );
-            }
-
-            continue;
-        }
-        else if( source[i] == 1 && source[i+1] == ESC_ENDNAMESPACE ){
-            if( namespaceScopes.size() <= 0 ){
-                compiler.errorMessenger.Output( 12, "End Namespace", i );
-                isSuccessful = false;
-            }
-            else{
-                namespaceScopes.pop_back();
-            }
-
-            i += 2;
-            continue;
-        }
-    }
-
-    if( namespaceScopes.size() > 0 ){
-        compiler.errorMessenger.Output( 63, NULL, cp );
-        isSuccessful = false;
-    }
-
-    return isSuccessful;
-}

trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp

@@ -153 +153 @@
 
     // 名前空間情報を取得
-    NamespaceSupporter::CollectNamespaces(
+    ActiveBasic::Compiler::LexicalAnalyzer::CollectNamespaces(
         compiler.GetObjectModule().GetCurrentSource().GetBuffer(),
         compiler.GetObjectModule().meta.GetNamespaces()

trunk/ab5.0/abdev/compiler_x86/compiler_x86.vcproj

@@ -5 +5 @@
     Name="compiler_x86"
     ProjectGUID="{11F0E9AB-EAEC-4616-A9DD-838073342CBB}"
+    RootNamespace="compiler_x86"
     >
     <Platforms>
@@ -1252 +1253 @@
                 </File>
                 <File
+                    RelativePath="..\BasicCompiler_Common\src\LexicalAnalyzer.cpp"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\src\Linker.cpp"
                     >
@@ -1461 +1466 @@
                 </File>
                 <File
+                    RelativePath="..\BasicCompiler_Common\include\LexicalAnalyzer.h"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\include\Linker.h"
                     >

trunk/ab5.0/abdev/compiler_x86/stdafx.h

@@ -44 +44 @@
 #include <Compiler.h>
 #include <Debugger.h>
+#include <LexicalAnalyzer.h>