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

Timestamp:

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

Author:

dai_9181

Message:

SplitMemberNameの依存関係を排除。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/src

Files:

• Class.cpp (modified) (6 diffs)
• Compiler.cpp (modified) (4 diffs)
• LexicalAnalyzer_Class.cpp (modified) (5 diffs)
• Meta.cpp (modified) (3 diffs)
• TypeDef.cpp (modified) (2 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;

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

@@ -3 +3 @@
 #include <Compiler.h>
 #include <Type.h>
+
+using namespace ActiveBasic::Compiler;
 
 Compiler compiler;
@@ -30 +32 @@
 
         // ジェネリクスクラスを取得
-        const CClass *pGenericClass = this->GetObjectModule().meta.FindClassSupportedTypeDef( className );
+        const CClass *pGenericClass = this->GetObjectModule().meta.FindClassSupportedTypeDef( 
+            LexicalAnalyzer::FullNameToSymbol( className )
+        );
 
         if( !pGenericClass )
@@ -140 +144 @@
     // TypeDefされた型
     ////////////////////
-    int i=this->GetObjectModule().meta.GetTypeDefs().GetIndex( typeName );
+    int i=this->GetObjectModule().meta.GetTypeDefs().GetIndex( LexicalAnalyzer::FullNameToSymbol( typeName ) );
     if(i!=-1){
         type = this->GetObjectModule().meta.GetTypeDefs()[i].GetBaseType();
@@ -147 +151 @@
 
     //クラス
-    const CClass *pobj_c = this->GetObjectModule().meta.GetClasses().FindEx( typeName );
+    const CClass *pobj_c = this->GetObjectModule().meta.GetClasses().FindEx( LexicalAnalyzer::FullNameToSymbol( 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.FindClassSupportedTypeDef(className);
+        const CClass *pInheritsClass = compiler.GetObjectModule().meta.FindClassSupportedTypeDef(
+            LexicalAnalyzer::FullNameToSymbol( className )
+        );
         if( !pInheritsClass ){
             compiler.errorMessenger.Output(106,className,nowLine);
@@ -640 +642 @@
 
         //継承元クラスを取得
-        const CClass *pInterfaceClass = compiler.GetObjectModule().meta.FindClassSupportedTypeDef( className );
+        const CClass *pInterfaceClass = compiler.GetObjectModule().meta.FindClassSupportedTypeDef(
+            LexicalAnalyzer::FullNameToSymbol( className )
+        );
         if( !pInterfaceClass ){
             compiler.errorMessenger.Output(106,paramStr.c_str(),nowLine);
@@ -768 +772 @@
             SplitGenericClassInstance( temporary, className, typeParameters, true, &typeParameterBaseClassNames );
 
-            CClass *pobj_c = const_cast<CClass *>( classes.FindEx(namespaceScopes, className) );
+            CClass *pobj_c = const_cast<CClass *>( classes.FindEx( Symbol( namespaceScopes, className ) ) );
             if(!pobj_c) continue;
 
@@ -835 +839 @@
 
                 //継承元クラスを取得
-                const CClass *pInheritsClass = compiler.GetObjectModule().meta.FindClassSupportedTypeDef( temporary );
+                const CClass *pInheritsClass = compiler.GetObjectModule().meta.FindClassSupportedTypeDef(
+                    LexicalAnalyzer::FullNameToSymbol( temporary )
+                );
                 if( !pInheritsClass ){
                     compiler.errorMessenger.Output(106,temporary,i);
@@ -1003 +1009 @@
             SplitGenericClassInstance( temporary, className, typeParameters, true, &typeParameterBaseClassNames );
 
-            CClass *pobj_c =  const_cast<CClass *>( classes.FindEx(namespaceScopes, className) );
+            CClass *pobj_c =  const_cast<CClass *>( classes.FindEx( Symbol( namespaceScopes, className ) ) );
             if(!pobj_c) continue;
 

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

@@ -177 +177 @@
 }
 
-const CClass *Meta::FindClassSupportedTypeDef( const NamespaceScopes &namespaceScopes, const std::string &name )
+const CClass *Meta::FindClassSupportedTypeDef( const Symbol &symbol )
 {
-    const CClass *pClass = this->GetClasses().FindEx( namespaceScopes, name );
+    const CClass *pClass = this->GetClasses().FindEx( symbol );
     if( pClass )
     {
@@ -186 +186 @@
 
     // TypeDefも見る
-    int index = this->GetTypeDefs().GetIndex( namespaceScopes, name );
+    int index = this->GetTypeDefs().GetIndex( symbol );
     if( index != -1 ){
         Type type = this->GetTypeDefs()[index].GetBaseType();
@@ -196 +196 @@
     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 );
-}

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

@@ -17 +17 @@
 }
 
-int TypeDefCollection::GetIndex( const NamespaceScopes &namespaceScopes, const std::string &name ) const{
+int TypeDefCollection::GetIndex( const Symbol &symbol ) const{
     int max = (int)(*this).size();
     for( int i=0; i<max; i++ ){
-        if( (*this)[i].IsEqualSymbol( namespaceScopes, name ) ){
+        if( (*this)[i].IsEqualSymbol( symbol ) ){
             return i;
         }
@@ -26 +26 @@
     return -1;
 }
-int TypeDefCollection::GetIndex( const std::string &fullName ) const{
-    char AreaName[VN_SIZE] = "";        //オブジェクト変数
-    char NestName[VN_SIZE] = "";        //入れ子メンバ
-    bool isNest = SplitMemberName( fullName.c_str(), AreaName, NestName );
-
-    return GetIndex( NamespaceScopes( AreaName ), NestName );
-}