Changeset 313 in dev for trunk/abdev/BasicCompiler_Common/Debug.cpp

Timestamp:

Sep 2, 2007, 11:11:40 PM (17 years ago)

Author:

dai_9181

Message:

ステップ実行時の不正終了を回避

File:

• trunk/abdev/BasicCompiler_Common/Debug.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler_Common/Debug.cpp

@@ -57 +57 @@
     int FileNum;
     const IncludedFilesRelation *pIncludedFilesRelation = NULL;
+    const BasicSource *pNowSource = NULL;
     BOOST_FOREACH( const BasicSource &source, compiler.GetObjectModule().GetSources() )
     {
@@ -63 +64 @@
         for(FileNum=0;FileNum<pIncludedFilesRelation->GetFileCounts();FileNum++)
         {
-            if(lstrcmpi(pIncludedFilesRelation->GetFilePathFromFileNumber(FileNum).c_str(),szFilePath)==0) break;
+            if(lstrcmpi(pIncludedFilesRelation->GetFilePathFromFileNumber(FileNum).c_str(),szFilePath)==0)
+            {
+                pNowSource = &source;
+                break;
+            }
         }
         if( FileNum == pIncludedFilesRelation->GetFileCounts() )
@@ -110 +115 @@
 
 loop:
-            int tempCp;
-            tempCp=GetCpFromLine(FileBaseLine+i2);
+            int tempCp = GetSourceCodeIndexFromLine( pNowSource->GetBuffer(), FileBaseLine+i2 );
 
             int i3;