Changeset 169 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Jun 18, 2007, 3:49:30 AM (18 years ago)

Author:

dai_9181

Message:

NamespaceScopesCollection::Importsをリファクタリング

Location:

trunk/abdev/BasicCompiler_Common

Files:

• Class.cpp (modified) (1 diff)
• Subroutine.cpp (modified) (1 diff)
• TypeDef.cpp (modified) (1 diff)
• include/Namespace.h (modified) (1 diff)
• src/Namespace.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/Class.cpp

@@ -785 +785 @@
                 temporary[i2]=basbuf[i];
             }
-            importedNamespaces.Imports( temporary );
+            if( !importedNamespaces.Imports( temporary ) )
+            {
+                SetError(64,temporary,cp );
+            }
 
             continue;

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ -720 +720 @@
                 temporary[i2]=basbuf[i];
             }
-            importedNamespaces.Imports( temporary );
+            if( !importedNamespaces.Imports( temporary ) )
+            {
+                SetError(64,temporary,cp );
+            }
 
             continue;

trunk/abdev/BasicCompiler_Common/TypeDef.cpp

@@ -192 +192 @@
                 temporary[i2]=basbuf[i];
             }
-            importedNamespaces.Imports( temporary );
+            if( !importedNamespaces.Imports( temporary ) )
+            {
+                SetError(64,temporary,cp );
+            }
 
             continue;

trunk/abdev/BasicCompiler_Common/include/Namespace.h

@@ -130 +130 @@
     void SplitNamespace( const char *fullName, char *namespaceStr, char *simpleName ) const;
 
-    void Imports( const string &namespaceStr );
+    bool Imports( const string &namespaceStr );
 
     static bool CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection );

trunk/abdev/BasicCompiler_Common/src/Namespace.cpp

@@ -101 +101 @@
     lstrcpy( simpleName, fullName + lstrlen( namespaceStr ) + dotLength );
 }
-void NamespaceScopesCollection::Imports( const string &namespaceStr ){
+bool NamespaceScopesCollection::Imports( const string &namespaceStr ){
     NamespaceScopes namespaceScopes( namespaceStr );
     if( !Smoothie::meta.namespaceScopesCollection.IsExist( namespaceScopes ) ){
-        SetError(64,namespaceStr.c_str(),cp );
-        return;
+        return false;
     }
 
     this->push_back( namespaceScopes );
+
+    return true;
 }
 bool NamespaceScopesCollection::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection )