Changeset 598 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp

Timestamp:

May 10, 2008, 8:16:16 PM (17 years ago)

Author:

dai_9181

Message:

SplitMemberNameの依存関係を排除。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp (modified) (6 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp

@@ -635 +635 @@
 }
 
-const CClass *Classes::FindEx( const NamespaceScopes &namespaceScopes, const std::string &name ) const
-{
-    if( namespaceScopes.size() == 0 && name == "Object" )
+const CClass *Classes::FindEx( const Symbol &symbol ) const
+{
+    if( symbol.GetNamespaceScopes().size() == 0 && symbol.GetName() == "Object" )
     {
         return GetObjectClassPtr();
     }
-    else if( namespaceScopes.size() == 0 && name == "String" )
+    else if( symbol.GetNamespaceScopes().size() == 0 && symbol.GetName() == "String" )
     {
         return GetStringClassPtr();
@@ -647 +647 @@
 
     std::vector<const CClass *> classes;
-    const CClass *pClass = GetHashArrayElement( name.c_str() );
+    const CClass *pClass = GetHashArrayElement( symbol.GetName().c_str() );
     while( pClass )
     {
-        if( pClass->IsEqualSymbol( namespaceScopes, name ) ){
+        if( pClass->IsEqualSymbol( symbol.GetNamespaceScopes(), symbol.GetName() ) ){
             //名前空間とクラス名が一致した
             classes.push_back( pClass );
@@ -674 +674 @@
     return NULL;
 }
-const CClass *Classes::FindEx( const std::string &fullName ) const
-{
-    char AreaName[VN_SIZE] = "";        //オブジェクト変数
-    char NestName[VN_SIZE] = "";        //入れ子メンバ
-    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
-
-    return FindEx( NamespaceScopes( AreaName ), NestName );
-}
 
 const CClass *Classes::GetStringClassPtr() const
@@ -688 +680 @@
     {
         // キャッシュしておく
-        pStringClass = this->FindEx( NamespaceScopes( "System" ), "String" );
+        pStringClass = this->FindEx( Symbol( NamespaceScopes( "System" ), "String" ) );
     }
     return pStringClass;
@@ -697 +689 @@
     {
         // キャッシュしておく
-        pObjectClass = this->FindEx( NamespaceScopes( "System" ), "Object" );
+        pObjectClass = this->FindEx( Symbol( NamespaceScopes( "System" ), "Object" ) );
     }
     return pObjectClass;
@@ -706 +698 @@
     {
         // キャッシュしておく
-        pInterfaceInfo = this->FindEx( "ActiveBasic.Core.InterfaceInfo" );
+        pInterfaceInfo = this->FindEx( Symbol( NamespaceScopes( "ActiveBasic.Core" ), "InterfaceInfo" ) );
     }
     return pInterfaceInfo;