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

Timestamp:

Apr 29, 2008, 11:36:37 AM (17 years ago)

Author:

dai_9181

Message:

Symbolコンストラクタを少なくし、LexicalAnalyzer::FullNameToSymbolメソッドを実装。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• VarList.cpp (modified) (2 diffs)
• VariableOpe.cpp (modified) (8 diffs)
• WatchList.cpp (modified) (3 diffs)
• gc.cpp (modified) (2 diffs)
• include/Compiler.h (modified) (2 diffs)
• include/LexicalAnalyzer.h (modified) (1 diff)
• include/Symbol.h (modified) (1 diff)
• include/Variable.h (modified) (1 diff)
• src/LexicalAnalyzer.cpp (modified) (1 diff)
• src/ObjectModule.cpp (modified) (1 diff)
• src/Symbol.cpp (modified) (1 diff)

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

@@ -7 +7 @@
 //デバッグ用
 #include "../BasicCompiler_Common/debug.h"
+
+using namespace ActiveBasic::Compiler;
 
 //変数リストのツリーハンドル
@@ -445 +447 @@
     //Thisポインタを取得
     LONG_PTR pThis;
-    const Variable *pVar = pUserProc->GetLocalVars().Find( Symbol( "_System_LocalThis" ) );
+    const Variable *pVar = pUserProc->GetLocalVars().Find( LexicalAnalyzer::FullNameToSymbol( "_System_LocalThis" ) );
     if( !pVar ){
         return;

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

@@ -12 +12 @@
 #include "../compiler_x86/opcode.h"
 #endif
+
+using namespace ActiveBasic::Compiler;
 
 BOOL IsPtrType(int type){
@@ -563 +565 @@
         /////////////////
 
-        pVar = UserProc::CompilingUserProc().GetLocalVars().BackSearch( Symbol( VarName ) );
+        pVar = UserProc::CompilingUserProc().GetLocalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) );
         if( pVar ){
             goto ok;
@@ -614 +616 @@
         GetNowStaticVarFullName(VarName,temporary);
 
-        pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( Symbol( temporary ) );
+        pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( LexicalAnalyzer::FullNameToSymbol( temporary ) );
         if( pVar ){
             goto ok;
@@ -643 +645 @@
         sprintf(temp2,"%s.%s",VarName,temporary);
 
-        pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( Symbol( temp2 ) );
+        pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( LexicalAnalyzer::FullNameToSymbol( temp2 ) );
         if( pVar ){
             lstrcpy(member,tempMember);
@@ -656 +658 @@
         sprintf(temp2,"%s.%s",compiler.pCompilingClass->GetName().c_str(),VarName);
 
-        pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( Symbol( temp2 ) );
+        pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( LexicalAnalyzer::FullNameToSymbol( temp2 ) );
         if( pVar ){
             goto ok;
@@ -667 +669 @@
     ////////////////////
 
-    pVar = compiler.GetObjectModule().meta.GetGlobalVars().BackSearch( Symbol( VarName ) );
+    pVar = compiler.GetObjectModule().meta.GetGlobalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) );
     if( pVar ){
         goto ok;
@@ -941 +943 @@
     /////////////////////////
 
-    if( compiler.GetObjectModule().meta.GetGlobalVars().DuplicateCheck( Symbol( name ) ) ){
+    if( compiler.GetObjectModule().meta.GetGlobalVars().DuplicateCheck( LexicalAnalyzer::FullNameToSymbol( name ) ) ){
         //２重定義のエラー
         compiler.errorMessenger.Output(15,name,cp);
@@ -1167 +1169 @@
 {
     char temporary[255];
-    if( compiler.GetObjectModule().meta.GetGlobalVars().Find( Symbol( "_DebugSys_dwThreadID" ) ) == NULL )
+    if( compiler.GetObjectModule().meta.GetGlobalVars().Find( LexicalAnalyzer::FullNameToSymbol( "_DebugSys_dwThreadID" ) ) == NULL )
     {
         // 未定義の場合は定義する

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

@@ -13 +13 @@
 //デバッグ用
 #include "debug.h"
+
+using namespace ActiveBasic::Compiler;
 
 int Debugging_GetArray( const Subscripts &subscripts,char *array,const Type &type,LONG_PTR *plpOffset);
@@ -350 +352 @@
     /////////////////
     if( UserProc::IsLocalAreaCompiling() ){
-        const Variable *pVar = UserProc::CompilingUserProc().GetLocalVars().Find( Symbol( VarName ) );
+        const Variable *pVar = UserProc::CompilingUserProc().GetLocalVars().Find( LexicalAnalyzer::FullNameToSymbol( VarName ) );
 
         if( pVar ){
@@ -436 +438 @@
         ///////////////////
 
-        const Variable *pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( VarName );
+        const Variable *pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( LexicalAnalyzer::FullNameToSymbol( VarName ) );
         if( !pVar ){
             //一致しないとき

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

@@ -8 +8 @@
 #include "../compiler_x86/opcode.h"
 #endif
+
+using namespace ActiveBasic::Compiler;
 
 void InitGCVariables(void){
@@ -19 +21 @@
     ///////////////////////////////
 
-    if( compiler.GetObjectModule().meta.GetGlobalVars().Find( Symbol( "_System_gc_StackRoot_StartPtr" ) ) == NULL )
+    if( compiler.GetObjectModule().meta.GetGlobalVars().Find( LexicalAnalyzer::FullNameToSymbol( "_System_gc_StackRoot_StartPtr" ) ) == NULL )
     {
         // 未定義の場合は定義する

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

@@ -51 +51 @@
         : isBuildSuccessful( false )
         , pObjectModule( new ObjectModule )
-        , pNowObjectModule( pObjectModule )
         , targetModuleType( Exe )
         , isDebug( false )
@@ -57 +56 @@
         , isCore( false )
     {
+        SelectObjectModule( *pObjectModule );
         Symbol::RegistNamespaceSupporter( &namespaceSupporter );
     }

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

@@ -8 +8 @@
 public:
     static bool CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection );
+    static Symbol FullNameToSymbol( const char *fullName );
+    static Symbol FullNameToSymbol( const std::string &fullName );
 };
 

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

@@ -47 +47 @@
     {
     }
-    Symbol( const char *fullName );
-    Symbol( const string &fullName );
     Symbol( const Symbol &symbol )
         : namespaceScopes( symbol.namespaceScopes )

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

@@ -59 +59 @@
 public:
     Variable( const string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData )
-        : Symbol( name )
+        : Symbol( ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( name ) )
         , type( type )
         , isConst( isConst )

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

@@ -53 +53 @@
     return isSuccessful;
 }
+
+Symbol LexicalAnalyzer::FullNameToSymbol( const char *fullName )
+{
+    char areaName[VN_SIZE] = "";        //オブジェクト変数
+    char nestName[VN_SIZE] = "";        //入れ子メンバ
+    bool isNest = SplitMemberName( fullName, areaName, nestName );
+
+    return Symbol( NamespaceScopes( areaName ), nestName );
+}
+
+Symbol LexicalAnalyzer::FullNameToSymbol( const std::string &fullName )
+{
+    return FullNameToSymbol( fullName.c_str() );
+}

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

@@ -49 +49 @@
 
 #include <Hashmap.h>
+#include <Configuration.h>
+#include <Symbol.h>
+#include <LexicalAnalyzer.h>
+#include <Program.h>
 #include <Compiler.h>
+#include <Debugger.h>
 
 

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

@@ -5 +5 @@
 
 const NamespaceSupporter *Symbol::namespaceSupporter = NULL;
-
-Symbol::Symbol( const char *fullName )
-    : isTargetObjectModule( true )
-{
-    char areaName[VN_SIZE] = "";        //オブジェクト変数
-    char nestName[VN_SIZE] = "";        //入れ子メンバ
-    bool isNest = SplitMemberName( fullName, areaName, nestName );
-
-    namespaceScopes = NamespaceScopes( areaName );
-    name = nestName;
-}
-Symbol::Symbol( const string &fullName )
-    : isTargetObjectModule( true )
-{
-    char areaName[VN_SIZE] = "";        //オブジェクト変数
-    char nestName[VN_SIZE] = "";        //入れ子メンバ
-    bool isNest = SplitMemberName( fullName.c_str(), areaName, nestName );
-
-    namespaceScopes = NamespaceScopes( areaName );
-    name = nestName;
-}
 
 std::string Symbol::GetFullName() const