From 5e527213a2430bb3018e5eebd909aef294edf9b5 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 18 Dec 2020 18:48:46 +0300
Subject: Switch to build2

---
 .../morphing/anonymous/attribute-group/buildfile   | 22 +++++++++++++++
 .../morphing/anonymous/attribute-group/driver.cxx  |  9 +++++++
 .../morphing/anonymous/attribute-group/test.xsd    | 31 ++++++++++++++++++++++
 xsd-tests/morphing/anonymous/basic/buildfile       | 22 +++++++++++++++
 xsd-tests/morphing/anonymous/basic/driver.cxx      |  9 +++++++
 xsd-tests/morphing/anonymous/basic/test.xsd        | 20 ++++++++++++++
 .../morphing/anonymous/cyclic-inclusion/.gitignore |  2 ++
 .../morphing/anonymous/cyclic-inclusion/buildfile  | 27 +++++++++++++++++++
 .../morphing/anonymous/cyclic-inclusion/driver.cxx | 10 +++++++
 .../anonymous/cyclic-inclusion/includee.xsd        | 18 +++++++++++++
 .../anonymous/cyclic-inclusion/includer.xsd        | 18 +++++++++++++
 xsd-tests/morphing/anonymous/group/buildfile       | 22 +++++++++++++++
 xsd-tests/morphing/anonymous/group/driver.cxx      |  9 +++++++
 xsd-tests/morphing/anonymous/group/test.xsd        | 29 ++++++++++++++++++++
 xsd-tests/morphing/anonymous/unstable/.gitignore   |  1 +
 xsd-tests/morphing/anonymous/unstable/buildfile    | 31 ++++++++++++++++++++++
 .../morphing/anonymous/unstable/includee-1.xsd     | 12 +++++++++
 .../morphing/anonymous/unstable/includee-2.xsd     | 14 ++++++++++
 xsd-tests/morphing/anonymous/unstable/includer.xsd | 18 +++++++++++++
 xsd-tests/morphing/anonymous/unstable/testscript   | 11 ++++++++
 20 files changed, 335 insertions(+)
 create mode 100644 xsd-tests/morphing/anonymous/attribute-group/buildfile
 create mode 100644 xsd-tests/morphing/anonymous/attribute-group/driver.cxx
 create mode 100644 xsd-tests/morphing/anonymous/attribute-group/test.xsd
 create mode 100644 xsd-tests/morphing/anonymous/basic/buildfile
 create mode 100644 xsd-tests/morphing/anonymous/basic/driver.cxx
 create mode 100644 xsd-tests/morphing/anonymous/basic/test.xsd
 create mode 100644 xsd-tests/morphing/anonymous/cyclic-inclusion/.gitignore
 create mode 100644 xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile
 create mode 100644 xsd-tests/morphing/anonymous/cyclic-inclusion/driver.cxx
 create mode 100644 xsd-tests/morphing/anonymous/cyclic-inclusion/includee.xsd
 create mode 100644 xsd-tests/morphing/anonymous/cyclic-inclusion/includer.xsd
 create mode 100644 xsd-tests/morphing/anonymous/group/buildfile
 create mode 100644 xsd-tests/morphing/anonymous/group/driver.cxx
 create mode 100644 xsd-tests/morphing/anonymous/group/test.xsd
 create mode 100644 xsd-tests/morphing/anonymous/unstable/.gitignore
 create mode 100644 xsd-tests/morphing/anonymous/unstable/buildfile
 create mode 100644 xsd-tests/morphing/anonymous/unstable/includee-1.xsd
 create mode 100644 xsd-tests/morphing/anonymous/unstable/includee-2.xsd
 create mode 100644 xsd-tests/morphing/anonymous/unstable/includer.xsd
 create mode 100644 xsd-tests/morphing/anonymous/unstable/testscript

(limited to 'xsd-tests/morphing')

