Changeset 504 in dev for trunk/ab5.0/abdev

Timestamp:

Apr 28, 2008, 7:04:16 PM (17 years ago)

Author:

dai_9181

Message:

Symbol::RegistNamespaceSupporterメソッドを追加。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• include/Compiler.h (modified) (1 diff)
• include/NamespaceSupporter.h (modified) (2 diffs)
• include/Symbol.h (modified) (2 diffs)
• src/Symbol.cpp (modified) (2 diffs)

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

@@ -58 +58 @@
         , isCore( false )
     {
+        Symbol::RegistNamespaceSupporter( &namespaceSupporter );
     }
     ~Compiler()

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

@@ -69 +69 @@
 
     // 指定された名前空間が同一エリアと見なされるかどうかをチェック
-    bool IsSameAreaNamespace( const NamespaceScopes &baseNamespaceScopes, const NamespaceScopes &entryNamespaceScopes ){
-        if( entryNamespaceScopes.size() ){
-            if( IsCoverd( baseNamespaceScopes, entryNamespaceScopes ) ){
+    bool IsSameAreaNamespace( const NamespaceScopes &baseNamespaceScopes, const NamespaceScopes &entryNamespaceScopes ) const
+    {
+        if( entryNamespaceScopes.size() )
+        {
+            if( IsCoverd( baseNamespaceScopes, entryNamespaceScopes ) )
+            {
                 // 包括しているときは同一と見なす
                 return true;
@@ -77 +80 @@
         }
         else{
-            if( baseNamespaceScopes.size() ){
+            if( baseNamespaceScopes.size() )
+            {
                 // 名前空間の判断が必要なとき
                 if( this->importedNamespaces.IsImported( baseNamespaceScopes )
-                    || IsLiving( baseNamespaceScopes ) ){
+                    || IsLiving( baseNamespaceScopes ) )
+                {
                     // Using指定があるとき
                     // または

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

@@ -11 +11 @@
 class Symbol
 {
+    static const NamespaceSupporter *namespaceSupporter;
+
     NamespaceScopes namespaceScopes;
     string name;
@@ -59 +61 @@
     }
 
+    static void RegistNamespaceSupporter( const NamespaceSupporter *namespaceSupporter )
+    {
+        Symbol::namespaceSupporter = namespaceSupporter;
+    }
+
     virtual const NamespaceScopes &GetNamespaceScopes() const
     {

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

@@ -3 +3 @@
 #include <Compiler.h>
 #include <Symbol.h>
+
+const NamespaceSupporter *Symbol::namespaceSupporter = NULL;
 
 Symbol::Symbol( const char *fullName )
@@ -41 +43 @@
     }
 
-    return compiler.GetNamespaceSupporter().IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
+    _ASSERTE( namespaceSupporter );
+    return namespaceSupporter->IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
 }
 bool Symbol::IsEqualSymbol( const Symbol &symbol ) const