Changeset 637 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/NativeCode.cpp

Timestamp:

Jun 11, 2008, 10:10:26 PM (16 years ago)

Author:

dai_9181

Message:

リンカの依存関係解決モジュールを製作中

File:

• trunk/ab5.0/abdev/ab_common/src/Lexical/NativeCode.cpp (modified) (5 diffs)

trunk/ab5.0/abdev/ab_common/src/Lexical/NativeCode.cpp

@@ -43 +43 @@
         this->sourceLines.push_back(
             SourceLine(
-                sourceLine.GetLineNum(),
                 baseOffset + sourceLine.GetNativeCodePos(),
-                sourceLine.GetRelationalObjectModuleIndex(),    // TODO: 複数libの取り込みを想定できていない（ソースコード行番号とネイティブコード位置の対応情報の追加は静的リンクが完了した後に行うべき）
-                sourceLine.GetSourceCodePos(),
-                sourceLine.GetCodeType()
+                sourceLine.GetCodeType(),
+                sourceLine.GetSourceCodePosition()
             )
         );
@@ -106 +104 @@
 }
 
-void NativeCode::NextSourceLine( int currentSourceIndex, int nowLine )
+void NativeCode::NextSourceLine( const SourceCodePosition &sourceCodePosition )
 {
     if( sourceLines.size() )
@@ -112 +110 @@
         if( sourceLines.back().GetNativeCodePos() == GetSize() )
         {
-            sourceLines.back().SetSourceCodePos( nowLine );
+            sourceLines.back().SetSourceCodePosition( sourceCodePosition );
             return;
         }
@@ -130 +128 @@
     sourceLines.push_back(
         SourceLine(
-            (long)sourceLines.size(),
             GetSize(),
-            currentSourceIndex,
-            nowLine,
-            sourceLineType
+            sourceLineType,
+            sourceCodePosition
         )
     );
@@ -152 +148 @@
     }
 }
-void NativeCode::ResetSourceIndexes( const std::vector<int> &relationTable )
+void NativeCode::ResetRelationalObjectModuleIndex( const std::vector<int> &relationTable )
 {
     BOOST_FOREACH( SourceLine &sourceLine, sourceLines )
     {
-        sourceLine.SetRelationalObjectModuleIndex( relationTable[sourceLine.GetRelationalObjectModuleIndex()] );
+        sourceLine.GetSourceCodePosition().SetRelationalObjectModuleIndex(
+            relationTable[sourceLine.GetSourceCodePosition().GetRelationalObjectModuleIndex()]
+        );
     }
 }
+
+void NativeCode::Resolve()
+{
+    // TODO: Resolve
+}