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

Timestamp:

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

Author:

dai_9181

Message:

SplitMemberNameの依存関係を排除。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• DebugMiddleFile.cpp (modified) (2 diffs)
• NumOpe_GetType.cpp (modified) (2 diffs)
• VariableOpe.cpp (modified) (1 diff)
• calculation.cpp (modified) (1 diff)
• hash.cpp (modified) (2 diffs)
• include/Class.h (modified) (1 diff)
• include/Meta.h (modified) (1 diff)
• include/TypeDef.h (modified) (1 diff)
• src/Class.cpp (modified) (6 diffs)
• src/Compiler.cpp (modified) (4 diffs)
• src/LexicalAnalyzer_Class.cpp (modified) (5 diffs)
• src/Meta.cpp (modified) (3 diffs)
• src/TypeDef.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -16 +16 @@
 #define MDLFILE_VER 0x70000003
 
+using namespace ActiveBasic::Compiler;
+
 
 void SetLpIndex_DebugFile(char *buffer,int *p,const Type &type){
@@ -35 +37 @@
         (*p)+=lstrlen(buffer+(*p))+1;
 
-        type.SetClassPtr( compiler.GetObjectModule().meta.GetClasses().FindEx(szClassName) );
+        type.SetClassPtr(
+            compiler.GetObjectModule().meta.GetClasses().FindEx( LexicalAnalyzer::FullNameToSymbol( szClassName ) )
+        );
     }
     else{

trunk/ab5.0/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -5 +5 @@
 #include "common.h"
 
+using namespace ActiveBasic::Compiler;
 
 int MakeWholeType(int size,int bSigned){
@@ -468 +469 @@
     if( pIsClassName )
     {
-        if( compiler.GetObjectModule().meta.FindClassSupportedTypeDef( termFull ) )
+        if( compiler.GetObjectModule().meta.FindClassSupportedTypeDef( LexicalAnalyzer::FullNameToSymbol( termFull ) ) )
         {
             *pIsClassName = true;

trunk/ab5.0/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ -639 +639 @@
         }
 
-        int typeDefIndex = compiler.GetObjectModule().meta.GetTypeDefs().GetIndex( VarName );
+        int typeDefIndex = compiler.GetObjectModule().meta.GetTypeDefs().GetIndex( LexicalAnalyzer::FullNameToSymbol( VarName ) );
         if( typeDefIndex != -1 ){
             // TypeDef後の型名だったとき

trunk/ab5.0/abdev/BasicCompiler_Common/calculation.cpp

@@ -1051 +1051 @@
 
         if(((unsigned _int64)*pi64)<=UCHAR_MAX){
-            //符号無し8ビット整数のリテラル値
+            // 符号無し8ビット整数のリテラル値
             return DEF_BYTE;
         }
         else if(((unsigned _int64)*pi64)<=USHRT_MAX){
-            //符号無し16ビット整数のリテラル値
+            // 符号無し16ビット整数のリテラル値
             return DEF_WORD;
         }
         else if(((unsigned _int64)*pi64)<=UINT_MAX){
-            //符号無し32ビット整数のリテラル値
+            // 符号無し32ビット整数のリテラル値
             return DEF_DWORD;
         }
         else{
-            //符号無し64ビット整数のリテラル値
+            // 符号無し64ビット整数のリテラル値
             return DEF_QWORD;
         }

trunk/ab5.0/abdev/BasicCompiler_Common/hash.cpp

@@ -82 +82 @@
             if( !pobj_c )
             {
-                pobj_c=compiler.GetObjectModule().meta.FindClassSupportedTypeDef(ObjName);
+                pobj_c = compiler.GetObjectModule().meta.FindClassSupportedTypeDef(
+                    LexicalAnalyzer::FullNameToSymbol( ObjName )
+                );
                 if( pobj_c ){
                     isStatic = true;
@@ -160 +162 @@
 
 const UserProc *GetClassMethod( const char *className, const char *methodName ){
-    const CClass *pClass = compiler.GetObjectModule().meta.FindClassSupportedTypeDef( className );
+    const CClass *pClass = compiler.GetObjectModule().meta.FindClassSupportedTypeDef(
+        LexicalAnalyzer::FullNameToSymbol( className )
+    );
     if( pClass ){
         std::vector<const UserProc *> userProcs;

trunk/ab5.0/abdev/BasicCompiler_Common/include/Class.h

@@ -496 +496 @@
     CClass *Add( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name,int nowLine);
 
-    const CClass *FindEx( const NamespaceScopes &namespaceScopes, const std::string &name ) const;
-    const CClass *FindEx( const std::string &fullName ) const;
+    const CClass *FindEx( const Symbol &symbol ) const;
 
 

trunk/ab5.0/abdev/BasicCompiler_Common/include/Meta.h

@@ -156 +156 @@
     const ::Delegate &ToDelegate( const CClass &_class );
 
-    const CClass *FindClassSupportedTypeDef( const NamespaceScopes &namespaceScopes, const std::string &name );
-    const CClass *FindClassSupportedTypeDef( const std::string &fullName );
+    const CClass *FindClassSupportedTypeDef( const Symbol &symbol );
 };

trunk/ab5.0/abdev/BasicCompiler_Common/include/TypeDef.h

@@ -59 +59 @@
 
     void Add( const NamespaceScopes &namespaceScopes, const std::string &name, const std::string &baseName, int nowLine );
-    int GetIndex( const NamespaceScopes &namespaceScopes, const std::string &name ) const;
-    int GetIndex( const std::string &fullName ) const;
+    int GetIndex( const Symbol &symbol ) const;
 };

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 );
-}