Changeset 637 in dev for trunk/ab5.0/abdev/ab_common/include/Lexical/Const.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/Const.h (modified) (10 diffs)

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

@@ -2 +2 @@
 
 //定数
-class CConst : public Symbol, public Jenga::Common::ObjectInHashmap<CConst>
+class CConst
+    : public RelationalObjectModuleItem
+    , public Jenga::Common::ObjectInHashmap<CConst>
 {
     Type type;
@@ -14 +16 @@
         trace_for_serialize( "serializing - CConst" );
 
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( RelationalObjectModuleItem );
+
+        if( ActiveBasic::Common::Environment::IsRemoveExternal() )
+        {
+            if( this->IsExternal() )
+            {
+                this->NeedResolve();
+                return;
+            }
+        }
+
         ar & BOOST_SERIALIZATION_NVP( type );
         ar & BOOST_SERIALIZATION_NVP( i64data );
@@ -20 +32 @@
 
 public:
-    CConst( const NamespaceScopes &namespaceScopes, const std::string &name, const Type &newType, _int64 i64data)
-        : Symbol( namespaceScopes, name )
+    CConst( const Symbol &symbol, const Type &newType, _int64 i64data)
+        : RelationalObjectModuleItem( symbol )
         , type( newType )
         , i64data( i64data )
     {
     }
-    CConst( const NamespaceScopes &namespaceScopes, const std::string &name, int value)
-        : Symbol( namespaceScopes, name )
+    CConst( const Symbol &symbol, int value)
+        : RelationalObjectModuleItem( symbol )
         , type( Type(DEF_LONG) )
         , i64data( value )
@@ -53 +65 @@
     }
     double GetDoubleData();
+
+    virtual bool Resolve();
 };
 class Consts : public Jenga::Common::Hashmap<CConst>
@@ -69 +83 @@
 public:
 
-    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, _int64 i64data, const Type &type );
-    void Add( const NamespaceScopes &namespaceScopes, const std::string &name, int value);
+    void Add( const Symbol &symbol, _int64 i64data, const Type &type );
+    void Add( const Symbol &symbol, int value);
 
 private:
@@ -83 +97 @@
 
 //定数マクロ
-class ConstMacro : public Symbol, public Jenga::Common::ObjectInHashmap<ConstMacro>
+class ConstMacro
+    : public RelationalObjectModuleItem
+    , public Jenga::Common::ObjectInHashmap<ConstMacro>
 {
     std::vector<std::string> parameters;
@@ -95 +111 @@
         trace_for_serialize( "serializing - ConstMacro" );
 
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( RelationalObjectModuleItem );
+
+        if( ActiveBasic::Common::Environment::IsRemoveExternal() )
+        {
+            if( this->IsExternal() )
+            {
+                this->NeedResolve();
+                return;
+            }
+        }
+
         ar & BOOST_SERIALIZATION_NVP( parameters );
         ar & BOOST_SERIALIZATION_NVP( expression );
@@ -101 +127 @@
 
 public:
-    ConstMacro( const NamespaceScopes &namespaceScopes, const std::string &name, const std::vector<std::string> &parameters, const std::string &expression )
-        : Symbol( namespaceScopes, name )
+    ConstMacro( const Symbol &symbol, const std::vector<std::string> &parameters, const std::string &expression )
+        : RelationalObjectModuleItem( symbol )
         , parameters( parameters )
         , expression( expression )
@@ -127 +153 @@
         return expression;
     }
+
+    virtual bool Resolve();
 };
-class ConstMacros : public Jenga::Common::Hashmap<ConstMacro>
+class ConstMacros
+    : public Jenga::Common::Hashmap<ConstMacro>
 {
     // XMLシリアライズ用
@@ -142 +171 @@
 
 public:
-    bool Add( const NamespaceScopes &namespaceScopes, const std::string &name, const char *parameterStr );
+    bool Add( const Symbol &symbol, const char *parameterStr );
     ConstMacro *Find( const Symbol &name );
 };