diff --git a/xsd-tests/morphing/anonymous/attribute-group/buildfile b/xsd-tests/morphing/anonymous/attribute-group/buildfile
new file mode 100644
index 0000000..3df24fc
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/attribute-group/buildfile
@@ -0,0 +1,22 @@
+# file      : morphing/anonymous/attribute-group/buildfile
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+# Just make sure that the schema files and the xsd-generated C++ mappings are
+# compilable.
+#
+import libs  = libxsd%lib{xsd}
+import libs += libxerces-c%lib{xerces-c}
+
+exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
+
+<{hxx cxx}{test}>: xsd{test} $xsd
+{{
+  diag xsd ($<[0]) # @@ TMP
+
+  $xsd cxx-tree --std c++11   \
+       --root-element-all     \
+       --output-dir $out_base \
+       $path($<[0])
+}}
+
+cxx.poptions =+ "-I$out_base"
diff --git a/xsd-tests/morphing/anonymous/attribute-group/driver.cxx b/xsd-tests/morphing/anonymous/attribute-group/driver.cxx
new file mode 100644
index 0000000..1632d7d
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/attribute-group/driver.cxx
@@ -0,0 +1,9 @@
+// file      : morphing/anonymous/attribute-group/driver.cxx
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+#include "test.hxx"
+
+int
+main (int, char*[])
+{
+}
diff --git a/xsd-tests/morphing/anonymous/attribute-group/test.xsd b/xsd-tests/morphing/anonymous/attribute-group/test.xsd
new file mode 100644
index 0000000..657be8a
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/attribute-group/test.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
+            xmlns="http://www.codesynthesis.com/xmlns/test"
+            targetNamespace="http://www.codesynthesis.com/xmlns/test">
+
+  <!-- Attribute Group that names anonymous type. -->
+  
+  <xsd:attributeGroup name="gfoo-1">
+    <xsd:attribute name="afoo-1">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string"/>
+      </xsd:simpleType>
+    </xsd:attribute>
+  </xsd:attributeGroup>
+
+  <xsd:attributeGroup name="gfoo-2">
+    <xsd:attributeGroup ref="gfoo-1"/>
+    <xsd:attribute name="afoo-2" type="xsd:string"/>
+  </xsd:attributeGroup>
+
+  <xsd:complexType name="Foo1">
+    <xsd:attributeGroup ref="gfoo-1"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="Foo2">
+    <xsd:attributeGroup ref="gfoo-2"/>
+  </xsd:complexType>
+
+</xsd:schema>
diff --git a/xsd-tests/morphing/anonymous/basic/buildfile b/xsd-tests/morphing/anonymous/basic/buildfile
new file mode 100644
index 0000000..e2573e7
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/basic/buildfile
@@ -0,0 +1,22 @@
+# file      : morphing/anonymous/basic/buildfile
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+# Just make sure that the schema files and the xsd-generated C++ mappings are
+# compilable.
+#
+import libs  = libxsd%lib{xsd}
+import libs += libxerces-c%lib{xerces-c}
+
+exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
+
+<{hxx cxx}{test}>: xsd{test} $xsd
+{{
+  diag xsd ($<[0]) # @@ TMP
+
+  $xsd cxx-tree --std c++11   \
+       --root-element-all     \
+       --output-dir $out_base \
+       $path($<[0])
+}}
+
+cxx.poptions =+ "-I$out_base"
diff --git a/xsd-tests/morphing/anonymous/basic/driver.cxx b/xsd-tests/morphing/anonymous/basic/driver.cxx
new file mode 100644
index 0000000..fc289eb
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/basic/driver.cxx
@@ -0,0 +1,9 @@
+// file      : morphing/anonymous/basic/driver.cxx
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+#include "test.hxx"
+
+int
+main (int, char*[])
+{
+}
diff --git a/xsd-tests/morphing/anonymous/basic/test.xsd b/xsd-tests/morphing/anonymous/basic/test.xsd
new file mode 100644
index 0000000..ce930d8
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/basic/test.xsd
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
+
+  <!-- Test xpath for nested anonymous types. -->
+ 
+  <element name="a">
+    <complexType>
+      <sequence>
+        <element name="b">
+	  <complexType>
+            <sequence>
+              <element name="c" type="string"/>
+            </sequence>
+          </complexType>
+        </element>
+      </sequence>
+    </complexType>
+  </element> 
+
+</schema>
diff --git a/xsd-tests/morphing/anonymous/cyclic-inclusion/.gitignore b/xsd-tests/morphing/anonymous/cyclic-inclusion/.gitignore
new file mode 100644
index 0000000..b27b7d8
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/cyclic-inclusion/.gitignore
@@ -0,0 +1,2 @@
+includee.?xx
+includer.?xx
diff --git a/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile b/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile
new file mode 100644
index 0000000..d25143a
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile
@@ -0,0 +1,27 @@
+# file      : morphing/anonymous/cyclic-inclusion/buildfile
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+# Just make sure that the schema files and the xsd-generated C++ mappings are
+# compilable.
+#
+import libs  = libxsd%lib{xsd}
+import libs += libxerces-c%lib{xerces-c}
+
+fs = includee includer
+
+exe{driver}: {hxx cxx}{* -{$fs}} {hxx cxx}{$fs} $libs
+
+for f: $fs
+{
+  <{hxx cxx}{$f}>: xsd{$f} $xsd
+  {{
+    diag xsd ($<[0]) # @@ TMP
+
+    $xsd cxx-tree --std c++11   \
+         --root-element-all     \
+         --output-dir $out_base \
+         $path($<[0])
+  }}
+}
+
+cxx.poptions =+ "-I$out_base"
diff --git a/xsd-tests/morphing/anonymous/cyclic-inclusion/driver.cxx b/xsd-tests/morphing/anonymous/cyclic-inclusion/driver.cxx
new file mode 100644
index 0000000..9046ee4
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/cyclic-inclusion/driver.cxx
@@ -0,0 +1,10 @@
+// file      : morphing/anonymous/cyclic-inclusion/driver.cxx
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+#include "includee.hxx"
+#include "includer.hxx"
+
+int
+main (int, char*[])
+{
+}
diff --git a/xsd-tests/morphing/anonymous/cyclic-inclusion/includee.xsd b/xsd-tests/morphing/anonymous/cyclic-inclusion/includee.xsd
new file mode 100644
index 0000000..51f7916
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/cyclic-inclusion/includee.xsd
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
+	    xmlns:t="http://www.codesynthesis.com/xmlns/test"
+            targetNamespace="http://www.codesynthesis.com/xmlns/test">
+
+  <xsd:include schemaLocation="includer.xsd"/>
+
+  <xsd:element name="bar">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element ref="t:foo"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+</xsd:schema>
diff --git a/xsd-tests/morphing/anonymous/cyclic-inclusion/includer.xsd b/xsd-tests/morphing/anonymous/cyclic-inclusion/includer.xsd
new file mode 100644
index 0000000..54e6b69
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/cyclic-inclusion/includer.xsd
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
+	    xmlns:t="http://www.codesynthesis.com/xmlns/test"
+            targetNamespace="http://www.codesynthesis.com/xmlns/test">
+
+  <xsd:include schemaLocation="includee.xsd"/>
+
+  <xsd:element name="foo">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="name" type="xsd:string"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+</xsd:schema>
diff --git a/xsd-tests/morphing/anonymous/group/buildfile b/xsd-tests/morphing/anonymous/group/buildfile
new file mode 100644
index 0000000..9cedf39
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/group/buildfile
@@ -0,0 +1,22 @@
+# file      : morphing/anonymous/group/buildfile
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+# Just make sure that the schema files and the xsd-generated C++ mappings are
+# compilable.
+#
+import libs  = libxsd%lib{xsd}
+import libs += libxerces-c%lib{xerces-c}
+
+exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
+
+<{hxx cxx}{test}>: xsd{test} $xsd
+{{
+  diag xsd ($<[0]) # @@ TMP
+
+  $xsd cxx-tree --std c++11   \
+       --root-element-all     \
+       --output-dir $out_base \
+       $path($<[0])
+}}
+
+cxx.poptions =+ "-I$out_base"
diff --git a/xsd-tests/morphing/anonymous/group/driver.cxx b/xsd-tests/morphing/anonymous/group/driver.cxx
new file mode 100644
index 0000000..2a76396
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/group/driver.cxx
@@ -0,0 +1,9 @@
+// file      : morphing/anonymous/group/driver.cxx
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+#include "test.hxx"
+
+int
+main (int, char*[])
+{
+}
diff --git a/xsd-tests/morphing/anonymous/group/test.xsd b/xsd-tests/morphing/anonymous/group/test.xsd
new file mode 100644
index 0000000..73e07af
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/group/test.xsd
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
+            xmlns="http://www.codesynthesis.com/xmlns/test"
+            targetNamespace="http://www.codesynthesis.com/xmlns/test">
+
+  <!-- Simple case. -->
+
+  <xsd:group name="gfoo">
+    <xsd:sequence>
+      <xsd:element name="foo-1">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:string"/>
+        </xsd:simpleType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:group>
+
+
+  <xsd:complexType name="Foo">
+    <xsd:group ref="gfoo"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="Bar">
+    <xsd:group ref="gfoo"/>
+  </xsd:complexType>
+
+</xsd:schema>
diff --git a/xsd-tests/morphing/anonymous/unstable/.gitignore b/xsd-tests/morphing/anonymous/unstable/.gitignore
new file mode 100644
index 0000000..c1b04fd
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/unstable/.gitignore
@@ -0,0 +1 @@
+includee-*.?xx
diff --git a/xsd-tests/morphing/anonymous/unstable/buildfile b/xsd-tests/morphing/anonymous/unstable/buildfile
new file mode 100644
index 0000000..e83cee7
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/unstable/buildfile
@@ -0,0 +1,31 @@
+# file      : morphing/anonymous/unstable/buildfile
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+fs = includee-1 includee-2
+
+./: {hxx cxx}{$fs}
+
+# Make sure that the schema files are compilable.
+#
+for f: $fs
+{
+  <{hxx cxx}{$f}>: xsd{$f} $xsd
+  {{
+    diag xsd ($<[0]) # @@ TMP
+
+    $xsd cxx-tree --std c++11   \
+         --root-element-all     \
+         --output-dir $out_base \
+         $path($<[0])
+  }}
+}
+
+# Test that the invalid schema files compilation expectedly fails.
+#
+./: testscript xsd{** -{$fs}} $xsd
+
+testscript{*}:
+{
+  test           = $xsd
+  test.arguments = cxx-tree --std c++11
+}
diff --git a/xsd-tests/morphing/anonymous/unstable/includee-1.xsd b/xsd-tests/morphing/anonymous/unstable/includee-1.xsd
new file mode 100644
index 0000000..916816f
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/unstable/includee-1.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
+	    xmlns:test="http://www.codesynthesis.com/xmlns/test"
+            targetNamespace="http://www.codesynthesis.com/xmlns/test">
+
+  <xsd:simpleType name="base">
+    <xsd:restriction base="xsd:string"/>
+  </xsd:simpleType>
+  
+</xsd:schema>
diff --git a/xsd-tests/morphing/anonymous/unstable/includee-2.xsd b/xsd-tests/morphing/anonymous/unstable/includee-2.xsd
new file mode 100644
index 0000000..c0eda26
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/unstable/includee-2.xsd
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
+	    xmlns:test="http://www.codesynthesis.com/xmlns/test"
+            targetNamespace="http://www.codesynthesis.com/xmlns/test">
+
+  <xsd:element name="base">
+    <xsd:simpleType>
+      <xsd:restriction base="xsd:string"/>
+    </xsd:simpleType>
+  </xsd:element>
+
+</xsd:schema>
diff --git a/xsd-tests/morphing/anonymous/unstable/includer.xsd b/xsd-tests/morphing/anonymous/unstable/includer.xsd
new file mode 100644
index 0000000..4593b5f
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/unstable/includer.xsd
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd"
+	    xmlns:Test="http://www.codesynthesis.com/xmlns/test"
+            targetNamespace="http://www.codesynthesis.com/xmlns/test">
+
+  <xsd:include schemaLocation="includee-1.xsd"/>
+  <xsd:include schemaLocation="includee-2.xsd"/>
+
+  <xsd:simpleType name="derived">
+    <xsd:restriction base="Test:base"/>
+  </xsd:simpleType>
+
+  <xsd:element name="element" type="Test:base"/>
+  <xsd:attribute name="attribute" type="Test:base"/>
+
+</xsd:schema>
diff --git a/xsd-tests/morphing/anonymous/unstable/testscript b/xsd-tests/morphing/anonymous/unstable/testscript
new file mode 100644
index 0000000..a9057e1
--- /dev/null
+++ b/xsd-tests/morphing/anonymous/unstable/testscript
@@ -0,0 +1,11 @@
+# file      : morphing/anonymous/unstable/testscript
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+: unstable-conflict
+:
+$* --output-dir $~ $src_base/includer.xsd 2>>/"EOE" != 0
+  $src_base/includee-2.xsd:8:28: error: element name 'base' creates an unstable conflict when used as a type name
+  $src_base/includee-1.xsd:8:31: info: conflicting type is defined here
+  $src_base/includee-2.xsd:8:28: info: use --anonymous-regex to resolve this conflict
+  $src_base/includee-2.xsd:8:28: info: and don't forget to pass the same option when translating 'includee-2.xsd' and all the schemas that refer to it
+  EOE
-- 
cgit v1.1