3 files changed, 280 insertions, 0 deletions
diff --git a/xsd/tests/cxx/tree/naming/knr/driver.cxx b/xsd/tests/cxx/tree/naming/knr/driver.cxx
new file mode 100644
index 0000000..5038d7b
--- /dev/null
+++ b/xsd/tests/cxx/tree/naming/knr/driver.cxx
@@ -0,0 +1,155 @@
+// file      : tests/cxx/tree/naming/knr/driver.cxx
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
+// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+// Test K&R naming style.
+//
+
+#include <sstream>
+#include <iostream>
+
+#include <xercesc/util/PlatformUtils.hpp>
+
+#include "test.hxx"
+
+using namespace std;
+using namespace test;
+
+int
+main ()
+{
+  xercesc::XMLPlatformUtils::Initialize ();
+
+  try
+  {
+    // Enum 'value' type.
+    //
+    {
+      gender::value v;
+      v = gender::female;
+      XSD_UNUSED (v);
+    }
+
+    // Anonymous type.
+    //
+    {
+      foo f ("a", "b");
+
+      if (f.a () != "a" || f.b () != "b")
+        return 1;
+    }
+
+    // Type name and accessors/modifiers.
+    //
+    {
+      type t ("bar");
+
+      // foo
+      //
+      {
+        type::foo_type* p = 0;
+        XSD_UNUSED (p);
+
+        type::foo_optional o;
+
+        if (t.foo ().present ())
+          return 1;
+
+        t.foo (o);
+      }
+
+      // bar
+      //
+      {
+        type::bar_type* p = 0;
+        XSD_UNUSED (p);
+
+        if (t.bar () != "bar")
+          return 1;
+
+        t.bar ("barbar");
+      }
+
+      // baz
+      //
+      {
+        type::baz_type* p = 0;
+        XSD_UNUSED (p);
+
+        type::baz_sequence s;
+        type::baz_iterator i (s.begin ());
+        type::baz_const_iterator ci (s.begin ());
+        XSD_UNUSED (i);
+        XSD_UNUSED (ci);
+
+        if (t.baz () != s)
+          return 1;
+
+        t.baz (s);
+      }
+
+      // any
+      //
+      {
+        type::any_sequence s (t.dom_document ());
+        type::any_iterator i (s.begin ());
+        type::any_const_iterator ci (s.begin ());
+        XSD_UNUSED (i);
+        XSD_UNUSED (ci);
+
+        if (t.any () != s)
+          return 1;
+
+        t.any (s);
+      }
+
+      // foo
+      //
+      {
+        type::fox_type x = type::fox_default_value ();
+
+        if (t.fox () != x)
+          return 1;
+
+        t.fox ("fox");
+      }
+
+      // any_attribute
+      //
+      {
+        type::any_attribute_set s (t.dom_document ());
+        type::any_attribute_iterator i (s.begin ());
+        type::any_attribute_const_iterator ci (s.begin ());
+        XSD_UNUSED (i);
+        XSD_UNUSED (ci);
+
+        if (t.any_attribute () != s)
+          return 1;
+
+        t.any_attribute (s);
+      }
+    }
+
+    // Parsing/serialization functions.
+    //
+    {
+      istringstream is ("<t:root xmlns:t='test'>foo</t:root>");
+      root (is, xml_schema::flags::dont_validate);
+    }
+
+    {
+      ostringstream os;
+      xml_schema::namespace_infomap m;
+      m["t"].name = "test";
+
+      root (os, "foo", m);
+    }
+  }
+  catch (xml_schema::exception const& e)
+  {
+    cerr << e << endl;
+    return 1;
+  }
+
+  xercesc::XMLPlatformUtils::Terminate ();
+}
diff --git a/xsd/tests/cxx/tree/naming/knr/makefile b/xsd/tests/cxx/tree/naming/knr/makefile
new file mode 100644
index 0000000..d8ecbab
--- /dev/null
+++ b/xsd/tests/cxx/tree/naming/knr/makefile
@@ -0,0 +1,94 @@
+# file      : tests/cxx/tree/naming/knr/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=.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=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
+gen  := $(addprefix $(out_base)/,$(genf))
+
+$(gen): xsd := $(out_root)/xsd/xsd
+
+$(gen): xsd_options += \
+--type-naming knr \
+--function-naming knr \
+--generate-ostream \
+--generate-serialization \
+--generate-comparison \
+--generate-wildcard
+
+$(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)
+	$(call message,test $$1,$$1,$(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,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): xsd_options += --std $(cxx_standard)
+$(call include,$(scf_root)/xsd/tree/xsd-cxx.make)
+endif
+
+
+# Dependencies.
+#
+$(call import,$(src_root)/xsd/makefile)
diff --git a/xsd/tests/cxx/tree/naming/knr/test.xsd b/xsd/tests/cxx/tree/naming/knr/test.xsd
new file mode 100644
index 0000000..4361544
--- /dev/null
+++ b/xsd/tests/cxx/tree/naming/knr/test.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
+
+  <simpleType name="gender">
+    <restriction base="string">
+      <enumeration value="male"/>
+      <enumeration value="female"/>
+    </restriction>
+  </simpleType>
+
+  <complexType name="type">
+    <sequence>
+      <element name="foo" minOccurs="0">
+        <complexType>
+          <sequence>
+            <element name="a" type="string"/>
+            <element name="b" type="string"/>
+          </sequence>
+        </complexType>
+      </element>
+      <element name="bar" type="string"/>
+      <element name="baz" type="string" maxOccurs="unbounded"/>
+      <any namespace="other" processContents="skip" maxOccurs="unbounded"/>
+    </sequence>
+    <attribute name="fox" type="string" default="hello"/>
+    <anyAttribute namespace="##other" processContents="skip"/>
+  </complexType>
+
+  <element name="root" type="string"/>
+
+</schema>