3 files changed, 93 insertions, 0 deletions
diff --git a/xsd-tests/cxx/tree/enumeration/ctor/buildfile b/xsd-tests/cxx/tree/enumeration/ctor/buildfile
new file mode 100644
index 0000000..96be1ce
--- /dev/null
+++ b/xsd-tests/cxx/tree/enumeration/ctor/buildfile
@@ -0,0 +1,22 @@
+# file      : cxx/tree/enumeration/ctor/buildfile
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+import libs  = libxsd%lib{xsd}
+import libs += libxerces-c%lib{xerces-c}
+
+exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
+
+<{hxx ixx cxx}{test}>: xsd{test} $xsd
+{{
+  diag xsd ($<[0]) # @@ TMP
+
+  $xsd cxx-tree --std c++11      \
+       --generate-inline         \
+       --generate-default-ctor   \
+       --generate-from-base-ctor \
+       --generate-doxygen        \
+       --output-dir $out_base    \
+       $path($<[0])
+}}
+
+cxx.poptions =+ "-I$out_base"
diff --git a/xsd-tests/cxx/tree/enumeration/ctor/driver.cxx b/xsd-tests/cxx/tree/enumeration/ctor/driver.cxx
new file mode 100644
index 0000000..c5ea1f2
--- /dev/null
+++ b/xsd-tests/cxx/tree/enumeration/ctor/driver.cxx
@@ -0,0 +1,30 @@
+// file      : cxx/tree/enumeration/ctor/driver.cxx
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+// Test enumeration constructors.
+//
+#include <string>
+
+#include "test.hxx"
+
+using namespace std;
+using namespace test;
+
+int
+main ()
+{
+  // Test ctor(const char*).
+  //
+  {
+    string_enum se ("a");
+    type t ("a", 1);
+  }
+
+  // Test ctor(const std::string&)
+  //
+  {
+    string const s ("c");
+    string_enum se (s);
+    type t (s, 3);
+  }
+}
diff --git a/xsd-tests/cxx/tree/enumeration/ctor/test.xsd b/xsd-tests/cxx/tree/enumeration/ctor/test.xsd
new file mode 100644
index 0000000..c5d625a
--- /dev/null
+++ b/xsd-tests/cxx/tree/enumeration/ctor/test.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
+
+  <simpleType name="string-enum-base">
+    <restriction base="string">
+      <enumeration value="a"/>
+      <enumeration value="b"/>
+      <enumeration value="c"/>
+    </restriction>
+  </simpleType>
+
+  <simpleType name="string-enum">
+    <restriction base="t:string-enum-base">
+      <enumeration value="a"/>
+      <enumeration value="c"/>
+    </restriction>
+  </simpleType>
+
+  <simpleType name="int-enum-base">
+    <restriction base="int">
+      <enumeration value="1"/>
+      <enumeration value="2"/>
+      <enumeration value="3"/>
+    </restriction>
+  </simpleType>
+
+  <simpleType name="int-enum">
+    <restriction base="t:int-enum-base">
+      <enumeration value="1"/>
+      <enumeration value="3"/>
+    </restriction>
+  </simpleType>
+
+  <complexType name="type">
+    <sequence>
+      <element name="a" type="t:string-enum"/>
+      <element name="b" type="t:int-enum"/>
+    </sequence>
+  </complexType>
+
+</schema>