Changeset 266 in dev for trunk/abdev/BasicCompiler_Common/include

Timestamp:

Aug 7, 2007, 4:14:06 AM (17 years ago)

Author:

dai_9181

Message:

BasicSourceのシリアライズがうまくいっていない

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• Class.h (modified) (1 diff)
• Compiler.h (modified) (3 diffs)
• Linker.h (modified) (2 diffs)
• Member.h (modified) (1 diff)
• Procedure.h (modified) (3 diffs)
• Source.h (added)

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -6 +6 @@
 #include <Method.h>
 #include <Member.h>
+#include <Source.h>
 
 class UserProc;

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -22 +22 @@
         : pObjectModule( new ObjectModule )
         , pNowObjectModule( pObjectModule )
+        , targetModuleType( Exe )
     {
     }
@@ -40 +41 @@
     Linker linker;
 
+    // オブジェクトモジュール
     ObjectModule &GetObjectModule()
     {
@@ -49 +51 @@
     }
 
+
+    // ターゲット
+    enum TargetModuleType
+    {
+        Exe,
+        Dll,
+        StaticLibrary,
+    };
+
+    TargetModuleType targetModuleType;
+
+    bool IsExe() const
+    {
+        if( targetModuleType == Exe )
+        {
+            return true;
+        }
+        return false;
+    }
+    bool IsDll() const
+    {
+        if( targetModuleType == Dll )
+        {
+            return true;
+        }
+        return false;
+    }
+    bool IsStaticLibrary() const
+    {
+        if( targetModuleType == StaticLibrary )
+        {
+            return true;
+        }
+        return false;
+    }
+    void SetTargetModuleType( TargetModuleType targetModuleType )
+    {
+        this->targetModuleType = targetModuleType;
+    }
+
+
+
     static bool StringToType( const std::string &typeName, Type &type );
     static const std::string TypeToString( const Type &type );

trunk/abdev/BasicCompiler_Common/include/Linker.h

@@ -12 +12 @@
     // データテーブル
     DataTable dataTable;
+
+    // ソースコード
+    BasicSource source;
 
     // XMLシリアライズ用
@@ -27 +30 @@
         ar & BOOST_SERIALIZATION_NVP( globalNativeCode );
         ar & BOOST_SERIALIZATION_NVP( dataTable );
+        ar & BOOST_SERIALIZATION_NVP( source );
     }
 };

trunk/abdev/BasicCompiler_Common/include/Member.h

@@ -3 +3 @@
 #include <string>
 #include <vector>
-
-#include <jenga/include/smoothie/Source.h>
 
 #include <option.h>

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -1 +1 @@
 #pragma once
-
-#include <jenga/include/smoothie/Source.h>
 
 #include <Hashmap.h>
@@ -12 +10 @@
 #include <Variable.h>
 #include <CodeGenerator.h>
+#include <Source.h>
 
 class CClass;
@@ -43 +42 @@
 
     // XMLシリアライズ用
-private:
 private:
     friend class boost::serialization::access;