diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2009-03-11 09:30:41 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2009-03-11 09:30:41 +0200 |
commit | 9db750f407ceeb5c1fab99414b074d289bfda179 (patch) | |
tree | eb1a5e52ebf84d79d378d5ab2ae56372028776e0 /tests | |
parent | bc628cff98a1d90d4ee293f22979db56b4ed0695 (diff) |
Add support for parsing/serialization of recursive types
tests/cxx/hybrid/recursive/: new test
Diffstat (limited to 'tests')
-rw-r--r-- | tests/cxx/hybrid/makefile | 2 | ||||
-rw-r--r-- | tests/cxx/hybrid/recursive/driver.cxx | 56 | ||||
-rw-r--r-- | tests/cxx/hybrid/recursive/makefile | 98 | ||||
-rw-r--r-- | tests/cxx/hybrid/recursive/output | 1 | ||||
-rw-r--r-- | tests/cxx/hybrid/recursive/test.xml | 25 | ||||
-rw-r--r-- | tests/cxx/hybrid/recursive/test.xsd | 115 |
6 files changed, 296 insertions, 1 deletions
diff --git a/tests/cxx/hybrid/makefile b/tests/cxx/hybrid/makefile index 84fed4c..2ea9a3d 100644 --- a/tests/cxx/hybrid/makefile +++ b/tests/cxx/hybrid/makefile @@ -8,7 +8,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make tests := sequences ifeq ($(xsde_iostream),y) -tests += built-in list test-template union +tests += built-in list recursive test-template union ifeq ($(xsde_cdr),y) tests += binary/cdr diff --git a/tests/cxx/hybrid/recursive/driver.cxx b/tests/cxx/hybrid/recursive/driver.cxx new file mode 100644 index 0000000..d3ce1c3 --- /dev/null +++ b/tests/cxx/hybrid/recursive/driver.cxx @@ -0,0 +1,56 @@ +// file : tests/cxx/hybrid/recursive/driver.cxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2006-2009 Code Synthesis Tools CC +// license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +// Test recursive parsing and serialization. +// + +#include <iostream> + +#include "test.hxx" +#include "test-pimpl.hxx" +#include "test-simpl.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; + } + + // Parse. + // + root_paggr root_p; + + xml_schema::document_pimpl doc_p ( + root_p.root_parser (), + root_p.root_namespace (), + root_p.root_name ()); + + root_p.pre (); + doc_p.parse (argv[1]); + type* r = root_p.post (); + + // Serialize. + // + root_saggr root_s; + + xml_schema::document_simpl doc_s ( + root_s.root_serializer (), + root_s.root_namespace (), + root_s.root_name ()); + + doc_s.add_prefix ("t", "test"); + + root_s.pre (*r); + doc_s.serialize (cout); + root_s.post (); + + delete r; +} diff --git a/tests/cxx/hybrid/recursive/makefile b/tests/cxx/hybrid/recursive/makefile new file mode 100644 index 0000000..7c65294 --- /dev/null +++ b/tests/cxx/hybrid/recursive/makefile @@ -0,0 +1,98 @@ +# file : tests/cxx/hybrid/recursive/makefile +# author : Boris Kolpackov <boris@codesynthesis.com> +# copyright : Copyright (c) 2006-2009 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=.o) \ +$(xsd:.xsd=-pskel.o) \ +$(xsd:.xsd=-pimpl.o) \ +$(xsd:.xsd=-sskel.o) \ +$(xsd:.xsd=-simpl.o)) + +dep := $(obj:.o=.o.d) + +xsde.l := $(out_root)/libxsde/xsde/xsde.l +xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options + +driver := $(out_base)/driver +test := $(out_base)/.test +clean := $(out_base)/.clean + + +# Build. +# +$(driver): $(obj) $(xsde.l) + +$(obj) $(dep): $(xsde.l.cpp-options) + +genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.cxx) \ + $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.cxx) \ + $(xsd:.xsd=-pimpl.hxx) $(xsd:.xsd=-pimpl.cxx) \ + $(xsd:.xsd=-sskel.hxx) $(xsd:.xsd=-sskel.cxx) \ + $(xsd:.xsd=-simpl.hxx) $(xsd:.xsd=-simpl.cxx) + +gen := $(addprefix $(out_base)/,$(genf)) + +$(gen): $(out_root)/xsde/xsde +$(gen): xsde := $(out_root)/xsde/xsde +$(gen): xsde_options += --generate-parser --generate-serializer \ +--generate-aggregate + +$(call include-dep,$(dep)) + +# Convenience alias for default target. +# +.PHONY: $(out_base)/ +$(out_base)/: $(driver) + + +# Test. +# +.PHONY: $(test) + +$(test): driver := $(driver) +$(test): $(driver) $(src_base)/test.xml $(src_base)/output + $(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output -,$(driver)) + +# Clean. +# +.PHONY: $(clean) + +$(clean): $(driver).o.clean \ + $(addsuffix .cxx.clean,$(obj)) \ + $(addsuffix .cxx.clean,$(dep)) \ + $(addprefix $(out_base)/,$(xsd:.xsd=.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,$(scf_root)/xsde/hybrid/xsd-cxx.make) + + +# Dependencies. +# +$(call import,$(src_root)/xsde/makefile) +$(call import,$(src_root)/libxsde/xsde/makefile) diff --git a/tests/cxx/hybrid/recursive/output b/tests/cxx/hybrid/recursive/output new file mode 100644 index 0000000..6b89789 --- /dev/null +++ b/tests/cxx/hybrid/recursive/output @@ -0,0 +1 @@ +<t:root xmlns:t="test"><test1><a>123</a></test1><test1><b><a>123</a></b></test1><test1><b><b><a>123</a></b></b></test1><test2></test2><test2><b><d><x>123</x></d></b></test2><test2><b><c></c><d><x>123</x></d></b></test2><test2><b><c><a></a></c><d><x>123</x></d></b></test2><test2><b><c><a><b><c><a></a></c><d><x>123</x></d></b></a></c><d><x>123</x></d></b></test2><test3><a>123</a><b>abc</b><c>a1</c></test3><test3><a>123</a><b>abc</b><c>a1</c><d><a>456</a><b>def</b><c>b2</c></d></test3><test3><a>123</a><b>abc</b><c>a1</c><d><a>456</a><b>def</b><c>b2</c><d><a>789</a><b>ghi</b><c>c3</c></d></d></test3><test4><a>123</a><c>abc</c></test4><test4><b><a>123</a></b><c>abc</c></test4><test4><b><b><a>123</a></b></b><c>abc</c></test4><test5><a>123</a><c>abc</c></test5><test5><b><a>123</a><c>abc</c></b><c>def</c></test5><test5><b><b><a>123</a><c>abc</c></b><c>def</c></b><c>ghi</c></test5></t:root>
\ No newline at end of file diff --git a/tests/cxx/hybrid/recursive/test.xml b/tests/cxx/hybrid/recursive/test.xml new file mode 100644 index 0000000..4db2950 --- /dev/null +++ b/tests/cxx/hybrid/recursive/test.xml @@ -0,0 +1,25 @@ +<t:root xmlns:t="test"> + + <test1><a>123</a></test1> + <test1><b><a>123</a></b></test1> + <test1><b><b><a>123</a></b></b></test1> + + <test2></test2> + <test2><b><d><x>123</x></d></b></test2> + <test2><b><c></c><d><x>123</x></d></b></test2> + <test2><b><c><a></a></c><d><x>123</x></d></b></test2> + <test2><b><c><a><b><c><a></a></c><d><x>123</x></d></b></a></c><d><x>123</x></d></b></test2> + + <test3><a>123</a><b>abc</b><c>a1</c></test3> + <test3><a>123</a><b>abc</b><c>a1</c><d><a>456</a><b>def</b><c>b2</c></d></test3> + <test3><a>123</a><b>abc</b><c>a1</c><d><a>456</a><b>def</b><c>b2</c><d><a>789</a><b>ghi</b><c>c3</c></d></d></test3> + + <test4><a>123</a><c>abc</c></test4> + <test4><b><a>123</a></b><c>abc</c></test4> + <test4><b><b><a>123</a></b></b><c>abc</c></test4> + + <test5><a>123</a><c>abc</c></test5> + <test5><b><a>123</a><c>abc</c></b><c>def</c></test5> + <test5><b><b><a>123</a><c>abc</c></b><c>def</c></b><c>ghi</c></test5> + +</t:root> diff --git a/tests/cxx/hybrid/recursive/test.xsd b/tests/cxx/hybrid/recursive/test.xsd new file mode 100644 index 0000000..578bf8f --- /dev/null +++ b/tests/cxx/hybrid/recursive/test.xsd @@ -0,0 +1,115 @@ +<?xml version="1.0"?> +<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test"> + + <element name="root" type="t:type"/> + + <complexType name="type"> + <sequence> + <element name="test1" type="t:test1" maxOccurs="unbounded"/> + <element name="test2" type="t:test2a" maxOccurs="unbounded"/> + <element name="test3" type="t:test3b" maxOccurs="unbounded"/> + <element name="test4" type="t:test4b" maxOccurs="unbounded"/> + <element name="test5" type="t:test5b" maxOccurs="unbounded"/> + </sequence> + </complexType> + + + <!-- test 1: single type recursion --> + + <complexType name="test1"> + <choice> + <element name="a" type="int"/> + <element name="b" type="t:test1"/> + </choice> + </complexType> + + + <!-- test 2: muti-type recursion --> + + <complexType name="test2a"> + <sequence> + <element name="b" type="t:test2b" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="test2b"> + <sequence> + <element name="c" type="t:test2c" minOccurs="0" maxOccurs="unbounded"/> + <element name="d" type="t:test2d"/> + </sequence> + </complexType> + + <complexType name="test2c"> + <sequence> + <element name="a" type="t:test2a" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="test2d"> + <sequence> + <element name="x" type="int"/> + </sequence> + </complexType> + + + <!-- test 3: single type recursion with a non-recursive base --> + + <complexType name="test3a"> + <sequence> + <element name="a" type="int"/> + <element name="b" type="string"/> + </sequence> + </complexType> + + <complexType name="test3b"> + <complexContent> + <extension base="t:test3a"> + <sequence> + <element name="c" type="string"/> + <element name="d" type="t:test3b" minOccurs="0"/> + </sequence> + </extension> + </complexContent> + </complexType> + + + <!-- test 4: single type recursion with a non-recursive derived --> + + <complexType name="test4a"> + <choice> + <element name="a" type="int"/> + <element name="b" type="t:test4a"/> + </choice> + </complexType> + + <complexType name="test4b"> + <complexContent> + <extension base="t:test4a"> + <sequence> + <element name="c" type="string"/> + </sequence> + </extension> + </complexContent> + </complexType> + + + <!-- test 5: recursion via derivation --> + + <complexType name="test5a"> + <choice> + <element name="a" type="int"/> + <element name="b" type="t:test5b"/> + </choice> + </complexType> + + <complexType name="test5b"> + <complexContent> + <extension base="t:test5a"> + <sequence> + <element name="c" type="string"/> + </sequence> + </extension> + </complexContent> + </complexType> + +</schema> |