Merge branch 'feature/upstream' into develop

5 files changed, 0 insertions, 265 deletions

diff --git a/xsd/tests/cxx/parser/list/driver.cxx b/xsd/tests/cxx/parser/list/driver.cxx
deleted file mode 100644
index 0a4071a..0000000
--- a/xsd/tests/cxx/parser/list/driver.cxx
+++ /dev/null
@@ -1,106 +0,0 @@
-// file      : tests/cxx/parser/list/driver.cxx
-// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
-// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test xsd:list parsing.
-//
-
-#include <string>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-
-struct string_list_pimpl: string_list_pskel
-{
-  virtual void
-  pre ()
-  {
-    cout << "{" << endl;
-  }
-
-  virtual void
-  item (string const& v)
-  {
-    cout << "  '" << v << "'" << endl;
-  }
-
-  virtual void
-  post_string_list ()
-  {
-    cout << "}" << endl
-         << endl;
-  }
-};
-
-struct string_list_lang_pimpl: string_list_lang_pskel
-{
-  virtual void
-  pre ()
-  {
-    cout << "{" << endl;
-  }
-
-  virtual void
-  item (string const& v)
-  {
-    cout << "  '" << v << "'" << endl;
-  }
-
-  virtual void
-  lang (string const& v)
-  {
-    cout << "  lang: '" << v << "'" << endl;
-  }
-
-  virtual void
-  post_string_list_lang ()
-  {
-    cout << "}" << endl
-         << endl;
-  }
-};
-
-struct type_pimpl: type_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;
-    string_list_pimpl string_list_p;
-    string_list_lang_pimpl string_list_lang_p;
-    type_pimpl type_p;
-
-    string_list_p.parsers (string_p);
-    string_list_lang_p.parsers (string_p, string_p);
-    type_p.parsers (string_list_p, string_list_lang_p);
-
-    xml_schema::document doc_p (type_p, "test", "root");
-
-    type_p.pre ();
-    doc_p.parse (argv[1]);
-    type_p.post_type ();
-  }
-  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/list/makefile b/xsd/tests/cxx/parser/list/makefile
deleted file mode 100644
index 9fc63fd..0000000
--- a/xsd/tests/cxx/parser/list/makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# file      : tests/cxx/parser/list/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
-
-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): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Test.
-#
-$(test): driver := $(driver)
-$(test): $(driver) $(src_base)/test.xml $(src_base)/output
-	$(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver))
-
-# 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/list/output b/xsd/tests/cxx/parser/list/output
deleted file mode 100644
index 3642c4d..0000000
--- a/xsd/tests/cxx/parser/list/output
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-}
-
-{
-}
-
-{
-}
-
-{
-  'one'
-}
-
-{
-  'one'
-  'two'
-  'three'
-}
-
-{
-  lang: 'en'
-  'one'
-  'two'
-  'three'
-}
-
diff --git a/xsd/tests/cxx/parser/list/test.xml b/xsd/tests/cxx/parser/list/test.xml
deleted file mode 100644
index 52229db..0000000
--- a/xsd/tests/cxx/parser/list/test.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<t:root xmlns:t="test"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="test test.xsd">
-
-  <string-list/>
-
-  <string-list> </string-list>
-
-  <string-list>
-
-  </string-list>
-
-  <string-list>one</string-list>
-
-  <string-list>
-    one two
-    three
-  </string-list>
-
-  <string-list-lang lang="en">
-    one two
-    three
-  </string-list-lang>
-
-</t:root>
diff --git a/xsd/tests/cxx/parser/list/test.xsd b/xsd/tests/cxx/parser/list/test.xsd
deleted file mode 100644
index 79bd084..0000000
--- a/xsd/tests/cxx/parser/list/test.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
-  <simpleType name="string-list">
-    <list itemType="string"/>
-  </simpleType>
-
-  <complexType name="string-list-lang">
-    <simpleContent>
-      <extension base="t:string-list">
-        <attribute name="lang" type="string"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <complexType name="type">
-    <choice maxOccurs="unbounded">
-      <element name="string-list" type="t:string-list"/>
-      <element name="string-list-lang" type="t:string-list-lang"/>
-    </choice>
-  </complexType>
-
-  <element name="root" type="t:type"/>
-
-</schema>