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

Timestamp:

Aug 14, 2007, 8:37:08 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• Meta.h (modified) (1 diff)
• NativeCode.h (modified) (5 diffs)
• ObjectModule.h (modified) (2 diffs)
• Source.h (modified) (5 diffs)

trunk/abdev/BasicCompiler_Common/include/Meta.h

@@ -75 +75 @@
 
     // 静的リンク
-    void StaticLink( Meta &meta, long dataSectionBaseOffset );
+    void StaticLink( Meta &meta, long dataSectionBaseOffset, int sourceIndexBase );
 
     const NamespaceScopesCollection &GetNamespaces() const

trunk/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -130 +130 @@
     int lineNum;
     long nativeCodePos;
+    int sourceIndex;
     long sourceCodePos;
     DWORD codeType;
@@ -142 +143 @@
         ar & BOOST_SERIALIZATION_NVP( lineNum );
         ar & BOOST_SERIALIZATION_NVP( nativeCodePos );
+        ar & BOOST_SERIALIZATION_NVP( sourceIndex );
         ar & BOOST_SERIALIZATION_NVP( sourceCodePos );
         ar & BOOST_SERIALIZATION_NVP( codeType );
@@ -147 +149 @@
 
 public:
-    SourceLine( int lineNum, int nativeCodePos, int sourceCodePos, DWORD codeType )
+    SourceLine( int lineNum, int nativeCodePos, int sourceIndex, int sourceCodePos, DWORD codeType )
         : lineNum( lineNum )
         , nativeCodePos( nativeCodePos )
+        , sourceIndex( sourceIndex )
         , sourceCodePos( sourceCodePos )
         , codeType( codeType )
@@ -165 +168 @@
     {
         return nativeCodePos;
+    }
+    int GetSourceIndex() const
+    {
+        return sourceIndex;
+    }
+    void SetSourceIndex( int sourceIndex )
+    {
+        this->sourceIndex = sourceIndex;
     }
     long GetSourceCodePos() const
@@ -366 +377 @@
 
     void ResetDataSectionBaseOffset( long dataSectionBaseOffset );
+    void ResetSourceIndexes( long sourceIndexBase );
 };

trunk/abdev/BasicCompiler_Common/include/ObjectModule.h

@@ -13 +13 @@
     DataTable dataTable;
 
+private:
     // ソースコード
-    BasicSource source;
+    int currentSourceIndex;
+    BasicSources sources;
 
     // XMLシリアライズ用
@@ -30 +32 @@
         ar & BOOST_SERIALIZATION_NVP( globalNativeCode );
         ar & BOOST_SERIALIZATION_NVP( dataTable );
-        ar & BOOST_SERIALIZATION_NVP( source );
+        ar & BOOST_SERIALIZATION_NVP( currentSourceIndex );
+        ar & BOOST_SERIALIZATION_NVP( sources );
     }
 
 public:
     void StaticLink( ObjectModule &objectModule );
+
+    int GetCurrentSourceIndex() const
+    {
+        return currentSourceIndex;
+    }
+    const BasicSource &GetCurrentSource() const
+    {
+        return sources[currentSourceIndex];
+    }
+    BasicSource &GetCurrentSource()
+    {
+        return sources[currentSourceIndex];
+    }
+    void SetCurrentSourceIndex( int currentSourceIndex )
+    {
+        this->currentSourceIndex = currentSourceIndex;
+    }
+    const BasicSource &GetSource( int sourceIndex ) const
+    {
+        return sources[sourceIndex];
+    }
+    BasicSources &GetSources()
+    {
+        return sources;
+    }
 
     bool Read( const std::string &filePath );

trunk/abdev/BasicCompiler_Common/include/Source.h

@@ -11 +11 @@
 
 #include <BoostSerializationSupport.h>
-
-using namespace std;
-
-struct INCLUDEFILEINFO{
-    char **ppFileNames;
-    int FilesNum;
-    int LineOfFile[MAX_LEN];
-};
 
 class IncludedFilesRelation
@@ -87 +79 @@
         buffer = (char *)calloc( 1, 1 );
         length = 0;
+    }
+    Text( const Text &text )
+        : length( text.length )
+    {
+        buffer = (char *)malloc( length + 1 );
+        memcpy( buffer, text.buffer, length );
+        buffer[length] = 0;
     }
     ~Text(){
@@ -195 +194 @@
 public:
     BasicSource(){}
+    BasicSource( const BasicSource &basicSource )
+        : Text( basicSource )
+        , includedFilesRelation( basicSource.includedFilesRelation )
+    {
+    }
     ~BasicSource(){}
 
@@ -222 +226 @@
     void Addition( const char *buffer );
 
-    bool GetLineInfo( int sourceCodePos, int &line, std::string &fileName );
+    bool GetLineInfo( int sourceCodePos, int &line, std::string &fileName ) const;
 
     void operator = ( const BasicSource &source ){
@@ -238 +242 @@
     }
 };
+typedef std::vector<BasicSource> BasicSources;