Changeset 269 in dev for trunk

Timestamp:

Aug 8, 2007, 4:19:30 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/MakePeHdr.cpp (modified) (1 diff)
• BasicCompiler_Common/BasicCompiler.cpp (modified) (2 diffs)
• BasicCompiler_Common/Intermediate_Step1.cpp (modified) (2 diffs)
• BasicCompiler_Common/include/Compiler.h (modified) (1 diff)
• BasicCompiler_Common/src/Source.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -547 +547 @@
 
 
+    if( compiler.IsStaticLibrary() )
+    {
+        // 静的リンクライブラリ
+
+        if( !compiler.GetObjectModule().WriteText( OutputFileName ) )
+        {
+            MessageBox(0,"XML書き込みに失敗","test",0);
+        }
+        return;
+    }
 /*
     int t,t2;

trunk/abdev/BasicCompiler_Common/BasicCompiler.cpp

@@ -566 +566 @@
     //_Test();
 
-    MessageBox(0,"starting compiler/debugger","ActiveBasic",MB_OK);
+    //MessageBox(0,"starting compiler/debugger","ActiveBasic",MB_OK);
     trace( "Start ActiveBasic Compiler!" );
 
@@ -751 +751 @@
         lstrcat(OutputFileName,temporary);
         lstrcat(OutputFileName,temp2);
-        if(bDebugCompile||bDebugRun) lstrcat(OutputFileName,"_debug.exe");
-        else lstrcat(OutputFileName,".exe");
+        if( compiler.IsStaticLibrary() )
+        {
+            if(bDebugCompile||bDebugRun)
+            {
+                lstrcat(OutputFileName,"_debug.abobj");
+            }
+            else
+            {
+                lstrcat(OutputFileName,".abobj");
+            }
+        }
+        else
+        {
+            if(bDebugCompile||bDebugRun)
+            {
+                lstrcat(OutputFileName,"_debug.exe");
+            }
+            else
+            {
+                lstrcat(OutputFileName,".exe");
+            }
+        }
     }
 

trunk/abdev/BasicCompiler_Common/Intermediate_Step1.cpp

@@ -3 +3 @@
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <Compiler.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -233 +235 @@
                 temporary[i3]=basbuf[i2];
             }
-            if(lstrcmpi(temporary,"noprompt")==0){
+            if( lstrcmp( temporary, "static_link" ) == 0 )
+            {
+                // 静的リンクライブラリ
+                while(basbuf[i2]==' '||basbuf[i2]=='\t') i2++;
+                if(basbuf[i2]!='\"'){
+                    SetError(1,NULL,i2);
+                    return;
+                }
+                for(i3=0,i2++;;i2++,i3++){
+                    if(basbuf[i2]=='\"'){
+                        temporary[i3]=0;
+                        break;
+                    }
+                    temporary[i3]=basbuf[i2];
+                }
+                GetFullPath(temporary,BasicCurDir);
+
+                compiler.staticLibraryFilePaths.push_back( temporary );
+
+                for(;;i2++){
+                    if(basbuf[i2]=='\n'||basbuf[i2]=='\0') break;
+                }
+                SlideString(basbuf+i2,i-i2);
+            }
+            else if(lstrcmpi(temporary,"noprompt")==0){
                 //#noprompt
                 //旧機能なので、無視

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -43 +43 @@
     // リンカ
     Linker linker;
+
+    // 静的リンクするオブジェクトファイル
+    std::vector<std::string> staticLibraryFilePaths;
 
     // オブジェクトモジュール

trunk/abdev/BasicCompiler_Common/src/Source.cpp

@@ -821 +821 @@
 
     // basic.sbpをインクルード
-    const char *headCode = "#include <basic.sbp>\n";
+    const char *headCode = "\n";
     Realloc( length + lstrlen(headCode) );
     Text::SlideString( buffer, lstrlen(headCode) );