Changeset 195 in dev for trunk/abdev/BasicCompiler_Common/src

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• ClassImpl.cpp (modified) (8 diffs)
• Compiler.cpp (modified) (1 diff)
• NamespaceSupporter.cpp (added)
• ProcedureImpl.cpp (modified) (3 diffs)
• TypeDef.cpp (modified) (4 diffs)
• VariableImpl.cpp (modified) (1 diff)

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){

trunk/abdev/BasicCompiler_Common/src/Compiler.cpp

@@ -4 +4 @@
 #include <Compiler.h>
 
+Compiler compiler;
 
 bool Compiler::StringToType( const string &typeName, Type &type ){

trunk/abdev/BasicCompiler_Common/src/ProcedureImpl.cpp

@@ -4 +4 @@
 #include <Compiler.h>
 #include <ProcedureImpl.h>
+#include <NamespaceSupporter.h>
 
 #include "../common.h"
@@ -388 +389 @@
     }
 
-    return compiler.IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
+    return namespaceSupporter.IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
 }
 bool GlobalProc::IsEqualSymbol( const GlobalProc &globalProc ) const
@@ -408 +409 @@
         return false;
     }
-    return compiler.IsSameAreaNamespace( this->GetNamespaceScopes(), namespaceScopes );
+    return namespaceSupporter.IsSameAreaNamespace( this->GetNamespaceScopes(), namespaceScopes );
 }
 bool DllProcImpl::SetParamsAndReturnType( const char *sourceOfParams, int nowLine ){

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 );

trunk/abdev/BasicCompiler_Common/src/VariableImpl.cpp

@@ -1 +1 @@
 #include <Compiler.h>
 #include <VariableImpl.h>
+#include <NamespaceSupporter.h>
 
 bool VariableImpl::IsEqualSymbol( const Symbol &symbol, bool isSupportStaticMember ) const
 {
     if( GetName() == symbol.GetName()
-        && compiler.IsSameAreaNamespace( this->GetNamespaceScopes(), symbol.GetNamespaceScopes() ) )
+        && namespaceSupporter.IsSameAreaNamespace( this->GetNamespaceScopes(), symbol.GetNamespaceScopes() ) )
     {
         return true;