Changeset 507 in dev for trunk/ab5.0/abdev/ab_common

Timestamp:

Apr 28, 2008, 8:14:31 PM (17 years ago)

Author:

dai_9181

Message:

NamespaceSupporterクラスをab_commonプロジェクトに移動した。

Location:

trunk/ab5.0/abdev/ab_common

Files:

• ab_common.vcproj (modified) (2 diffs)
• include/Namespace.h (modified) (1 diff)
• include/NamespaceSupporter.h (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/include/NamespaceSupporter.h ) (5 diffs)
• src/NamespaceSupporter.cpp (moved) (moved from trunk/ab5.0/abdev/BasicCompiler_Common/src/NamespaceSupporter.cpp ) (2 diffs)
• stdafx.h (modified) (1 diff)

trunk/ab5.0/abdev/ab_common/ab_common.vcproj

@@ -320 +320 @@
                     >
                 </File>
+                <File
+                    RelativePath=".\include\NamespaceSupporter.h"
+                    >
+                </File>
             </Filter>
         </Filter>
@@ -340 +344 @@
                 <File
                     RelativePath=".\src\Namespace.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath=".\src\NamespaceSupporter.cpp"
                     >
                 </File>

trunk/ab5.0/abdev/ab_common/include/Namespace.h

@@ -1 +1 @@
 #pragma once
-
-#include <vector>
-#include <string>
-#include <boost/foreach.hpp>
 
 

trunk/ab5.0/abdev/ab_common/include/NamespaceSupporter.h

@@ -1 +1 @@
 #pragma once
+
+namespace ActiveBasic{ namespace Common{ namespace Lexical{
+
 
 class NamespaceSupporter
 {
+    const NamespaceScopesCollection *allNamespaceScopesCollection;
+
     // Importsされた名前空間
     NamespaceScopesCollection importedNamespaces;
@@ -10 +15 @@
 
 public:
+    NamespaceSupporter()
+        : allNamespaceScopesCollection( NULL )
+    {
+    }
+
+    void RegistAllNamespaceScopesCollection( const NamespaceScopesCollection *allNamespaceScopesCollection )
+    {
+        this->allNamespaceScopesCollection = allNamespaceScopesCollection;
+    }
+
     NamespaceScopesCollection &GetImportedNamespaces()
     {
@@ -18 +33 @@
         this->importedNamespaces = namespaces;
     }
+    bool ImportsNamespace( const NamespaceScopes &namespaceScopes );
     bool ImportsNamespace( const std::string &namespaceStr );
 
@@ -40 +56 @@
     // entryName =   "ActiveBasic"
     // この場合、living は entryName を包括している。
-    bool IsCoverd( const NamespaceScopes &namespaceScopes, const string &entryName ) const
+    bool IsCoverd( const NamespaceScopes &namespaceScopes, const std::string &entryName ) const
     {
-        if( namespaceScopes.IsEqual( entryName ) ){
+        if( namespaceScopes.IsEqual( entryName ) )
+        {
             return true;
         }
 
-        string thisStr = namespaceScopes.ToString();
+        std::string thisStr = namespaceScopes.ToString();
 
         NamespaceScopes tempLivingNamespaceScopes = livingNamespaceScopes;
 
-        while( tempLivingNamespaceScopes.size() ){
-            string tempStr = tempLivingNamespaceScopes.ToString() + "." + entryName;
-            if( thisStr == tempStr ){
+        while( tempLivingNamespaceScopes.size() )
+        {
+            std::string tempStr = tempLivingNamespaceScopes.ToString() + "." + entryName;
+            if( thisStr == tempStr )
+            {
                 return true;
             }
@@ -98 +117 @@
     }
 };
+
+
+}}}

trunk/ab5.0/abdev/ab_common/src/NamespaceSupporter.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 
-#include <Compiler.h>
+using namespace ActiveBasic::Common::Lexical;
 
-bool NamespaceSupporter::ImportsNamespace( const std::string &namespaceStr )
+bool NamespaceSupporter::ImportsNamespace( const NamespaceScopes &namespaceScopes )
 {
-    NamespaceScopes namespaceScopes( namespaceStr );
-    if( !compiler.GetObjectModule().meta.GetNamespaces().IsExist( namespaceScopes ) ){
+    if( !allNamespaceScopesCollection->IsExist( namespaceScopes ) ){
         return false;
     }
@@ -14 +13 @@
     return true;
 }
+
+bool NamespaceSupporter::ImportsNamespace( const std::string &namespaceStr )
+{
+    NamespaceScopes namespaceScopes( namespaceStr );
+
+    return ImportsNamespace( namespaceScopes );
+}

trunk/ab5.0/abdev/ab_common/stdafx.h

@@ -34 +34 @@
 
 #include <Namespace.h>
+#include <NamespaceSupporter.h>