Changeset 554 in dev

Timestamp:

May 5, 2008, 1:23:46 AM (16 years ago)

Author:

dai_9181

Message:

CDefine::Initメソッドで使用するCompilerクラス依存のフラグを外部から引き渡すようにした。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

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

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

@@ -4 +4 @@
 
 #include "common.h"
+#include <ver.h>
 
 void StepCompileProgress(void){
@@ -65 +66 @@
     compiler.GetObjectModule().SetCurrentSourceIndex( (int)compiler.GetObjectModule().GetSources().size() );
     compiler.GetObjectModule().GetSources().push_back( BasicSource() );
-    if( !compiler.GetObjectModule().GetCurrentSource().ReadFile( program.GetSourceFilePath() ) ){
+    bool result = compiler.GetObjectModule().GetCurrentSource().ReadFile(
+        program.GetSourceFilePath(),
+        compiler.IsDebug(),
+        compiler.IsDll(),
+        compiler.IsUnicode(),
+        MAJOR_VER
+    );
+    if( !result ){
         compiler.errorMessenger.Output(201,program.GetSourceFilePath(),-1);
         goto EndCompile;

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

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

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

@@ -7 +7 @@
     std::vector<std::string> names;
 public:
-    CDefine( int majorVer );
-    ~CDefine();
     void Free();
-    void Init( int majorVer );
+    void Init( bool isDebug, bool isDll, bool isUnicode, int majorVer );
 
     BOOL add(char *name);
@@ -18 +16 @@
     void DirectiveIfdef(char *buffer);
 };
-// TODO: バージョン番号の識別子defineが未完成
-CDefine objDefine(0);
+CDefine objDefine;
 
 
@@ -92 +89 @@
 //////////////////////////////////////
 
-CDefine::CDefine( int majorVer )
-{
-    Init( majorVer );
-}
-CDefine::~CDefine()
-{
-}
-void CDefine::Init( int majorVer )
+void CDefine::Init( bool isDebug, bool isDll, bool isUnicode, int majorVer )
 {
     names.clear();
 
-    if( compiler.IsDebug() )
+    if( isDebug )
     {
         add("_DEBUG");
@@ -112 +102 @@
 #endif
 
-    if( compiler.IsDll() )
+    if( isDll )
     {
         add("_DLL");
     }
 
-    if( compiler.IsUnicode() )
+    if( isUnicode )
     {
         add( "UNICODE" );
@@ -854 +844 @@
 }
 
-bool BasicSource::ReadFile( const std::string &filePath ){
+bool BasicSource::ReadFile( const std::string &filePath, bool isDebug, bool isDll, bool isUnicode, int majorVer ){
     if( !Text::ReadFile( filePath ) ){
         return false;
@@ -871 +861 @@
     // #defineと#requireを初期化
     // TODO: バージョン番号の識別子defineが未完成
-    objDefine.Init(0);
+    objDefine.Init( isDebug, isDll, isUnicode, majorVer );
     requireFiles.clear();