Changeset 587 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/include

Timestamp:

May 10, 2008, 3:09:26 PM (17 years ago)

Author:

dai_9181

Message:

[585][586]をリバース。NativeCodeクラスとMetaクラスは依存関係があるので分離しない方針とする。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/include

Files:

• Class.h (modified) (1 diff)
• Delegate.h (modified) (1 diff)
• ObjectModule.h (modified) (5 diffs)
• VtblGenerator.h (modified) (1 diff)

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

@@ -431 +431 @@
     
 private:
-    int vtbl_offset;
-    int comVtblOffset;
-    int vtblMasterListOffset;
+    long vtbl_offset;
+    long comVtblOffset;
+    long vtblMasterListOffset;
 public:
     std::vector<long> vtblMasterList;

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

@@ -57 +57 @@
     }
 
-    int GetSourceIndex() const
+    void SetSourceIndex( int sourceIndex )
     {
-        return sourceIndex;
+        this->sourceIndex = sourceIndex;
     }
 

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

@@ -1 +1 @@
 #pragma once
 
-class NativeSection
+class ObjectModule
 {
 public:
+    // メタ情報
+    Meta meta;
+
     // グローバル領域のネイティブコード
     NativeCode globalNativeCode;
@@ -19 +22 @@
     virtual const char *RootTagName() const
     {
-        return "nativeSection";
+        return "objectModule";
     }
     friend class boost::serialization::access;
@@ -26 +29 @@
         trace_for_serialize( "serializing - objectModule" );
 
+        ar & BOOST_SERIALIZATION_NVP( meta );
         ar & BOOST_SERIALIZATION_NVP( globalNativeCode );
         ar & BOOST_SERIALIZATION_NVP( dataTable );
@@ -33 +37 @@
 
 public:
+    void StaticLink( ObjectModule &objectModule );
+
     int GetCurrentSourceIndex() const
     {
@@ -57 +63 @@
         return sources;
     }
-};
-
-class ObjectModule
-{
-public:
-    // メタ情報
-    Meta meta;
-
-    NativeSection nativeSection;
-
-    // XMLシリアライズ用
-private:
-    virtual const char *RootTagName() const
-    {
-        return "objectModule";
-    }
-    friend class boost::serialization::access;
-    template<class Archive> void serialize(Archive& ar, const unsigned int version)
-    {
-        trace_for_serialize( "serializing - objectModule" );
-
-        ar & BOOST_SERIALIZATION_NVP( meta );
-        ar & BOOST_SERIALIZATION_NVP( nativeSection );
-    }
-
-public:
-    void StaticLink( ObjectModule &objectModule );
 
     bool Read( const std::string &filePath );
     bool Write( const std::string &filePath ) const;
-    bool Load( const Jenga::Common::Binary &binary );
-    bool Save( Jenga::Common::Binary &binary ) const;
+    bool ReadString( const std::string &str );
+    bool WriteString( std::string &str ) const;
 };
 typedef std::vector<ObjectModule *> ObjectModules;

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

@@ -8 +8 @@
 public:
     // vtblを一時的に生成
-    static int GenerateVTablePart( const Methods &methods );
+    static LONG_PTR GenerateVTablePart( const Methods &methods );
     static void GenerateFullVTables( CClass &_class );
     static void GenerateVTablesForAllClasses( Classes &classes );