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

Timestamp:

May 6, 2008, 1:41:03 PM (16 years ago)

Author:

dai_9181

Message:

・Classes::Find→Classes::FindExにリネームして、TypeDefサポートを排除した。
・Meta::FindClassSupportedTypeDefメソッドを実装。従来のClasses::Findの実装内容を受け継ぐ。

File:

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

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

@@ -648 +648 @@
 }
 
-const CClass *Classes::Find( const NamespaceScopes &namespaceScopes, const std::string &name ) const
-{
-    if( namespaceScopes.size() == 0 && name == "Object" ){
+const CClass *Classes::FindEx( const NamespaceScopes &namespaceScopes, const std::string &name ) const
+{
+    if( namespaceScopes.size() == 0 && name == "Object" )
+    {
         return GetObjectClassPtr();
     }
-    else if( namespaceScopes.size() == 0 && name == "String" ){
+    else if( namespaceScopes.size() == 0 && name == "String" )
+    {
         return GetStringClassPtr();
     }
@@ -683 +685 @@
     }
 
-    // TypeDefも見る
-    int index = compiler.GetObjectModule().meta.GetTypeDefs().GetIndex( namespaceScopes, name );
-    if( index != -1 ){
-        Type type = compiler.GetObjectModule().meta.GetTypeDefs()[index].GetBaseType();
-        if( type.IsObject() ){
-            return &type.GetClass();
-        }
-    }
-
     return NULL;
 }
-const CClass *Classes::Find( const std::string &fullName ) const
+const CClass *Classes::FindEx( const std::string &fullName ) const
 {
     char AreaName[VN_SIZE] = "";        //オブジェクト変数
@@ -700 +693 @@
     bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
 
-    return Find( NamespaceScopes( AreaName ), NestName );
+    return FindEx( NamespaceScopes( AreaName ), NestName );
 }
 
@@ -707 +700 @@
     if( !pStringClass ){
         // キャッシュしておく
-        pStringClass = this->Find( NamespaceScopes( "System" ), "String" );
+        pStringClass = this->FindEx( NamespaceScopes( "System" ), "String" );
 
         if( !pStringClass )
@@ -723 +716 @@
     if( !pObjectClass ){
         // キャッシュしておく
-        pObjectClass = this->Find( NamespaceScopes( "System" ), "Object" );
+        pObjectClass = this->FindEx( NamespaceScopes( "System" ), "Object" );
 
         if( !pObjectClass )
@@ -739 +732 @@
     if( !pInterfaceInfo ){
         // キャッシュしておく
-        pInterfaceInfo = this->Find( "ActiveBasic.Core.InterfaceInfo" );
+        pInterfaceInfo = this->FindEx( "ActiveBasic.Core.InterfaceInfo" );
 
         if( !pInterfaceInfo )