Changeset 637 in dev for trunk/ab5.0/abdev/ab_common/include/Lexical/Procedure.h

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/ab_common/include/Lexical/Procedure.h (modified) (15 diffs)

trunk/ab5.0/abdev/ab_common/include/Lexical/Procedure.h

@@ -1 +1 @@
 #pragma once
 
-class Procedure : public Symbol
+class Procedure
+    : public RelationalObjectModuleItem
 {
 public:
@@ -35 +36 @@
         trace_for_serialize( "serializing - Procedure" );
 
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( RelationalObjectModuleItem );
         ar & BOOST_SERIALIZATION_NVP( kind );
         ar & BOOST_SERIALIZATION_NVP( isCdecl );
@@ -45 +46 @@
 
 public:
-    Procedure( const NamespaceScopes &namespaceScopes, const std::string &name, Kind kind, bool isCdecl )
-        : Symbol( namespaceScopes, name )
+    Procedure( const Symbol &symbol, Kind kind, bool isCdecl )
+        : RelationalObjectModuleItem( symbol )
         , kind( kind )
         , isCdecl( isCdecl )
@@ -91 +92 @@
         this->sourceCodePosition = sourceCodePosition;
     }
+    virtual void ResetRelationalObjectModuleIndex( const std::vector<int> &relationTable );
 
     const Parameters &Params() const
@@ -156 +158 @@
 
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
+
+        if( ActiveBasic::Common::Environment::IsRemoveExternal() )
+        {
+            if( this->IsExternal() )
+            {
+                this->NeedResolve();
+                return;
+            }
+        }
+
         ar & BOOST_SERIALIZATION_NVP( _paramStr );
         ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
@@ -178 +190 @@
 public:
 
-    UserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport );
+    UserProc( const Symbol &symbol, const NamespaceScopesCollection &importedNamespaces, Kind kind, bool isMacro, bool isCdecl, bool isExport );
     UserProc( const UserProc &userProc, const CClass *pParentClass );
     UserProc();
@@ -206 +218 @@
     }
 
+    virtual void ResetRelationalObjectModuleIndex( const std::vector<int> &relationTable );
+
     /*!
     @brief  オーバーライド用に関数同士が等しいかどうかをチェックする
@@ -360 +374 @@
     const CMethod &GetMethod() const;
 
+    virtual bool Resolve();
 
     static const UserProc *pGlobalProc;
@@ -389 +404 @@
 };
 
-class DllProc : public Procedure, public Jenga::Common::ObjectInHashmap<DllProc>
+class DllProc
+    : public Procedure
+    , public Jenga::Common::ObjectInHashmap<DllProc>
 {
     std::string dllFileName;
@@ -403 +420 @@
 
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
+
+        if( ActiveBasic::Common::Environment::IsRemoveExternal() )
+        {
+            if( this->IsExternal() )
+            {
+                this->NeedResolve();
+                return;
+            }
+        }
+
         ar & BOOST_SERIALIZATION_NVP( dllFileName );
         ar & BOOST_SERIALIZATION_NVP( alias );
@@ -409 +436 @@
 
 public:
-    DllProc( const NamespaceScopes &namespaceScopes, const std::string &name, Kind kind, bool isCdecl, const std::string &dllFileName, const std::string &alias )
-        : Procedure( namespaceScopes, name, kind, isCdecl )
+    DllProc( const Symbol &symbol, Kind kind, bool isCdecl, const std::string &dllFileName, const std::string &alias )
+        : Procedure( symbol, kind, isCdecl )
         , dllFileName( dllFileName )
         , alias( alias )
@@ -454 +481 @@
         return lookupAddress;
     }
+
+    virtual bool Resolve();
 };
 class DllProcs : public Jenga::Common::Hashmap<DllProc>
@@ -469 +498 @@
 };
 
-class ProcPointer : public Procedure
+class ProcPointer
+    : public Procedure
 {
     // XMLシリアライズ用
@@ -483 +513 @@
 public:
     ProcPointer( Kind kind )
-        : Procedure( NamespaceScopes(), std::string(), kind, false )
+        : Procedure( Symbol( NamespaceScopes(), std::string() ), kind, false )
     {
     }
@@ -489 +519 @@
     {
     }
-    ~ProcPointer(){}
+    ~ProcPointer()
+    {
+    }
+
+    virtual bool Resolve();
 };