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

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/src

Files:

• Class.cpp (modified) (6 diffs)
• Compiler.cpp (modified) (2 diffs)
• LexicalAnalyzer_Class.cpp (modified) (5 diffs)
• Meta.cpp (modified) (1 diff)

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 )

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

@@ -30 +30 @@
 
         // ジェネリクスクラスを取得
-        const CClass *pGenericClass = this->GetObjectModule().meta.GetClasses().Find( className );
+        const CClass *pGenericClass = this->GetObjectModule().meta.FindClassSupportedTypeDef( className );
 
         if( !pGenericClass )
@@ -128 +128 @@
 
     //クラス
-    const CClass *pobj_c = this->GetObjectModule().meta.GetClasses().Find( typeName );
+    const CClass *pobj_c = this->GetObjectModule().meta.GetClasses().FindEx( typeName );
     if(pobj_c){
         if( pobj_c->IsStructure() ){

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

@@ -472 +472 @@
 
         //継承元クラスを取得
-        const CClass *pInheritsClass = compiler.GetObjectModule().meta.GetClasses().Find(className);
+        const CClass *pInheritsClass = compiler.GetObjectModule().meta.FindClassSupportedTypeDef(className);
         if( !pInheritsClass ){
             compiler.errorMessenger.Output(106,className,nowLine);
@@ -628 +628 @@
 
         //継承元クラスを取得
-        const CClass *pInterfaceClass = compiler.GetObjectModule().meta.GetClasses().Find( className );
+        const CClass *pInterfaceClass = compiler.GetObjectModule().meta.FindClassSupportedTypeDef( className );
         if( !pInterfaceClass ){
             compiler.errorMessenger.Output(106,paramStr.c_str(),nowLine);
@@ -756 +756 @@
             SplitGenericClassInstance( temporary, className, typeParameters, true, &typeParameterBaseClassNames );
 
-            CClass *pobj_c = const_cast<CClass *>( classes.Find(namespaceScopes, className) );
+            CClass *pobj_c = const_cast<CClass *>( classes.FindEx(namespaceScopes, className) );
             if(!pobj_c) continue;
 
@@ -823 +823 @@
 
                 //継承元クラスを取得
-                const CClass *pInheritsClass = classes.Find(temporary);
+                const CClass *pInheritsClass = compiler.GetObjectModule().meta.FindClassSupportedTypeDef( temporary );
                 if( !pInheritsClass ){
                     compiler.errorMessenger.Output(106,temporary,i);
@@ -980 +980 @@
             SplitGenericClassInstance( temporary, className, typeParameters, true, &typeParameterBaseClassNames );
 
-            CClass *pobj_c =  const_cast<CClass *>( classes.Find(namespaceScopes, className) );
+            CClass *pobj_c =  const_cast<CClass *>( classes.FindEx(namespaceScopes, className) );
             if(!pobj_c) continue;
 

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

@@ -178 +178 @@
     throw;
 }
+
+const CClass *Meta::FindClassSupportedTypeDef( const NamespaceScopes &namespaceScopes, const std::string &name )
+{
+    const CClass *pClass = this->GetClasses().FindEx( namespaceScopes, name );
+    if( pClass )
+    {
+        return pClass;
+    }
+
+    // TypeDefも見る
+    int index = this->GetTypeDefs().GetIndex( namespaceScopes, name );
+    if( index != -1 ){
+        Type type = this->GetTypeDefs()[index].GetBaseType();
+        if( type.IsObject() ){
+            return &type.GetClass();
+        }
+    }
+
+    return NULL;
+}
+const CClass *Meta::FindClassSupportedTypeDef( const std::string &fullName )
+{
+    char AreaName[VN_SIZE] = "";        //オブジェクト変数
+    char NestName[VN_SIZE] = "";        //入れ子メンバ
+    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
+
+    return FindClassSupportedTypeDef( NamespaceScopes( AreaName ), NestName );
+}