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

Timestamp:

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

Author:

dai_9181

Message:

sourceをObjectModuleに入れた

File:

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

trunk/abdev/BasicCompiler_Common/error.cpp

@@ -4 +4 @@
 
 #include <Program.h>
-#include <Class.h>
+#include <Compiler.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -291 +291 @@
     extern ERRORINFO *pErrorInfo;
     extern int ErrorNum;
-    char temporary[1024],temp2[1024],temp3[32],FileName[MAX_PATH];
+    char temporary[1024],temp2[1024],temp3[32];
     BOOL bFirst;
     int i2;
@@ -329 +329 @@
     }
     else{
-        GetLineNum(pos,&pErrorInfo[ErrorNum].line,FileName);
-
-        pErrorInfo[ErrorNum].FileName=(char *)HeapAlloc(hHeap,0,lstrlen(FileName)+1);
-        lstrcpy(pErrorInfo[ErrorNum].FileName,FileName);
+        std::string dummyStr;
+        compiler.GetObjectModule().source.GetLineInfo( pos, pErrorInfo[ErrorNum].line, dummyStr );
+
+        pErrorInfo[ErrorNum].FileName=(char *)HeapAlloc(hHeap,0,lstrlen(dummyStr.c_str())+1);
+        lstrcpy(pErrorInfo[ErrorNum].FileName,dummyStr.c_str());
 
         _splitpath(pErrorInfo[ErrorNum].FileName,0,0,temp2,temp3);