Changeset 195 in dev for trunk

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/BasicCompiler.vcproj (modified) (2 diffs)
• BasicCompiler32/Compile_ProcOp.cpp (modified) (2 diffs)
• BasicCompiler32/MakePeHdr.cpp (modified) (4 diffs)
• BasicCompiler_Common/Compile.cpp (modified) (2 diffs)
• BasicCompiler_Common/Const.cpp (modified) (2 diffs)
• BasicCompiler_Common/Enum.cpp (modified) (2 diffs)
• BasicCompiler_Common/Intermediate_Step2.cpp (modified) (2 diffs)
• BasicCompiler_Common/Subroutine.cpp (modified) (3 diffs)
• BasicCompiler_Common/VariableOpe.cpp (modified) (2 diffs)
• BasicCompiler_Common/include/Compiler.h (modified) (2 diffs)
• BasicCompiler_Common/include/NamespaceSupporter.h (added)
• BasicCompiler_Common/src/ClassImpl.cpp (modified) (8 diffs)
• BasicCompiler_Common/src/Compiler.cpp (modified) (1 diff)
• BasicCompiler_Common/src/NamespaceSupporter.cpp (added)
• BasicCompiler_Common/src/ProcedureImpl.cpp (modified) (3 diffs)
• BasicCompiler_Common/src/TypeDef.cpp (modified) (4 diffs)
• BasicCompiler_Common/src/VariableImpl.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/BasicCompiler.vcproj

@@ -1276 +1276 @@
                 </File>
                 <File
+                    RelativePath="..\BasicCompiler_Common\src\NamespaceSupporter.cpp"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\src\ProcedureImpl.cpp"
                     >
@@ -1377 +1381 @@
                 </File>
                 <File
+                    RelativePath="..\BasicCompiler_Common\include\NamespaceSupporter.h"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\include\ProcedureImpl.h"
                     >

trunk/abdev/BasicCompiler32/Compile_ProcOp.cpp

@@ -7 +7 @@
 #include <ClassImpl.h>
 #include <VariableImpl.h>
+#include <NamespaceSupporter.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -281 +282 @@
 
     // コンパイル中の関数が属する名前空間
-    Smoothie::Temp::liveingNamespaceScopes = pUserProc->GetNamespaceScopes();
+    namespaceSupporter.GetLivingNamespaceScopes() = pUserProc->GetNamespaceScopes();
 
     // コンパイル中の関数でImportsされている名前空間
