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

Timestamp:

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

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/src/TypeDef.cpp (modified) (4 diffs)

trunk/abdev/BasicCompiler_Common/src/TypeDef.cpp

@@ -5 +5 @@
 #include <TypeDef.h>
 #include <Compiler.h>
+#include <NamespaceSupporter.h>
 
 TypeDef::TypeDef( const NamespaceScopes &namespaceScopes, const string &name, const string &baseName, int nowLine )
@@ -24 +25 @@
         return false;
     }
-    return compiler.IsSameAreaNamespace( this->namespaceScopes, namespaceScopes );
+    return namespaceSupporter.IsSameAreaNamespace( this->namespaceScopes, namespaceScopes );
 }
 bool TypeDef::IsEqualSymbol( const string &fullName ) const
@@ -147 +148 @@
 
     // 名前空間管理
-    NamespaceScopes &namespaceScopes = Smoothie::Temp::liveingNamespaceScopes;
+    NamespaceScopes &namespaceScopes = namespaceSupporter.GetLivingNamespaceScopes();
     namespaceScopes.clear();
 
     // Importsされた名前空間の管理
-    NamespaceScopesCollection &importedNamespaces = compiler.GetImportedNamespaces();
+    NamespaceScopesCollection &importedNamespaces = namespaceSupporter.GetImportedNamespaces();
     importedNamespaces.clear();
 
@@ -192 +193 @@
                 temporary[i2]=basbuf[i];
             }
-            if( !compiler.ImportsNamespace( temporary ) )
+            if( !namespaceSupporter.ImportsNamespace( temporary ) )
             {
                 SmoothieException::Throw(64,temporary,i );