Changeset 313 in dev

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/abdev/BasicCompiler_Common

Files:

• BreakPoint.cpp (modified) (3 diffs)
• Debug.cpp (modified) (3 diffs)
• DebugMiddleFile.cpp (modified) (1 diff)
• StrOperation.cpp (modified) (1 diff)
• common.h (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/BreakPoint.cpp

@@ -48 +48 @@
     int FileNum;
     const IncludedFilesRelation *pIncludedFilesRelation = NULL;
+    const BasicSource *pNowSource = NULL;
     BOOST_FOREACH( const BasicSource &source, compiler.GetObjectModule().GetSources() )
     {
@@ -54 +55 @@
         for(FileNum=0;FileNum<pIncludedFilesRelation->GetFileCounts();FileNum++)
         {
-            if(lstrcmpi(pIncludedFilesRelation->GetFilePathFromFileNumber(FileNum).c_str(),lpszFileName)==0) break;
+            if(lstrcmpi(pIncludedFilesRelation->GetFilePathFromFileNumber(FileNum).c_str(),lpszFileName)==0)
+            {
+                pNowSource = &source;
+                break;
+            }
         }
         if( FileNum == pIncludedFilesRelation->GetFileCounts() )
@@ -100 +105 @@
 
 loop:
-            int tempCp;
-            tempCp=GetCpFromLine(FileBaseLine+i2);
+            int tempCp = GetSourceCodeIndexFromLine( pNowSource->GetBuffer(), FileBaseLine+i2 );
 
             int i3;

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;

trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -246 +246 @@
 
     SingleStepCodeBuffer=MakeSingleStepCode();
+    
+    //ソースコード
+    extern char *basbuf;
+    basbuf = const_cast<char *>(compiler.GetObjectModule().GetSource(0).GetBuffer());
 
 

trunk/abdev/BasicCompiler_Common/StrOperation.cpp

@@ -174 +174 @@
 }
 
-int GetCpFromLine(int LineNum){
-    extern char *basbuf;
-
+int GetSourceCodeIndexFromLine( const char *source, int LineNum ){
     int i,nCount=0;
     for(i=0;;i++){
-        if(basbuf[i]=='\n'){
+        if(source[i]=='\n'){
             nCount++;
             if(LineNum==nCount){
                 for(i++;;i++){
-                    if(IsCommandDelimitation(basbuf[i])) break;
+                    if(IsCommandDelimitation(source[i])) break;
                 }
                 return i;

trunk/abdev/BasicCompiler_Common/common.h

@@ -319 +319 @@
 void SlideString(char *str,int slide);
 void SlideBuffer(char *buffer,int length,int slide);
-int GetCpFromLine(int LineNum);
+int GetSourceCodeIndexFromLine( const char *source, int LineNum );
 char GetEndXXXCommand(char es);
 void GetDefaultNameFromES(char es,char *name);