-    compiler.SetImportedNamespaces( pUserProc->GetImportedNamespaces() );
+    namespaceSupporter.SetImportedNamespaces( pUserProc->GetImportedNamespaces() );
 
     if(pUserProc->IsSystem()){

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -6 +6 @@
 #include <ClassImpl.h>
 #include <Compiler.h>
+#include <NamespaceSupporter.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -169 +170 @@
 
     // 名前空間情報を取得
-    NamespaceScopesCollection::CollectNamespaces(
+    NamespaceSupporter::CollectNamespaces(
         Smoothie::Lexical::source.GetBuffer(),
         compiler.GetMeta().GetNamespaces()
@@ -370 +371 @@
     if(!bDll){
         // 名前空間が初期化されているかをチェック
-        if( Smoothie::Temp::liveingNamespaceScopes.size() ){
+        if( namespaceSupporter.GetLivingNamespaceScopes().size() ){
             SetError();
         }
@@ -470 +471 @@
 
         // 名前空間が正しく閉じられているかをチェック
-        if( Smoothie::Temp::liveingNamespaceScopes.size() ){
+        if( namespaceSupporter.GetLivingNamespaceScopes().size() ){
             SetError(63,NULL,-1);
         }

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ -6 +6 @@
 #include <CodeGenerator.h>
 #include <Compiler.h>
+#include <NamespaceSupporter.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -252 +253 @@
 
             case ESC_NAMESPACE:
-                Smoothie::Temp::liveingNamespaceScopes.push_back( Command + 2 );
+                namespaceSupporter.GetLivingNamespaceScopes().push_back( Command + 2 );
                 break;
             case ESC_ENDNAMESPACE:
-                if( Smoothie::Temp::liveingNamespaceScopes.size() <= 0 ){
+                if( namespaceSupporter.GetLivingNamespaceScopes().size() <= 0 ){
                     SetError(12,"End Namespace",cp);
                 }
-                Smoothie::Temp::liveingNamespaceScopes.pop_back();
+                namespaceSupporter.GetLivingNamespaceScopes().pop_back();
                 break;
             case ESC_IMPORTS:
-                compiler.ImportsNamespace( Command + 2 );
+                namespaceSupporter.ImportsNamespace( Command + 2 );
                 break;
             case ESC_CLEARNAMESPACEIMPORTED:
-                compiler.GetImportedNamespaces().clear();
+                namespaceSupporter.GetImportedNamespaces().clear();
                 break;
 

trunk/abdev/BasicCompiler_Common/Const.cpp

@@ -1 +1 @@
 #include <Compiler.h>
+#include <NamespaceSupporter.h>
 
 #include "common.h"
@@ -14 +15 @@
         return false;
     }
-    return compiler.IsSameAreaNamespace( this->namespaceScopes, namespaceScopes );
+    return namespaceSupporter.IsSameAreaNamespace( this->namespaceScopes, namespaceScopes );
 }
 bool ConstBase::IsEqualSymbol( const string &fullName ) const

trunk/abdev/BasicCompiler_Common/Enum.cpp

@@ -3 +3 @@
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <NamespaceSupporter.h>
 
 #include "common.h"
@@ -115 +117 @@
 
     // 名前空間管理
-    NamespaceScopes &namespaceScopes = Smoothie::Temp::liveingNamespaceScopes;
+    NamespaceScopes &namespaceScopes = namespaceSupporter.GetLivingNamespaceScopes();
     namespaceScopes.clear();
 

trunk/abdev/BasicCompiler_Common/Intermediate_Step2.cpp

@@ -1 +1 @@
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <NamespaceSupporter.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -250 +252 @@
 
     // 名前空間管理
-    NamespaceScopes &namespaceScopes = Smoothie::Temp::liveingNamespaceScopes;
+    NamespaceScopes &namespaceScopes = namespaceSupporter.GetLivingNamespaceScopes();
     namespaceScopes.clear();
 

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ -4 +4 @@
 #include <Compiler.h>
 #include <ProcedureImpl.h>
+#include <NamespaceSupporter.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -628 +629 @@
 
     // 名前空間管理
-    NamespaceScopes &namespaceScopes = Smoothie::Temp::liveingNamespaceScopes;
+    NamespaceScopes &namespaceScopes = namespaceSupporter.GetLivingNamespaceScopes();
     namespaceScopes.clear();
 
     // Importsされた名前空間の管理
-    NamespaceScopesCollection &importedNamespaces = compiler.GetImportedNamespaces();
+    NamespaceScopesCollection &importedNamespaces = namespaceSupporter.GetImportedNamespaces();
     importedNamespaces.clear();
 
@@ -686 +687 @@
                 temporary[i2]=basbuf[i];
             }
-            if( !compiler.ImportsNamespace( temporary ) )
+            if( !namespaceSupporter.ImportsNamespace( temporary ) )
             {
                 SetError(64,temporary,cp );

trunk/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ -5 +5 @@
 #include <LexicalScopingImpl.h>
 #include <VariableImpl.h>
+#include <NamespaceSupporter.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -976 +977 @@
     bool isConst = ( dwFlag & DIMFLAG_CONST ) ? true:false;
 
-    Variable *pVar = new VariableImpl( Smoothie::Temp::liveingNamespaceScopes, name, type, isConst );
+    Variable *pVar = new VariableImpl( namespaceSupporter.GetLivingNamespaceScopes(), name, type, isConst );
 
     if( SubScripts[0] != -1 ){

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -8 +8 @@
     NativeCode nativeCode;
     MetaImpl metaImpl;
-
-    NamespaceScopesCollection importedNamespaces;
 
 public:
@@ -22 +20 @@
     }
 
-    NamespaceScopesCollection &GetImportedNamespaces()
-    {
-        return importedNamespaces;
-    }
-    void SetImportedNamespaces( const NamespaceScopesCollection &namespaces )
-    {
-        this->importedNamespaces = namespaces;
-    }
-    bool ImportsNamespace( const std::string &namespaceStr )
-    {
-        NamespaceScopes namespaceScopes( namespaceStr );
-        if( !this->GetMeta().GetNamespaces().IsExist( namespaceScopes ) ){
-            return false;
-        }
-
-        this->importedNamespaces.push_back( namespaceScopes );
-
-        return true;
-    }
-
     static bool StringToType( const std::string &typeName, Type &type );
     static const std::string TypeToString( const Type &type );
-
-    // 指定された名前空間が同一エリアと見なされるかどうかをチェック
-    bool IsSameAreaNamespace( const NamespaceScopes &baseNamespaceScopes, const NamespaceScopes &entryNamespaceScopes ){
-        if( entryNamespaceScopes.size() ){
-            if( baseNamespaceScopes.IsCoverd( entryNamespaceScopes ) ){
-                // 包括しているときは同一と見なす
-                return true;
-            }
-        }
-        else{
-            if( baseNamespaceScopes.size() ){
-                // 名前空間の判断が必要なとき
-                if( this->importedNamespaces.IsImported( baseNamespaceScopes )
-                    || baseNamespaceScopes.IsLiving() ){
-                    // Using指定があるとき
-                    // または
-                    // 指定された名前空間が現在の名前空間スコープと同一のとき
-                    return true;
-                }
-            }
-            else{
-                return true;
-            }
-        }
-
-        return false;
-    }
 };
 
-static Compiler compiler;
+extern Compiler compiler;

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;