Changeset 143 in dev

Timestamp:

Jun 16, 2007, 11:25:37 AM (17 years ago)

Author:

dai_9181

Message:

Smoothie::Metaクラス内を整理

Files:

• BasicCompiler32/Compile_ProcOp.cpp (modified) (1 diff)
• BasicCompiler64/Compile_ProcOp.cpp (modified) (1 diff)
• BasicCompiler_Common/Class.cpp (modified) (1 diff)
• BasicCompiler_Common/Compile.cpp (modified) (1 diff)
• BasicCompiler_Common/Subroutine.cpp (modified) (1 diff)
• BasicCompiler_Common/TypeDef.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Smoothie.h (modified) (1 diff)
• BasicCompiler_Common/src/Namespace.cpp (modified) (1 diff)
• BasicCompiler_Common/src/Smoothie.cpp (modified) (1 diff)

BasicCompiler32/Compile_ProcOp.cpp

@@ -275 +275 @@
 
     // コンパイル中の関数でImportsされている名前空間
-    Smoothie::Meta::importedNamespaces = pUserProc->GetImportedNamespaces();
+    Smoothie::Temp::importedNamespaces = pUserProc->GetImportedNamespaces();
 
     if(pUserProc->IsSystem()){

BasicCompiler64/Compile_ProcOp.cpp

@@ -265 +265 @@
 
     // コンパイル中の関数でImportsされている名前空間
-    Smoothie::Meta::importedNamespaces = pUserProc->GetImportedNamespaces();
+    Smoothie::Temp::importedNamespaces = pUserProc->GetImportedNamespaces();
 
     if(pUserProc->IsSystem()){

BasicCompiler_Common/Class.cpp

@@ -748 +748 @@
 
     // Importsされた名前空間の管理
-    NamespaceScopesCollection &importedNamespaces = Smoothie::Meta::importedNamespaces;
+    NamespaceScopesCollection &importedNamespaces = Smoothie::Temp::importedNamespaces;
     importedNamespaces.clear();
 

BasicCompiler_Common/Compile.cpp

@@ -240 +240 @@
                 break;
             case ESC_IMPORTS:
-                Smoothie::Meta::importedNamespaces.Imports( Command + 2 );
+                Smoothie::Temp::importedNamespaces.Imports( Command + 2 );
                 break;
             case ESC_CLEARNAMESPACEIMPORTED:
-                Smoothie::Meta::importedNamespaces.clear();
+                Smoothie::Temp::importedNamespaces.clear();
                 break;
 

BasicCompiler_Common/Subroutine.cpp

@@ -666 +666 @@
 
     // Importsされた名前空間の管理
-    NamespaceScopesCollection &importedNamespaces = Smoothie::Meta::importedNamespaces;
+    NamespaceScopesCollection &importedNamespaces = Smoothie::Temp::importedNamespaces;
     importedNamespaces.clear();
 

BasicCompiler_Common/TypeDef.cpp

@@ -151 +151 @@
 
     // Importsされた名前空間の管理
-    NamespaceScopesCollection &importedNamespaces = Smoothie::Meta::importedNamespaces;
+    NamespaceScopesCollection &importedNamespaces = Smoothie::Temp::importedNamespaces;
     importedNamespaces.clear();
 

BasicCompiler_Common/include/Smoothie.h

@@ -33 +33 @@
     };
 
+    // プロジェクト中に存在するメタ情報
     class Meta{
     public:
+        // 名前空間
+        static NamespaceScopesCollection namespaceScopesCollection;
+
+        // クラス
+
         // TypeDef
         static TypeDefCollection typeDefs;
+
+        // 関数ポインタ
         static vector<ProcPointer *> procPointers;
-        static NamespaceScopesCollection namespaceScopesCollection;
+
+        // blittable型
+        static BlittableTypes blittableTypes;
+    };
+
+    // コンパイル中に一時的に利用する
+    class Temp{
+    public:
+        // 現在インポートされている名前空間
         static NamespaceScopesCollection importedNamespaces;
-        static BlittableTypes blittableTypes;
     };
 

BasicCompiler_Common/src/Namespace.cpp

@@ -25 +25 @@
 bool NamespaceScopes::IsImported() const
 {
-    BOOST_FOREACH( const NamespaceScopes &namespaceScopes, Smoothie::Meta::importedNamespaces ){
+    BOOST_FOREACH( const NamespaceScopes &namespaceScopes, Smoothie::Temp::importedNamespaces ){
         if( this->IsEqual( namespaceScopes ) ){
             return true;

BasicCompiler_Common/src/Smoothie.cpp

@@ -22 +22 @@
 vector<ProcPointer *> Smoothie::Meta::procPointers;
 NamespaceScopesCollection Smoothie::Meta::namespaceScopesCollection;
-NamespaceScopesCollection Smoothie::Meta::importedNamespaces;
+NamespaceScopesCollection Smoothie::Temp::importedNamespaces;
 BlittableTypes Smoothie::Meta::blittableTypes;