Changeset 602 in dev

Timestamp:

May 10, 2008, 9:10:08 PM (17 years ago)

Author:

dai_9181

Message:

依存関係を整理中

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• MakeExe.cpp (modified) (1 diff)
• include/Source.h (modified) (2 diffs)
• src/Source.cpp (modified) (7 diffs)

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

@@ -71 +71 @@
         compiler.IsDll(),
         compiler.IsUnicode(),
-        MAJOR_VER
+        MAJOR_VER,
+        program.GetSourceFilePath(),
+        program.GetIncludeDir()
     );
     if( !result ){

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

@@ -187 +187 @@
 
     bool ReadFile_InIncludeDirective( const std::string &filePath );
-    void DirectiveIncludeOrRequire();
+    void DirectiveIncludeOrRequire( const std::string &mainSourceFilePath, const std::string &includeDirPath );
 
     void RemoveReturnLineUnderbar();
@@ -229 +229 @@
     void SetBuffer( const char *buffer );
 
-    bool ReadFile( const std::string &filePath, bool isDebug, bool isDll, bool isUnicode, int majorVer );
+    bool ReadFile( const std::string &filePath, bool isDebug, bool isDll, bool isUnicode, int majorVer, const std::string &mainSourceFilePath, const std::string &includeDirPath );
 
     void Addition( const char *buffer );

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

@@ -535 +535 @@
 }
 
-void BasicSource::DirectiveIncludeOrRequire(){
+void BasicSource::DirectiveIncludeOrRequire( const std::string &mainSourceFilePath, const std::string &includeDirPath ){
     extern HANDLE hHeap;
     extern char BasicCurDir[MAX_PATH];
@@ -552 +552 @@
 
     // メインソースコード
-    FileLayer[layer] = includedFilesRelation.AddFile( program.GetSourceFilePath() );
+    FileLayer[layer] = includedFilesRelation.AddFile( mainSourceFilePath );
 
     //参照ディレクトリ
@@ -595 +595 @@
 
                     if(sw1){
-                        sprintf(temp2,"%s\\%s", program.GetIncludeDir().c_str(), temporary );
+                        sprintf(temp2,"%s\\%s", includeDirPath.c_str(), temporary );
                         lstrcpy(temporary,temp2);
                     }
@@ -605 +605 @@
             else if(memcmp(buffer+i+1,"prompt",6)==0){
                 i2=i+7;
-                sprintf(temporary,"%s\\basic\\prompt.sbp", program.GetIncludeDir().c_str() );
+                sprintf(temporary,"%s\\basic\\prompt.sbp", includeDirPath.c_str() );
             }
             else if(memcmp(buffer+i+1,"N88BASIC",8)==0){
                 i2=i+9;
-                sprintf(temporary,"%s\\basic\\prompt.sbp", program.GetIncludeDir().c_str() );
+                sprintf(temporary,"%s\\basic\\prompt.sbp", includeDirPath.c_str() );
             }
             else if(memcmp(buffer+i+1,"console",7)==0){
@@ -617 +617 @@
 
                 i2=i+8;
-                sprintf(temporary,"%s\\basic\\dos_console.sbp", program.GetIncludeDir().c_str() );
+                sprintf(temporary,"%s\\basic\\dos_console.sbp", includeDirPath.c_str() );
             }
             else continue;
@@ -851 +851 @@
 }
 
-bool BasicSource::ReadFile( const std::string &filePath, bool isDebug, bool isDll, bool isUnicode, int majorVer ){
+bool BasicSource::ReadFile( const std::string &filePath, bool isDebug, bool isDll, bool isUnicode, int majorVer, const std::string &mainSourceFilePath, const std::string &includeDirPath )
+{
     if( !Text::ReadFile( filePath ) ){
         return false;
@@ -882 +883 @@
 
     // #include / #require ディレクティブを処理
-    DirectiveIncludeOrRequire();
+    DirectiveIncludeOrRequire( mainSourceFilePath, includeDirPath );
 
     // アンダーバーによる改行を正規表現に戻す