From af83df9be50a9383d0c54fb24b8e486a658a2a02 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 14 Dec 2009 17:32:14 +0200
Subject: New default/fixed value initialization code

Now the default/fixed values are parsed by the compiler at compile time
instead of the standard parsing code at runtime.
---
 tests/cxx/tree/default/driver.cxx         |  48 -------
 tests/cxx/tree/default/general/driver.cxx |  39 +++++
 tests/cxx/tree/default/general/makefile   |  83 +++++++++++
 tests/cxx/tree/default/general/output     |  28 ++++
 tests/cxx/tree/default/general/test.xml   |  16 +++
 tests/cxx/tree/default/general/test.xsd   | 231 ++++++++++++++++++++++++++++++
 tests/cxx/tree/default/makefile           |  81 ++---------
 tests/cxx/tree/default/omit/driver.cxx    |  48 +++++++
 tests/cxx/tree/default/omit/makefile      |  83 +++++++++++
 tests/cxx/tree/default/omit/output        |  21 +++
 tests/cxx/tree/default/omit/test.xml      |   9 ++
 tests/cxx/tree/default/omit/test.xsd      |  30 ++++
 tests/cxx/tree/default/output             |  26 ----
 tests/cxx/tree/default/test.xml           |  11 --
 tests/cxx/tree/default/test.xsd           |  39 -----
 15 files changed, 596 insertions(+), 197 deletions(-)
 delete mode 100644 tests/cxx/tree/default/driver.cxx
 create mode 100644 tests/cxx/tree/default/general/driver.cxx
 create mode 100644 tests/cxx/tree/default/general/makefile
 create mode 100644 tests/cxx/tree/default/general/output
 create mode 100644 tests/cxx/tree/default/general/test.xml
 create mode 100644 tests/cxx/tree/default/general/test.xsd
 create mode 100644 tests/cxx/tree/default/omit/driver.cxx
 create mode 100644 tests/cxx/tree/default/omit/makefile
 create mode 100644 tests/cxx/tree/default/omit/output
 create mode 100644 tests/cxx/tree/default/omit/test.xml
 create mode 100644 tests/cxx/tree/default/omit/test.xsd
 delete mode 100644 tests/cxx/tree/default/output
 delete mode 100644 tests/cxx/tree/default/test.xml
 delete mode 100644 tests/cxx/tree/default/test.xsd

(limited to 'tests/cxx')

