Changeset 199 in dev for trunk/abdev/BasicCompiler_Common/include

Timestamp:

Jun 27, 2007, 3:16:11 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• Compiler.h (modified) (2 diffs)
• NamespaceSupporter.h (modified) (3 diffs)

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -2 +2 @@
 
 #include <CodeGenerator.h>
+#include <NamespaceSupporter.h>
 #include <MetaImpl.h>
 
 class Compiler
 {
+    // ネイティブコード
     NativeCode nativeCode;
+
+    // 名前空間サポート
+    NamespaceSupporter namespaceSupporter;
+
+    // メタ情報
     MetaImpl metaImpl;
 
@@ -13 +20 @@
     {
         return nativeCode;
+    }
+
+    NamespaceSupporter &GetNamespaceSupporter()
+    {
+        return namespaceSupporter;
     }
 

trunk/abdev/BasicCompiler_Common/include/NamespaceSupporter.h

@@ -1 +1 @@
 #pragma once
 
-#include <Compiler.h>
+#include <jenga/include/smoothie/Namespace.h>
 
 class NamespaceSupporter
@@ -20 +20 @@
         this->importedNamespaces = namespaces;
     }
-    bool ImportsNamespace( const std::string &namespaceStr )
-    {
-        NamespaceScopes namespaceScopes( namespaceStr );
-        if( !compiler.GetMeta().GetNamespaces().IsExist( namespaceScopes ) ){
-            return false;
-        }
-
-        this->importedNamespaces.push_back( namespaceScopes );
-
-        return true;
-    }
+    bool ImportsNamespace( const std::string &namespaceStr );
 
     NamespaceScopes &GetLivingNamespaceScopes()
@@ -109 +99 @@
     static bool CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection );
 };
-extern NamespaceSupporter namespaceSupporter;