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

Timestamp:

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

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/BreakPoint.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/BreakPoint.cpp

@@ -44 +44 @@
 }
 
-void CFileBreakPoint::update(char *nativeCodeBuffer){
+void CFileBreakPoint::update(char *nativeCodeBuffer)
+{
     int FileNum;
-    for(FileNum=0;FileNum<compiler.GetObjectModule().source.GetIncludedFilesRelation().GetFileCounts();FileNum++){
-        if(lstrcmpi(compiler.GetObjectModule().source.GetIncludedFilesRelation().GetFilePathFromFileNumber(FileNum).c_str(),lpszFileName)==0) break;
-    }
-    if( FileNum == compiler.GetObjectModule().source.GetIncludedFilesRelation().GetFileCounts() )
+    const IncludedFilesRelation *pIncludedFilesRelation = NULL;
+    BOOST_FOREACH( const BasicSource &source, compiler.GetObjectModule().GetSources() )
+    {
+        pIncludedFilesRelation = &source.GetIncludedFilesRelation();
+
+        for(FileNum=0;FileNum<pIncludedFilesRelation->GetFileCounts();FileNum++)
+        {
+            if(lstrcmpi(pIncludedFilesRelation->GetFilePathFromFileNumber(FileNum).c_str(),lpszFileName)==0) break;
+        }
+        if( FileNum == pIncludedFilesRelation->GetFileCounts() )
+        {
+            pIncludedFilesRelation = NULL;
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    if( !pIncludedFilesRelation )
+    {
+        Jenga::Throw( "CFileBreakPoint::update内で不正な処理" );
+        return;
+    }
+
+    int i;
+    for(i=0;;i++){
+        if( pIncludedFilesRelation->GetFileNumber( i ) == FileNum
+            || pIncludedFilesRelation->GetFileNumber( i ) == -1 )
+        {
+            break;
+        }
+    }
+    if( pIncludedFilesRelation->GetFileNumber( i ) == -1 )
     {
         return;
     }
 
-    int i;
-    for(i=0;;i++){
-        if( compiler.GetObjectModule().source.GetIncludedFilesRelation().GetFileNumber( i ) == FileNum
-            || compiler.GetObjectModule().source.GetIncludedFilesRelation().GetFileNumber( i ) == -1 )
-        {
-            break;
-        }
-    }
-    if( compiler.GetObjectModule().source.GetIncludedFilesRelation().GetFileNumber( i ) == -1 )
-    {
-        return;
-    }
-
     int FileBaseLine;
     FileBaseLine=i;
@@ -72 +90 @@
     int i2,nCount=0;
     for(i2=0;;i2++){
-        if( compiler.GetObjectModule().source.GetIncludedFilesRelation().GetFileNumber( FileBaseLine+i2 ) == -1 )
+        if( pIncludedFilesRelation->GetFileNumber( FileBaseLine+i2 ) == -1 )
         {
             //ソースコードの終端行