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

Timestamp:

Mar 8, 2008, 10:38:39 PM (17 years ago)

Author:

dai_9181

Message:

デリゲートのパラメータや戻り値にクラス型を指定できない不具合を修正。

File:

• trunk/abdev/BasicCompiler_Common/include/Delegate.h (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/include/Delegate.h

@@ -4 +4 @@
 #include <Procedure.h>
 
-class Delegate : public Procedure, public Jenga::Common::ObjectInHashmap<Delegate>
+class Delegates;
+
+class Delegate
+    : public Procedure
+    , public Jenga::Common::ObjectInHashmap<Delegate>
 {
+    friend Delegates;
+
+    std::string paramStr;
+    std::string returnTypeName;
+    int sourceIndex;
+
     Parameters dynamicParams;
 
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - Delegate" );
+
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
+        ar & BOOST_SERIALIZATION_NVP( dynamicParams );
+    }
+
 public:
-    Delegate( const NamespaceScopes &namespaceScopes, const std::string &name, Procedure::Kind procKind, const char *paramStr, const Type &returnType, int nowLine );
+    Delegate( const NamespaceScopes &namespaceScopes, const std::string &name, Procedure::Kind procKind, const char *paramStr, const std::string &returnTypeName, int sourceIndex )
+        : Procedure( namespaceScopes, name, procKind, false )
+        , paramStr( paramStr )
+        , returnTypeName( returnTypeName )
+        , sourceIndex( sourceIndex )
+    {
+    }
     Delegate()
     {
     }
+
+    void RefleshParameterAndReturnType();
 
     virtual const std::string &GetKeyName() const
@@ -30 +59 @@
     void Collect( const BasicSource &source );
     void GenerateSourceCode( std::string &destSource );
+    void RefleshParameterAndReturnType();
 };