Changeset 570 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/VariableOpe.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/VariableOpe.cpp (modified) (3 diffs)

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

@@ -565 +565 @@
         /////////////////
 
-        pVar = compiler.GetCompilingUserProc().GetLocalVars().BackSearch( LexicalAnalyzer::FullNameToSymbol( VarName ) );
+        pVar = compiler.GetCompilingUserProc().GetLocalVars().BackSearch(
+            LexicalAnalyzer::FullNameToSymbol( VarName ),
+            compiler.codeGenerator.lexicalScopes.GetNowLevel()
+        );
         if( pVar ){
             goto ok;
@@ -669 +672 @@
     ////////////////////
 
-    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 ok;
@@ -943 +949 @@
     /////////////////////////
 
-    if( compiler.GetObjectModule().meta.GetGlobalVars().DuplicateCheck( LexicalAnalyzer::FullNameToSymbol( name ) ) ){
+    if( compiler.GetObjectModule().meta.GetGlobalVars().DuplicateCheck( LexicalAnalyzer::FullNameToSymbol( name ), compiler.codeGenerator.lexicalScopes.GetNowLevel() ) ){
         //２重定義のエラー
         compiler.errorMessenger.Output(15,name,cp);