Changeset 541 in dev for trunk/ab5.0/abdev/BasicCompiler_Common

Timestamp:

May 4, 2008, 12:34:35 AM (16 years ago)

Author:

dai_9181

Message:

SynonymErrorWordsを排除。
ClearSynonymErrorWordsメソッドを追加。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• BasicCompiler.h (modified) (1 diff)
• MakeExe.cpp (modified) (1 diff)
• include/Messenger.h (modified) (1 diff)
• src/Messenger.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/BasicCompiler.h

@@ -21 +21 @@
 DWORD ImageBase;
 
-char **SynonymErrorWords;
-int SynonymErrorNum;
 BOOL bStopCompile;
 

trunk/ab5.0/abdev/BasicCompiler_Common/MakeExe.cpp

@@ -122 +122 @@
     StepCompileProgress();
 
-    //重複エラー情報管理のメモリを確保
-    extern char **SynonymErrorWords;
-    extern int SynonymErrorNum;
-    SynonymErrorNum=0;
-    SynonymErrorWords=(char **)HeapAlloc(hHeap,0,1);
+    // 重複エラー情報をクリア
+    compiler.errorMessenger.ClearSynonymKeyWords();
 
     ChangeCommandToCode(basbuf);
     compiler.GetObjectModule().GetSources()[0]._ResetLength();
-
-    //重複エラー情報管理のメモリを解放
-    for(i3=0;i3<SynonymErrorNum;i3++) HeapDefaultFree(SynonymErrorWords[i3]);
-    HeapDefaultFree(SynonymErrorWords);
-    SynonymErrorWords=0;
 
     if( compiler.errorMessenger.HasError() || bStopCompile )

trunk/ab5.0/abdev/BasicCompiler_Common/include/Messenger.h

@@ -67 +67 @@
     void OutputFatalError();
 
+    void ClearSynonymKeyWords();
+
     int GetErrorCount() const;
     bool HasError() const;

trunk/ab5.0/abdev/BasicCompiler_Common/src/Messenger.cpp

@@ -396 +396 @@
 }
 
+void ErrorMessenger::ClearSynonymKeyWords()
+{
+    synonymKeyWords.clear();
+}
+
 int ErrorMessenger::GetErrorCount() const
 {