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

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

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

trunk/abdev/BasicCompiler_Common/src/ClassImpl.cpp

@@ -83 +83 @@
     }
 
-    return namespaceSupporter.IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
+    return compiler.GetNamespaceSupporter().IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
 }
 
@@ -518 +518 @@
 
     // 名前空間管理
-    NamespaceScopes &namespaceScopes = namespaceSupporter.GetLivingNamespaceScopes();
+    NamespaceScopes &namespaceScopes = compiler.GetNamespaceSupporter().GetLivingNamespaceScopes();
     namespaceScopes.clear();
 
     // Importsされた名前空間の管理
-    NamespaceScopesCollection &importedNamespaces = namespaceSupporter.GetImportedNamespaces();
+    NamespaceScopesCollection &importedNamespaces = compiler.GetNamespaceSupporter().GetImportedNamespaces();
     importedNamespaces.clear();
 
@@ -559 +559 @@
                 temporary[i2]=source[i];
             }
-            if( !namespaceSupporter.ImportsNamespace( temporary ) )
+            if( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ) )
             {
                 SmoothieException::Throw(64,temporary,i );
@@ -654 +654 @@
 
         // 名前空間をセット
-        namespaceSupporter.GetLivingNamespaceScopes() = objClass.GetNamespaceScopes();
+        compiler.GetNamespaceSupporter().GetLivingNamespaceScopes() = objClass.GetNamespaceScopes();
 
         int i=0;
@@ -675 +675 @@
     }
 
-    namespaceSupporter.GetLivingNamespaceScopes().clear();
+    compiler.GetNamespaceSupporter().GetLivingNamespaceScopes().clear();
 
     cp=back_cp;
@@ -710 +710 @@
 
     // 名前空間管理
-    NamespaceScopes backupNamespaceScopes = namespaceSupporter.GetLivingNamespaceScopes();
-    NamespaceScopes &namespaceScopes = namespaceSupporter.GetLivingNamespaceScopes();
+    NamespaceScopes backupNamespaceScopes = compiler.GetNamespaceSupporter().GetLivingNamespaceScopes();
+    NamespaceScopes &namespaceScopes = compiler.GetNamespaceSupporter().GetLivingNamespaceScopes();
     namespaceScopes.clear();
 
@@ -1153 +1153 @@
 
     // 名前空間を元に戻す
-    namespaceSupporter.GetLivingNamespaceScopes() = backupNamespaceScopes;
+    compiler.GetNamespaceSupporter().GetLivingNamespaceScopes() = backupNamespaceScopes;
 }
 void ClassesImpl::GetAllClassInfo(void){
@@ -1165 +1165 @@
     pobj_LoopRefCheck=0;
 
-    // イテレータ用のデータを作る
+    // イテレータの準備
     this->Iterator_Init();
 }

trunk/abdev/BasicCompiler_Common/src/NamespaceSupporter.cpp

@@ -1 +1 @@
 #include <jenga/include/smoothie/SmoothieException.h>
 
-#include <NamespaceSupporter.h>
+#include <Compiler.h>
 
-NamespaceSupporter namespaceSupporter;
+bool NamespaceSupporter::ImportsNamespace( const std::string &namespaceStr )
+{
+    NamespaceScopes namespaceScopes( namespaceStr );
+    if( !compiler.GetMeta().GetNamespaces().IsExist( namespaceScopes ) ){
+        return false;
+    }
+
+    this->importedNamespaces.push_back( namespaceScopes );
+
+    return true;
+}
 
 bool NamespaceSupporter::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection )

trunk/abdev/BasicCompiler_Common/src/ProcedureImpl.cpp

@@ -389 +389 @@
     }
 
-    return namespaceSupporter.IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
+    return compiler.GetNamespaceSupporter().IsSameAreaNamespace( GetNamespaceScopes(), namespaceScopes );
 }
 bool GlobalProc::IsEqualSymbol( const GlobalProc &globalProc ) const
@@ -409 +409 @@
         return false;
     }
-    return namespaceSupporter.IsSameAreaNamespace( this->GetNamespaceScopes(), namespaceScopes );
+    return compiler.GetNamespaceSupporter().IsSameAreaNamespace( this->GetNamespaceScopes(), namespaceScopes );
 }
 bool DllProcImpl::SetParamsAndReturnType( const char *sourceOfParams, int nowLine ){

trunk/abdev/BasicCompiler_Common/src/TypeDef.cpp

@@ -25 +25 @@
         return false;
     }
-    return namespaceSupporter.IsSameAreaNamespace( this->namespaceScopes, namespaceScopes );
+    return compiler.GetNamespaceSupporter().IsSameAreaNamespace( this->namespaceScopes, namespaceScopes );
 }
 bool TypeDef::IsEqualSymbol( const string &fullName ) const
@@ -148 +148 @@
 
     // 名前空間管理
-    NamespaceScopes &namespaceScopes = namespaceSupporter.GetLivingNamespaceScopes();
+    NamespaceScopes &namespaceScopes = compiler.GetNamespaceSupporter().GetLivingNamespaceScopes();
     namespaceScopes.clear();
 
     // Importsされた名前空間の管理
-    NamespaceScopesCollection &importedNamespaces = namespaceSupporter.GetImportedNamespaces();
+    NamespaceScopesCollection &importedNamespaces = compiler.GetNamespaceSupporter().GetImportedNamespaces();
     importedNamespaces.clear();
 
@@ -193 +193 @@
                 temporary[i2]=basbuf[i];
             }
-            if( !namespaceSupporter.ImportsNamespace( temporary ) )
+            if( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ) )
             {
                 SmoothieException::Throw(64,temporary,i );

trunk/abdev/BasicCompiler_Common/src/VariableImpl.cpp

@@ -6 +6 @@
 {
     if( GetName() == symbol.GetName()
-        && namespaceSupporter.IsSameAreaNamespace( this->GetNamespaceScopes(), symbol.GetNamespaceScopes() ) )
+        && compiler.GetNamespaceSupporter().IsSameAreaNamespace( this->GetNamespaceScopes(), symbol.GetNamespaceScopes() ) )
     {
         return true;