remerge

15 files changed, 379 insertions, 0 deletions

diff --git a/xsd/tests/cxx/parser/validation/restriction/driver.cxx b/xsd/tests/cxx/parser/validation/restriction/driver.cxx
new file mode 100644
index 0000000..ea87af6
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/driver.cxx
@@ -0,0 +1,108 @@
+// file      : tests/cxx/parser/validation/restriction/driver.cxx
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+// Test the restriction compositor validation.
+//
+
+#include <string>
+#include <fstream>
+#include <iostream>
+
+#include "test-pskel.hxx"
+
+using namespace std;
+using namespace test;
+
+struct base_a_pimpl: base_a_pskel
+{
+};
+
+struct restriction_a_pimpl: restriction_a_pskel
+{
+};
+
+struct extension_b_pimpl: extension_b_pskel
+{
+};
+
+struct restriction_b_pimpl: restriction_b_pskel
+{
+};
+
+struct type_b_pimpl: type_b_pskel
+{
+};
+
+struct type_r_pimpl: type_r_pskel
+{
+};
+
+
+int
+main (int argc, char* argv[])
+{
+  if (argc != 2)
+  {
+    cerr << "usage: " << argv[0] << " test.xml" << endl;
+    return 1;
+  }
+
+  try
+  {
+    xml_schema::string_pimpl string_p;
+    base_a_pimpl base_a_p;
+    restriction_a_pimpl restriction_a_p;
+    extension_b_pimpl extension_b_p;
+    restriction_b_pimpl restriction_b_p;
+    type_b_pimpl type_b_p;
+    type_r_pimpl type_r_p;
+
+    base_a_p.parsers (string_p, string_p, string_p,
+                      string_p, string_p, string_p);
+
+    restriction_a_p.parsers (string_p, string_p, string_p,
+                             string_p, string_p, string_p);
+
+    extension_b_p.parsers (string_p, string_p, string_p,
+                           string_p, string_p);
+
+    restriction_b_p.parsers (string_p, string_p, string_p,
+                             string_p, string_p);
+
+    type_b_p.parsers (base_a_p, extension_b_p);
+    type_r_p.parsers (restriction_a_p, restriction_b_p);
+
+    xml_schema::document doc_b_p (type_b_p, "test", "root");
+    xml_schema::document doc_r_p (type_r_p, "test", "root");
+
+    {
+      ifstream ifs (argv[1]);
+      type_b_p.pre ();
+      doc_b_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate);
+      type_b_p.post_type_b ();
+    }
+
+    try
+    {
+      ifstream ifs (argv[1]);
+      type_r_p.pre ();
+      doc_r_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate);
+      type_r_p.post_type_r ();
+    }
+    catch (xml_schema::exception const& e)
+    {
+      cout << e << endl;
+    }
+  }
+  catch (xml_schema::exception const& e)
+  {
+    cerr << e << endl;
+    return 1;
+  }
+  catch (ios_base::failure const&)
+  {
+    cerr << "io failure" << endl;
+    return 1;
+  }
+}
diff --git a/xsd/tests/cxx/parser/validation/restriction/makefile b/xsd/tests/cxx/parser/validation/restriction/makefile
new file mode 100644
index 0000000..5e1a9fd
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/makefile
@@ -0,0 +1,93 @@
+# file      : tests/cxx/parser/validation/restriction/makefile
+# copyright : Copyright (c) 2006-2014 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
+
+tests := 000 001 002 003 004 005
+
+obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o))
+dep := $(obj:.o=.o.d)
+
+driver := $(out_base)/driver
+test   := $(out_base)/.test
+clean  := $(out_base)/.clean
+
+# Import.
+#
+$(call import,\
+  $(scf_root)/import/libxerces-c/stub.make,\
+  l: xerces_c.l,cpp-options: xerces_c.l.cpp-options)
+
+# Build.
+#
+$(driver): $(obj) $(xerces_c.l)
+
+$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd
+$(obj) $(dep): $(xerces_c.l.cpp-options)
+
+genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
+
+$(gen): xsd := $(out_root)/xsd/xsd
+$(gen): xsd_options += --generate-validation
+$(gen): $(out_root)/xsd/xsd
+
+$(call include-dep,$(dep),$(obj),$(gen))
+
+
+# Convenience alias for default target.
+#
+$(out_base)/: $(driver)
+
+
+# Test.
+#
+test_targets := $(addprefix $(out_base)/.test-,$(tests))
+
+$(test): $(test_targets)
+$(test_targets): driver := $(driver)
+
+.PHONY: $(out_base)/.test-%
+$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std
+	$(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -)
+
+
+# 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))
+$(gen): | $(out_base)/.gitignore
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver $(genf)
+$(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,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): xsd_options += --std $(cxx_standard)
+$(call include,$(scf_root)/xsd/parser/xsd-cxx.make)
+endif
+
+
+# Dependencies.
+#
+$(call import,$(src_root)/xsd/makefile)
diff --git a/xsd/tests/cxx/parser/validation/restriction/test-000.std b/xsd/tests/cxx/parser/validation/restriction/test-000.std
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test-000.std
diff --git a/xsd/tests/cxx/parser/validation/restriction/test-000.xml b/xsd/tests/cxx/parser/validation/restriction/test-000.xml
new file mode 100644
index 0000000..21402b4
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test-000.xml
@@ -0,0 +1,31 @@
+<t:root xmlns:t="test"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="test test.xsd">
+
+  <restriction-a z="z">
+    <a>a</a>
+    <b>b</b>
+    <c>c</c>
+  </restriction-a>
+
+  <restriction-a x="x" y="y" z="z">
+    <a>a</a>
+    <b>b</b>
+    <c>c</c>
+  </restriction-a>
+
+  <restriction-b y="y">
+    <a>a</a>
+    <b>b</b>
+  </restriction-b>
+
+  <restriction-b y="y">
+    <a>a</a>
+    <c>c</c>
+  </restriction-b>
+
+  <restriction-b x="x" y="y">
+    <a>a</a>
+  </restriction-b>
+
+</t:root>
diff --git a/xsd/tests/cxx/parser/validation/restriction/test-001.std b/xsd/tests/cxx/parser/validation/restriction/test-001.std
new file mode 100644
index 0000000..5077837
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test-001.std
@@ -0,0 +1 @@
+:7:8 error: expected element 'a' instead of 'b'
diff --git a/xsd/tests/cxx/parser/validation/restriction/test-001.xml b/xsd/tests/cxx/parser/validation/restriction/test-001.xml
new file mode 100644
index 0000000..4015302
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test-001.xml
@@ -0,0 +1,11 @@
+<t:root xmlns:t="test"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="test test.xsd">
+
+  <!-- valid base but not restriction: a element -->
+  <restriction-a z="z">
+    <b>b</b>
+    <c>c</c>
+  </restriction-a>
+
+</t:root>
diff --git a/xsd/tests/cxx/parser/validation/restriction/test-002.std b/xsd/tests/cxx/parser/validation/restriction/test-002.std
new file mode 100644
index 0000000..f12c342
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test-002.std
@@ -0,0 +1 @@
+:10:19 error: expected attribute 'z'
diff --git a/xsd/tests/cxx/parser/validation/restriction/test-002.xml b/xsd/tests/cxx/parser/validation/restriction/test-002.xml
new file mode 100644
index 0000000..eb7684c
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test-002.xml
@@ -0,0 +1,12 @@
+<t:root xmlns:t="test"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="test test.xsd">
+
+  <!-- valid base but not restriction: z attribute -->
+  <restriction-a>
+    <a>a</a>
+    <b>b</b>
+    <c>c</c>
+  </restriction-a>
+
+</t:root>
diff --git a/xsd/tests/cxx/parser/validation/restriction/test-003.std b/xsd/tests/cxx/parser/validation/restriction/test-003.std
new file mode 100644
index 0000000..0c65175
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test-003.std
@@ -0,0 +1 @@
+:11:8 error: unexpected element 'a'
diff --git a/xsd/tests/cxx/parser/validation/restriction/test-003.xml b/xsd/tests/cxx/parser/validation/restriction/test-003.xml
new file mode 100644
index 0000000..49f18c7
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test-003.xml
@@ -0,0 +1,16 @@
+<t:root xmlns:t="test"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="test test.xsd">
+
+  <!-- valid base but not restriction: sequence maxOccurs="1" -->
+  <restriction-a z="z">
+    <a>a</a>
+    <b>b</b>
+    <c>c</c>
+
+    <a>a</a>
+    <b>b</b>
+    <c>c</c>
+  </restriction-a>
+
+</t:root>
diff --git a/xsd/tests/cxx/parser/validation/restriction/test-004.std b/xsd/tests/cxx/parser/validation/restriction/test-004.std
new file mode 100644
index 0000000..5077837
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test-004.std
@@ -0,0 +1 @@
+:7:8 error: expected element 'a' instead of 'b'
diff --git a/xsd/tests/cxx/parser/validation/restriction/test-004.xml b/xsd/tests/cxx/parser/validation/restriction/test-004.xml
new file mode 100644
index 0000000..115cd38
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test-004.xml
@@ -0,0 +1,10 @@
+<t:root xmlns:t="test"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="test test.xsd">
+
+  <!-- valid extension but not restriction: a element -->
+  <restriction-b y="y">
+    <b>b</b>
+  </restriction-b>
+
+</t:root>
diff --git a/xsd/tests/cxx/parser/validation/restriction/test-005.std b/xsd/tests/cxx/parser/validation/restriction/test-005.std
new file mode 100644
index 0000000..e92de14
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test-005.std
@@ -0,0 +1 @@
+:9:19 error: expected attribute 'y'
diff --git a/xsd/tests/cxx/parser/validation/restriction/test-005.xml b/xsd/tests/cxx/parser/validation/restriction/test-005.xml
new file mode 100644
index 0000000..e9ab7d9
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test-005.xml
@@ -0,0 +1,11 @@
+<t:root xmlns:t="test"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="test test.xsd">
+
+  <!-- valid extension but not restriction: y attribute -->
+  <restriction-b>
+    <a>a</a>
+    <b>b</b>
+  </restriction-b>
+
+</t:root>
diff --git a/xsd/tests/cxx/parser/validation/restriction/test.xsd b/xsd/tests/cxx/parser/validation/restriction/test.xsd
new file mode 100644
index 0000000..158ded5
--- /dev/null
+++ b/xsd/tests/cxx/parser/validation/restriction/test.xsd
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
+
+  <!-- simple case -->
+  <complexType name="base-a">
+    <sequence minOccurs="1" maxOccurs="2">
+      <element name="a" type="string" minOccurs="0"/>
+      <element name="b" type="string"/>
+      <element name="c" type="string"/>
+    </sequence>
+    <attribute name="x" type="string"/>
+    <attribute name="y" type="string"/>
+    <attribute name="z" type="string"/>
+  </complexType>
+
+  <complexType name="restriction-a">
+    <complexContent>
+      <restriction base="t:base-a">
+        <sequence minOccurs="1" maxOccurs="1">
+          <element name="a" type="string" minOccurs="1"/>
+          <element name="b" type="string"/>
+          <element name="c" type="string"/>
+        </sequence>
+	<!-- Can be ommited if not changed, e.g., 'x'. -->
+	<attribute name="y" type="string"/> <!-- But can also be repeated without change. -->
+        <attribute name="z" type="string" use="required"/>
+      </restriction>
+    </complexContent>
+  </complexType>
+
+  <!-- restriction of an extension -->
+  <complexType name="base-b">
+    <sequence>
+      <element name="a" type="string" minOccurs="0"/>
+    </sequence>
+    <attribute name="x" type="string"/>
+  </complexType>
+
+  <complexType name="extension-b">
+    <complexContent>
+      <extension base="t:base-b">
+        <choice>
+          <element name="b" type="string" minOccurs="0"/>
+          <element name="c" type="string"/>
+        </choice>
+        <attribute name="y" type="string"/>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <complexType name="restriction-b">
+    <complexContent>
+      <restriction base="t:extension-b">
+        <sequence>
+	  <sequence>
+            <element name="a" type="string" minOccurs="1"/>
+          </sequence>
+	  <choice>
+            <element name="b" type="string" minOccurs="0"/>
+            <element name="c" type="string"/>
+          </choice>
+	</sequence>
+        <attribute name="y" type="string" use="required"/>
+      </restriction>
+    </complexContent>
+  </complexType>
+
+  <complexType name="type-b">
+    <choice maxOccurs="unbounded">
+      <element name="restriction-a" type="t:base-a"/>
+      <element name="restriction-b" type="t:extension-b"/>
+    </choice>
+  </complexType>
+
+  <complexType name="type-r">
+    <choice maxOccurs="unbounded">
+      <element name="restriction-a" type="t:restriction-a"/>
+      <element name="restriction-b" type="t:restriction-b"/>
+    </choice>
+  </complexType>
+
+</schema>