diff --git a/tests/cxx/tree/default/driver.cxx b/tests/cxx/tree/default/driver.cxx
deleted file mode 100644
index 3c71222..0000000
--- a/tests/cxx/tree/default/driver.cxx
+++ /dev/null
@@ -1,48 +0,0 @@
-// file      : tests/cxx/tree/default/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 default attribute/element values.
-//
-
-#include <memory> // std::auto_ptr
-#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
-  {
-    auto_ptr<type> r (root (argv[1], xml_schema::flags::dont_validate));
-
-    cout << *r << endl
-         << "default x: " << derived::x_default_value () << endl
-         << "default y: " << derived::y_default_value () << endl
-	 << "fixed p: " << derived::p_default_value () << endl
-	 << "fixed q1: " << derived::q1_default_value () << endl
-	 << "fixed q2: " << derived::q2_default_value () << endl;
-
-    // Serialize.
-    //
-    xml_schema::namespace_infomap map;
-    map["t"].name = "test";
-    root (cout, *r, map);
-  }
-  catch (xml_schema::exception const& e)
-  {
-    cerr << e << endl;
-    return 1;
-  }
-}
diff --git a/tests/cxx/tree/default/general/driver.cxx b/tests/cxx/tree/default/general/driver.cxx
new file mode 100644
index 0000000..e588a6b
--- /dev/null
+++ b/tests/cxx/tree/default/general/driver.cxx
@@ -0,0 +1,39 @@
+// file      : tests/cxx/tree/default/general/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 default attribute/element values.
+//
+
+#include <memory> // std::auto_ptr
+#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
+  {
+    auto_ptr<type> r (root (argv[1], xml_schema::flags::dont_validate));
+
+    xml_schema::namespace_infomap map;
+    map["t"].name = "test";
+    root (cout, *r, map);
+  }
+  catch (xml_schema::exception const& e)
+  {
+    cerr << e << endl;
+    return 1;
+  }
+}
diff --git a/tests/cxx/tree/default/general/makefile b/tests/cxx/tree/default/general/makefile
new file mode 100644
index 0000000..78dd1c4
--- /dev/null
+++ b/tests/cxx/tree/default/general/makefile
@@ -0,0 +1,83 @@
+# file      : tests/cxx/tree/default/general/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))
+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$(src_root)/libxsd
+$(obj) $(dep): $(xerces_c.l.cpp-options)
+
+genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
+
+$(gen): xsd := $(out_root)/xsd/xsd
+$(gen): xsd_options := --generate-ostream --generate-serialization \
+--generate-default-ctor --generate-from-base-ctor
+$(gen): $(out_root)/xsd/xsd
+
+$(call include-dep,$(dep))
+
+# 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=.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)/xsd/tree/xsd-cxx.make)
+
+
+# Dependencies.
+#
+$(call import,$(src_root)/xsd/makefile)
diff --git a/tests/cxx/tree/default/general/output b/tests/cxx/tree/default/general/output
new file mode 100644
index 0000000..89b4bb3
--- /dev/null
+++ b/tests/cxx/tree/default/general/output
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<t:root xmlns:t="test" bool1="true" bool2="true" bool3="false" bool4="false" byte="-99" decimal1="1.12345" decimal2="-0.456" double1="1.12345" double2="1123.45" double3="-0.00012345" double4="NaN" double5="-INF" fix1="123" fix2="123" fix3="abc" fix4="abc" fix5="aaa bbb ccc" fix6="aaa bbb ccc" float1="1.123" float2="1123" float3="-0.000123" float4="NaN" float5="-INF" id="this" idref="this" idrefs="this" int="-99999" integer="-99999" language="en-us" long="-99999" ncname="abcd" ninteger="-99999" nmtoken="ab:cd" nmtokens1="a:b efg aaa" nmtokens2="abc" nninteger="99999" npinteger="-99999" nstring=" a  b " pinteger="99999" qname1="foo" qname2="t:bar" short="-999" string1="" string2=" a  b " token="a b" ubyte="99" uint="99999" ulong="99999" uri="http://example.com" ushort="999">
+
+  <union a="abc"/>
+
+  <list a="123 345 678" b="ab cd ef" c="abc" d="abc def"/>
+
+  <simple a="123" b="abc" c="123" d="abc" e="abc" f="abc 123"/>
+
+  <date a="2009-03-31" b="2009-03-31Z" c="2009-03-31Z" d="2009-03-31Z" e="2009-03-31+12:30" f="2009-03-31-12:30" g="2002009-03-31-12:30"/>
+
+  <time a="12:03:45" b="12:03:45.123Z" c="12:03:05.123Z" d="12:03:45.123Z" e="12:03:45.123+12:30" f="12:03:45-12:30"/>
+
+  <date-time a="2009-03-31T12:03:45" b="2009-03-31T12:03:45.123Z" c="2002009-03-31T12:03:05.123-12:30"/>
+
+  <duration a="P100Y" b="P100M" c="P100D" d="PT12H" e="PT12M" f="PT12.123S" g="-P100Y10M20DT12H12M1.123S"/>
+
+  <day a="---02" b="---22Z" c="---22-12:30"/>
+
+  <month a="--02" b="--12Z" c="--12+12:30"/>
+
+  <year a="2009" b="-2002009Z" c="2009-12:30"/>
+
+  <month-day a="--02-02" b="--12-22Z" c="--12-22+12:30"/>
+
+  <year-month a="2009-02" b="-2002009-12Z" c="2009-12-12:30"/>
+
+</t:root>
diff --git a/tests/cxx/tree/default/general/test.xml b/tests/cxx/tree/default/general/test.xml
new file mode 100644
index 0000000..11bd0a7
--- /dev/null
+++ b/tests/cxx/tree/default/general/test.xml
@@ -0,0 +1,16 @@
+<t:root xmlns:t="test" id="this" fix2="123" fix4="abc" fix6="aaa bbb ccc">
+
+  <union/>
+  <list/>
+  <simple/>
+  <date/>
+  <time/>
+  <date-time/>
+  <duration/>
+  <day/>
+  <month/>
+  <year/>
+  <month-day/>
+  <year-month/>
+
+</t:root>
diff --git a/tests/cxx/tree/default/general/test.xsd b/tests/cxx/tree/default/general/test.xsd
new file mode 100644
index 0000000..e9a3bcb
--- /dev/null
+++ b/tests/cxx/tree/default/general/test.xsd
@@ -0,0 +1,231 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
+
+  <!-- union -->
+
+  <simpleType name="union">
+    <union memberTypes="int string"/>
+  </simpleType>
+
+  <complexType name="union-test">
+    <attribute default="abc" name="a" type="t:union"/>
+  </complexType>
+
+  <!-- list -->
+
+  <simpleType name="fix-list">
+    <list itemType="int"/>
+  </simpleType>
+
+  <simpleType name="var-list">
+    <list itemType="string"/>
+  </simpleType>
+
+  <simpleType name="list-item">
+    <restriction base="string"/>
+  </simpleType>
+
+  <simpleType name="usr-list">
+    <list itemType="t:list-item"/>
+  </simpleType>
+
+  <simpleType name="union-list">
+    <list itemType="t:union"/>
+  </simpleType>
+
+  <complexType name="list-test">
+    <attribute default="123 345 678" name="a" type="t:fix-list"/>
+    <attribute default=" ab   cd ef   " name="b" type="t:var-list"/>
+    <attribute default="abc" name="c" type="t:usr-list"/>
+    <attribute default="abc def" name="d" type="t:union-list"/>
+  </complexType>
+
+  <!-- simple type -->
+
+  <simpleType name="int-base">
+    <restriction base="int"/>
+  </simpleType>
+
+  <simpleType name="str-base">
+    <restriction base="string"/>
+  </simpleType>
+
+  <simpleType name="int">
+    <restriction base="t:int-base"/>
+  </simpleType>
+
+  <simpleType name="str">
+    <restriction base="t:str-base"/>
+  </simpleType>
+
+  <simpleType name="union-derived">
+    <restriction base="t:union"/>
+  </simpleType>
+
+  <simpleType name="list-derived">
+    <restriction base="t:usr-list"/>
+  </simpleType>
+
+  <complexType name="simple-test">
+    <attribute default="123" name="a" type="t:int-base"/>
+    <attribute default="abc" name="b" type="t:str-base"/>
+    <attribute default="123" name="c" type="t:int"/>
+    <attribute default="abc" name="d" type="t:str"/>
+    <attribute default="abc" name="e" type="t:union-derived"/>
+    <attribute default="abc 123" name="f" type="t:list-derived"/>
+  </complexType>
+
+  <!-- date/time types -->
+
+  <complexType name="date-test">
+    <attribute default="2009-03-31" name="a" type="date"/>
+    <attribute default="2009-03-31Z" name="b" type="date"/>
+    <attribute default="2009-03-31+00:00" name="c" type="date"/>
+    <attribute default="2009-03-31-00:00" name="d" type="date"/>
+    <attribute default="2009-03-31+12:30" name="e" type="date"/>
+    <attribute default="2009-03-31-12:30" name="f" type="date"/>
+    <attribute default="2002009-03-31-12:30" name="g" type="date"/>
+  </complexType>
+
+  <complexType name="time-test">
+    <attribute default="12:03:45" name="a" type="time"/>
+    <attribute default="12:03:45.123Z" name="b" type="time"/>
+    <attribute default="12:03:05.123+00:00" name="c" type="time"/>
+    <attribute default="12:03:45.123-00:00" name="d" type="time"/>
+    <attribute default="12:03:45.123+12:30" name="e" type="time"/>
+    <attribute default="12:03:45-12:30" name="f" type="time"/>
+  </complexType>
+
+  <complexType name="date-time-test">
+    <attribute default="2009-03-31T12:03:45" name="a" type="dateTime"/>
+    <attribute default="2009-03-31T12:03:45.123Z" name="b" type="dateTime"/>
+    <attribute default="2002009-03-31T12:03:05.123-12:30" name="c" type="dateTime"/>
+  </complexType>
+
+  <complexType name="duration-test">
+    <attribute default="P100Y" name="a" type="duration"/>
+    <attribute default="P100M" name="b" type="duration"/>
+    <attribute default="P100D" name="c" type="duration"/>
+    <attribute default="PT12H" name="d" type="duration"/>
+    <attribute default="PT12M" name="e" type="duration"/>
+    <attribute default="PT12.123S" name="f" type="duration"/>
+    <attribute default="-P100Y10M20DT12H12M1.123S" name="g" type="duration"/>
+  </complexType>
+
+  <complexType name="day-test">
+    <attribute default="---02" name="a" type="gDay"/>
+    <attribute default="---22Z" name="b" type="gDay"/>
+    <attribute default="---22-12:30" name="c" type="gDay"/>
+  </complexType>
+
+  <complexType name="month-test">
+    <attribute default="--02" name="a" type="gMonth"/>
+    <attribute default="--12Z" name="b" type="gMonth"/>
+    <attribute default="--12+12:30" name="c" type="gMonth"/>
+  </complexType>
+
+  <complexType name="year-test">
+    <attribute default="2009" name="a" type="gYear"/>
+    <attribute default="-2002009Z" name="b" type="gYear"/>
+    <attribute default="2009-12:30" name="c" type="gYear"/>
+  </complexType>
+
+  <complexType name="month-day-test">
+    <attribute default="--02-02" name="a" type="gMonthDay"/>
+    <attribute default="--12-22Z" name="b" type="gMonthDay"/>
+    <attribute default="--12-22+12:30" name="c" type="gMonthDay"/>
+  </complexType>
+
+  <complexType name="year-month-test">
+    <attribute default="2009-02" name="a" type="gYearMonth"/>
+    <attribute default="-2002009-12Z" name="b" type="gYearMonth"/>
+    <attribute default="2009-12-12:30" name="c" type="gYearMonth"/>
+  </complexType>
+
+
+  <complexType name="type">
+    <sequence>
+      <element name="union" type="t:union-test"/>
+      <element name="list" type="t:list-test"/>
+      <element name="simple" type="t:simple-test"/>
+      <element name="date" type="t:date-test"/>
+      <element name="time" type="t:time-test"/>
+      <element name="date-time" type="t:date-time-test"/>
+      <element name="duration" type="t:duration-test"/>
+      <element name="day" type="t:day-test"/>
+      <element name="month" type="t:month-test"/>
+      <element name="year" type="t:year-test"/>
+      <element name="month-day" type="t:month-day-test"/>
+      <element name="year-month" type="t:year-month-test"/>
+    </sequence>
+
+<!--
+      <attribute name="any" type="anySimpleType" default=""/>
+-->
+
+      <attribute name="bool1" type="boolean" default="true"/>
+      <attribute name="bool2" type="boolean" default="1"/>
+      <attribute name="bool3" type="boolean" default="false"/>
+      <attribute name="bool4" type="boolean" default="0"/>
+
+      <attribute name="byte" type="byte" default="-99"/>
+      <attribute name="ubyte" type="unsignedByte" default="99"/>
+      <attribute name="short" type="short" default="-999"/>
+      <attribute name="ushort" type="unsignedShort" default="999"/>
+      <attribute name="int" type="int" default="-99999"/>
+      <attribute name="uint" type="unsignedInt" default="99999"/>
+      <attribute name="long" type="long" default="-99999"/>
+      <attribute name="ulong" type="unsignedLong" default="99999"/>
+
+      <attribute name="integer" type="integer" default="-99999"/>
+      <attribute name="npinteger" type="nonPositiveInteger" default="-99999"/>
+      <attribute name="nninteger" type="nonNegativeInteger" default="99999"/>
+      <attribute name="pinteger" type="positiveInteger" default="99999"/>
+      <attribute name="ninteger" type="negativeInteger" default="-99999"/>
+
+      <attribute name="float1" type="float" default="1.123"/>
+      <attribute name="float2" type="float" default="1.123e3"/>
+      <attribute name="float3" type="float" default="-.123E-3"/>
+      <attribute name="float4" type="float" default="NaN"/>
+      <attribute name="float5" type="float" default="-INF"/>
+
+      <attribute name="double1" type="double" default="1.12345"/>
+      <attribute name="double2" type="double" default="1.12345e3"/>
+      <attribute name="double3" type="double" default="-.12345E-3"/>
+      <attribute name="double4" type="double" default="NaN"/>
+      <attribute name="double5" type="double" default="-INF"/>
+
+      <attribute name="decimal1" type="decimal" default="1.12345"/>
+      <attribute name="decimal2" type="decimal" default="-.456"/>
+
+      <attribute name="string1" type="string" default=""/>
+      <attribute name="string2" type="string" default=" a  b "/>
+      <attribute name="nstring" type="normalizedString" default=" a  b "/>
+      <attribute name="token" type="token" default=" a  b "/>
+      <attribute name="nmtoken" type="NMTOKEN" default="ab:cd"/>
+      <attribute name="nmtokens1" type="NMTOKENS" default="  a:b  efg aaa  "/>
+      <attribute name="nmtokens2" type="NMTOKENS" default="abc"/>
+      <attribute name="ncname" type="NCName" default="  abcd  "/>
+      <attribute name="language" type="language" default=" en-us "/>
+      <attribute name="id" type="ID"/>
+      <attribute name="idref" type="IDREF" default="this"/>
+      <attribute name="idrefs" type="IDREFS" default=" this "/>
+      <attribute name="uri" type="anyURI" default=" http://example.com "/>
+
+      <attribute name="qname1" type="QName" default="foo"/>
+      <attribute name="qname2" type="QName" default="t:bar"/>
+
+      <!-- fixed -->
+
+      <attribute name="fix1" type="int" fixed="123"/>
+      <attribute name="fix2" type="int" fixed="123" use="required"/>
+      <attribute name="fix3" type="string" fixed="abc"/>
+      <attribute name="fix4" type="string" fixed="abc" use="required"/>
+      <attribute name="fix5" type="NMTOKENS" fixed="aaa bbb ccc"/>
+      <attribute name="fix6" type="NMTOKENS" fixed="aaa bbb ccc" use="required"/>
+
+  </complexType>
+
+  <element name="root" type="t:type"/>
+
+</schema>
diff --git a/tests/cxx/tree/default/makefile b/tests/cxx/tree/default/makefile
index 431e708..a1055f9 100644
--- a/tests/cxx/tree/default/makefile
+++ b/tests/cxx/tree/default/makefile
@@ -5,79 +5,14 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
 
