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

Timestamp:

Aug 14, 2007, 3:22:02 AM (17 years ago)

Author:

dai_9181

Message:

sourceをObjectModuleに入れた

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• BoostSerializationSupport.h (modified) (1 diff)
• Compiler.h (modified) (1 diff)
• DataTable.h (modified) (1 diff)
• NativeCode.h (modified) (1 diff)
• ObjectModule.h (modified) (2 diffs)
• Source.h (modified) (4 diffs)

trunk/abdev/BasicCompiler_Common/include/BoostSerializationSupport.h

@@ -25 +25 @@
     bool ReadXml( const std::string &xmlFilePath, bool isShowExceptionMessage = true );
     bool WriteXml( const std::string &xmlFilePath, bool isShowExceptionMessage = true ) const;
+    bool ReadXmlString( const std::string &xmlString );
+    bool WriteXmlString( std::string &xmlString ) const;
 
     bool ReadBinary( const std::string &filePath, bool isShowExceptionMessage = true );

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -46 +46 @@
         return namespaceSupporter;
     }
-
-    // ソースコード
-    BasicSource source;
 
     // コード生成機構

trunk/abdev/BasicCompiler_Common/include/DataTable.h

@@ -28 +28 @@
         for( int i=0; i<size; i++ )
         {
-            if( _buffer[i*3+2] != ',' )
-            {
-                //エラー
-                DebugBreak();
-            }
-            ULONG_PTR l;
-            sscanf( _buffer.c_str() + i*3, "%02x,", &l );
-            buffer[i] = (char)l;
+            ULONG_PTR l1 = ( ( _buffer[i*3] >= 'a' ) ? ( _buffer[i*3] - 'a' + 0x0a ) : ( _buffer[i*3] - '0' ) ) * 0x10;
+            ULONG_PTR l2 = ( _buffer[i*3+1] >= 'a' ) ? ( _buffer[i*3+1] - 'a' + 0x0a ) : ( _buffer[i*3+1] - '0' );
+            ULONG_PTR l = l1 + l2;
+            buffer[i] = static_cast<char>(l);
         }
     }

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -219 +219 @@
         for( int i=0; i<size; i++ )
         {
-            ULONG_PTR l;
-            sscanf( code.c_str() + i*3, "%02x,", &l );
-            codeBuffer[i] = (char)l;
+            ULONG_PTR l1 = ( ( code[i*3] >= 'a' ) ? ( code[i*3] - 'a' + 0x0a ) : ( code[i*3] - '0' ) ) * 0x10;
+            ULONG_PTR l2 = ( code[i*3+1] >= 'a' ) ? ( code[i*3+1] - 'a' + 0x0a ) : ( code[i*3+1] - '0' );
+            ULONG_PTR l = l1 + l2;
+            codeBuffer[i] = static_cast<char>(l);
         }
     }

trunk/abdev/BasicCompiler_Common/include/ObjectModule.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 );
     }
 
 public:
     void StaticLink( ObjectModule &objectModule );
+
+    bool Read( const std::string &filePath );
+    bool Write( const std::string &filePath ) const;
+    bool ReadString( const std::string &str );
+    bool WriteString( std::string &str ) const;
 };
 typedef std::vector<ObjectModule *> ObjectModules;

trunk/abdev/BasicCompiler_Common/include/Source.h

@@ -18 +18 @@
     int FilesNum;
     int LineOfFile[MAX_LEN];
+};
+
+class IncludedFilesRelation
+{
+    std::vector<std::string> filePaths;
+    std::vector<int> lineFileNumbers;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - IncludedFilesRelation" );
+
+        ar & BOOST_SERIALIZATION_NVP( filePaths );
+        ar & BOOST_SERIALIZATION_NVP( lineFileNumbers );
+    }
+
+public:
+    IncludedFilesRelation()
+    {
+    }
+    ~IncludedFilesRelation()
+    {
+    }
+
+    const int GetFileNumber( int lineNumber ) const
+    {
+        return lineFileNumbers[lineNumber];
+    }
+    const std::string &GetFilePath( int lineNumber ) const
+    {
+        return filePaths[GetFileNumber( lineNumber )];
+    }
+    const std::string &GetFilePathFromFileNumber( int fileNumber ) const
+    {
+        return filePaths[fileNumber];
+    }
+    int GetFileCounts() const
+    {
+        return filePaths.size();
+    }
+
+    int AddFile( const std::string &filePath )
+    {
+        filePaths.push_back( filePath );
+        return filePaths.size()-1;
+    }
+    void AddLine( int fileNumber )
+    {
+        lineFileNumbers.push_back( fileNumber );
+    }
+
+    int GetLineCounts() const
+    {
+        return lineFileNumbers.size();
+    }
 };
 
@@ -66 +123 @@
     static const string generateDirectiveName;
 
+    IncludedFilesRelation includedFilesRelation;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    BOOST_SERIALIZATION_SPLIT_MEMBER();
+    template<class Archive> void load(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing(load) - BasicSource" );
+
+        std::string _buffer;
+        ar & BOOST_SERIALIZATION_NVP( _buffer );
+        ar & BOOST_SERIALIZATION_NVP( length );
+        ar & BOOST_SERIALIZATION_NVP( includedFilesRelation );
+
+        // 読み込み後の処理
+        Realloc( length );
+        for( int i=0; i<length; i++ )
+        {
+            ULONG_PTR l1 = ( ( _buffer[i*3] >= 'a' ) ? ( _buffer[i*3] - 'a' + 0x0a ) : ( _buffer[i*3] - '0' ) ) * 0x10;
+            ULONG_PTR l2 = ( _buffer[i*3+1] >= 'a' ) ? ( _buffer[i*3+1] - 'a' + 0x0a ) : ( _buffer[i*3+1] - '0' );
+            ULONG_PTR l = l1 + l2;
+            buffer[i] = static_cast<char>(l);
+        }
+        buffer[length] = 0;
+    }
+    template<class Archive> void save(Archive& ar, const unsigned int version) const
+    {
+        trace_for_serialize( "serializing(save) - BasicSource" );
+
+        // 保存準備
+        char *tempCode = (char *)calloc( (length+1) * 3, 1 );
+        for( int i=0; i<length; i++ )
+        {
+            char temp[32];
+            sprintf( temp, "%02x,", (unsigned char)buffer[i] );
+            tempCode[i*3] = temp[0];
+            tempCode[i*3+1] = temp[1];
+            tempCode[i*3+2] = temp[2];
+        }
+
+        std::string _buffer = tempCode;
+        free( tempCode );
+
+        ar & BOOST_SERIALIZATION_NVP( _buffer );
+        ar & BOOST_SERIALIZATION_NVP( length );
+        ar & BOOST_SERIALIZATION_NVP( includedFilesRelation );
+    }
+
+private:
     void Realloc( int newLength ){
         buffer = (char *)realloc( buffer, newLength + 255 );
@@ -102 +209 @@
     }
 
+    const IncludedFilesRelation &GetIncludedFilesRelation() const
+    {
+        return includedFilesRelation;
+    }
+
     void SetBuffer( const char *buffer );
 
@@ -109 +221 @@
 
     void Addition( const char *buffer );
+
+    bool GetLineInfo( int sourceCodePos, int &line, std::string &fileName );
 
     void operator = ( const BasicSource &source ){