Switch to build2

5 files changed, 137 insertions, 0 deletions

diff --git a/xsd-tests/cxx/tree/encoding/wchar/buildfile b/xsd-tests/cxx/tree/encoding/wchar/buildfile
new file mode 100644
index 0000000..f640976
--- /dev/null
+++ b/xsd-tests/cxx/tree/encoding/wchar/buildfile
@@ -0,0 +1,25 @@
+# file      : cxx/tree/encoding/wchar/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
+
+exe{driver}: xml{test}:    test.input  = true
+exe{driver}: file{output}: test.stdout = true
+
+<{hxx ixx cxx}{test}>: xsd{test} $xsd
+{{
+  diag xsd ($<[0]) # @@ TMP
+
+  $xsd cxx-tree --std c++11     \
+       --generate-inline        \
+       --generate-serialization \
+       --char-type wchar_t      \
+       --generate-doxygen       \
+       --output-dir $out_base   \
+       $path($<[0])
+}}
+
+cxx.poptions =+ "-I$out_base"
diff --git a/xsd-tests/cxx/tree/encoding/wchar/driver.cxx b/xsd-tests/cxx/tree/encoding/wchar/driver.cxx
new file mode 100644
index 0000000..dbcbcba
--- /dev/null
+++ b/xsd-tests/cxx/tree/encoding/wchar/driver.cxx
@@ -0,0 +1,55 @@
+// file      : cxx/tree/encoding/wchar/driver.cxx
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+// Test the wide character mapping.
+//
+
+#include <memory> // std::auto_ptr/unique_ptr
+#include <fstream>
+#include <iostream>
+
+#include "test.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;
+  }
+
+  try
+  {
+    // Use dont_validate because we do not have instance's system id (path).
+    //
+    std::ifstream ifs (argv[1]);
+    XSD_AUTO_PTR<type> r (root (ifs, xml_schema::flags::dont_validate));
+
+    {
+      type::b_sequence const& s (r->b ());
+
+      if (s[0] != strenum::abc ||
+          s[1] != strenum::a__c ||
+          s[2] != strenum::cxx__bc ||
+          s[3] != strenum::ab__)
+      {
+        cerr << "invalid encoding" << endl;
+        return 1;
+      }
+    }
+
+    xml_schema::namespace_infomap map;
+    map[L"t"].name = L"test";
+
+    root (std::cout, *r, map, L"ASCII");
+  }
+  catch (xml_schema::exception const& e)
+  {
+    cerr << "xml_schema::exception: " << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/xsd-tests/cxx/tree/encoding/wchar/output b/xsd-tests/cxx/tree/encoding/wchar/output
new file mode 100644
index 0000000..e0eaef0
--- /dev/null
+++ b/xsd-tests/cxx/tree/encoding/wchar/output
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ASCII" standalone="no" ?>
+<t:root xmlns:t="test">
+  <a>abc</a>
+  <a>&#x1FFF;&#xD7FF;</a>
+  <a>&#x1000;&#x10FF;</a>
+  <b>abc</b>
+  <b>a&#x1FFF;&#xD7FF;c</b>
+  <b>&#x1000;&#x10FF;bc</b>
+  <b>ab&#x1000;&#x10FF;</b>
+</t:root>
diff --git a/xsd-tests/cxx/tree/encoding/wchar/test.xml b/xsd-tests/cxx/tree/encoding/wchar/test.xml
new file mode 100644
index 0000000..9abb1b6
--- /dev/null
+++ b/xsd-tests/cxx/tree/encoding/wchar/test.xml
@@ -0,0 +1,14 @@
+<t:root xmlns:t="test"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="test test.xsd">
+
+  <a>abc</a>
+  <a>&#x1FFF;&#xD7FF;</a>
+  <a>&#x1000;&#x10FF;</a>
+
+  <b>abc</b>
+  <b>a&#x1FFF;&#xD7FF;c</b>
+  <b>&#x1000;&#x10FF;bc</b>
+  <b>ab&#x1000;&#x10FF;</b>
+
+</t:root>
diff --git a/xsd-tests/cxx/tree/encoding/wchar/test.xsd b/xsd-tests/cxx/tree/encoding/wchar/test.xsd
new file mode 100644
index 0000000..0151d2f
--- /dev/null
+++ b/xsd-tests/cxx/tree/encoding/wchar/test.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
+
+  <simpleType name="strenum">
+
+    <annotation>
+      <documentation>
+        Test enum. Valid values are:
+        abc
+        a&#x1FFF;&#xD7FF;c
+        &#x1000;&#x10FF;bc
+        ab&#x1000;&#x10FF;
+      </documentation>
+    </annotation>
+
+    <restriction base="string">
+      <enumeration value="abc"/>
+      <enumeration value="a&#x1FFF;&#xD7FF;c"/>
+      <enumeration value="&#x1000;&#x10FF;bc"/>
+      <enumeration value="ab&#x1000;&#x10FF;"/>
+    </restriction>
+  </simpleType>
+
+  <complexType name="type">
+    <sequence>
+      <element name="a" type="string" maxOccurs="unbounded"/>
+      <element name="b" type="t:strenum" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <element name="root" type="t:type"/>
+
+</schema>