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

Timestamp:

Jun 10, 2008, 11:40:17 PM (16 years ago)

Author:

dai_9181

Message:

libファイルを跨ったテンプレート展開に対応。

File:

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

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

@@ -621 +621 @@
         {
             pobj_dti->lpdwCp[i3]=oldSourceLines[i2].GetSourceCodePos();
-            pobj_dti->lpdwSourceIndex[i3]=oldSourceLines[i2].GetSourceIndex();
+            pobj_dti->relationalObjectModuleIndexes[i3]=oldSourceLines[i2].GetRelationalObjectModuleIndex();
         }
     }
@@ -631 +631 @@
                 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];
+                pobj_dti->relationalObjectModuleIndexes[i2]=pobj_dti->relationalObjectModuleIndexes[i2+1];
             }
             i3--;
@@ -639 +639 @@
 
     std::string dummyStr;
-    if(!compiler.GetObjectModule().GetSource( pobj_dti->lpdwSourceIndex[pobj_dti->iProcLevel] ).GetLineInfo( pobj_dti->lpdwCp[pobj_dti->iProcLevel], i2, dummyStr )){
+    extern BasicSources sourcesLinkRelationalObjectModule;
+    if(!sourcesLinkRelationalObjectModule[pobj_dti->relationalObjectModuleIndexes[pobj_dti->iProcLevel]].GetLineInfo( pobj_dti->lpdwCp[pobj_dti->iProcLevel], i2, dummyStr )){
         extern HWND hMainDlg;
         //"デバッグ情報の取得に失敗"
@@ -721 +722 @@
 
                 std::string dummyStr;
-                compiler.GetObjectModule().GetSource( pobj_dti->lpdwSourceIndex[pobj_dti->iProcLevel] ).GetLineInfo( pobj_dti->lpdwCp[pobj_dti->iProcLevel-i2], i3, dummyStr );
+                extern BasicSources sourcesLinkRelationalObjectModule;
+                sourcesLinkRelationalObjectModule[pobj_dti->relationalObjectModuleIndexes[pobj_dti->iProcLevel]].GetLineInfo( pobj_dti->lpdwCp[pobj_dti->iProcLevel-i2], i3, dummyStr );
                 ShowErrorLine(i3,dummyStr.c_str());