Changeset 467 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/Source.cpp

Timestamp:

Mar 27, 2008, 2:29:35 AM (17 years ago)

Author:

dai_9181

Message:

いくつかのグローバル変数をProgram/Debuggerクラスにまとめた。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/Source.cpp (modified) (5 diffs)

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

@@ -556 +556 @@
 void BasicSource::DirectiveIncludeOrRequire(){
     extern HANDLE hHeap;
-    extern char szIncludeDir[MAX_PATH];
     extern char BasicCurDir[MAX_PATH];
     int i,i2,i3,sw1,LineNum,FileLayer[255],layer,LastFileByte[255];
@@ -572 +571 @@
 
     // メインソースコード
-    extern char SourceFileName[MAX_PATH];
-    FileLayer[layer] = includedFilesRelation.AddFile( SourceFileName );
+    FileLayer[layer] = includedFilesRelation.AddFile( program.GetSourceFilePath() );
 
     //参照ディレクトリ
@@ -616 +614 @@
 
                     if(sw1){
-                        sprintf(temp2,"%s%s",szIncludeDir,temporary);
+                        sprintf(temp2,"%s%s", program.GetIncludeDir().c_str(), temporary );
                         lstrcpy(temporary,temp2);
                     }
@@ -626 +624 @@
             else if(memcmp(buffer+i+1,"prompt",6)==0){
                 i2=i+7;
-                sprintf(temporary,"%sbasic\\prompt.sbp",szIncludeDir);
+                sprintf(temporary,"%sbasic\\prompt.sbp", program.GetIncludeDir().c_str() );
             }
             else if(memcmp(buffer+i+1,"N88BASIC",8)==0){
                 i2=i+9;
-                sprintf(temporary,"%sbasic\\prompt.sbp",szIncludeDir);
+                sprintf(temporary,"%sbasic\\prompt.sbp", program.GetIncludeDir().c_str() );
             }
             else if(memcmp(buffer+i+1,"console",7)==0){
@@ -638 +636 @@
 
                 i2=i+8;
-                sprintf(temporary,"%sbasic\\dos_console.sbp",szIncludeDir);
+                sprintf(temporary,"%sbasic\\dos_console.sbp", program.GetIncludeDir().c_str() );
             }
             else continue;