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

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/ab5.0/abdev/compiler_x86

Files:

• Compile_Var.cpp (modified) (7 diffs)
• stdafx.h (modified) (1 diff)

trunk/ab5.0/abdev/compiler_x86/Compile_Var.cpp

@@ -13 +13 @@
 int AllLocalVarSize;
 
+using namespace ActiveBasic::Compiler;
 
 void SetRelativeOffset( Type &resultType, RELATIVE_VAR *pRelativeVar,const char *lpPtrOffset){
@@ -392 +393 @@
         //////////////////
 
-        const Variable *pVar = UserProc::CompilingUserProc().GetLocalVars().BackSearch( Symbol( VarName ) );
+        const Variable *pVar = UserProc::CompilingUserProc().GetLocalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) );
         if( pVar ){
             //ポインタ変数の場合
@@ -519 +520 @@
             GetNowStaticVarFullName(VarName,temporary);
 
-            pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( Symbol( temporary ) );
+            pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( LexicalAnalyzer::FullNameToSymbol( temporary ) );
             if( pVar ){
                 goto GlobalOk;
@@ -550 +551 @@
             char temp2[VN_SIZE];
             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);
@@ -562 +563 @@
             char temp2[VN_SIZE];
             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 GlobalOk;
@@ -572 +573 @@
         /////////////////////
 
-        pVar = compiler.GetObjectModule().meta.GetGlobalVars().BackSearch( Symbol( VarName ) );
+        pVar = compiler.GetObjectModule().meta.GetGlobalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) );
         if( pVar ){
             goto GlobalOk;
@@ -1103 +1104 @@
         /////////////////
 
-        if( UserProc::CompilingUserProc().GetLocalVars().DuplicateCheck( Symbol( VarName ) ) ){
+        if( UserProc::CompilingUserProc().GetLocalVars().DuplicateCheck( LexicalAnalyzer::FullNameToSymbol( VarName ) ) ){
             //２重定義のエラー
             compiler.errorMessenger.Output(15,VarName,cp);

trunk/ab5.0/abdev/compiler_x86/stdafx.h

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