Fix recursive polymorphic parsing in C++/Parser

New test: cxx/parser/polyrecur.

8 files changed, 553 insertions, 1 deletions

diff --git a/tests/cxx/parser/makefile b/tests/cxx/parser/makefile
index 39b9f61..e2fe635 100644
--- a/tests/cxx/parser/makefile
+++ b/tests/cxx/parser/makefile
@@ -33,7 +33,7 @@ endif # exceptions
 
 ifeq ($(xsde_polymorphic),y)
 ifeq ($(xsde_reuse_style),tiein)
-build_tests += polymorphism
+build_tests += polymorphism polyrecur
 endif
 endif
 
diff --git a/tests/cxx/parser/polyrecur/driver.cxx b/tests/cxx/parser/polyrecur/driver.cxx
new file mode 100644
index 0000000..856b01b
--- /dev/null
+++ b/tests/cxx/parser/polyrecur/driver.cxx
@@ -0,0 +1,87 @@
+// file      : tests/cxx/parser/polyrecur/driver.cxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2006-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+// Test recursive polymorphic parsing.
+//
+#include <iostream>
+
+#include "test-pskel.hxx"
+#include "test-pimpl.hxx"
+
+using namespace std;
+using namespace test;
+
+int
+main (int argc, char* argv[])
+{
+  if (argc != 2)
+  {
+    cerr << "usage: " << argv[0] << " test.xml" << endl;
+    return 1;
+  }
+
+#ifdef XSDE_EXCEPTIONS
+  try
+  {
+#endif
+
+    // Instantiate individual parsers.
+    //
+    xml_schema::int_pimpl int_p;
+
+    root_pimpl root_p;
+    expression_pimpl expression_p;
+    recursive_pimpl recursive_p;
+    value_a_pimpl value_a_p;
+    value_b_pimpl value_b_p;
+
+    xml_schema::parser_map_impl expression_map (5);
+
+    // Connect the parsers together.
+    //
+    expression_map.insert (value_a_p);
+    expression_map.insert (value_b_p);
+    expression_map.insert (recursive_p);
+
+    root_p.parsers (expression_p);
+    root_p.expression_parser (expression_map);
+
+    recursive_p.parsers (expression_p);
+    recursive_p.expression_parser (expression_map);
+
+    value_a_p.parsers (int_p);
+    value_b_p.parsers (int_p);
+
+    xml_schema::document_pimpl doc_p (root_p, "test", "root", true);
+
+    root_p.pre ();
+    doc_p.parse (argv[1]);
+
+#ifndef XSDE_EXCEPTIONS
+    if (doc_p._error ())
+    {
+      cerr << "error" << endl;
+      return 1;
+    }
+#endif
+
+    root_p.post_root ();
+
+#ifdef XSDE_EXCEPTIONS
+  }
+  catch (xml_schema::parser_exception const& e)
+  {
+    cerr << e << endl;
+    return 1;
+  }
+  catch (std::ios_base::failure const&)
+  {
+    cerr << "io failure" << endl;
+    return 1;
+  }
+#endif
+
+  return 0;
+}
diff --git a/tests/cxx/parser/polyrecur/makefile b/tests/cxx/parser/polyrecur/makefile
new file mode 100644
index 0000000..8a553f8
--- /dev/null
+++ b/tests/cxx/parser/polyrecur/makefile
@@ -0,0 +1,95 @@
+# file      : tests/cxx/parser/polyrecur/makefile
+# author    : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2006-2011 Code Synthesis Tools CC
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
+
+xsd := test.xsd
+cxx := driver.cxx test-pimpl.cxx
+
+obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o))
+dep := $(obj:.o=.o.d)
+
+xsde.l             := $(out_root)/libxsde/xsde/xsde.l
+xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options
+
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+dist     := $(out_base)/.dist
+dist-win := $(out_base)/.dist-win
+clean    := $(out_base)/.clean
+
+
+# Build.
+#
+$(driver): $(obj) $(xsde.l)
+
+$(obj) $(dep): $(xsde.l.cpp-options)
+
+skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
+skel  := $(addprefix $(out_base)/,$(skelf))
+
+$(skel): xsde := $(out_root)/xsde/xsde
+$(skel): $(out_root)/xsde/xsde
+$(skel) $(dist) $(dist-win): xsde_options += --generate-polymorphic
+
+$(call include-dep,$(dep))
+
+# Convenience alias for default target.
+#
+$(out_base)/: $(driver)
+
+
+# Test.
+#
+$(test): driver := $(driver)
+$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std
+	$(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver))
+
+
+# Dist.
+#
+$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \
+-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix)
+
+$(dist):
+	$(call message,install $(src_base),$(scf_root)/dist $(opt))
+
+$(dist-win):
+	$(call message,install $(src_base),$(scf_root)/dist -win $(opt))
+
+
+# Clean.
+#
+$(clean): $(driver).o.clean                                \
+  $(addsuffix .cxx.clean,$(obj))                           \
+  $(addsuffix .cxx.clean,$(dep))                           \
+  $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean))
+
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(skel): | $(out_base)/.gitignore
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver $(skelf)
+$(clean): $(out_base)/.gitignore.clean
+
+$(call include,$(bld_root)/git/gitignore.make)
+endif
+
+
+# How to.
+#
+$(call include,$(bld_root)/cxx/o-e.make)
+$(call include,$(bld_root)/cxx/cxx-o.make)
+$(call include,$(bld_root)/cxx/cxx-d.make)
+$(call include,$(scf_root)/xsde/parser/xsd-cxx.make)
+
+
+# Dependencies.
+#
+$(call import,$(src_root)/xsde/makefile)
+$(call import,$(src_root)/libxsde/xsde/makefile)
diff --git a/tests/cxx/parser/polyrecur/test-000.std b/tests/cxx/parser/polyrecur/test-000.std
new file mode 100644
index 0000000..28a835f
--- /dev/null
+++ b/tests/cxx/parser/polyrecur/test-000.std
@@ -0,0 +1,22 @@
+root start
+recursive start
+value_a begin
+value->constant
+value: post_expression override
+value_a: post_value override
+value_a end
+recursive->expression event
+recursive start
+value_b begin
+value->constant
+value: post_expression override
+value_b: post_value override
+value_b end
+recursive->expression event
+recursive: post_expression override
+recursive end
+recursive->expression event
+recursive: post_expression override
+recursive end
+root->expression
+root end
diff --git a/tests/cxx/parser/polyrecur/test-000.xml b/tests/cxx/parser/polyrecur/test-000.xml
new file mode 100644
index 0000000..42035ba
--- /dev/null
+++ b/tests/cxx/parser/polyrecur/test-000.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root xmlns="test"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="test test.xsd">
+  <recursive>
+    <value-a>
+      <constant>1</constant>
+    </value-a>
+    <recursive>
+      <value-b>
+        <constant>2</constant>
+      </value-b>
+    </recursive>
+  </recursive>
+</root>
diff --git a/tests/cxx/parser/polyrecur/test-pimpl.cxx b/tests/cxx/parser/polyrecur/test-pimpl.cxx
new file mode 100644
index 0000000..158ad55
--- /dev/null
+++ b/tests/cxx/parser/polyrecur/test-pimpl.cxx
@@ -0,0 +1,163 @@
+// file      : tests/cxx/parser/polyrecur/test-pimpl.cxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2006-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+#include <iostream>
+
+#include "test-pimpl.hxx"
+
+using namespace std;
+
+namespace test
+{
+  // root_pimpl
+  //
+
+  void root_pimpl::
+  pre ()
+  {
+    cout << "root start" << endl;
+  }
+
+  void root_pimpl::
+  expression ()
+  {
+    cout << "root->expression" << endl;
+  }
+
+  void root_pimpl::
+  post_root ()
+  {
+    cout << "root end" << endl;
+  }
+
+  // expression_pimpl
+  //
+
+  void expression_pimpl::
+  pre ()
+  {
+    cout << "expression begin" << endl;
+  }
+
+  void expression_pimpl::
+  post_expression ()
+  {
+    cout << "expression end" << endl;
+  }
+
+  // recursive_pimpl
+  //
+
+  void recursive_pimpl::
+  pre ()
+  {
+    cout << "recursive start" << endl;
+  }
+
+  void recursive_pimpl::
+  expression ()
+  {
+    cout << "recursive->expression event" << endl;
+  }
+
+  void recursive_pimpl::
+  post_expression ()
+  {
+    cout << "recursive: post_expression override" << endl;
+    post_recursive ();
+  }
+
+  void recursive_pimpl::
+  post_recursive ()
+  {
+    cout << "recursive end" << endl;
+  }
+
+  // value_pimpl
+  //
+
+  void value_pimpl::
+  pre ()
+  {
+    cout << "value begin" << endl;
+  }
+
+  void value_pimpl::
+  constant (int)
+  {
+    cout << "value->constant" << endl;
+  }
+
+  void value_pimpl::
+  post_expression ()
+  {
+    cout << "value: post_expression override" << endl;
+    post_value ();
+  }
+
+  void value_pimpl::
+  post_value ()
+  {
+    cout << "value end" << endl;
+  }
+
+  // value_a_pimpl
+  //
+
+  void value_a_pimpl::
+  pre ()
+  {
+    cout << "value_a begin" << endl;
+  }
+
+  void value_a_pimpl::
+  post_expression ()
+  {
+    cout << "value: post_expression override" << endl;
+    post_value ();
+  }
+
+  void value_a_pimpl::
+  post_value ()
+  {
+    cout << "value_a: post_value override" << endl;
+    post_value_a ();
+  }
+
+  void value_a_pimpl::
+  post_value_a ()
+  {
+    cout << "value_a end" << endl;
+  }
+
+  // value_b_pimpl
+  //
+
+  void value_b_pimpl::
+  pre ()
+  {
+    cout << "value_b begin" << endl;
+  }
+
+  void value_b_pimpl::
+  post_expression ()
+  {
+    cout << "value: post_expression override" << endl;
+    post_value ();
+  }
+
+  void value_b_pimpl::
+  post_value ()
+  {
+    cout << "value_b: post_value override" << endl;
+    post_value_b ();
+  }
+
+  void value_b_pimpl::
+  post_value_b ()
+  {
+    cout << "value_b end" << endl;
+  }
+}
diff --git a/tests/cxx/parser/polyrecur/test-pimpl.hxx b/tests/cxx/parser/polyrecur/test-pimpl.hxx
new file mode 100644
index 0000000..fa6e206
--- /dev/null
+++ b/tests/cxx/parser/polyrecur/test-pimpl.hxx
@@ -0,0 +1,117 @@
+// file      : tests/cxx/parser/polyrecur/test-pimpl.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2006-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+#ifndef TEST_PIMPL_HXX
+#define TEST_PIMPL_HXX
+
+#include "test-pskel.hxx"
+
+namespace test
+{
+  class root_pimpl: public root_pskel
+  {
+  public:
+    virtual void
+    pre ();
+
+    virtual void
+    expression ();
+
+    virtual void
+    post_root ();
+  };
+
+  class expression_pimpl: public expression_pskel
+  {
+  public:
+    virtual void
+    pre ();
+
+    virtual void
+    post_expression ();
+  };
+
+  class recursive_pimpl: public recursive_pskel
+  {
+  public:
+    recursive_pimpl (): recursive_pskel (&base_impl_) {}
+
+    virtual void
+    pre ();
+
+    virtual void
+    expression ();
+
+    virtual void
+    post_expression ();
+
+    virtual void
+    post_recursive ();
+
+    expression_pimpl base_impl_;
+  };
+
+  class value_pimpl: public value_pskel
+  {
+  public:
+    value_pimpl (): value_pskel (&base_impl_) {}
+
+    virtual void
+    pre ();
+
+    virtual void
+    constant (int);
+
+    virtual void
+    post_expression ();
+
+    virtual void
+    post_value ();
+
+    expression_pimpl base_impl_;
+  };
+
+  class value_a_pimpl: public value_a_pskel
+  {
+  public:
+    value_a_pimpl (): value_a_pskel (&base_impl_) {}
+
+    virtual void
+    pre ();
+
+    virtual void
+    post_expression ();
+
+    virtual void
+    post_value ();
+
+    virtual void
+    post_value_a ();
+
+    value_pimpl base_impl_;
+  };
+
+  class value_b_pimpl: public value_b_pskel
+  {
+  public:
+    value_b_pimpl (): value_b_pskel (&base_impl_) {}
+
+    virtual void
+    pre ();
+
+    virtual void
+    post_expression ();
+
+    virtual void
+    post_value ();
+
+    virtual void
+    post_value_b ();
+
+    value_pimpl base_impl_;
+  };
+}
+
+#endif // TEST_PIMPL_HXX
diff --git a/tests/cxx/parser/polyrecur/test.xsd b/tests/cxx/parser/polyrecur/test.xsd
new file mode 100644
index 0000000..affcc8a
--- /dev/null
+++ b/tests/cxx/parser/polyrecur/test.xsd
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:t="test"
+        targetNamespace="test"
+        elementFormDefault="qualified">
+
+  <element name="root" type="t:root"/>
+  <complexType name="root">
+    <sequence>
+      <element ref="t:expression" minOccurs="0" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <element name="expression" type="t:expression" abstract="true"/>
+  <complexType name="expression" abstract="true"/>
+
+  <element name="recursive" type="t:recursive" substitutionGroup="t:expression"/>
+  <complexType name="recursive">
+    <complexContent>
+      <extension base="t:expression">
+        <sequence minOccurs="0" maxOccurs="unbounded">
+          <element ref="t:expression"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <element name="value" type="t:value" abstract="true" substitutionGroup="t:expression"/>
+  <complexType name="value" abstract="true">
+    <complexContent>
+      <extension base="t:expression">
+        <sequence>
+          <element name="constant" type="int"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <element name="value-a" type="t:value-a" substitutionGroup="t:expression"/>
+  <complexType name="value-a">
+    <complexContent>
+      <extension base="t:value"/>
+    </complexContent>
+  </complexType>
+
+  <element name="value-b" type="t:value-b" substitutionGroup="t:expression"/>
+  <complexType name="value-b">
+    <complexContent>
+      <extension base="t:value"/>
+    </complexContent>
+  </complexType>
+
+</schema>