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

Timestamp:

Aug 14, 2007, 3:22:02 AM (17 years ago)

Author:

dai_9181

Message:

sourceをObjectModuleに入れた

File:

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

trunk/abdev/BasicCompiler_Common/Debug.cpp

@@ -55 +55 @@
     /////////////////////////////////////////////////////////
 
-    extern INCLUDEFILEINFO IncludeFileInfo;
-
     int FileNum;
-    for(FileNum=0;FileNum<IncludeFileInfo.FilesNum;FileNum++){
-        if(lstrcmpi(IncludeFileInfo.ppFileNames[FileNum],szFilePath)==0) break;
-    }
-    if(FileNum==IncludeFileInfo.FilesNum) return;
+    for(FileNum=0;FileNum<compiler.GetObjectModule().source.GetIncludedFilesRelation().GetFileCounts();FileNum++){
+        if(lstrcmpi(compiler.GetObjectModule().source.GetIncludedFilesRelation().GetFilePathFromFileNumber(FileNum).c_str(),szFilePath)==0) break;
+    }
+    if( FileNum == compiler.GetObjectModule().source.GetIncludedFilesRelation().GetFileCounts() )
+    {
+        return;
+    }
 
     for(i=0;;i++){
-        if(IncludeFileInfo.LineOfFile[i]==FileNum||
-            IncludeFileInfo.LineOfFile[i]==-1) break;
-    }
-    if(IncludeFileInfo.LineOfFile[i]==-1) return;
+        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;
@@ -73 +80 @@
 
     int i2;
-    for(i2=0;;i++,i2++){
-        if(FileNum<IncludeFileInfo.LineOfFile[i]){
-            while(FileNum!=IncludeFileInfo.LineOfFile[i]) i++;
+    for(i2=0;;i++,i2++)
+    {
+        if( FileNum < compiler.GetObjectModule().source.GetIncludedFilesRelation().GetFileNumber( i ) )
+        {
+            while( FileNum != compiler.GetObjectModule().source.GetIncludedFilesRelation().GetFileNumber( i ) )
+            {
+                i++;
+            }
         }