From a32d89c25b80f443d93a050a979e465f4d1dc39e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 14 Sep 2011 14:35:19 +0200
Subject: Fix bug in aggregate generation for derived lists

---
 xsde/cxx/hybrid/parser-aggregate-header.cxx     | 19 +++++++++++++++----
 xsde/cxx/hybrid/serializer-aggregate-header.cxx | 19 +++++++++++++++----
 xsde/cxx/hybrid/serializer-aggregate-source.cxx |  4 ++--
 3 files changed, 32 insertions(+), 10 deletions(-)

(limited to 'xsde/cxx/hybrid')

diff --git a/xsde/cxx/hybrid/parser-aggregate-header.cxx b/xsde/cxx/hybrid/parser-aggregate-header.cxx
index 986db36..967f1db 100644
--- a/xsde/cxx/hybrid/parser-aggregate-header.cxx
+++ b/xsde/cxx/hybrid/parser-aggregate-header.cxx
@@ -23,10 +23,12 @@ namespace CXX
       // For base types we only want member's types, but not the
       // base itself.
       //
-      struct BaseType: Traversal::Complex, Context
+      struct BaseType: Traversal::Complex,
+                       Traversal::List,
+                       Context
       {
-        BaseType (Context& c)
-            : Context (c)
+        BaseType (Context& c, Traversal::NodeBase& def)
+            : Context (c), def_ (def)
         {
         }
 
@@ -41,6 +43,15 @@ namespace CXX
             contains_compositor (c);
           }
         }
+
+        virtual Void
+        traverse (SemanticGraph::List& l)
+        {
+          def_.dispatch (l.argumented ().type ());
+        }
+
+      private:
+        Traversal::NodeBase& def_;
       };
 
       struct ParserDef: Traversal::Type,
@@ -113,7 +124,7 @@ namespace CXX
               map_ (map),
               tid_map_ (tid_map),
               set_ (set),
-              base_ (c)
+              base_ (c, *this)
         {
           *this >> inherits_ >> base_ >> inherits_;
 
diff --git a/xsde/cxx/hybrid/serializer-aggregate-header.cxx b/xsde/cxx/hybrid/serializer-aggregate-header.cxx
index 07b24cd..cfcb203 100644
--- a/xsde/cxx/hybrid/serializer-aggregate-header.cxx
+++ b/xsde/cxx/hybrid/serializer-aggregate-header.cxx
@@ -24,10 +24,12 @@ namespace CXX
       // For base types we only want member's types, but not the
       // base itself.
       //
-      struct BaseType: Traversal::Complex, Context
+      struct BaseType: Traversal::Complex,
+                       Traversal::List,
+                       Context
       {
-        BaseType (Context& c)
-            : Context (c)
+        BaseType (Context& c, Traversal::NodeBase& def)
+            : Context (c), def_ (def)
         {
         }
 
@@ -42,6 +44,15 @@ namespace CXX
             contains_compositor (c);
           }
         }
+
+        virtual Void
+        traverse (SemanticGraph::List& l)
+        {
+          def_.dispatch (l.argumented ().type ());
+        }
+
+      private:
+        Traversal::NodeBase& def_;
       };
 
       struct SerializerDef: Traversal::Type,
@@ -114,7 +125,7 @@ namespace CXX
               map_ (map),
               tid_map_ (tid_map),
               set_ (set),
-              base_ (c)
+              base_ (c, *this)
         {
           *this >> inherits_ >> base_ >> inherits_;
 
diff --git a/xsde/cxx/hybrid/serializer-aggregate-source.cxx b/xsde/cxx/hybrid/serializer-aggregate-source.cxx
index 2a3deb0..e9edeea 100644
--- a/xsde/cxx/hybrid/serializer-aggregate-source.cxx
+++ b/xsde/cxx/hybrid/serializer-aggregate-source.cxx
@@ -205,8 +205,8 @@ namespace CXX
       };
 
       struct SerializerConnect: Traversal::List,
-                            Traversal::Complex,
-                            Context
+                                Traversal::Complex,
+                                Context
       {
         SerializerConnect (Context& c,
                            TypeInstanceMap& map,
-- 
cgit v1.1