Changeset 570 in dev for trunk/ab5.0/abdev/compiler_x86/Compile_Var.cpp

Timestamp:

May 6, 2008, 8:31:52 PM (17 years ago)

Author:

dai_9181

Message:

Variables::DuplicateCheck、Variables::BackSearchメソッドにnowScopeLevelパラメータを追加した。

File:

• trunk/ab5.0/abdev/compiler_x86/Compile_Var.cpp (modified) (3 diffs)

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

@@ -393 +393 @@
         //////////////////
 
-        const Variable *pVar = compiler.GetCompilingUserProc().GetLocalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) );
+        const Variable *pVar = compiler.GetCompilingUserProc().GetLocalVars().BackSearch(
+            LexicalAnalyzer::FullNameToSymbol( VarName ),
+            compiler.codeGenerator.lexicalScopes.GetNowLevel()
+        );
         if( pVar ){
             //ポインタ変数の場合
@@ -573 +576 @@
         /////////////////////
 
-        pVar = compiler.GetObjectModule().meta.GetGlobalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) );
+        pVar = compiler.GetObjectModule().meta.GetGlobalVars().BackSearch(
+            LexicalAnalyzer::FullNameToSymbol( VarName ),
+            compiler.codeGenerator.lexicalScopes.GetNowLevel()
+        );
         if( pVar ){
             goto GlobalOk;
@@ -1104 +1110 @@
         /////////////////
 
-        if( compiler.GetCompilingUserProc().GetLocalVars().DuplicateCheck( LexicalAnalyzer::FullNameToSymbol( VarName ) ) ){
+        if( compiler.GetCompilingUserProc().GetLocalVars().DuplicateCheck( LexicalAnalyzer::FullNameToSymbol( VarName ), compiler.codeGenerator.lexicalScopes.GetNowLevel() ) ){
             //２重定義のエラー
             compiler.errorMessenger.Output(15,VarName,cp);