Changeset 514 in dev for trunk/ab5.0/abdev/compiler_x64/Compile_Var.cpp

Timestamp:

May 1, 2008, 11:26:31 AM (17 years ago)

Author:

dai_9181

Message:

[505]～[513]を64bit版にマージ。

File:

• trunk/ab5.0/abdev/compiler_x64/Compile_Var.cpp (modified) (7 diffs)

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

@@ -12 +12 @@
 int AllLocalVarSize;
 
+using namespace ActiveBasic::Compiler;
 
 void SetRelativeOffset( Type &resultType, RELATIVE_VAR *pRelativeVar,const char *lpPtrOffset){
@@ -416 +417 @@
         //////////////////
 
-        const Variable *pVar = UserProc::CompilingUserProc().GetLocalVars().BackSearch( Symbol( VarName ) );
+        const Variable *pVar = UserProc::CompilingUserProc().GetLocalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) );
         if( pVar ){
             //ポインタ変数の場合
@@ -538 +539 @@
             GetNowStaticVarFullName(VarName,temporary);
 
-            pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( Symbol( temporary ) );
+            pVar = compiler.GetObjectModule().meta.GetGlobalVars().Find( LexicalAnalyzer::FullNameToSymbol( temporary ) );
             if( pVar ){
                 goto GlobalOk;
@@ -569 +570 @@
             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);
@@ -581 +582 @@
             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;
@@ -591 +592 @@
         /////////////////////
 
-        pVar = compiler.GetObjectModule().meta.GetGlobalVars().BackSearch( Symbol( VarName ) );
+        pVar = compiler.GetObjectModule().meta.GetGlobalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) );
         if( pVar ){
             goto GlobalOk;
@@ -1111 +1112 @@
         /////////////////
 
-        if( UserProc::CompilingUserProc().GetLocalVars().DuplicateCheck( VarName ) ){
+        if( UserProc::CompilingUserProc().GetLocalVars().DuplicateCheck( LexicalAnalyzer::FullNameToSymbol( VarName ) ) ){
             //２重定義のエラー
             compiler.errorMessenger.Output(15,VarName,cp);