-xsd := test.xsd
-cxx := driver.cxx
+tests := general omit
 
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o))
-dep := $(obj:.o=.o.d)
+default   := $(out_base)/
+test      := $(out_base)/.test
+clean     := $(out_base)/.clean
 
-driver := $(out_base)/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
+$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests)))
+$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests)))
+$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests)))
 
-
-# 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$(src_root)/libxsd
-$(obj) $(dep): $(xerces_c.l.cpp-options)
-
-genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
-gen  := $(addprefix $(out_base)/,$(genf))
-
-$(gen): xsd := $(out_root)/xsd/xsd
-$(gen): xsd_options := --generate-ostream --generate-serialization \
---generate-default-ctor --generate-from-base-ctor --omit-default-attributes
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep))
-
-# 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=.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)/xsd/tree/xsd-cxx.make)
-
-
-# Dependencies.
-#
-$(call import,$(src_root)/xsd/makefile)
+$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
diff --git a/tests/cxx/tree/default/omit/driver.cxx b/tests/cxx/tree/default/omit/driver.cxx
new file mode 100644
index 0000000..e7c52f2
--- /dev/null
+++ b/tests/cxx/tree/default/omit/driver.cxx
@@ -0,0 +1,48 @@
+// file      : tests/cxx/tree/default/omit/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 default attribute omission from the output.
+//
+
+#include <memory> // std::auto_ptr
+#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
+  {
+    auto_ptr<type> r (root (argv[1], xml_schema::flags::dont_validate));
+
+    cout << *r << endl
+         << "default x: " << derived::x_default_value () << endl
+         << "default y: " << derived::y_default_value () << endl
+	 << "fixed p: " << derived::p_default_value () << endl
+	 << "fixed q1: " << derived::q1_default_value () << endl
+	 << "fixed q2: " << derived::q2_default_value () << endl;
+
+    // Serialize.
+    //
+    xml_schema::namespace_infomap map;
+    map["t"].name = "test";
+    root (cout, *r, map);
+  }
+  catch (xml_schema::exception const& e)
+  {
+    cerr << e << endl;
+    return 1;
+  }
+}
diff --git a/tests/cxx/tree/default/omit/makefile b/tests/cxx/tree/default/omit/makefile
new file mode 100644
index 0000000..8a78c51
--- /dev/null
+++ b/tests/cxx/tree/default/omit/makefile
@@ -0,0 +1,83 @@
+# file      : tests/cxx/tree/default/omit/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))
+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$(src_root)/libxsd
+$(obj) $(dep): $(xerces_c.l.cpp-options)
+
+genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
+
+$(gen): xsd := $(out_root)/xsd/xsd
+$(gen): xsd_options := --generate-ostream --generate-serialization \
+--generate-default-ctor --generate-from-base-ctor --omit-default-attributes
+$(gen): $(out_root)/xsd/xsd
+
+$(call include-dep,$(dep))
+
+# 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=.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)/xsd/tree/xsd-cxx.make)
+
+
+# Dependencies.
+#
+$(call import,$(src_root)/xsd/makefile)
diff --git a/tests/cxx/tree/default/omit/output b/tests/cxx/tree/default/omit/output
new file mode 100644
index 0000000..eef99a3
--- /dev/null
+++ b/tests/cxx/tree/default/omit/output
@@ -0,0 +1,21 @@
+
+derived: 
+a: a
+x: foo
+q1: 1
+y: -20
+p: bar
+q2: 2
+default x: foo
+default y: -20
+fixed p: bar
+fixed q1: 1
+fixed q2: 2
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<t:root xmlns:t="test">
+
+  <derived q1="1" q2="2">
+    <a>a</a>
+  </derived>
+
+</t:root>
diff --git a/tests/cxx/tree/default/omit/test.xml b/tests/cxx/tree/default/omit/test.xml
new file mode 100644
index 0000000..dec39b4
--- /dev/null
+++ b/tests/cxx/tree/default/omit/test.xml
@@ -0,0 +1,9 @@
+<t:root xmlns:t="test"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="test test.xsd">
+
+  <derived q1="1" q2="2">
+    <a>a</a>
+  </derived>
+
+</t:root>
diff --git a/tests/cxx/tree/default/omit/test.xsd b/tests/cxx/tree/default/omit/test.xsd
new file mode 100644
index 0000000..bfc68d4
--- /dev/null
+++ b/tests/cxx/tree/default/omit/test.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
+
+  <complexType name="base">
+    <sequence>
+      <element name="a" type="string"/>
+    </sequence>
+    <attribute name="x" type="string" default="foo"/>
+    <attribute name="q1" type="int" fixed="1" use="required"/>
+  </complexType>
+
+  <complexType name="derived">
+    <complexContent>
+      <extension base="t:base">
+        <attribute name="y" type="int" default="-20"/>
+        <attribute name="p" type="string" fixed="bar"/>
+        <attribute name="q2" type="int" fixed="2" use="required"/>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <complexType name="type">
+    <sequence>
+      <element name="derived" type="t:derived"/>
+    </sequence>
+  </complexType>
+
+  <element name="root" type="t:type"/>
+
+</schema>
diff --git a/tests/cxx/tree/default/output b/tests/cxx/tree/default/output
deleted file mode 100644
index 1259952..0000000
--- a/tests/cxx/tree/default/output
+++ /dev/null
@@ -1,26 +0,0 @@
-
-derived: 
-a: a
-x: foo
-q1: 1
-y: -20
-p: bar
-q2: 2
-qname: 
-x: x
-y: y
-default x: foo
-default y: -20
-fixed p: bar
-fixed q1: 1
-fixed q2: 2
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<t:root xmlns:t="test">
-
-  <derived q1="1" q2="2">
-    <a>a</a>
-  </derived>
-
-  <qname x="x" y="y"/>
-
-</t:root>
diff --git a/tests/cxx/tree/default/test.xml b/tests/cxx/tree/default/test.xml
deleted file mode 100644
index d568ac9..0000000
--- a/tests/cxx/tree/default/test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<t:root xmlns:t="test"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="test test.xsd">
-
-  <derived q1="1" q2="2">
-    <a>a</a>
-  </derived>
-
-  <qname y="y"><!--a></a--></qname>
-
-</t:root>
diff --git a/tests/cxx/tree/default/test.xsd b/tests/cxx/tree/default/test.xsd
deleted file mode 100644
index aa9ac66..0000000
--- a/tests/cxx/tree/default/test.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
-  <complexType name="base">
-    <sequence>
-      <element name="a" type="string"/>
-    </sequence>
-    <attribute name="x" type="string" default="foo"/>
-    <attribute name="q1" type="int" fixed="1" use="required"/>
-  </complexType>
-
-  <complexType name="derived">
-    <complexContent>
-      <extension base="t:base">
-        <attribute name="y" type="int" default="-20"/>
-        <attribute name="p" type="string" fixed="bar"/>
-	<attribute name="q2" type="int" fixed="2" use="required"/>
-      </extension>
-    </complexContent>
-  </complexType>
-
-  <complexType name="qname">
-    <sequence>
-      <!--element name="a" type="QName" default="a"/-->
-    </sequence>
-    <attribute name="x" type="QName" default="x"/>
-    <attribute name="y" type="QName" fixed="y" use="required"/>
-  </complexType>
-
-  <complexType name="type">
-    <sequence>
-      <element name="derived" type="t:derived"/>
-      <element name="qname" type="t:qname"/>
-    </sequence>
-  </complexType>
-
-  <element name="root" type="t:type"/>
-
-</schema>
-- 
cgit v1.1