Changeset 743 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/VarList.cpp

Timestamp:

Sep 7, 2008, 12:38:43 AM (16 years ago)

Author:

dai

Message:

oldSourceLinesを排除。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/VarList.cpp (modified) (2 diffs)

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

@@ -7 +7 @@
 //デバッグ用
 #include "../BasicCompiler_Common/debug.h"
+#include "../BasicCompiler_Common/DebugSection.h"
 
 using namespace ActiveBasic::Compiler;
@@ -612 +613 @@
 
     //行番号情報
-    extern SourceLines oldSourceLines;
-    for(i3=0;i3<(int)pobj_dti->iProcLevel+1;i3++){
-        for(i2=0;i2<(int)oldSourceLines.size()-2;i2++){
-            if((ULONG_PTR)(oldSourceLines[i2].GetNativeCodePos()+ImageBase+MemPos_CodeSection)<=pobj_dti->lplpObp[i3]&&
-                pobj_dti->lplpObp[i3]<=(ULONG_PTR)(oldSourceLines[i2+1].GetNativeCodePos()+ImageBase+MemPos_CodeSection)) break;
-        }
-        if(i2==oldSourceLines.size()-1) pobj_dti->lpdwCp[i3]=-1;
+    for(i3=0;i3<(int)pobj_dti->iProcLevel+1;i3++)
+    {
+        extern DebugSectionCollection debugSectionCollection;
+        const SourceLines &sourceLines = debugSectionCollection.GetCurrent()._oldSourceLines;
+
+        for( i2=0; i2<static_cast<int>(sourceLines.size()-2); i2++ )
+        {
+            if((ULONG_PTR)(sourceLines[i2].GetNativeCodePos()+ImageBase+MemPos_CodeSection)<=pobj_dti->lplpObp[i3]&&
+                pobj_dti->lplpObp[i3]<=(ULONG_PTR)(sourceLines[i2+1].GetNativeCodePos()+ImageBase+MemPos_CodeSection))
+            {
+                break;
+            }
+        }
+        if( i2 == sourceLines.size() - 1 )
+        {
+            pobj_dti->lpdwCp[i3] = -1;
+        }
         else
         {
-            pobj_dti->lpdwCp[i3]=oldSourceLines[i2].GetSourceCodePosition().GetPos();
-            pobj_dti->relationalObjectModuleIndexes[i3]=oldSourceLines[i2].GetSourceCodePosition().GetRelationalObjectModuleIndex();
+            pobj_dti->lpdwCp[i3] = sourceLines[i2].GetSourceCodePosition().GetPos();
+            pobj_dti->relationalObjectModuleIndexes[i3] = sourceLines[i2].GetSourceCodePosition().GetRelationalObjectModuleIndex();
         }
     }