Changeset 195 in dev for trunk/abdev/BasicCompiler_Common/src/ClassImpl.cpp

Timestamp:

Jun 26, 2007, 1:48:18 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/src/ClassImpl.cpp (modified) (8 diffs)

trunk/abdev/BasicCompiler_Common/src/ClassImpl.cpp

@@ -7 +7 @@
 #include <ClassImpl.h>
 #include <Compiler.h>
+#include <NamespaceSupporter.h>
 
 #include "../common.h"
@@ -82 +83 @@
     }
 
-    return compiler.IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
+    return namespaceSupporter.IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
 }
 
@@ -517 +518 @@
 
     // 名前空間管理
-    NamespaceScopes &namespaceScopes = Smoothie::Temp::liveingNamespaceScopes;
+    NamespaceScopes &namespaceScopes = namespaceSupporter.GetLivingNamespaceScopes();
     namespaceScopes.clear();
 
     // Importsされた名前空間の管理
-    NamespaceScopesCollection &importedNamespaces = compiler.GetImportedNamespaces();
+    NamespaceScopesCollection &importedNamespaces = namespaceSupporter.GetImportedNamespaces();
     importedNamespaces.clear();
 
@@ -558 +559 @@
                 temporary[i2]=source[i];
             }
-            if( !compiler.ImportsNamespace( temporary ) )
+            if( !namespaceSupporter.ImportsNamespace( temporary ) )
             {
                 SmoothieException::Throw(64,temporary,i );
@@ -653 +654 @@
 
         // 名前空間をセット
-        Smoothie::Temp::liveingNamespaceScopes = objClass.GetNamespaceScopes();
+        namespaceSupporter.GetLivingNamespaceScopes() = objClass.GetNamespaceScopes();
 
         int i=0;
@@ -674 +675 @@
     }
 
-    Smoothie::Temp::liveingNamespaceScopes.clear();
+    namespaceSupporter.GetLivingNamespaceScopes().clear();
 
     cp=back_cp;
@@ -709 +710 @@
 
     // 名前空間管理
-    NamespaceScopes backupNamespaceScopes = Smoothie::Temp::liveingNamespaceScopes;
-    NamespaceScopes &namespaceScopes = Smoothie::Temp::liveingNamespaceScopes;
+    NamespaceScopes backupNamespaceScopes = namespaceSupporter.GetLivingNamespaceScopes();
+    NamespaceScopes &namespaceScopes = namespaceSupporter.GetLivingNamespaceScopes();
     namespaceScopes.clear();
 
@@ -1152 +1153 @@
 
     // 名前空間を元に戻す
-    Smoothie::Temp::liveingNamespaceScopes = backupNamespaceScopes;
+    namespaceSupporter.GetLivingNamespaceScopes() = backupNamespaceScopes;
 }
 void ClassesImpl::GetAllClassInfo(void){