Changeset 280 in dev for trunk/abdev/BasicCompiler_Common/VarList.cpp

Timestamp:

Aug 14, 2007, 8:37:08 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/VarList.cpp (modified) (4 diffs)

trunk/abdev/BasicCompiler_Common/VarList.cpp

@@ -576 +576 @@
         }
         if(i2==oldSourceLines.size()-1) pobj_dti->lpdwCp[i3]=-1;
-        else pobj_dti->lpdwCp[i3]=oldSourceLines[i2].GetSourceCodePos();
+        else
+        {
+            pobj_dti->lpdwCp[i3]=oldSourceLines[i2].GetSourceCodePos();
+            pobj_dti->lpdwSourceIndex[i3]=oldSourceLines[i2].GetSourceIndex();
+        }
     }
     for(i3=0;i3<(int)pobj_dti->iProcLevel+1;i3++){
@@ -585 +589 @@
                 pobj_dti->lplpSpBase[i2]=pobj_dti->lplpSpBase[i2+1];
                 pobj_dti->lpdwCp[i2]=pobj_dti->lpdwCp[i2+1];
+                pobj_dti->lpdwSourceIndex[i2]=pobj_dti->lpdwSourceIndex[i2+1];
             }
             i3--;
@@ -592 +597 @@
 
     std::string dummyStr;
-    if(!compiler.GetObjectModule().source.GetLineInfo( pobj_dti->lpdwCp[pobj_dti->iProcLevel], i2, dummyStr )){
+    if(!compiler.GetObjectModule().GetSource( pobj_dti->lpdwSourceIndex[pobj_dti->iProcLevel] ).GetLineInfo( pobj_dti->lpdwCp[pobj_dti->iProcLevel], i2, dummyStr )){
         extern HWND hMainDlg;
         //"デバッグ情報の取得に失敗"
@@ -674 +679 @@
 
                 std::string dummyStr;
-                compiler.GetObjectModule().source.GetLineInfo( pobj_dti->lpdwCp[pobj_dti->iProcLevel-i2], i3, dummyStr );
+                compiler.GetObjectModule().GetSource( pobj_dti->lpdwSourceIndex[pobj_dti->iProcLevel] ).GetLineInfo( pobj_dti->lpdwCp[pobj_dti->iProcLevel-i2], i3, dummyStr );
                 ShowErrorLine(i3,dummyStr.c_str());