summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/clash/clash.xsd25
-rw-r--r--tests/clash/foo.xsd11
-rw-r--r--tests/code/name-conflict/test.xsd40
-rw-r--r--tests/code/name-escaping/test.xsd60
-rw-r--r--tests/cxx/makefile15
-rw-r--r--tests/cxx/parser/built-in/driver.cxx529
-rw-r--r--tests/cxx/parser/built-in/makefile82
-rw-r--r--tests/cxx/parser/built-in/output164
-rw-r--r--tests/cxx/parser/built-in/test.xml199
-rw-r--r--tests/cxx/parser/built-in/test.xsd63
-rw-r--r--tests/cxx/parser/enumeration/driver.cxx81
-rw-r--r--tests/cxx/parser/enumeration/gender.hxx13
-rw-r--r--tests/cxx/parser/enumeration/makefile83
-rw-r--r--tests/cxx/parser/enumeration/output3
-rw-r--r--tests/cxx/parser/enumeration/test.map7
-rw-r--r--tests/cxx/parser/enumeration/test.xml10
-rw-r--r--tests/cxx/parser/enumeration/test.xsd35
-rw-r--r--tests/cxx/parser/generated-impl/makefile93
-rw-r--r--tests/cxx/parser/generated-impl/output122
-rw-r--r--tests/cxx/parser/generated-impl/test.xml168
-rw-r--r--tests/cxx/parser/generated-impl/test.xsd142
-rw-r--r--tests/cxx/parser/list/driver.cxx105
-rw-r--r--tests/cxx/parser/list/makefile82
-rw-r--r--tests/cxx/parser/list/output26
-rw-r--r--tests/cxx/parser/list/test.xml25
-rw-r--r--tests/cxx/parser/list/test.xsd25
-rw-r--r--tests/cxx/parser/makefile18
-rw-r--r--tests/cxx/parser/name-clash/inheritance/driver.cxx62
-rw-r--r--tests/cxx/parser/name-clash/inheritance/makefile83
-rw-r--r--tests/cxx/parser/name-clash/inheritance/output2
-rw-r--r--tests/cxx/parser/name-clash/inheritance/test.xml8
-rw-r--r--tests/cxx/parser/name-clash/inheritance/test.xsd22
-rw-r--r--tests/cxx/parser/polymorphism/makefile16
-rw-r--r--tests/cxx/parser/polymorphism/recursive/driver.cxx68
-rw-r--r--tests/cxx/parser/polymorphism/recursive/makefile83
-rw-r--r--tests/cxx/parser/polymorphism/recursive/output22
-rw-r--r--tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx147
-rw-r--r--tests/cxx/parser/polymorphism/recursive/test-pimpl.hxx94
-rw-r--r--tests/cxx/parser/polymorphism/recursive/test.xml15
-rw-r--r--tests/cxx/parser/polymorphism/recursive/test.xsd53
-rw-r--r--tests/cxx/parser/polymorphism/same-type/driver.cxx62
-rw-r--r--tests/cxx/parser/polymorphism/same-type/makefile83
-rw-r--r--tests/cxx/parser/polymorphism/same-type/output4
-rw-r--r--tests/cxx/parser/polymorphism/same-type/test.xml10
-rw-r--r--tests/cxx/parser/polymorphism/same-type/test.xsd21
-rw-r--r--tests/cxx/parser/recursive/driver.cxx139
-rw-r--r--tests/cxx/parser/recursive/makefile83
-rw-r--r--tests/cxx/parser/recursive/output22
-rw-r--r--tests/cxx/parser/recursive/test.xml11
-rw-r--r--tests/cxx/parser/recursive/test.xsd27
-rw-r--r--tests/cxx/parser/test-template/driver.cxx66
-rw-r--r--tests/cxx/parser/test-template/makefile82
-rw-r--r--tests/cxx/parser/test-template/output1
-rw-r--r--tests/cxx/parser/test-template/test.xml7
-rw-r--r--tests/cxx/parser/test-template/test.xsd12
-rw-r--r--tests/cxx/parser/union/driver.cxx60
-rw-r--r--tests/cxx/parser/union/makefile82
-rw-r--r--tests/cxx/parser/union/output2
-rw-r--r--tests/cxx/parser/union/test.xml10
-rw-r--r--tests/cxx/parser/union/test.xsd16
-rw-r--r--tests/cxx/parser/validation/all/driver.cxx98
-rw-r--r--tests/cxx/parser/validation/all/makefile92
-rw-r--r--tests/cxx/parser/validation/all/test-000.std46
-rw-r--r--tests/cxx/parser/validation/all/test-000.xml53
-rw-r--r--tests/cxx/parser/validation/all/test-001.std6
-rw-r--r--tests/cxx/parser/validation/all/test-001.xml11
-rw-r--r--tests/cxx/parser/validation/all/test-002.std4
-rw-r--r--tests/cxx/parser/validation/all/test-002.xml9
-rw-r--r--tests/cxx/parser/validation/all/test-003.std6
-rw-r--r--tests/cxx/parser/validation/all/test-003.xml12
-rw-r--r--tests/cxx/parser/validation/all/test.xsd20
-rw-r--r--tests/cxx/parser/validation/any/driver.cxx121
-rw-r--r--tests/cxx/parser/validation/any/makefile92
-rw-r--r--tests/cxx/parser/validation/any/test-000.std29
-rw-r--r--tests/cxx/parser/validation/any/test-000.xml21
-rw-r--r--tests/cxx/parser/validation/any/test.xsd20
-rw-r--r--tests/cxx/parser/validation/attribute/driver.cxx197
-rw-r--r--tests/cxx/parser/validation/attribute/makefile92
-rw-r--r--tests/cxx/parser/validation/attribute/test-000.std24
-rw-r--r--tests/cxx/parser/validation/attribute/test-000.xml10
-rw-r--r--tests/cxx/parser/validation/attribute/test.xsd71
-rw-r--r--tests/cxx/parser/validation/built-in/any-type/driver.cxx154
-rw-r--r--tests/cxx/parser/validation/built-in/any-type/makefile92
-rw-r--r--tests/cxx/parser/validation/built-in/any-type/test-000.std99
-rw-r--r--tests/cxx/parser/validation/built-in/any-type/test-000.xml41
-rw-r--r--tests/cxx/parser/validation/built-in/any-type/test.xsd31
-rw-r--r--tests/cxx/parser/validation/built-in/binary/driver.cxx153
-rw-r--r--tests/cxx/parser/validation/built-in/binary/makefile70
-rw-r--r--tests/cxx/parser/validation/built-in/boolean/driver.cxx145
-rw-r--r--tests/cxx/parser/validation/built-in/boolean/makefile70
-rw-r--r--tests/cxx/parser/validation/built-in/byte/driver.cxx256
-rw-r--r--tests/cxx/parser/validation/built-in/byte/makefile70
-rw-r--r--tests/cxx/parser/validation/built-in/date-time/driver.cxx1533
-rw-r--r--tests/cxx/parser/validation/built-in/date-time/makefile70
-rw-r--r--tests/cxx/parser/validation/built-in/float/driver.cxx285
-rw-r--r--tests/cxx/parser/validation/built-in/float/makefile70
-rw-r--r--tests/cxx/parser/validation/built-in/int/driver.cxx116
-rw-r--r--tests/cxx/parser/validation/built-in/int/makefile70
-rw-r--r--tests/cxx/parser/validation/built-in/integer/driver.cxx303
-rw-r--r--tests/cxx/parser/validation/built-in/integer/makefile70
-rw-r--r--tests/cxx/parser/validation/built-in/long/driver.cxx116
-rw-r--r--tests/cxx/parser/validation/built-in/long/makefile70
-rw-r--r--tests/cxx/parser/validation/built-in/makefile17
-rw-r--r--tests/cxx/parser/validation/built-in/qname/driver.cxx105
-rw-r--r--tests/cxx/parser/validation/built-in/qname/makefile70
-rw-r--r--tests/cxx/parser/validation/built-in/short/driver.cxx116
-rw-r--r--tests/cxx/parser/validation/built-in/short/makefile70
-rw-r--r--tests/cxx/parser/validation/built-in/string/driver.cxx512
-rw-r--r--tests/cxx/parser/validation/built-in/string/makefile70
-rw-r--r--tests/cxx/parser/validation/built-in/uri/driver.cxx53
-rw-r--r--tests/cxx/parser/validation/built-in/uri/makefile70
-rw-r--r--tests/cxx/parser/validation/choice/driver.cxx126
-rw-r--r--tests/cxx/parser/validation/choice/makefile92
-rw-r--r--tests/cxx/parser/validation/choice/test-000.std22
-rw-r--r--tests/cxx/parser/validation/choice/test-000.xml30
-rw-r--r--tests/cxx/parser/validation/choice/test-001.std4
-rw-r--r--tests/cxx/parser/validation/choice/test-001.xml10
-rw-r--r--tests/cxx/parser/validation/choice/test-002.std11
-rw-r--r--tests/cxx/parser/validation/choice/test-002.xml17
-rw-r--r--tests/cxx/parser/validation/choice/test-003.std5
-rw-r--r--tests/cxx/parser/validation/choice/test-003.xml11
-rw-r--r--tests/cxx/parser/validation/choice/test-004.std4
-rw-r--r--tests/cxx/parser/validation/choice/test-004.xml11
-rw-r--r--tests/cxx/parser/validation/choice/test.xsd24
-rw-r--r--tests/cxx/parser/validation/makefile16
-rw-r--r--tests/cxx/parser/validation/restriction/driver.cxx107
-rw-r--r--tests/cxx/parser/validation/restriction/makefile92
-rw-r--r--tests/cxx/parser/validation/restriction/test-000.std0
-rw-r--r--tests/cxx/parser/validation/restriction/test-000.xml31
-rw-r--r--tests/cxx/parser/validation/restriction/test-001.std1
-rw-r--r--tests/cxx/parser/validation/restriction/test-001.xml11
-rw-r--r--tests/cxx/parser/validation/restriction/test-002.std1
-rw-r--r--tests/cxx/parser/validation/restriction/test-002.xml12
-rw-r--r--tests/cxx/parser/validation/restriction/test-003.std1
-rw-r--r--tests/cxx/parser/validation/restriction/test-003.xml16
-rw-r--r--tests/cxx/parser/validation/restriction/test-004.std1
-rw-r--r--tests/cxx/parser/validation/restriction/test-004.xml10
-rw-r--r--tests/cxx/parser/validation/restriction/test-005.std1
-rw-r--r--tests/cxx/parser/validation/restriction/test-005.xml11
-rw-r--r--tests/cxx/parser/validation/restriction/test.xsd82
-rw-r--r--tests/cxx/parser/validation/sequence/driver.cxx139
-rw-r--r--tests/cxx/parser/validation/sequence/makefile92
-rw-r--r--tests/cxx/parser/validation/sequence/test-000.std56
-rw-r--r--tests/cxx/parser/validation/sequence/test-000.xml46
-rw-r--r--tests/cxx/parser/validation/sequence/test-001.std4
-rw-r--r--tests/cxx/parser/validation/sequence/test-001.xml10
-rw-r--r--tests/cxx/parser/validation/sequence/test-002.std20
-rw-r--r--tests/cxx/parser/validation/sequence/test-002.xml27
-rw-r--r--tests/cxx/parser/validation/sequence/test-003.std5
-rw-r--r--tests/cxx/parser/validation/sequence/test-003.xml17
-rw-r--r--tests/cxx/parser/validation/sequence/test-004.std4
-rw-r--r--tests/cxx/parser/validation/sequence/test-004.xml14
-rw-r--r--tests/cxx/parser/validation/sequence/test-005.std6
-rw-r--r--tests/cxx/parser/validation/sequence/test-005.xml15
-rw-r--r--tests/cxx/parser/validation/sequence/test-006.std13
-rw-r--r--tests/cxx/parser/validation/sequence/test-006.xml17
-rw-r--r--tests/cxx/parser/validation/sequence/test.xsd28
-rw-r--r--tests/cxx/tree/any-type/driver.cxx144
-rw-r--r--tests/cxx/tree/any-type/makefile86
-rw-r--r--tests/cxx/tree/any-type/output73
-rw-r--r--tests/cxx/tree/any-type/test.xml26
-rw-r--r--tests/cxx/tree/any-type/test.xsd19
-rw-r--r--tests/cxx/tree/binary/cdr/driver.cxx143
-rw-r--r--tests/cxx/tree/binary/cdr/makefile89
-rw-r--r--tests/cxx/tree/binary/cdr/test.xml93
-rw-r--r--tests/cxx/tree/binary/cdr/test.xsd123
-rw-r--r--tests/cxx/tree/binary/makefile16
-rw-r--r--tests/cxx/tree/binary/polymorphic/driver.cxx164
-rw-r--r--tests/cxx/tree/binary/polymorphic/makefile90
-rw-r--r--tests/cxx/tree/binary/polymorphic/test.xml92
-rw-r--r--tests/cxx/tree/binary/polymorphic/test.xsd125
-rw-r--r--tests/cxx/tree/binary/xdr-ordered/driver.cxx189
-rw-r--r--tests/cxx/tree/binary/xdr-ordered/makefile85
-rw-r--r--tests/cxx/tree/binary/xdr-ordered/test.xml93
-rw-r--r--tests/cxx/tree/binary/xdr-ordered/test.xsd123
-rw-r--r--tests/cxx/tree/binary/xdr/driver.cxx187
-rw-r--r--tests/cxx/tree/binary/xdr/makefile85
-rw-r--r--tests/cxx/tree/binary/xdr/test.xml93
-rw-r--r--tests/cxx/tree/binary/xdr/test.xsd123
-rw-r--r--tests/cxx/tree/built-in/attributes.xml73
-rw-r--r--tests/cxx/tree/built-in/driver.cxx93
-rw-r--r--tests/cxx/tree/built-in/elements.xml84
-rw-r--r--tests/cxx/tree/built-in/inherited.xml84
-rw-r--r--tests/cxx/tree/built-in/makefile99
-rw-r--r--tests/cxx/tree/built-in/types.xsd460
-rw-r--r--tests/cxx/tree/chameleon/driver.cxx35
-rw-r--r--tests/cxx/tree/chameleon/includee.xsd13
-rw-r--r--tests/cxx/tree/chameleon/includer.xsd12
-rw-r--r--tests/cxx/tree/chameleon/makefile85
-rw-r--r--tests/cxx/tree/chameleon/output3
-rw-r--r--tests/cxx/tree/chameleon/test.xml8
-rw-r--r--tests/cxx/tree/comparison/driver.cxx38
-rw-r--r--tests/cxx/tree/comparison/makefile85
-rw-r--r--tests/cxx/tree/comparison/test.xml19
-rw-r--r--tests/cxx/tree/comparison/test.xsd30
-rw-r--r--tests/cxx/tree/compilation/driver.cxx116
-rw-r--r--tests/cxx/tree/compilation/makefile85
-rw-r--r--tests/cxx/tree/compilation/test.xsd12
-rw-r--r--tests/cxx/tree/complex/ctor/driver.cxx122
-rw-r--r--tests/cxx/tree/complex/ctor/makefile86
-rw-r--r--tests/cxx/tree/complex/ctor/test.xsd182
-rw-r--r--tests/cxx/tree/complex/makefile16
-rw-r--r--tests/cxx/tree/containment/driver.cxx118
-rw-r--r--tests/cxx/tree/containment/makefile85
-rw-r--r--tests/cxx/tree/containment/test.xsd59
-rw-r--r--tests/cxx/tree/default/general/driver.cxx37
-rw-r--r--tests/cxx/tree/default/general/makefile86
-rw-r--r--tests/cxx/tree/default/general/output15
-rw-r--r--tests/cxx/tree/default/general/test.xml16
-rw-r--r--tests/cxx/tree/default/general/test.xsd241
-rw-r--r--tests/cxx/tree/default/makefile16
-rw-r--r--tests/cxx/tree/default/omit/driver.cxx46
-rw-r--r--tests/cxx/tree/default/omit/makefile86
-rw-r--r--tests/cxx/tree/default/omit/output19
-rw-r--r--tests/cxx/tree/default/omit/test.xml9
-rw-r--r--tests/cxx/tree/default/omit/test.xsd30
-rw-r--r--tests/cxx/tree/detach/driver.cxx108
-rw-r--r--tests/cxx/tree/detach/makefile85
-rw-r--r--tests/cxx/tree/detach/test.xsd32
-rw-r--r--tests/cxx/tree/dom-association/dom-parse.cxx95
-rw-r--r--tests/cxx/tree/dom-association/dom-parse.hxx23
-rw-r--r--tests/cxx/tree/dom-association/driver.cxx71
-rw-r--r--tests/cxx/tree/dom-association/makefile91
-rw-r--r--tests/cxx/tree/dom-association/output0
-rw-r--r--tests/cxx/tree/dom-association/test.xml7
-rw-r--r--tests/cxx/tree/dom-association/test.xsd12
-rw-r--r--tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx74
-rw-r--r--tests/cxx/tree/encoding/char/iso-8859-1/makefile86
-rw-r--r--tests/cxx/tree/encoding/char/iso-8859-1/test.std10
-rw-r--r--tests/cxx/tree/encoding/char/iso-8859-1/test.xml14
-rw-r--r--tests/cxx/tree/encoding/char/iso-8859-1/test.xsd31
-rw-r--r--tests/cxx/tree/encoding/char/lcp/driver.cxx40
-rw-r--r--tests/cxx/tree/encoding/char/lcp/makefile85
-rw-r--r--tests/cxx/tree/encoding/char/lcp/test.std4
-rw-r--r--tests/cxx/tree/encoding/char/lcp/test.xml7
-rw-r--r--tests/cxx/tree/encoding/char/lcp/test.xsd12
-rw-r--r--tests/cxx/tree/encoding/char/makefile16
-rw-r--r--tests/cxx/tree/encoding/char/utf-8/driver.cxx63
-rw-r--r--tests/cxx/tree/encoding/char/utf-8/makefile85
-rw-r--r--tests/cxx/tree/encoding/char/utf-8/test.std9
-rw-r--r--tests/cxx/tree/encoding/char/utf-8/test.xml13
-rw-r--r--tests/cxx/tree/encoding/char/utf-8/test.xsd31
-rw-r--r--tests/cxx/tree/encoding/makefile16
-rw-r--r--tests/cxx/tree/encoding/wchar/driver.cxx55
-rw-r--r--tests/cxx/tree/encoding/wchar/makefile86
-rw-r--r--tests/cxx/tree/encoding/wchar/test.std10
-rw-r--r--tests/cxx/tree/encoding/wchar/test.xml14
-rw-r--r--tests/cxx/tree/encoding/wchar/test.xsd33
-rw-r--r--tests/cxx/tree/enumeration/ctor/driver.cxx30
-rw-r--r--tests/cxx/tree/enumeration/ctor/makefile86
-rw-r--r--tests/cxx/tree/enumeration/ctor/test.xsd41
-rw-r--r--tests/cxx/tree/enumeration/inheritance/driver.cxx53
-rw-r--r--tests/cxx/tree/enumeration/inheritance/makefile85
-rw-r--r--tests/cxx/tree/enumeration/inheritance/output1
-rw-r--r--tests/cxx/tree/enumeration/inheritance/test.xml3
-rw-r--r--tests/cxx/tree/enumeration/inheritance/test.xsd22
-rw-r--r--tests/cxx/tree/enumeration/makefile16
-rw-r--r--tests/cxx/tree/float/driver.cxx53
-rw-r--r--tests/cxx/tree/float/makefile85
-rw-r--r--tests/cxx/tree/float/test.std35
-rw-r--r--tests/cxx/tree/float/test.xml35
-rw-r--r--tests/cxx/tree/float/test.xsd74
-rw-r--r--tests/cxx/tree/list/ctor/driver.cxx50
-rw-r--r--tests/cxx/tree/list/ctor/makefile86
-rw-r--r--tests/cxx/tree/list/ctor/test.xsd18
-rw-r--r--tests/cxx/tree/list/makefile16
-rw-r--r--tests/cxx/tree/makefile43
-rw-r--r--tests/cxx/tree/name-clash/inheritance/driver.cxx35
-rw-r--r--tests/cxx/tree/name-clash/inheritance/makefile85
-rw-r--r--tests/cxx/tree/name-clash/inheritance/output3
-rw-r--r--tests/cxx/tree/name-clash/inheritance/test.xml8
-rw-r--r--tests/cxx/tree/name-clash/inheritance/test.xsd53
-rw-r--r--tests/cxx/tree/name-clash/makefile16
-rw-r--r--tests/cxx/tree/naming/camel/driver.cxx154
-rw-r--r--tests/cxx/tree/naming/camel/makefile93
-rw-r--r--tests/cxx/tree/naming/camel/test.xsd31
-rw-r--r--tests/cxx/tree/naming/java/driver.cxx153
-rw-r--r--tests/cxx/tree/naming/java/makefile93
-rw-r--r--tests/cxx/tree/naming/java/test.xsd31
-rw-r--r--tests/cxx/tree/naming/knr/driver.cxx154
-rw-r--r--tests/cxx/tree/naming/knr/makefile93
-rw-r--r--tests/cxx/tree/naming/knr/test.xsd31
-rw-r--r--tests/cxx/tree/naming/makefile16
-rw-r--r--tests/cxx/tree/order/driver.cxx64
-rw-r--r--tests/cxx/tree/order/makefile93
-rw-r--r--tests/cxx/tree/order/output92
-rw-r--r--tests/cxx/tree/order/test.xml71
-rw-r--r--tests/cxx/tree/order/test.xsd130
-rw-r--r--tests/cxx/tree/polymorphism/comparison/driver.cxx85
-rw-r--r--tests/cxx/tree/polymorphism/comparison/makefile86
-rw-r--r--tests/cxx/tree/polymorphism/comparison/test.xml7
-rw-r--r--tests/cxx/tree/polymorphism/comparison/test.xsd39
-rw-r--r--tests/cxx/tree/polymorphism/makefile16
-rw-r--r--tests/cxx/tree/polymorphism/ostream/driver.cxx34
-rw-r--r--tests/cxx/tree/polymorphism/ostream/makefile87
-rw-r--r--tests/cxx/tree/polymorphism/ostream/output18
-rw-r--r--tests/cxx/tree/polymorphism/ostream/test.xml10
-rw-r--r--tests/cxx/tree/polymorphism/ostream/test.xsd62
-rw-r--r--tests/cxx/tree/polymorphism/same-type/driver.cxx35
-rw-r--r--tests/cxx/tree/polymorphism/same-type/makefile86
-rw-r--r--tests/cxx/tree/polymorphism/same-type/output9
-rw-r--r--tests/cxx/tree/polymorphism/same-type/test.xml10
-rw-r--r--tests/cxx/tree/polymorphism/same-type/test.xsd21
-rw-r--r--tests/cxx/tree/prefix/bar.xsd34
-rw-r--r--tests/cxx/tree/prefix/driver.cxx34
-rw-r--r--tests/cxx/tree/prefix/foo.xsd16
-rw-r--r--tests/cxx/tree/prefix/makefile86
-rw-r--r--tests/cxx/tree/prefix/output18
-rw-r--r--tests/cxx/tree/prefix/test.xml19
-rw-r--r--tests/cxx/tree/prefix/test.xsd40
-rw-r--r--tests/cxx/tree/test-template/driver.cxx35
-rw-r--r--tests/cxx/tree/test-template/makefile85
-rw-r--r--tests/cxx/tree/test-template/output2
-rw-r--r--tests/cxx/tree/test-template/test.xml7
-rw-r--r--tests/cxx/tree/test-template/test.xsd12
-rw-r--r--tests/cxx/tree/types-only/driver.cxx30
-rw-r--r--tests/cxx/tree/types-only/makefile85
-rw-r--r--tests/cxx/tree/types-only/test.xsd52
-rw-r--r--tests/cxx/tree/union/ctor/driver.cxx30
-rw-r--r--tests/cxx/tree/union/ctor/makefile86
-rw-r--r--tests/cxx/tree/union/ctor/test.xsd14
-rw-r--r--tests/cxx/tree/union/makefile16
-rw-r--r--tests/cxx/tree/wildcard/driver.cxx203
-rw-r--r--tests/cxx/tree/wildcard/makefile86
-rw-r--r--tests/cxx/tree/wildcard/output24
-rw-r--r--tests/cxx/tree/wildcard/test.xml19
-rw-r--r--tests/cxx/tree/wildcard/test.xsd18
-rw-r--r--tests/failed/test-00.xsd12
-rw-r--r--tests/makefile14
-rw-r--r--tests/morphing/anonymous/attribute-group/test.xsd31
-rw-r--r--tests/morphing/anonymous/cyclic-inclusion/includee.xsd18
-rw-r--r--tests/morphing/anonymous/cyclic-inclusion/includer.xsd18
-rw-r--r--tests/morphing/anonymous/group/test.xsd29
-rw-r--r--tests/morphing/anonymous/test-000.xsd20
-rw-r--r--tests/morphing/anonymous/unstable/includee-1.xsd12
-rw-r--r--tests/morphing/anonymous/unstable/includee-2.xsd14
-rw-r--r--tests/morphing/anonymous/unstable/includer.xsd18
-rw-r--r--tests/processing/inheritance/test-000.xsd22
-rw-r--r--tests/processing/inheritance/test-001.xsd26
-rw-r--r--tests/schema/anonymous/test.xsd143
-rw-r--r--tests/schema/any-attribute/test.xsd22
-rw-r--r--tests/schema/any-type/test.xsd22
-rw-r--r--tests/schema/any/fail.xsd19
-rw-r--r--tests/schema/any/test.xsd19
-rw-r--r--tests/schema/attribute-group/global.xsd50
-rw-r--r--tests/schema/attribute/global.xsd21
-rw-r--r--tests/schema/attribute/local.xsd37
-rw-r--r--tests/schema/attribute/ref.xsd42
-rw-r--r--tests/schema/cardinality/test.xsd46
-rw-r--r--tests/schema/chameleon/includer.xsd17
-rw-r--r--tests/schema/chameleon/schemas/includee.xsd12
-rw-r--r--tests/schema/enumeration/test.xsd89
-rw-r--r--tests/schema/forward/test.xsd32
-rw-r--r--tests/schema/group/global.xsd39
-rw-r--r--tests/schema/group/test.xsd148
-rw-r--r--tests/schema/import/importer.xsd20
-rw-r--r--tests/schema/import/schemas/importee.xsd15
-rw-r--r--tests/schema/include/includer.xsd17
-rw-r--r--tests/schema/include/schemas/includee.xsd14
-rw-r--r--tests/schema/inheritance/cycle.xsd34
-rw-r--r--tests/schema/inheritance/sourced-forward/includee.xsd10
-rw-r--r--tests/schema/inheritance/sourced-forward/includer.xsd14
-rw-r--r--tests/schema/list/anonymous/test.xsd16
-rw-r--r--tests/schema/list/any-simple-type/test.xsd12
-rw-r--r--tests/schema/list/driver.cxx13
-rw-r--r--tests/schema/list/test.xsd72
-rw-r--r--tests/schema/no-namespace/test.xsd15
-rw-r--r--tests/schema/recursive/test.xsd43
-rw-r--r--tests/schema/ref-type/idref.xsd42
-rw-r--r--tests/schema/ref-type/idrefs.xsd43
-rw-r--r--tests/schema/ref-type/invalid-0.xsd17
-rw-r--r--tests/schema/ref-type/invalid-1.xsd11
-rw-r--r--tests/schema/restriction/test.xsd67
-rw-r--r--tests/schema/union/test.xsd65
374 files changed, 0 insertions, 22776 deletions
diff --git a/tests/clash/clash.xsd b/tests/clash/clash.xsd
deleted file mode 100644
index 8458908..0000000
--- a/tests/clash/clash.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/bar"
- xmlns:f="http://www.codesynthesis.com/xmlns/test/foo"
- targetNamespace="http://www.codesynthesis.com/xmlns/test/bar">
-
- <xsd:import namespace="http://www.codesynthesis.com/xmlns/test/foo" schemaLocation="foo.xsd"/>
-
- <!-- example of a name clash. -->
-
- <xsd:element name="foo" type="xsd:string"/>
-
- <xsd:complexType name="Foo">
- <xsd:sequence>
- <xsd:element ref="foo"/>
- <xsd:element name="foo" type="xsd:long"/>
- <xsd:element ref="f:foo"/>
- <xsd:element ref="f:foo"/>
- </xsd:sequence>
- <xsd:attribute name="foo" type="xsd:string"/>
- </xsd:complexType>
-
-</xsd:schema>
diff --git a/tests/clash/foo.xsd b/tests/clash/foo.xsd
deleted file mode 100644
index 8a06ba8..0000000
--- a/tests/clash/foo.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/foo"
- targetNamespace="http://www.codesynthesis.com/xmlns/test/foo">
-
- <xsd:element name="foo" type="xsd:int"/>
- <xsd:element name="bar" type="xsd:int"/>
-
-</xsd:schema>
diff --git a/tests/code/name-conflict/test.xsd b/tests/code/name-conflict/test.xsd
deleted file mode 100644
index a017cc8..0000000
--- a/tests/code/name-conflict/test.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <xsd:simpleType name="enumeration">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="enumeration"/>
- <xsd:enumeration value="enumeration1"/>
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:element name="enumeration" type="enumeration"/>
-
- <xsd:complexType name="complex">
- <xsd:sequence>
- <xsd:element name="complex" type="xsd:string"/>
- <xsd:element name="complex1" type="xsd:string"/>
- <xsd:element name="type" type="xsd:string"/>
- <xsd:element name="container" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="complex" type="complex"/>
-
- <xsd:complexType name="anonymous">
- <xsd:sequence>
- <xsd:element name="anonymous">
- <xsd:complexType> <!-- this is really twisted -->
- <xsd:sequence>
- <xsd:element name="anonymous2" type="xsd:string"/>
- <xsd:element name="anonymous21" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="anonymous1" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="anonymous" type="anonymous"/>
-
-</xsd:schema>
diff --git a/tests/code/name-escaping/test.xsd b/tests/code/name-escaping/test.xsd
deleted file mode 100644
index 08c7530..0000000
--- a/tests/code/name-escaping/test.xsd
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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">
-
- <!-- type -->
-
- <xsd:simpleType name="long">
- <xsd:restriction base="xsd:long"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="strange.type-name.">
- <xsd:restriction base="long"/>
- </xsd:simpleType>
-
- <xsd:element name="one-two-explicit">
- <xsd:simpleType>
- <xsd:restriction base="xsd:NCName">
- <xsd:enumeration value="on.e-"/>
- <xsd:enumeration value="t-wo."/>
- <xsd:enumeration value="explicit"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:element>
-
-
- <!-- element [global/local] -->
-
- <xsd:element name="switch" type="long"/>
- <xsd:element name="strange.element-name." type="strange.type-name."/>
-
-
- <xsd:element name="with-anonymous-type-1">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="for" type="long"/>
- <xsd:element name="switch" minOccurs="0" type="long"/>
- <xsd:element name="strange.element-name." maxOccurs="unbounded" type="strange.type-name."/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
-
-
- <!-- attributes [global/local] -->
-
- <xsd:attribute name="default" type="long"/>
- <xsd:attribute name="strange.attribute-name." type="strange.type-name."/>
-
- <xsd:element name="with-anonymous-type-2">
- <xsd:complexType>
- <xsd:attribute name="and" type="long" use="required"/>
- <xsd:attribute name="strange.attribute-name." type="strange.type-name."/>
- </xsd:complexType>
- </xsd:element>
-
-
-</xsd:schema>
diff --git a/tests/cxx/makefile b/tests/cxx/makefile
deleted file mode 100644
index 769a1d0..0000000
--- a/tests/cxx/makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# file : tests/cxx/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-default := $(out_base)/
-test := $(out_base)/.test
-clean := $(out_base)/.clean
-
-$(default): $(out_base)/parser/ $(out_base)/tree/
-$(test): $(out_base)/parser/.test $(out_base)/tree/.test
-$(clean): $(out_base)/parser/.clean $(out_base)/tree/.clean
-
-$(call import,$(src_base)/parser/makefile)
-$(call import,$(src_base)/tree/makefile)
diff --git a/tests/cxx/parser/built-in/driver.cxx b/tests/cxx/parser/built-in/driver.cxx
deleted file mode 100644
index 6cfd8fc..0000000
--- a/tests/cxx/parser/built-in/driver.cxx
+++ /dev/null
@@ -1,529 +0,0 @@
-// file : tests/cxx/parser/built-in/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test built-in type parsing.
-//
-
-#include <string>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-using xml_schema::ro_string;
-
-struct any_type_pimpl: xml_schema::any_type_pimpl
-{
- virtual void
- pre ()
- {
- cout << "{" << endl;
- }
-
- virtual void
- _start_any_element (ro_string const&,
- ro_string const& n,
- ro_string const*)
- {
- cout << " start any element '" << n << "'" << endl;
- }
-
- virtual void
- _end_any_element (ro_string const&, ro_string const& n)
- {
- cout << " end any element '" << n << "'" << endl;
- }
-
- virtual void
- _any_attribute (ro_string const&,
- ro_string const& n,
- ro_string const& v)
- {
- cout << " any attribute " << n << " = '" << v << "'" << endl;
- }
-
- virtual void
- _any_characters (ro_string const& s)
- {
- cout << " any text: '" << s << "'" << endl;
- }
-
- virtual void
- post_any_type ()
- {
- cout << "}" << endl
- << endl;
- }
-};
-
-struct any_simple_type_pimpl: xml_schema::any_simple_type_pimpl
-{
- virtual void
- pre ()
- {
- cout << "{" << endl;
- }
-
- virtual void
- _any_characters (ro_string const& s)
- {
- cout << " any text: '" << s << "'" << endl;
- }
-
- virtual void
- post_any_simple_type ()
- {
- cout << "}" << endl
- << endl;
- }
-};
-
-struct type_pimpl: type_pskel
-{
- virtual void
- boolean (bool v)
- {
- cout << v << endl;
- }
-
- virtual void
- byte (signed char v)
- {
- cout << short (v) << endl;
- }
-
- virtual void
- unsigned_byte (unsigned char v)
- {
- cout << (unsigned short) (v) << endl;
- }
-
- virtual void
- short_ (short v)
- {
- cout << v << endl;
- }
-
- virtual void
- unsigned_short (unsigned short v)
- {
- cout << v << endl;
- }
-
- virtual void
- int_ (int v)
- {
- cout << v << endl;
- }
-
- virtual void
- unsigned_int (unsigned int v)
- {
- cout << v << endl;
- }
-
- virtual void
- long_ (long long v)
- {
- cout << v << endl;
- }
-
- virtual void
- unsigned_long (unsigned long long v)
- {
- cout << v << endl;
- }
-
- virtual void
- integer (long long v)
- {
- cout << v << endl;
- }
-
- virtual void
- negative_integer (long long v)
- {
- cout << v << endl;
- }
-
-
- virtual void
- non_positive_integer (long long v)
- {
- cout << v << endl;
- }
-
-
- virtual void
- positive_integer (unsigned long long v)
- {
- cout << v << endl;
- }
-
- virtual void
- non_negative_integer (unsigned long long v)
- {
- cout << v << endl;
- }
-
- virtual void
- float_ (float v)
- {
- cout << v << endl;
- }
-
- virtual void
- double_ (double v)
- {
- cout << v << endl;
- }
-
- virtual void
- decimal (double v)
- {
- cout << v << endl;
- }
-
- virtual void
- string (std::string const& v)
- {
- cout << "'" << v << "'" << endl;
- }
-
- virtual void
- normalized_string (std::string const& v)
- {
- cout << "'" << v << "'" << endl;
- }
-
- virtual void
- token (std::string const& v)
- {
- cout << "'" << v << "'" << endl;
- }
-
- virtual void
- name (std::string const& v)
- {
- cout << "'" << v << "'" << endl;
- }
-
- virtual void
- nmtoken (std::string const& v)
- {
- cout << "'" << v << "'" << endl;
- }
-
- virtual void
- nmtokens (xml_schema::string_sequence const& s)
- {
- cout << "'";
-
- for (xml_schema::string_sequence::const_iterator i (s.begin ());
- i != s.end (); ++i)
- cout << *i << " ";
-
- cout << "'" << endl;
- }
-
- virtual void
- ncname (std::string const& v)
- {
- cout << "'" << v << "'" << endl;
- }
-
- virtual void
- id (std::string const& v)
- {
- cout << "'" << v << "'" << endl;
- }
-
- virtual void
- idref (std::string const& v)
- {
- cout << "'" << v << "'" << endl;
- }
-
- virtual void
- idrefs (xml_schema::string_sequence const& s)
- {
- cout << "'";
-
- for (xml_schema::string_sequence::const_iterator i (s.begin ());
- i != s.end (); ++i)
- cout << *i << " ";
-
- cout << "'" << endl;
- }
-
- virtual void
- language (std::string const& v)
- {
- cout << "'" << v << "'" << endl;
- }
-
- virtual void
- uri (std::string const& v)
- {
- cout << "'" << v << "'" << endl;
- }
-
- virtual void
- qname (xml_schema::qname const& v)
- {
- cout << "'" << v.prefix () << ":" << v.name () << "'" << endl;
- }
-
- virtual void
- base64_binary (XSD_AUTO_PTR<xml_schema::buffer> v)
- {
- std::string tmp (v->data (), v->size ());
- cout << "'" << tmp << "'" << endl;
- }
-
- virtual void
- hex_binary (XSD_AUTO_PTR<xml_schema::buffer> v)
- {
- std::string tmp (v->data (), v->size ());
- cout << "'" << tmp << "'" << endl;
- }
-
- virtual void
- gday (xml_schema::gday const& v)
- {
- cout << v.day ();
-
- if (v.zone_present ())
- cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours ()
- << ':' << v.zone_minutes ();
-
- cout << endl;
- }
-
- virtual void
- gmonth (xml_schema::gmonth const& v)
- {
- cout << v.month ();
-
- if (v.zone_present ())
- cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours ()
- << ':' << v.zone_minutes ();
-
- cout << endl;
- }
-
- virtual void
- gyear (xml_schema::gyear const& v)
- {
- cout << v.year ();
-
- if (v.zone_present ())
- cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours ()
- << ':' << v.zone_minutes ();
-
- cout << endl;
- }
-
- virtual void
- gmonth_day (xml_schema::gmonth_day const& v)
- {
- cout << v.month () << '-' << v.day ();
-
- if (v.zone_present ())
- cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours ()
- << ':' << v.zone_minutes ();
-
- cout << endl;
- }
-
- virtual void
- gyear_month (xml_schema::gyear_month const& v)
- {
- cout << v.year () << '-' << v.month ();
-
- if (v.zone_present ())
- cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours ()
- << ':' << v.zone_minutes ();
-
- cout << endl;
- }
-
- virtual void
- date (xml_schema::date const& v)
- {
- cout << v.year () << '-' << v.month () << '-' << v.day ();
-
- if (v.zone_present ())
- cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours ()
- << ':' << v.zone_minutes ();
-
- cout << endl;
- }
-
- virtual void
- time (xml_schema::time const& v)
- {
- cout << v.hours () << ':' << v.minutes () << ':' << v.seconds ();
-
- if (v.zone_present ())
- cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours ()
- << ':' << v.zone_minutes ();
-
- cout << endl;
- }
-
- virtual void
- date_time (xml_schema::date_time const& v)
- {
- cout << v.year () << '-' << v.month () << '-' << v.day () << 'T'
- << v.hours () << ':' << v.minutes () << ':' << v.seconds ();
-
- if (v.zone_present ())
- cout << (v.zone_hours () < 0 ? "" : "+") << v.zone_hours ()
- << ':' << v.zone_minutes ();
-
- cout << endl;
- }
-
- virtual void
- duration (xml_schema::duration const& v)
- {
- cout << (v.negative () ? "-" : "") << 'P'
- << v.years () << 'Y'
- << v.months () << 'M'
- << v.days () << 'D'
- << 'T'
- << v.hours () << 'H'
- << v.minutes () << 'M'
- << v.seconds () << 'S'
- << endl;
- }
-};
-
-int
-main (int argc, char* argv[])
-{
- if (argc != 2)
- {
- cerr << "usage: " << argv[0] << " test.xml" << endl;
- return 1;
- }
-
- try
- {
- any_type_pimpl any_type_p;
- any_simple_type_pimpl any_simple_type_p;
-
- xml_schema::boolean_pimpl boolean_p;
-
- xml_schema::byte_pimpl byte_p;
- xml_schema::unsigned_byte_pimpl unsigned_byte_p;
- xml_schema::short_pimpl short_p;
- xml_schema::unsigned_short_pimpl unsigned_short_p;
- xml_schema::int_pimpl int_p;
- xml_schema::unsigned_int_pimpl unsigned_int_p;
- xml_schema::long_pimpl long_p;
- xml_schema::unsigned_long_pimpl unsigned_long_p;
-
- xml_schema::integer_pimpl integer_p;
- xml_schema::negative_integer_pimpl negative_integer_p;
- xml_schema::non_positive_integer_pimpl non_positive_integer_p;
- xml_schema::positive_integer_pimpl positive_integer_p;
- xml_schema::non_negative_integer_pimpl non_negative_integer_p;
-
- xml_schema::float_pimpl float_p;
- xml_schema::double_pimpl double_p;
- xml_schema::decimal_pimpl decimal_p;
-
- xml_schema::string_pimpl string_p;
- xml_schema::normalized_string_pimpl normalized_string_p;
- xml_schema::token_pimpl token_p;
- xml_schema::name_pimpl name_p;
- xml_schema::nmtoken_pimpl nmtoken_p;
- xml_schema::nmtokens_pimpl nmtokens_p;
- xml_schema::ncname_pimpl ncname_p;
- xml_schema::id_pimpl id_p;
- xml_schema::idref_pimpl idref_p;
- xml_schema::idrefs_pimpl idrefs_p;
-
- xml_schema::language_pimpl language_p;
- xml_schema::uri_pimpl uri_p;
- xml_schema::qname_pimpl qname_p;
-
- xml_schema::base64_binary_pimpl base64_binary_p;
- xml_schema::hex_binary_pimpl hex_binary_p;
-
- xml_schema::gday_pimpl gday_p;
- xml_schema::gmonth_pimpl gmonth_p;
- xml_schema::gyear_pimpl gyear_p;
- xml_schema::gmonth_day_pimpl gmonth_day_p;
- xml_schema::gyear_month_pimpl gyear_month_p;
- xml_schema::date_pimpl date_p;
- xml_schema::time_pimpl time_p;
- xml_schema::date_time_pimpl date_time_p;
- xml_schema::duration_pimpl duration_p;
-
- type_pimpl type_p;
-
- type_p.parsers (any_type_p,
- any_simple_type_p,
- boolean_p,
- byte_p,
- unsigned_byte_p,
- short_p,
- unsigned_short_p,
- int_p,
- unsigned_int_p,
- long_p,
- unsigned_long_p,
- integer_p,
- negative_integer_p,
- non_positive_integer_p,
- positive_integer_p,
- non_negative_integer_p,
- float_p,
- double_p,
- decimal_p,
- string_p,
- normalized_string_p,
- token_p,
- name_p,
- nmtoken_p,
- nmtokens_p,
- ncname_p,
- id_p,
- idref_p,
- idrefs_p,
- language_p,
- uri_p,
- qname_p,
- base64_binary_p,
- hex_binary_p,
- gday_p,
- gmonth_p,
- gyear_p,
- gmonth_day_p,
- gyear_month_p,
- date_p,
- time_p,
- date_time_p,
- duration_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 (std::ios_base::failure const&)
- {
- cerr << "io failure" << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/parser/built-in/makefile b/tests/cxx/parser/built-in/makefile
deleted file mode 100644
index 5602b6a..0000000
--- a/tests/cxx/parser/built-in/makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# file : tests/cxx/parser/built-in/makefile
-# 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/tests/cxx/parser/built-in/output b/tests/cxx/parser/built-in/output
deleted file mode 100644
index 756abcd..0000000
--- a/tests/cxx/parser/built-in/output
+++ /dev/null
@@ -1,164 +0,0 @@
-{
- any attribute x = 'x'
- any text: '
- '
- start any element 'a'
- any text: 'a'
- end any element 'a'
- any text: '
- '
- start any element 'any-type'
- any attribute x = 'xxx'
- any text: 'aaa'
- start any element 'a'
- any text: 'bbb'
- end any element 'a'
- any text: 'ccc'
- end any element 'any-type'
- any text: '
- '
-}
-
-{
- any text: '123abc'
-}
-
-1
-0
-1
-0
-0
-127
--128
-123
-0
-255
-123
-0
-32767
--32768
--12345
-0
-65535
-12345
-0
-2147483647
--2147483648
--1234567890
-0
-4294967295
-1234567890
-0
-9223372036854775807
--9223372036854775808
--1234567890123456789
-0
-18446744073709551615
-12345678901234567890
-0
-2147483647
--2147483648
--1234567890
--2147483648
--1234567890
-0
--2147483648
--1234567890
-4294967295
-1234567890
-0
-4294967295
-1234567890
-0
-0
--0
-inf
--inf
-nan
-123.567
-123.567
--1.23567e+07
--4.5e-06
-0
-0
--0
-inf
--inf
-nan
-123.567
-123.567
--1.23567e+07
--4.5e-06
-0
-0
--0
-123.567
-123.567
--123.567
-'string space
-newline
- '
-' string space newline '
-'string space newline'
-'as123:345-.abs'
-'1as123:345-.abs'
-'abc 123 '
-'as123_345-.abs'
-'as123_345-.abs'
-'abc'
-'a123'
-'as123_345-.abs'
-'abc a123 '
-'x'
-'en'
-'en-us'
-'one-two-three-four44-seven77-eight888'
-''
-'relative'
-'#id'
-'http://www.example.com/foo#bar'
-':schemaLocation'
-'xsi:schemaLocation'
-'12345abcjk'
-'a'
-'ab'
-'abc'
-''
-'12345abcjk'
-12+12:0
-1
-31
-15+0:0
-15-14:0
-10+12:0
-1
-12+0:0
-2007+12:0
-1
--20000+0:0
-10-28+12:0
-12-31
-1-1+0:0
-2007-12+12:0
--2007-10
-20007-10+0:0
--20007-1
-2007-12-26+12:0
--2007-10-15
-20007-12-31+0:0
--20007-1-1
-12:46:23.456+12:0
-12:13:14
-12:13:14+0:0
-2007-12-26T12:13:14.123+12:0
--2007-10-15T12:13:14
-20007-12-31T12:13:14+0:0
--20007-1-1T12:13:14
--P2007Y13M32DT25H61M61.123S
-P1Y0M0DT0H0M0S
-P0Y1M0DT0H0M0S
-P0Y0M1DT0H0M0S
-P0Y0M0DT1H0M0S
-P0Y0M0DT0H1M0S
-P0Y0M0DT0H0M1.1S
-P1Y0M0DT0H0M1S
diff --git a/tests/cxx/parser/built-in/test.xml b/tests/cxx/parser/built-in/test.xml
deleted file mode 100644
index 8d9332a..0000000
--- a/tests/cxx/parser/built-in/test.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <any-type x="x">
- <a>a</a>
- <any-type x="xxx">aaa<a>bbb</a>ccc</any-type>
- </any-type>
-
- <any-simple-type>123abc</any-simple-type>
-
- <boolean>1</boolean>
- <boolean> 0 </boolean>
- <boolean>true</boolean>
- <boolean> false </boolean>
-
- <byte>0</byte>
- <byte>+127</byte>
- <byte>-128</byte>
- <byte> 123 </byte>
-
- <unsigned-byte>0</unsigned-byte>
- <unsigned-byte>255</unsigned-byte>
- <unsigned-byte> 123 </unsigned-byte>
-
- <short>0</short>
- <short>+32767</short>
- <short>-32768</short>
- <short> -12345 </short>
-
- <unsigned-short>0</unsigned-short>
- <unsigned-short>65535</unsigned-short>
- <unsigned-short> 12345 </unsigned-short>
-
- <int>0</int>
- <int>+2147483647</int>
- <int>-2147483648</int>
- <int> -1234567890 </int>
-
- <unsigned-int>0</unsigned-int>
- <unsigned-int>4294967295</unsigned-int>
- <unsigned-int> 1234567890 </unsigned-int>
-
- <long>0</long>
- <long>+9223372036854775807</long>
- <long>-9223372036854775808</long>
- <long> -1234567890123456789 </long>
-
- <unsigned-long>0</unsigned-long>
- <unsigned-long>18446744073709551615</unsigned-long>
- <unsigned-long> 12345678901234567890 </unsigned-long>
-
- <integer>0</integer>
- <integer> +2147483647 </integer>
- <integer>-02147483648</integer>
- <integer>-1234567890</integer>
-
- <negative-integer>-02147483648</negative-integer>
- <negative-integer> -1234567890 </negative-integer>
-
- <non-positive-integer>0</non-positive-integer>
- <non-positive-integer>-02147483648</non-positive-integer>
- <non-positive-integer> -1234567890 </non-positive-integer>
-
- <positive-integer>4294967295</positive-integer>
- <positive-integer> +01234567890 </positive-integer>
-
- <non-negative-integer>0</non-negative-integer>
- <non-negative-integer>4294967295</non-negative-integer>
- <non-negative-integer> +01234567890 </non-negative-integer>
-
- <float>0</float>
- <float>+0</float>
- <float>-0</float>
- <float>INF</float>
- <float>-INF</float>
- <float>NaN</float>
- <float> 123.567 </float>
- <float>+123.567</float>
- <float>-123.567e5</float>
- <float>-.45E-5</float>
-
- <double>0</double>
- <double>+0</double>
- <double>-0</double>
- <double>INF</double>
- <double>-INF</double>
- <double>NaN</double>
- <double> 123.567 </double>
- <double>+123.567</double>
- <double>-123.567e5</double>
- <double>-.45E-5</double>
-
- <decimal>0</decimal>
- <decimal>+0</decimal>
- <decimal>-0</decimal>
- <decimal> 123.567 </decimal>
- <decimal>+123.567</decimal>
- <decimal>-123.567</decimal>
-
- <string>string space
-newline
- </string>
-
- <normalized-string> string space
-newline
-
- </normalized-string>
-
- <token> string space
-newline
-
- </token>
-
- <name> as123:345-.abs </name>
-
- <nmtoken> 1as123:345-.abs </nmtoken>
-
- <nmtokens> abc 123 </nmtokens>
-
- <ncname> as123_345-.abs </ncname>
-
- <id> as123_345-.abs </id>
- <id> abc </id>
- <id> a123 </id>
-
- <idref> as123_345-.abs </idref>
-
- <idrefs> abc a123 </idrefs>
-
- <language> x </language>
- <language> en </language>
- <language> en-us </language>
- <language>one-two-three-four44-seven77-eight888</language>
-
- <uri> </uri>
- <uri> relative </uri>
- <uri> #id </uri>
- <uri> http://www.example.com/foo#bar </uri>
-
- <qname>schemaLocation</qname>
- <qname>xsi:schemaLocation</qname>
-
- <base64_binary> MTIzND
- VhYmNqaw = =</base64_binary>
- <base64_binary>YQ==</base64_binary>
- <base64_binary>YWI=</base64_binary>
- <base64_binary>YWJj</base64_binary>
-
- <hex_binary> </hex_binary>
- <hex_binary> 31323334356162636a6b </hex_binary>
-
- <gday> ---12+12:00 </gday>
- <gday>---01</gday>
- <gday>---31</gday>
- <gday>---15Z</gday>
- <gday>---15-14:00</gday>
-
- <gmonth> --10+12:00 </gmonth>
- <gmonth>--01</gmonth>
- <gmonth>--12Z</gmonth>
-
- <gyear> 2007+12:00 </gyear>
- <gyear>0001</gyear>
- <gyear>-20000Z</gyear>
-
- <gmonth_day> --10-28+12:00 </gmonth_day>
- <gmonth_day>--12-31</gmonth_day>
- <gmonth_day>--01-01Z</gmonth_day>
-
- <gyear_month> 2007-12+12:00 </gyear_month>
- <gyear_month>-2007-10</gyear_month>
- <gyear_month>20007-10Z</gyear_month>
- <gyear_month>-20007-01</gyear_month>
-
- <date> 2007-12-26+12:00 </date>
- <date>-2007-10-15</date>
- <date>20007-12-31Z</date>
- <date>-20007-01-01</date>
-
- <time> 12:46:23.456+12:00 </time>
- <time>12:13:14</time>
- <time>12:13:14Z</time>
-
- <date_time> 2007-12-26T12:13:14.123+12:00 </date_time>
- <date_time>-2007-10-15T12:13:14</date_time>
- <date_time>20007-12-31T12:13:14Z</date_time>
- <date_time>-20007-01-01T12:13:14</date_time>
-
- <duration> -P2007Y13M32DT25H61M61.123S </duration>
- <duration>P1Y</duration>
- <duration>P1M</duration>
- <duration>P1D</duration>
- <duration>PT1H</duration>
- <duration>PT1M</duration>
- <duration>PT1.1S</duration>
- <duration>P1YT1S</duration>
-
-</t:root>
diff --git a/tests/cxx/parser/built-in/test.xsd b/tests/cxx/parser/built-in/test.xsd
deleted file mode 100644
index 9c00eb4..0000000
--- a/tests/cxx/parser/built-in/test.xsd
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="type">
- <sequence>
- <element name="any-type" type="anyType" maxOccurs="unbounded"/>
- <element name="any-simple-type" type="anySimpleType" maxOccurs="unbounded"/>
-
- <element name="boolean" type="boolean" maxOccurs="unbounded"/>
-
- <element name="byte" type="byte" maxOccurs="unbounded"/>
- <element name="unsigned-byte" type="unsignedByte" maxOccurs="unbounded"/>
- <element name="short" type="short" maxOccurs="unbounded"/>
- <element name="unsigned-short" type="unsignedShort" maxOccurs="unbounded"/>
- <element name="int" type="int" maxOccurs="unbounded"/>
- <element name="unsigned-int" type="unsignedInt" maxOccurs="unbounded"/>
- <element name="long" type="long" maxOccurs="unbounded"/>
- <element name="unsigned-long" type="unsignedLong" maxOccurs="unbounded"/>
-
- <element name="integer" type="integer" maxOccurs="unbounded"/>
- <element name="negative-integer" type="negativeInteger" maxOccurs="unbounded"/>
- <element name="non-positive-integer" type="nonPositiveInteger" maxOccurs="unbounded"/>
- <element name="positive-integer" type="positiveInteger" maxOccurs="unbounded"/>
- <element name="non-negative-integer" type="nonNegativeInteger" maxOccurs="unbounded"/>
-
- <element name="float" type="float" maxOccurs="unbounded"/>
- <element name="double" type="double" maxOccurs="unbounded"/>
- <element name="decimal" type="decimal" maxOccurs="unbounded"/>
-
- <element name="string" type="string" maxOccurs="unbounded"/>
- <element name="normalized-string" type="normalizedString" maxOccurs="unbounded"/>
- <element name="token" type="token" maxOccurs="unbounded"/>
- <element name="name" type="Name" maxOccurs="unbounded"/>
- <element name="nmtoken" type="NMTOKEN" maxOccurs="unbounded"/>
- <element name="nmtokens" type="NMTOKENS" maxOccurs="unbounded"/>
- <element name="ncname" type="NCName" maxOccurs="unbounded"/>
- <element name="id" type="ID" maxOccurs="unbounded"/>
- <element name="idref" type="IDREF" maxOccurs="unbounded"/>
- <element name="idrefs" type="IDREFS" maxOccurs="unbounded"/>
-
- <element name="language" type="language" maxOccurs="unbounded"/>
- <element name="uri" type="anyURI" maxOccurs="unbounded"/>
- <element name="qname" type="QName" maxOccurs="unbounded"/>
-
- <element name="base64_binary" type="base64Binary" maxOccurs="unbounded"/>
- <element name="hex_binary" type="hexBinary" maxOccurs="unbounded"/>
-
- <element name="gday" type="gDay" maxOccurs="unbounded"/>
- <element name="gmonth" type="gMonth" maxOccurs="unbounded"/>
- <element name="gyear" type="gYear" maxOccurs="unbounded"/>
- <element name="gmonth_day" type="gMonthDay" maxOccurs="unbounded"/>
- <element name="gyear_month" type="gYearMonth" maxOccurs="unbounded"/>
- <element name="date" type="date" maxOccurs="unbounded"/>
- <element name="time" type="time" maxOccurs="unbounded"/>
- <element name="date_time" type="dateTime" maxOccurs="unbounded"/>
- <element name="duration" type="duration" maxOccurs="unbounded"/>
-
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/parser/enumeration/driver.cxx b/tests/cxx/parser/enumeration/driver.cxx
deleted file mode 100644
index e90f58b..0000000
--- a/tests/cxx/parser/enumeration/driver.cxx
+++ /dev/null
@@ -1,81 +0,0 @@
-// file : tests/cxx/parser/enumeration/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test xsd:enumeration parsing.
-//
-
-#include <string>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace xml_schema;
-
-struct digit_pimpl: test::digit_pskel, int_pimpl
-{
-};
-
-struct gender_pimpl: test::gender_pskel, string_pimpl
-{
- virtual ::gender
- post_gender ()
- {
- std::string str (post_string ());
-
- if (str == "male")
- return male;
- else
- return female;
- }
-};
-
-struct type_pimpl: test::type_pskel
-{
- virtual void
- digit (int i)
- {
- cout << i << endl;
- }
-
- virtual void
- gender (::gender g)
- {
- cout << g << endl;
- }
-};
-
-int
-main (int argc, char* argv[])
-{
- if (argc != 2)
- {
- cerr << "usage: " << argv[0] << " test.xml" << endl;
- return 1;
- }
-
- try
- {
- digit_pimpl digit_p;
- gender_pimpl gender_p;
- type_pimpl type_p;
-
- type_p.parsers (digit_p, gender_p);
-
- 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 (std::ios_base::failure const&)
- {
- cerr << "io failure" << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/parser/enumeration/gender.hxx b/tests/cxx/parser/enumeration/gender.hxx
deleted file mode 100644
index a2e5cd8..0000000
--- a/tests/cxx/parser/enumeration/gender.hxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// file : tests/cxx/parser/enumeration/gender.hxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-#ifndef GENDER_HXX
-#define GENDER_HXX
-
-enum gender
-{
- male,
- female
-};
-
-#endif // GENDER_HXX
diff --git a/tests/cxx/parser/enumeration/makefile b/tests/cxx/parser/enumeration/makefile
deleted file mode 100644
index f2ae834..0000000
--- a/tests/cxx/parser/enumeration/makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# file : tests/cxx/parser/enumeration/makefile
-# 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): xsd_options += --type-map $(src_base)/test.map
-$(gen): $(out_root)/xsd/xsd $(src_base)/test.map
-
-$(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/tests/cxx/parser/enumeration/output b/tests/cxx/parser/enumeration/output
deleted file mode 100644
index 16db301..0000000
--- a/tests/cxx/parser/enumeration/output
+++ /dev/null
@@ -1,3 +0,0 @@
-1
-0
-1
diff --git a/tests/cxx/parser/enumeration/test.map b/tests/cxx/parser/enumeration/test.map
deleted file mode 100644
index f8868d6..0000000
--- a/tests/cxx/parser/enumeration/test.map
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace test
-{
- include "gender.hxx";
-
- digit int int;
- gender ::gender ::gender;
-}
diff --git a/tests/cxx/parser/enumeration/test.xml b/tests/cxx/parser/enumeration/test.xml
deleted file mode 100644
index a6fa893..0000000
--- a/tests/cxx/parser/enumeration/test.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <digit>1</digit>
-
- <gender>male</gender>
- <gender>female</gender>
-
-</t:root>
diff --git a/tests/cxx/parser/enumeration/test.xsd b/tests/cxx/parser/enumeration/test.xsd
deleted file mode 100644
index ded3a18..0000000
--- a/tests/cxx/parser/enumeration/test.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <simpleType name="digit">
- <restriction base="int">
- <enumeration value="0"/>
- <enumeration value="1"/>
- <enumeration value="2"/>
- <enumeration value="3"/>
- <enumeration value="4"/>
- <enumeration value="5"/>
- <enumeration value="6"/>
- <enumeration value="7"/>
- <enumeration value="8"/>
- <enumeration value="9"/>
- </restriction>
- </simpleType>
-
- <simpleType name="gender">
- <restriction base="string">
- <enumeration value="male"/>
- <enumeration value="female"/>
- </restriction>
- </simpleType>
-
- <complexType name="type">
- <choice maxOccurs="unbounded">
- <element name="digit" type="t:digit"/>
- <element name="gender" type="t:gender"/>
- </choice>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/parser/generated-impl/makefile b/tests/cxx/parser/generated-impl/makefile
deleted file mode 100644
index ba26c37..0000000
--- a/tests/cxx/parser/generated-impl/makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# file : tests/cxx/parser/generated-impl/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
-
-xsd := test.xsd
-
-obj := $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.o) $(xsd:.xsd=-pimpl.o) $(xsd:.xsd=-driver.o))
-dep := $(obj:.o=.o.d)
-
-driver := $(out_base)/$(xsd:.xsd=-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) \
- $(xsd:.xsd=-pimpl.hxx) \
- $(xsd:.xsd=-pimpl.cxx) \
- $(xsd:.xsd=-driver.cxx)
-
-gen := $(addprefix $(out_base)/,$(genf))
-
-
-$(gen): xsd := $(out_root)/xsd/xsd
-$(gen): xsd_options += --generate-print-impl --generate-test-driver \
---force-overwrite
-$(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)) \
- $(addprefix $(out_base)/,$(xsd:.xsd=-pimpl.cxx.xsd.clean))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(gen): | $(out_base)/.gitignore
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := $(xsd:.xsd=-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)
-
-xsd_parser_impl_suffix := -pimpl
-
-$(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/tests/cxx/parser/generated-impl/output b/tests/cxx/parser/generated-impl/output
deleted file mode 100644
index 7c58647..0000000
--- a/tests/cxx/parser/generated-impl/output
+++ /dev/null
@@ -1,122 +0,0 @@
-gender: male
-foo: foo
-gender: male
-int: 0
-int: 1
-int: 2
-int: 3
-foo: foo
-int: 3
-int: 2
-int: 1
-int: 0
-union: 9
-foo: foo
-union: string
-x: x
-a: aaa
-x: x
-y: y
-a: aaa
-b: bbb
-boolean: 1
-boolean: 0
-boolean: 1
-boolean: 0
-byte: 0
-byte: 123
-byte: -123
-unsigned-byte: 0
-unsigned-byte: 123
-short: 0
-short: -1234
-short: 1234
-unsigned-short: 0
-unsigned-short: 1234
-int: 0
-int: -12345
-int: 12345
-unsigned-int: 0
-unsigned-int: 12345
-long: 0
-long: -123456
-long: 123456
-unsigned-long: 0
-unsigned-long: 123456
-integer: 0
-integer: -123456
-integer: 123456
-negative-integer: -123456
-non-positive-integer: 0
-non-positive-integer: -123456
-positive-integer: 123456
-non-negative-integer: 0
-non-negative-integer: 123456
-float: 0
-float: 1.123
-float: -1.123
-double: 0
-double: 1.1234
-double: -1.1234
-decimal: 0
-decimal: 1.1234
-decimal: -1.1234
-string: string space newline
-normalized-string: string space newline
-token: string space newline
-name: as123:345-.abs
-nmtoken: 1as123:345-.abs
-nmtokens: abc 123
-ncname: as123_345-.abs
-id: abc
-id: a123
-idref: abc
-idrefs: abc a123
-language: en
-language: en-us
-uri: http://www.example.com/foo#bar
-qname: schemaLocation
-qname: xsi:schemaLocation
-base64_binary: 10 bytes
-base64_binary: 1 bytes
-base64_binary: 2 bytes
-base64_binary: 3 bytes
-hex_binary: 0 bytes
-hex_binary: 10 bytes
-gday: ---12+12:0
-gday: ---1
-gday: ---31
-gday: ---15+0:0
-gday: ---15-14:0
-gmonth: --10+12:0
-gmonth: --1
-gmonth: --12+0:0
-gyear: 2007+12:0
-gyear: 1
-gyear: -20000+0:0
-gmonth_day: --10-28+12:0
-gmonth_day: --12-31
-gmonth_day: --1-1+0:0
-gyear_month: 2007-12+12:0
-gyear_month: -2007-10
-gyear_month: 20007-10+0:0
-gyear_month: -20007-1
-date: 2007-12-26+12:0
-date: -2007-10-15
-date: 20007-12-31+0:0
-date: -20007-1-1
-time: 12:46:23.456+12:0
-time: 12:13:14
-time: 12:13:14+0:0
-date_time: 2007-12-26T12:13:14.123+12:0
-date_time: -2007-10-15T12:13:14
-date_time: 20007-12-31T12:13:14+0:0
-date_time: -20007-1-1T12:13:14
-duration: -P2007Y13M32DT25H61M61.123S
-duration: P1Y0M0DT0H0M0S
-duration: P0Y1M0DT0H0M0S
-duration: P0Y0M1DT0H0M0S
-duration: P0Y0M0DT1H0M0S
-duration: P0Y0M0DT0H1M0S
-duration: P0Y0M0DT0H0M1.1S
-duration: P1Y0M0DT0H0M1S
diff --git a/tests/cxx/parser/generated-impl/test.xml b/tests/cxx/parser/generated-impl/test.xml
deleted file mode 100644
index 2f29a39..0000000
--- a/tests/cxx/parser/generated-impl/test.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <gender>male</gender>
- <gender-extension foo="foo">male</gender-extension>
-
- <list>0 1 2 3</list>
- <list-extension foo="foo">3 2 1 0</list-extension>
-
- <union>9</union>
- <union-extension foo="foo">string</union-extension>
-
- <complex x="x">
- <a>aaa</a>
- </complex>
-
- <complex-extension x="x" y="y">
- <a>aaa</a>
- <b>bbb</b>
- </complex-extension>
-
- <any-type>aaa<b>bbb</b>ccc</any-type>
- <any-simple-type>abc123</any-simple-type>
-
- <boolean>1</boolean>
- <boolean> 0 </boolean>
- <boolean>true</boolean>
- <boolean> false </boolean>
-
- <byte>0</byte>
- <byte>123</byte>
- <byte>-123</byte>
-
- <unsigned-byte>0</unsigned-byte>
- <unsigned-byte>123</unsigned-byte>
-
- <short>0</short>
- <short>-1234</short>
- <short>1234</short>
-
- <unsigned-short>0</unsigned-short>
- <unsigned-short>1234</unsigned-short>
-
- <int>0</int>
- <int>-12345</int>
- <int>12345</int>
-
- <unsigned-int>0</unsigned-int>
- <unsigned-int>12345</unsigned-int>
-
- <long>0</long>
- <long>-123456</long>
- <long>123456</long>
-
- <unsigned-long>0</unsigned-long>
- <unsigned-long>123456</unsigned-long>
-
- <integer>0</integer>
- <integer>-123456</integer>
- <integer>123456</integer>
-
- <negative-integer>-123456</negative-integer>
-
- <non-positive-integer>0</non-positive-integer>
- <non-positive-integer>-123456</non-positive-integer>
-
- <positive-integer>123456</positive-integer>
-
- <non-negative-integer>0</non-negative-integer>
- <non-negative-integer>123456</non-negative-integer>
-
- <float>0</float>
- <float>1.123</float>
- <float>-1.123</float>
-
- <double>0</double>
- <double>1.1234</double>
- <double>-1.1234</double>
-
- <decimal>0</decimal>
- <decimal>1.1234</decimal>
- <decimal>-1.1234</decimal>
-
- <string>string space newline</string>
-
- <normalized-string>string space newline</normalized-string>
-
- <token> string space newline</token>
-
- <name>as123:345-.abs</name>
-
- <nmtoken>1as123:345-.abs</nmtoken>
-
- <nmtokens>abc 123</nmtokens>
-
- <ncname>as123_345-.abs</ncname>
-
- <id>abc</id>
- <id>a123</id>
-
- <idref>abc</idref>
-
- <idrefs>abc a123</idrefs>
-
- <language>en</language>
- <language>en-us</language>
-
- <uri>http://www.example.com/foo#bar</uri>
-
- <qname>schemaLocation</qname>
- <qname>xsi:schemaLocation</qname>
-
- <base64_binary>MTIzNDVhYmNqaw==</base64_binary>
- <base64_binary>YQ==</base64_binary>
- <base64_binary>YWI=</base64_binary>
- <base64_binary>YWJj</base64_binary>
-
- <hex_binary></hex_binary>
- <hex_binary>31323334356162636a6b</hex_binary>
-
- <gday>---12+12:00</gday>
- <gday>---01</gday>
- <gday>---31</gday>
- <gday>---15Z</gday>
- <gday>---15-14:00</gday>
-
- <gmonth>--10+12:00</gmonth>
- <gmonth>--01</gmonth>
- <gmonth>--12Z</gmonth>
-
- <gyear>2007+12:00</gyear>
- <gyear>0001</gyear>
- <gyear>-20000Z</gyear>
-
- <gmonth_day>--10-28+12:00</gmonth_day>
- <gmonth_day>--12-31</gmonth_day>
- <gmonth_day>--01-01Z</gmonth_day>
-
- <gyear_month>2007-12+12:00</gyear_month>
- <gyear_month>-2007-10</gyear_month>
- <gyear_month>20007-10Z</gyear_month>
- <gyear_month>-20007-01</gyear_month>
-
- <date>2007-12-26+12:00</date>
- <date>-2007-10-15</date>
- <date>20007-12-31Z</date>
- <date>-20007-01-01</date>
-
- <time>12:46:23.456+12:00</time>
- <time>12:13:14</time>
- <time>12:13:14Z</time>
-
- <date_time>2007-12-26T12:13:14.123+12:00</date_time>
- <date_time>-2007-10-15T12:13:14</date_time>
- <date_time>20007-12-31T12:13:14Z</date_time>
- <date_time>-20007-01-01T12:13:14</date_time>
-
- <duration>-P2007Y13M32DT25H61M61.123S</duration>
- <duration>P1Y</duration>
- <duration>P1M</duration>
- <duration>P1D</duration>
- <duration>PT1H</duration>
- <duration>PT1M</duration>
- <duration>PT1.1S</duration>
- <duration>P1YT1S</duration>
-
-</t:root>
diff --git a/tests/cxx/parser/generated-impl/test.xsd b/tests/cxx/parser/generated-impl/test.xsd
deleted file mode 100644
index 7bc8f23..0000000
--- a/tests/cxx/parser/generated-impl/test.xsd
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <!-- enum -->
-
- <simpleType name="gender">
- <restriction base="string">
- <enumeration value="male"/>
- <enumeration value="female"/>
- </restriction>
- </simpleType>
-
- <complexType name="gender-extension">
- <simpleContent>
- <extension base="t:gender">
- <attribute name="foo" type="string"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <!-- list -->
-
- <simpleType name="list">
- <list itemType="int"/>
- </simpleType>
-
- <complexType name="list-extension">
- <simpleContent>
- <extension base="t:list">
- <attribute name="foo" type="string"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <!-- union -->
-
- <simpleType name="union">
- <union memberTypes="int string"/>
- </simpleType>
-
- <complexType name="union-extension">
- <simpleContent>
- <extension base="t:union">
- <attribute name="foo" type="string"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <!-- complex -->
-
- <complexType name="complex">
- <sequence>
- <element name="a" type="string"/>
- </sequence>
- <attribute name="x" type="string"/>
- </complexType>
-
- <complexType name="complex-extension">
- <complexContent>
- <extension base="t:complex">
- <sequence>
- <element name="b" type="string"/>
- </sequence>
- <attribute name="y" type="string"/>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="type">
- <sequence>
- <element name="gender" type="t:gender"/>
- <element name="gender-extension" type="t:gender-extension"/>
-
- <element name="list" type="t:list"/>
- <element name="list-extension" type="t:list-extension"/>
-
- <element name="union" type="t:union"/>
- <element name="union-extension" type="t:union-extension"/>
-
- <element name="complex" type="t:complex"/>
- <element name="complex-extension" type="t:complex-extension"/>
-
- <!-- Built-in types. -->
-
- <element name="any-type" type="anyType" maxOccurs="unbounded"/>
- <element name="any-simple-type" type="anySimpleType" maxOccurs="unbounded"/>
-
- <element name="boolean" type="boolean" maxOccurs="unbounded"/>
-
- <element name="byte" type="byte" maxOccurs="unbounded"/>
- <element name="unsigned-byte" type="unsignedByte" maxOccurs="unbounded"/>
- <element name="short" type="short" maxOccurs="unbounded"/>
- <element name="unsigned-short" type="unsignedShort" maxOccurs="unbounded"/>
- <element name="int" type="int" maxOccurs="unbounded"/>
- <element name="unsigned-int" type="unsignedInt" maxOccurs="unbounded"/>
- <element name="long" type="long" maxOccurs="unbounded"/>
- <element name="unsigned-long" type="unsignedLong" maxOccurs="unbounded"/>
-
- <element name="integer" type="integer" maxOccurs="unbounded"/>
- <element name="negative-integer" type="negativeInteger" maxOccurs="unbounded"/>
- <element name="non-positive-integer" type="nonPositiveInteger" maxOccurs="unbounded"/>
- <element name="positive-integer" type="positiveInteger" maxOccurs="unbounded"/>
- <element name="non-negative-integer" type="nonNegativeInteger" maxOccurs="unbounded"/>
-
- <element name="float" type="float" maxOccurs="unbounded"/>
- <element name="double" type="double" maxOccurs="unbounded"/>
- <element name="decimal" type="decimal" maxOccurs="unbounded"/>
-
- <element name="string" type="string" maxOccurs="unbounded"/>
- <element name="normalized-string" type="normalizedString" maxOccurs="unbounded"/>
- <element name="token" type="token" maxOccurs="unbounded"/>
- <element name="name" type="Name" maxOccurs="unbounded"/>
- <element name="nmtoken" type="NMTOKEN" maxOccurs="unbounded"/>
- <element name="nmtokens" type="NMTOKENS" maxOccurs="unbounded"/>
- <element name="ncname" type="NCName" maxOccurs="unbounded"/>
- <element name="id" type="ID" maxOccurs="unbounded"/>
- <element name="idref" type="IDREF" maxOccurs="unbounded"/>
- <element name="idrefs" type="IDREFS" maxOccurs="unbounded"/>
-
- <element name="language" type="language" maxOccurs="unbounded"/>
- <element name="uri" type="anyURI" maxOccurs="unbounded"/>
- <element name="qname" type="QName" maxOccurs="unbounded"/>
-
- <element name="base64_binary" type="base64Binary" maxOccurs="unbounded"/>
- <element name="hex_binary" type="hexBinary" maxOccurs="unbounded"/>
-
- <element name="gday" type="gDay" maxOccurs="unbounded"/>
- <element name="gmonth" type="gMonth" maxOccurs="unbounded"/>
- <element name="gyear" type="gYear" maxOccurs="unbounded"/>
- <element name="gmonth_day" type="gMonthDay" maxOccurs="unbounded"/>
- <element name="gyear_month" type="gYearMonth" maxOccurs="unbounded"/>
- <element name="date" type="date" maxOccurs="unbounded"/>
- <element name="time" type="time" maxOccurs="unbounded"/>
- <element name="date_time" type="dateTime" maxOccurs="unbounded"/>
- <element name="duration" type="duration" maxOccurs="unbounded"/>
-
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/parser/list/driver.cxx b/tests/cxx/parser/list/driver.cxx
deleted file mode 100644
index dfc27bf..0000000
--- a/tests/cxx/parser/list/driver.cxx
+++ /dev/null
@@ -1,105 +0,0 @@
-// file : tests/cxx/parser/list/driver.cxx
-// 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/tests/cxx/parser/list/makefile b/tests/cxx/parser/list/makefile
deleted file mode 100644
index c3b5a87..0000000
--- a/tests/cxx/parser/list/makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# file : tests/cxx/parser/list/makefile
-# 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/tests/cxx/parser/list/output b/tests/cxx/parser/list/output
deleted file mode 100644
index 3642c4d..0000000
--- a/tests/cxx/parser/list/output
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-}
-
-{
-}
-
-{
-}
-
-{
- 'one'
-}
-
-{
- 'one'
- 'two'
- 'three'
-}
-
-{
- lang: 'en'
- 'one'
- 'two'
- 'three'
-}
-
diff --git a/tests/cxx/parser/list/test.xml b/tests/cxx/parser/list/test.xml
deleted file mode 100644
index 52229db..0000000
--- a/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/tests/cxx/parser/list/test.xsd b/tests/cxx/parser/list/test.xsd
deleted file mode 100644
index 79bd084..0000000
--- a/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>
diff --git a/tests/cxx/parser/makefile b/tests/cxx/parser/makefile
deleted file mode 100644
index 53de7c7..0000000
--- a/tests/cxx/parser/makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# file : tests/cxx/parser/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
-
-tests := built-in enumeration generated-impl list recursive \
-name-clash/inheritance polymorphism test-template validation \
-union
-
-default := $(out_base)/
-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)))
-
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
diff --git a/tests/cxx/parser/name-clash/inheritance/driver.cxx b/tests/cxx/parser/name-clash/inheritance/driver.cxx
deleted file mode 100644
index dc5f871..0000000
--- a/tests/cxx/parser/name-clash/inheritance/driver.cxx
+++ /dev/null
@@ -1,62 +0,0 @@
-// file : tests/cxx/parser/name-clash/inheritance/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test for name clashes across inheritance hierarchy.
-//
-
-#include <string>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-
-struct derived_pimpl: derived_pskel
-{
- virtual void
- e (string const& v)
- {
- cout << "e: " << v << endl;
- }
-
- virtual void
- e1 (string const& v)
- {
- cout << "e1: " << v << endl;
- }
-};
-
-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;
- derived_pimpl derived_p;
-
- derived_p.parsers (string_p, string_p);
-
- xml_schema::document doc_p (derived_p, "test", "root");
-
- derived_p.pre ();
- doc_p.parse (argv[1]);
- derived_p.post_derived ();
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- return 1;
- }
- catch (std::ios_base::failure const&)
- {
- cerr << "io failure" << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/parser/name-clash/inheritance/makefile b/tests/cxx/parser/name-clash/inheritance/makefile
deleted file mode 100644
index c540ebe..0000000
--- a/tests/cxx/parser/name-clash/inheritance/makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# file : tests/cxx/parser/name-clash/inheritance/makefile
-# 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): xsd_options += --generate-validation
-$(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/tests/cxx/parser/name-clash/inheritance/output b/tests/cxx/parser/name-clash/inheritance/output
deleted file mode 100644
index 4efd51b..0000000
--- a/tests/cxx/parser/name-clash/inheritance/output
+++ /dev/null
@@ -1,2 +0,0 @@
-e: e
-e1: e1
diff --git a/tests/cxx/parser/name-clash/inheritance/test.xml b/tests/cxx/parser/name-clash/inheritance/test.xml
deleted file mode 100644
index 8c17101..0000000
--- a/tests/cxx/parser/name-clash/inheritance/test.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <e>e</e>
- <e>e1</e>
-
-</t:root>
diff --git a/tests/cxx/parser/name-clash/inheritance/test.xsd b/tests/cxx/parser/name-clash/inheritance/test.xsd
deleted file mode 100644
index 62a782e..0000000
--- a/tests/cxx/parser/name-clash/inheritance/test.xsd
+++ /dev/null
@@ -1,22 +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="e" type="string"/>
- </sequence>
- </complexType>
-
- <complexType name="derived">
- <complexContent>
- <extension base="t:base">
- <sequence>
- <element name="e" type="string"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <element name="root" type="t:derived"/>
-
-</schema>
diff --git a/tests/cxx/parser/polymorphism/makefile b/tests/cxx/parser/polymorphism/makefile
deleted file mode 100644
index 252d857..0000000
--- a/tests/cxx/parser/polymorphism/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# file : tests/cxx/parser/polymorphism/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
-
-tests := same-type recursive
-
-default := $(out_base)/
-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)))
-
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
diff --git a/tests/cxx/parser/polymorphism/recursive/driver.cxx b/tests/cxx/parser/polymorphism/recursive/driver.cxx
deleted file mode 100644
index 4a401bd..0000000
--- a/tests/cxx/parser/polymorphism/recursive/driver.cxx
+++ /dev/null
@@ -1,68 +0,0 @@
-// file : tests/cxx/parser/polymorphism/recursive/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test polymorphic recursive parsing.
-//
-
-#include <string>
-#include <iostream>
-
-#include "test-pskel.hxx"
-#include "test-pimpl.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
- {
- xml_schema::int_pimpl int_p;
-
- root_pimpl root_p;
- expression_pimpl expression_p;
- recursive_pimpl recursive_p;
- value_a_pimpl value_a_p;
- value_b_pimpl value_b_p;
-
- xml_schema::parser_map_impl expression_map;
-
- // Connect the parsers together.
- //
- root_p.parsers (expression_p);
- expression_map.insert(value_a_p);
- expression_map.insert(value_b_p);
- expression_map.insert(recursive_p);
-
- root_p.expression_parser(expression_map);
-
- recursive_p.parsers(expression_p);
- recursive_p.expression_parser(expression_map);
-
- value_a_p.parsers(int_p);
- value_b_p.parsers(int_p);
-
- xml_schema::document doc_p (root_p, "test", "root", true);
-
- root_p.pre ();
- doc_p.parse (argv[1]);
- root_p.post_root ();
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- return 1;
- }
- catch (std::ios_base::failure const&)
- {
- cerr << "io failure" << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/parser/polymorphism/recursive/makefile b/tests/cxx/parser/polymorphism/recursive/makefile
deleted file mode 100644
index 855d471..0000000
--- a/tests/cxx/parser/polymorphism/recursive/makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# file : tests/cxx/parser/polymorphism/recursive/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make
-
-xsd := test.xsd
-cxx := driver.cxx test-pimpl.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): xsd_options += --generate-polymorphic
-$(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/tests/cxx/parser/polymorphism/recursive/output b/tests/cxx/parser/polymorphism/recursive/output
deleted file mode 100644
index 28a835f..0000000
--- a/tests/cxx/parser/polymorphism/recursive/output
+++ /dev/null
@@ -1,22 +0,0 @@
-root start
-recursive start
-value_a begin
-value->constant
-value: post_expression override
-value_a: post_value override
-value_a end
-recursive->expression event
-recursive start
-value_b begin
-value->constant
-value: post_expression override
-value_b: post_value override
-value_b end
-recursive->expression event
-recursive: post_expression override
-recursive end
-recursive->expression event
-recursive: post_expression override
-recursive end
-root->expression
-root end
diff --git a/tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx b/tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx
deleted file mode 100644
index 8c355ea..0000000
--- a/tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx
+++ /dev/null
@@ -1,147 +0,0 @@
-// file : tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-#include <iostream>
-
-#include "test-pimpl.hxx"
-
-using namespace std;
-
-namespace test
-{
- // root_pimpl
- //
-
- void root_pimpl::
- pre ()
- {
- cout << "root start" << endl;
- }
-
- void root_pimpl::
- expression ()
- {
- cout << "root->expression" << endl;
- }
-
- void root_pimpl::
- post_root ()
- {
- cout << "root end" << endl;
- }
-
- // expression_pimpl
- //
-
- void expression_pimpl::
- pre ()
- {
- cout << "expression begin" << endl;
- }
-
- void expression_pimpl::
- post_expression ()
- {
- cout << "expression end" << endl;
- }
-
- // recursive_pimpl
- //
-
- void recursive_pimpl::
- pre ()
- {
- cout << "recursive start" << endl;
- }
-
- void recursive_pimpl::
- expression ()
- {
- cout << "recursive->expression event" << endl;
- }
-
- void recursive_pimpl::
- post_expression ()
- {
- cout << "recursive: post_expression override" << endl;
- post_recursive ();
- }
-
- void recursive_pimpl::
- post_recursive ()
- {
- cout << "recursive end" << endl;
- }
-
- // value_pimpl
- //
-
- void value_pimpl::
- pre ()
- {
- cout << "value begin" << endl;
- }
-
- void value_pimpl::
- constant (int)
- {
- cout << "value->constant" << endl;
- }
-
- void value_pimpl::
- post_expression ()
- {
- cout << "value: post_expression override" << endl;
- post_value ();
- }
-
- void value_pimpl::
- post_value ()
- {
- cout << "value end" << endl;
- }
-
- // value_a_pimpl
- //
-
- void value_a_pimpl::
- pre ()
- {
- cout << "value_a begin" << endl;
- }
-
- void value_a_pimpl::
- post_value ()
- {
- cout << "value_a: post_value override" << endl;
- post_value_a ();
- }
-
- void value_a_pimpl::
- post_value_a ()
- {
- cout << "value_a end" << endl;
- }
-
- // value_b_pimpl
- //
-
- void value_b_pimpl::
- pre ()
- {
- cout << "value_b begin" << endl;
- }
-
- void value_b_pimpl::
- post_value ()
- {
- cout << "value_b: post_value override" << endl;
- post_value_b ();
- }
-
- void value_b_pimpl::
- post_value_b ()
- {
- cout << "value_b end" << endl;
- }
-}
diff --git a/tests/cxx/parser/polymorphism/recursive/test-pimpl.hxx b/tests/cxx/parser/polymorphism/recursive/test-pimpl.hxx
deleted file mode 100644
index 932be9e..0000000
--- a/tests/cxx/parser/polymorphism/recursive/test-pimpl.hxx
+++ /dev/null
@@ -1,94 +0,0 @@
-// file : tests/cxx/parser/polymorphism/recursive/test-pimpl.hxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-#ifndef TEST_PIMPL_HXX
-#define TEST_PIMPL_HXX
-
-#include "test-pskel.hxx"
-
-namespace test
-{
- class root_pimpl: public virtual root_pskel
- {
- public:
- virtual void
- pre ();
-
- virtual void
- expression ();
-
- virtual void
- post_root ();
- };
-
- class expression_pimpl: public virtual expression_pskel
- {
- public:
- virtual void
- pre ();
-
- virtual void
- post_expression ();
- };
-
- class recursive_pimpl: public virtual recursive_pskel,
- public expression_pimpl
- {
- public:
- virtual void
- pre ();
-
- virtual void
- expression ();
-
- virtual void
- post_expression ();
-
- virtual void
- post_recursive ();
- };
-
- class value_pimpl: public virtual value_pskel, public expression_pimpl
- {
- public:
- virtual void
- pre ();
-
- virtual void
- constant (int);
-
- virtual void
- post_expression ();
-
- virtual void
- post_value ();
- };
-
- class value_a_pimpl: public virtual value_a_pskel, public value_pimpl
- {
- public:
- virtual void
- pre ();
-
- virtual void
- post_value ();
-
- virtual void
- post_value_a ();
- };
-
- class value_b_pimpl: public virtual value_b_pskel, public value_pimpl
- {
- public:
- virtual void
- pre ();
-
- virtual void
- post_value ();
-
- virtual void
- post_value_b ();
- };
-}
-
-#endif // TEST_PIMPL_HXX
diff --git a/tests/cxx/parser/polymorphism/recursive/test.xml b/tests/cxx/parser/polymorphism/recursive/test.xml
deleted file mode 100644
index 42035ba..0000000
--- a/tests/cxx/parser/polymorphism/recursive/test.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root xmlns="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
- <recursive>
- <value-a>
- <constant>1</constant>
- </value-a>
- <recursive>
- <value-b>
- <constant>2</constant>
- </value-b>
- </recursive>
- </recursive>
-</root>
diff --git a/tests/cxx/parser/polymorphism/recursive/test.xsd b/tests/cxx/parser/polymorphism/recursive/test.xsd
deleted file mode 100644
index affcc8a..0000000
--- a/tests/cxx/parser/polymorphism/recursive/test.xsd
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:t="test"
- targetNamespace="test"
- elementFormDefault="qualified">
-
- <element name="root" type="t:root"/>
- <complexType name="root">
- <sequence>
- <element ref="t:expression" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
- <element name="expression" type="t:expression" abstract="true"/>
- <complexType name="expression" abstract="true"/>
-
- <element name="recursive" type="t:recursive" substitutionGroup="t:expression"/>
- <complexType name="recursive">
- <complexContent>
- <extension base="t:expression">
- <sequence minOccurs="0" maxOccurs="unbounded">
- <element ref="t:expression"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <element name="value" type="t:value" abstract="true" substitutionGroup="t:expression"/>
- <complexType name="value" abstract="true">
- <complexContent>
- <extension base="t:expression">
- <sequence>
- <element name="constant" type="int"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <element name="value-a" type="t:value-a" substitutionGroup="t:expression"/>
- <complexType name="value-a">
- <complexContent>
- <extension base="t:value"/>
- </complexContent>
- </complexType>
-
- <element name="value-b" type="t:value-b" substitutionGroup="t:expression"/>
- <complexType name="value-b">
- <complexContent>
- <extension base="t:value"/>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/tests/cxx/parser/polymorphism/same-type/driver.cxx b/tests/cxx/parser/polymorphism/same-type/driver.cxx
deleted file mode 100644
index 4ccaec5..0000000
--- a/tests/cxx/parser/polymorphism/same-type/driver.cxx
+++ /dev/null
@@ -1,62 +0,0 @@
-// file : tests/cxx/parser/polymorphism/same-type/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test substitution group and xsi:type that don't change the type.
-//
-
-#include <string>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-
-struct base_pimpl: base_pskel
-{
- virtual void
- a (string const& v)
- {
- cout << v << 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;
- base_pimpl base_p;
- type_pimpl type_p;
-
- base_p.parsers (string_p);
- type_p.parsers (base_p);
-
- xml_schema::document doc_p (type_p, "test", "root", true);
-
- type_p.pre ();
- doc_p.parse (argv[1]);
- type_p.post_type ();
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- return 1;
- }
- catch (std::ios_base::failure const&)
- {
- cerr << "io failure" << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/parser/polymorphism/same-type/makefile b/tests/cxx/parser/polymorphism/same-type/makefile
deleted file mode 100644
index 588d8b6..0000000
--- a/tests/cxx/parser/polymorphism/same-type/makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# file : tests/cxx/parser/polymorphism/same-type/makefile
-# 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): xsd_options += --generate-polymorphic
-$(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/tests/cxx/parser/polymorphism/same-type/output b/tests/cxx/parser/polymorphism/same-type/output
deleted file mode 100644
index d418277..0000000
--- a/tests/cxx/parser/polymorphism/same-type/output
+++ /dev/null
@@ -1,4 +0,0 @@
-a1
-a2
-a3
-a4
diff --git a/tests/cxx/parser/polymorphism/same-type/test.xml b/tests/cxx/parser/polymorphism/same-type/test.xml
deleted file mode 100644
index f8b6d1e..0000000
--- a/tests/cxx/parser/polymorphism/same-type/test.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <t:base><a>a1</a></t:base>
- <t:derived><a>a2</a></t:derived>
- <t:base xsi:type="t:base"><a>a3</a></t:base>
- <t:derived xsi:type="t:base"><a>a4</a></t:derived>
-
-</t:root>
diff --git a/tests/cxx/parser/polymorphism/same-type/test.xsd b/tests/cxx/parser/polymorphism/same-type/test.xsd
deleted file mode 100644
index a4157d3..0000000
--- a/tests/cxx/parser/polymorphism/same-type/test.xsd
+++ /dev/null
@@ -1,21 +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>
- </complexType>
-
- <element name="base" type="t:base"/>
- <element name="derived" type="t:base" substitutionGroup="t:base"/>
-
- <complexType name="type">
- <sequence>
- <element ref="t:base" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/parser/recursive/driver.cxx b/tests/cxx/parser/recursive/driver.cxx
deleted file mode 100644
index 39c6621..0000000
--- a/tests/cxx/parser/recursive/driver.cxx
+++ /dev/null
@@ -1,139 +0,0 @@
-// file : tests/cxx/parser/recursive/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test recursive parser invocation.
-//
-
-#include <iostream>
-#include <string>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-
-struct sub_pimpl: sub_type_pskel
-{
- virtual void
- pre ()
- {
- cout << "sub::pre" << endl;
- }
-
- virtual void
- sub ()
- {
- cout << "sub::sub" << endl;
- }
-
- virtual void
- sub2 ()
- {
- cout << "sub::sub2" << endl;
- }
-
- virtual void
- name (string const& n)
- {
- cout << "sub::name: " << n << endl;
- }
-
- virtual void
- post_sub_type ()
- {
- cout << "sub::post" << endl;
- }
-};
-
-struct indir_pimpl: indir_type_pskel
-{
- virtual void
- pre ()
- {
- cout << "indir::pre" << endl;
- }
-
- virtual void
- sub ()
- {
- cout << "indir::sub" << endl;
- }
-
- virtual void
- name (string const& n)
- {
- cout << "indir::name: " << n << endl;
- }
-
- virtual void
- post_indir_type ()
- {
- cout << "indir::post" << endl;
- }
-};
-
-struct test_pimpl: test_type_pskel
-{
- virtual void
- pre ()
- {
- cout << "test::pre" << endl;
- }
-
- virtual void
- sub ()
- {
- cout << "test::sub" << endl;
- }
-
- virtual void
- name (string const& n)
- {
- cout << "test::name: " << n << endl;
- }
-
- virtual void
- post_test_type ()
- {
- cout << "test::post" << endl;
- }
-};
-
-
-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;
-
- sub_pimpl sub_p;
- indir_pimpl indir_p;
- test_pimpl test_p;
-
- sub_p.parsers (sub_p, indir_p, sub_p, string_p);
- indir_p.parsers (sub_p, string_p);
- test_p.parsers (sub_p, string_p);
-
- xml_schema::document doc_p (test_p, "test");
-
- test_p.pre ();
- doc_p.parse (argv[1]);
- test_p.post_test_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/tests/cxx/parser/recursive/makefile b/tests/cxx/parser/recursive/makefile
deleted file mode 100644
index a1bc9ab..0000000
--- a/tests/cxx/parser/recursive/makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# file : tests/cxx/parser/recursive/makefile
-# 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): xsd_options += --generate-validation
-$(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/tests/cxx/parser/recursive/output b/tests/cxx/parser/recursive/output
deleted file mode 100644
index f26fb72..0000000
--- a/tests/cxx/parser/recursive/output
+++ /dev/null
@@ -1,22 +0,0 @@
-test::pre
-test::name: testName
-sub::pre
-sub::name: subName
-sub::pre
-sub::name: sub-subName
-sub::post
-sub::sub
-indir::pre
-indir::name: sub-indirName
-sub::pre
-sub::name: sub-indir-subName
-sub::post
-indir::sub
-indir::post
-sub::pre
-sub::name: sub-sub2Name
-sub::post
-sub::sub2
-sub::post
-test::sub
-test::post
diff --git a/tests/cxx/parser/recursive/test.xml b/tests/cxx/parser/recursive/test.xml
deleted file mode 100644
index f6c219d..0000000
--- a/tests/cxx/parser/recursive/test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<test xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="test.xsd"
- name="testName">
- <sub name="subName">
- <sub name="sub-subName"/>
- <indir name="sub-indirName">
- <sub name="sub-indir-subName"/>
- </indir>
- <sub2 name="sub-sub2Name"/>
- </sub>
-</test>
diff --git a/tests/cxx/parser/recursive/test.xsd b/tests/cxx/parser/recursive/test.xsd
deleted file mode 100644
index 33e1d2d..0000000
--- a/tests/cxx/parser/recursive/test.xsd
+++ /dev/null
@@ -1,27 +0,0 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:complexType name="sub_type">
- <xs:sequence>
- <xs:element name="sub" type="sub_type" minOccurs="0"/>
- <xs:element name="indir" type="indir_type" minOccurs="0"/>
- <xs:element name="sub2" type="sub_type" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" />
- </xs:complexType>
-
- <xs:complexType name="indir_type">
- <xs:sequence>
- <xs:element name="sub" type="sub_type" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" />
- </xs:complexType>
-
- <xs:complexType name="test_type">
- <xs:sequence>
- <xs:element name="sub" type="sub_type" />
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" />
- </xs:complexType>
-
- <xs:element name="test" type="test_type" />
-</xs:schema>
diff --git a/tests/cxx/parser/test-template/driver.cxx b/tests/cxx/parser/test-template/driver.cxx
deleted file mode 100644
index 9f56496..0000000
--- a/tests/cxx/parser/test-template/driver.cxx
+++ /dev/null
@@ -1,66 +0,0 @@
-// file : tests/cxx/parser/test-template/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Insert test description here.
-//
-
-#include <string>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-
-struct type_pimpl: type_pskel
-{
- virtual void
- pre ()
- {
- }
-
- virtual void
- a (string const& v)
- {
- cout << v << endl;
- }
-
- virtual void
- post_type ()
- {
- }
-};
-
-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;
- type_pimpl type_p;
-
- type_p.parsers (string_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 (std::ios_base::failure const&)
- {
- cerr << "io failure" << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/parser/test-template/makefile b/tests/cxx/parser/test-template/makefile
deleted file mode 100644
index b680466..0000000
--- a/tests/cxx/parser/test-template/makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# file : tests/cxx/parser/test-template/makefile
-# 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/tests/cxx/parser/test-template/output b/tests/cxx/parser/test-template/output
deleted file mode 100644
index 7898192..0000000
--- a/tests/cxx/parser/test-template/output
+++ /dev/null
@@ -1 +0,0 @@
-a
diff --git a/tests/cxx/parser/test-template/test.xml b/tests/cxx/parser/test-template/test.xml
deleted file mode 100644
index 624a80c..0000000
--- a/tests/cxx/parser/test-template/test.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <a>a</a>
-
-</t:root>
diff --git a/tests/cxx/parser/test-template/test.xsd b/tests/cxx/parser/test-template/test.xsd
deleted file mode 100644
index 07bebc7..0000000
--- a/tests/cxx/parser/test-template/test.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="type">
- <sequence>
- <element name="a" type="string"/>
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/parser/union/driver.cxx b/tests/cxx/parser/union/driver.cxx
deleted file mode 100644
index 5577f78..0000000
--- a/tests/cxx/parser/union/driver.cxx
+++ /dev/null
@@ -1,60 +0,0 @@
-// file : tests/cxx/parser/union/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test xsd:union parsing.
-//
-
-#include <string>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-
-struct int_string_union_pimpl: int_string_union_pskel
-{
- virtual void
- _characters (const xml_schema::ro_string& s)
- {
- cout << "'" << s << "'" << 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
- {
- int_string_union_pimpl int_string_union_p;
- type_pimpl type_p;
-
- type_p.parsers (int_string_union_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 (std::ios_base::failure const&)
- {
- cerr << "io failure" << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/parser/union/makefile b/tests/cxx/parser/union/makefile
deleted file mode 100644
index a8e70f6..0000000
--- a/tests/cxx/parser/union/makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# file : tests/cxx/parser/union/makefile
-# 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/tests/cxx/parser/union/output b/tests/cxx/parser/union/output
deleted file mode 100644
index a92ffc3..0000000
--- a/tests/cxx/parser/union/output
+++ /dev/null
@@ -1,2 +0,0 @@
-'one'
-'1'
diff --git a/tests/cxx/parser/union/test.xml b/tests/cxx/parser/union/test.xml
deleted file mode 100644
index 5b3e799..0000000
--- a/tests/cxx/parser/union/test.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <int-string-union/>
- <int-string-union> </int-string-union>
- <int-string-union>one</int-string-union>
- <int-string-union>1</int-string-union>
-
-</t:root>
diff --git a/tests/cxx/parser/union/test.xsd b/tests/cxx/parser/union/test.xsd
deleted file mode 100644
index 5bf3d47..0000000
--- a/tests/cxx/parser/union/test.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <simpleType name="int-string-union">
- <union memberTypes="int string"/>
- </simpleType>
-
- <complexType name="type">
- <choice maxOccurs="unbounded">
- <element name="int-string-union" type="t:int-string-union"/>
- </choice>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/parser/validation/all/driver.cxx b/tests/cxx/parser/validation/all/driver.cxx
deleted file mode 100644
index 093d480..0000000
--- a/tests/cxx/parser/validation/all/driver.cxx
+++ /dev/null
@@ -1,98 +0,0 @@
-// file : tests/cxx/parser/validation/all/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the all compositor validation.
-//
-
-#include <string>
-#include <fstream>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-
-struct all_pimpl: all_pskel
-{
- virtual void
- pre ()
- {
- cout << "{" << endl;
- }
-
- virtual void
- a (string const& v)
- {
- cout << " a = " << v << endl;
- }
-
- virtual void
- b (string const& v)
- {
- cout << " b = " << v << endl;
- }
-
- virtual void
- c (string const& v)
- {
- cout << " c = " << v << endl;
- }
-
- virtual void
- post_all ()
- {
- 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;
- all_pimpl all_p;
- type_pimpl type_p;
-
- all_p.parsers (string_p, string_p, string_p);
- type_p.parsers (all_p);
-
- xml_schema::document doc_p (type_p, "test", "root");
-
- try
- {
- ifstream ifs (argv[1]);
- type_p.pre ();
- doc_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate);
- type_p.post_type ();
- }
- catch (xml_schema::exception const& e)
- {
- cout << " " << e << endl
- << "}" << endl
- << endl;
- }
- }
- 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/tests/cxx/parser/validation/all/makefile b/tests/cxx/parser/validation/all/makefile
deleted file mode 100644
index b50e067..0000000
--- a/tests/cxx/parser/validation/all/makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-# file : tests/cxx/parser/validation/all/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make
-
-xsd := test.xsd
-cxx := driver.cxx
-
-tests := 000 001 002 003
-
-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): xsd_options += --generate-validation
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Test.
-#
-test_targets := $(addprefix $(out_base)/.test-,$(tests))
-
-$(test): $(test_targets)
-$(test_targets): driver := $(driver)
-
-.PHONY: $(out_base)/.test-%
-$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std
- $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -)
-
-
-# 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/tests/cxx/parser/validation/all/test-000.std b/tests/cxx/parser/validation/all/test-000.std
deleted file mode 100644
index b4445f2..0000000
--- a/tests/cxx/parser/validation/all/test-000.std
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- a = a
- b = b
- c = c
-}
-
-{
- a = a
- c = c
- b = b
-}
-
-{
- b = b
- a = a
- c = c
-}
-
-{
- b = b
- c = c
- a = a
-}
-
-{
- c = c
- a = a
- b = b
-}
-
-{
- c = c
- b = b
- a = a
-}
-
-{
- a = a
- b = b
-}
-
-{
- a = a
- b = b
-}
-
diff --git a/tests/cxx/parser/validation/all/test-000.xml b/tests/cxx/parser/validation/all/test-000.xml
deleted file mode 100644
index 6e46fae..0000000
--- a/tests/cxx/parser/validation/all/test-000.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- all combinations -->
- <all>
- <a>a</a>
- <b>b</b>
- <c>c</c>
- </all>
-
- <all>
- <a>a</a>
- <c>c</c>
- <b>b</b>
- </all>
-
- <all>
- <b>b</b>
- <a>a</a>
- <c>c</c>
- </all>
-
- <all>
- <b>b</b>
- <c>c</c>
- <a>a</a>
- </all>
-
- <all>
- <c>c</c>
- <a>a</a>
- <b>b</b>
- </all>
-
- <all>
- <c>c</c>
- <b>b</b>
- <a>a</a>
- </all>
-
- <!-- optional c is not present -->
- <all>
- <a>a</a>
- <b>b</b>
- </all>
-
- <all>
- <a>a</a>
- <b>b</b>
- </all>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/all/test-001.std b/tests/cxx/parser/validation/all/test-001.std
deleted file mode 100644
index 0472ad9..0000000
--- a/tests/cxx/parser/validation/all/test-001.std
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- a = a
- c = c
- :9:9 error: expected element 'b'
-}
-
diff --git a/tests/cxx/parser/validation/all/test-001.xml b/tests/cxx/parser/validation/all/test-001.xml
deleted file mode 100644
index 3df5600..0000000
--- a/tests/cxx/parser/validation/all/test-001.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">
-
- <!-- required b is not present (invalid) -->
- <all>
- <a>a</a>
- <c>c</c>
- </all>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/all/test-002.std b/tests/cxx/parser/validation/all/test-002.std
deleted file mode 100644
index c014230..0000000
--- a/tests/cxx/parser/validation/all/test-002.std
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- :7:9 error: expected element 'a'
-}
-
diff --git a/tests/cxx/parser/validation/all/test-002.xml b/tests/cxx/parser/validation/all/test-002.xml
deleted file mode 100644
index aed0c0c..0000000
--- a/tests/cxx/parser/validation/all/test-002.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- invalid -->
- <all>
- </all>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/all/test-003.std b/tests/cxx/parser/validation/all/test-003.std
deleted file mode 100644
index dd8c0d3..0000000
--- a/tests/cxx/parser/validation/all/test-003.std
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- a = a
- b = b
- :9:7 error: unexpected element 'a'
-}
-
diff --git a/tests/cxx/parser/validation/all/test-003.xml b/tests/cxx/parser/validation/all/test-003.xml
deleted file mode 100644
index b147cba..0000000
--- a/tests/cxx/parser/validation/all/test-003.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- invalid -->
- <all>
- <a>a</a>
- <b>b</b>
- <a>a</a>
- </all>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/all/test.xsd b/tests/cxx/parser/validation/all/test.xsd
deleted file mode 100644
index 1f670e3..0000000
--- a/tests/cxx/parser/validation/all/test.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="all">
- <all minOccurs="1">
- <element name="a" type="string"/>
- <element name="b" type="string"/>
- <element name="c" type="string" minOccurs="0"/>
- </all>
- </complexType>
-
- <complexType name="type">
- <sequence>
- <element name="all" type="t:all" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/parser/validation/any/driver.cxx b/tests/cxx/parser/validation/any/driver.cxx
deleted file mode 100644
index 3896598..0000000
--- a/tests/cxx/parser/validation/any/driver.cxx
+++ /dev/null
@@ -1,121 +0,0 @@
-// file : tests/cxx/parser/validation/any/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the any particle validation.
-//
-
-#include <string>
-#include <fstream>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-using xml_schema::ro_string;
-
-struct any_a_pimpl: any_a_pskel
-{
- virtual void
- pre ()
- {
- cout << "{" << endl;
- }
-
- virtual void
- a (string const& v)
- {
- cout << " a = " << v << endl;
- }
-
- virtual void
- x (string const& v)
- {
- cout << " x = " << v << endl;
- }
-
- virtual void
- _start_any_element (ro_string const&,
- ro_string const& n,
- ro_string const*)
- {
- cout << " start any element '" << n << "'" << endl;
- }
-
- virtual void
- _end_any_element (ro_string const&, ro_string const& n)
- {
- cout << " end any element '" << n << "'" << endl;
- }
-
- virtual void
- _any_attribute (ro_string const&,
- ro_string const& n,
- ro_string const& v)
- {
- cout << " any attribute " << n << " = '" << v << "'" << endl;
- }
-
- virtual void
- _any_characters (ro_string const& s)
- {
- cout << " any text: '" << s << "'" << endl;
- }
-
- virtual void
- post_any_a ()
- {
- 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;
- any_a_pimpl any_a_p;
- type_pimpl type_p;
-
- any_a_p.parsers (string_p, string_p);
- type_p.parsers (any_a_p);
-
- xml_schema::document doc_p (type_p, "test", "root");
-
- try
- {
- ifstream ifs (argv[1]);
- type_p.pre ();
- doc_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate);
- type_p.post_type ();
- }
- catch (xml_schema::exception const& e)
- {
- cout << " " << e << endl
- << "}" << endl
- << endl;
- }
- }
- 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/tests/cxx/parser/validation/any/makefile b/tests/cxx/parser/validation/any/makefile
deleted file mode 100644
index fe3cdab..0000000
--- a/tests/cxx/parser/validation/any/makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-# file : tests/cxx/parser/validation/any/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make
-
-xsd := test.xsd
-cxx := driver.cxx
-
-tests := 000
-
-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): xsd_options += --generate-validation
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Test.
-#
-test_targets := $(addprefix $(out_base)/.test-,$(tests))
-
-$(test): $(test_targets)
-$(test_targets): driver := $(driver)
-
-.PHONY: $(out_base)/.test-%
-$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std
- $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -)
-
-
-# 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/tests/cxx/parser/validation/any/test-000.std b/tests/cxx/parser/validation/any/test-000.std
deleted file mode 100644
index a1cc6e3..0000000
--- a/tests/cxx/parser/validation/any/test-000.std
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- start any element 'any'
- end any element 'any'
-}
-
-{
- start any element 'any'
- any attribute x = 'xxx'
- any text: 'aaa'
- start any element 'a'
- any text: 'bbb'
- end any element 'a'
- any text: 'ccc'
- end any element 'any'
-}
-
-{
- x = x
- a = a
- start any element 'any'
- any attribute x = 'xxx'
- any text: 'aaa'
- start any element 'a'
- any text: 'bbb'
- end any element 'a'
- any text: 'ccc'
- end any element 'any'
-}
-
diff --git a/tests/cxx/parser/validation/any/test-000.xml b/tests/cxx/parser/validation/any/test-000.xml
deleted file mode 100644
index f1a0c83..0000000
--- a/tests/cxx/parser/validation/any/test-000.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- test dispatching of any-nested elements and attributes -->
-
- <any-a>
- <o:any/>
- </any-a>
-
- <any-a>
- <o:any x="xxx">aaa<a>bbb</a>ccc</o:any>
- </any-a>
-
- <any-a x="x">
- <a>a</a>
- <o:any x="xxx">aaa<a>bbb</a>ccc</o:any>
- </any-a>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/any/test.xsd b/tests/cxx/parser/validation/any/test.xsd
deleted file mode 100644
index c05aeb5..0000000
--- a/tests/cxx/parser/validation/any/test.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="any-a">
- <sequence>
- <element name="a" type="string" minOccurs="0"/>
- <any namespace="other" processContents="skip" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="x" type="string"/>
- </complexType>
-
- <complexType name="type">
- <choice maxOccurs="unbounded">
- <element name="any-a" type="t:any-a"/>
- </choice>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/parser/validation/attribute/driver.cxx b/tests/cxx/parser/validation/attribute/driver.cxx
deleted file mode 100644
index 8eda713..0000000
--- a/tests/cxx/parser/validation/attribute/driver.cxx
+++ /dev/null
@@ -1,197 +0,0 @@
-// file : tests/cxx/parser/validation/attribute/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test attribute and attribute wildcard (anyAttribute) validation.
-//
-
-#include <string>
-#include <fstream>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-using xml_schema::ro_string;
-
-struct pass_a_pimpl: pass_a_pskel
-{
- virtual void
- pre ()
- {
- cout << "pass-a" << endl
- << "{" << endl;
- }
-
- virtual void
- a (string const& v)
- {
- cout << " a = " << v << endl;
- }
-
- virtual void
- b (string const& v)
- {
- cout << " b = " << v << endl;
- }
-
- virtual void
- _any_attribute (ro_string const& ns,
- ro_string const& name,
- ro_string const& value)
- {
- cout << " any: " << ns << "#" << name << " = " << value << endl;
- }
-
- virtual void
- post_pass_a ()
- {
- cout << "}" << endl
- << endl;
- }
-};
-
-struct pass_b_pimpl: pass_b_pskel
-{
- virtual void
- pre ()
- {
- cout << "pass-b" << endl
- << "{" << endl;
- }
-
- virtual void
- a (string const& v)
- {
- cout << " a = " << v << endl;
- }
-
- virtual void
- b (string const& v)
- {
- cout << " b = " << v << endl;
- }
-
- virtual void
- _any_attribute (ro_string const& ns,
- ro_string const& name,
- ro_string const& value)
- {
- cout << " any: " << ns << "#" << name << " = " << value << endl;
- }
-
- virtual void
- post_pass_b ()
- {
- cout << "}" << endl
- << endl;
- }
-};
-
-struct pass_c_pimpl: pass_c_pskel
-{
- virtual void
- pre ()
- {
- cout << "pass-c" << endl
- << "{" << endl;
- }
-
- virtual void
- a (string const& v)
- {
- cout << " a = " << v << endl;
- }
-
- virtual void
- b (string const& v)
- {
- cout << " b = " << v << endl;
- }
-
- virtual void
- post_pass_c ()
- {
- cout << "}" << endl
- << endl;
- }
-};
-
-struct fail_pimpl: fail_pskel
-{
- virtual void
- pre ()
- {
- cout << "fail" << endl
- << "{" << endl;
- }
-
- virtual void
- a (string const& v)
- {
- cout << " a = " << v << endl;
- }
-
- virtual void
- post_fail ()
- {
- 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;
- pass_a_pimpl pass_a_p;
- pass_b_pimpl pass_b_p;
- pass_c_pimpl pass_c_p;
- fail_pimpl fail_p;
- type_pimpl type_p;
-
- pass_a_p.parsers (string_p, string_p);
- pass_b_p.parsers (string_p, string_p);
- pass_c_p.parsers (string_p, string_p);
- fail_p.parsers (string_p);
- type_p.parsers (pass_a_p, pass_b_p, pass_c_p, fail_p);
-
- xml_schema::document doc_p (type_p, "test", "root");
-
- try
- {
- ifstream ifs (argv[1]);
- type_p.pre ();
- doc_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate);
- type_p.post_type ();
- }
- catch (xml_schema::exception const& e)
- {
- cout << " " << e << endl
- << "}" << endl
- << endl;
- }
- }
- 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/tests/cxx/parser/validation/attribute/makefile b/tests/cxx/parser/validation/attribute/makefile
deleted file mode 100644
index d92bf1d..0000000
--- a/tests/cxx/parser/validation/attribute/makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-# file : tests/cxx/parser/validation/attribute/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make
-
-xsd := test.xsd
-cxx := driver.cxx
-
-tests := 000
-
-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): xsd_options += --generate-validation
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Test.
-#
-test_targets := $(addprefix $(out_base)/.test-,$(tests))
-
-$(test): $(test_targets)
-$(test_targets): driver := $(driver)
-
-.PHONY: $(out_base)/.test-%
-$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std
- $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -)
-
-
-# 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/tests/cxx/parser/validation/attribute/test-000.std b/tests/cxx/parser/validation/attribute/test-000.std
deleted file mode 100644
index 847b054..0000000
--- a/tests/cxx/parser/validation/attribute/test-000.std
+++ /dev/null
@@ -1,24 +0,0 @@
-pass-a
-{
- b = b
- any: test#foo = foo
- any: test#bar = bar
-}
-
-pass-b
-{
- a = a
- b = b
-}
-
-pass-c
-{
- a = a
- b = b
-}
-
-fail
-{
- :8:10 error: expected attribute 'a'
-}
-
diff --git a/tests/cxx/parser/validation/attribute/test-000.xml b/tests/cxx/parser/validation/attribute/test-000.xml
deleted file mode 100644
index b994d1a..0000000
--- a/tests/cxx/parser/validation/attribute/test-000.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <pass-a b="b" t:foo="foo" t:bar="bar"/>
- <pass-b a="a" b="b"/>
- <pass-c a="a" b="b"/>
- <fail/>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/attribute/test.xsd b/tests/cxx/parser/validation/attribute/test.xsd
deleted file mode 100644
index 833eb8e..0000000
--- a/tests/cxx/parser/validation/attribute/test.xsd
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
-
- <!-- Test optional and required attributes as well as a wildcard. -->
- <complexType name="pass-a">
- <attribute name="a" type="string" use="optional"/>
- <attribute name="b" type="string" use="required"/>
- <anyAttribute namespace="##targetNamespace" processContents="skip"/>
- </complexType>
-
-
- <!-- Test that in inheritance attributes are checked before wildcards. -->
- <complexType name="pass-b-base">
- <attribute name="a" type="string"/>
- <anyAttribute namespace="#any" processContents="skip"/>
- </complexType>
-
- <complexType name="pass-b">
- <complexContent>
- <extension base="t:pass-b-base">
- <attribute name="b" type="string"/>
- <anyAttribute namespace="#any" processContents="skip"/>
- </extension>
- </complexContent>
- </complexType>
-
-
- <!-- Test that in inheritance by restriction required attribute is
- checked for even though it is not explicitly mentioned in
- derived. -->
- <complexType name="pass-c-base">
- <attribute name="a" type="string" use="required"/>
- <attribute name="b" type="string" use="optional"/>
- </complexType>
-
- <complexType name="pass-c">
- <complexContent>
- <restriction base="t:pass-c-base">
- <attribute name="b" type="string" use="required"/>
- </restriction>
- </complexContent>
- </complexType>
-
-
- <!-- Test detection of missing required attribute. -->
- <complexType name="fail-base">
- <attribute name="a" type="string" use="optional"/>
- </complexType>
-
- <complexType name="fail">
- <complexContent>
- <restriction base="t:fail-base">
- <attribute name="a" type="string" use="required"/>
- </restriction>
- </complexContent>
- </complexType>
-
-
- <complexType name="type">
- <sequence>
- <element name="pass-a" type="t:pass-a"/>
- <element name="pass-b" type="t:pass-b"/>
- <element name="pass-c" type="t:pass-c"/>
- <element name="fail" type="t:fail"/>
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/parser/validation/built-in/any-type/driver.cxx b/tests/cxx/parser/validation/built-in/any-type/driver.cxx
deleted file mode 100644
index fd91247..0000000
--- a/tests/cxx/parser/validation/built-in/any-type/driver.cxx
+++ /dev/null
@@ -1,154 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/any-type/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the anyType and anySimpleType validation.
-//
-
-#include <string>
-#include <fstream>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-using xml_schema::ro_string;
-
-struct any_type_pimpl: xml_schema::any_type_pimpl
-{
- virtual void
- pre ()
- {
- cout << "{" << endl;
- }
-
- virtual void
- _start_any_element (ro_string const&,
- ro_string const& n,
- ro_string const*)
- {
- cout << " start any element '" << n << "'" << endl;
- }
-
- virtual void
- _end_any_element (ro_string const&, ro_string const& n)
- {
- cout << " end any element '" << n << "'" << endl;
- }
-
- virtual void
- _any_attribute (ro_string const&,
- ro_string const& n,
- ro_string const& v)
- {
- cout << " any attribute " << n << " = '" << v << "'" << endl;
- }
-
- virtual void
- _any_characters (ro_string const& s)
- {
- cout << " any text: '" << s << "'" << endl;
- }
-
- virtual void
- post_any_type ()
- {
- cout << "}" << endl
- << endl;
- }
-};
-
-struct any_simple_type_pimpl: xml_schema::any_simple_type_pimpl
-{
- virtual void
- pre ()
- {
- cout << "{" << endl;
- }
-
- virtual void
- _any_characters (ro_string const& s)
- {
- cout << " any text: '" << s << "'" << endl;
- }
-
- virtual void
- post_any_simple_type ()
- {
- cout << "}" << endl
- << endl;
- }
-};
-
-struct any_extension_pimpl: virtual any_extension_pskel,
- any_type_pimpl
-
-{
- virtual void
- x (const string& v)
- {
- cout << " x = " << v << endl;
- }
-};
-
-struct any_simple_extension_pimpl: virtual any_simple_extension_pskel,
- any_simple_type_pimpl
-{
- virtual void
- x (const string& v)
- {
- cout << " x = " << v << 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;
-
- any_type_pimpl any_type_p;
- any_simple_type_pimpl any_simple_type_p;
-
- any_extension_pimpl any_extension_p;
- any_simple_extension_pimpl any_simple_extension_p;
-
- type_pimpl type_p;
-
- any_extension_p.parsers (string_p);
- any_simple_extension_p.parsers (string_p);
-
- type_p.parsers (any_type_p,
- any_extension_p,
- any_simple_extension_p,
- any_simple_type_p);
-
- xml_schema::document doc_p (type_p, "test", "root");
-
- ifstream ifs (argv[1]);
- type_p.pre ();
- doc_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate);
- 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/tests/cxx/parser/validation/built-in/any-type/makefile b/tests/cxx/parser/validation/built-in/any-type/makefile
deleted file mode 100644
index dfbb183..0000000
--- a/tests/cxx/parser/validation/built-in/any-type/makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/any-type/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-xsd := test.xsd
-cxx := driver.cxx
-
-tests := 000
-
-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): xsd_options += --generate-validation
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Test.
-#
-test_targets := $(addprefix $(out_base)/.test-,$(tests))
-
-$(test): $(test_targets)
-$(test_targets): driver := $(driver)
-
-.PHONY: $(out_base)/.test-%
-$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std
- $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -)
-
-
-# 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/tests/cxx/parser/validation/built-in/any-type/test-000.std b/tests/cxx/parser/validation/built-in/any-type/test-000.std
deleted file mode 100644
index 84d7b3a..0000000
--- a/tests/cxx/parser/validation/built-in/any-type/test-000.std
+++ /dev/null
@@ -1,99 +0,0 @@
-{
- any text: '123abc'
-}
-
-{
- any text: '
- '
- start any element 'any'
- end any element 'any'
- any text: '
- '
-}
-
-{
- any text: '
- '
- start any element 'any'
- any attribute x = 'xxx'
- any text: 'aaa'
- start any element 'a'
- any text: 'bbb'
- end any element 'a'
- any text: 'ccc'
- end any element 'any'
- any text: '
- '
-}
-
-{
- any attribute x = 'x'
- any text: '
- '
- start any element 'a'
- any text: 'a'
- end any element 'a'
- any text: '
- '
- start any element 'any'
- any attribute x = 'xxx'
- any text: 'aaa'
- start any element 'a'
- any text: 'bbb'
- end any element 'a'
- any text: 'ccc'
- end any element 'any'
- any text: '
- '
-}
-
-{
- any text: '
- '
- start any element 'any'
- end any element 'any'
- any text: '
- '
-}
-
-{
- any text: '
- '
- start any element 'any'
- any attribute x = 'xxx'
- any text: 'aaa'
- start any element 'a'
- any text: 'bbb'
- end any element 'a'
- any text: 'ccc'
- end any element 'any'
- any text: '
- '
-}
-
-{
- x = x
- any text: '
- '
- start any element 'a'
- any text: 'a'
- end any element 'a'
- any text: '
- '
- start any element 'any'
- any attribute x = 'xxx'
- any text: 'aaa'
- start any element 'a'
- any text: 'bbb'
- end any element 'a'
- any text: 'ccc'
- end any element 'any'
- any text: '
- '
-}
-
-{
- x = x
- any text: 'abc123'
-}
-
diff --git a/tests/cxx/parser/validation/built-in/any-type/test-000.xml b/tests/cxx/parser/validation/built-in/any-type/test-000.xml
deleted file mode 100644
index 7875b7e..0000000
--- a/tests/cxx/parser/validation/built-in/any-type/test-000.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd"
- as="123abc">
-
- <!-- test dispatching of anyType nested elements and attributes -->
-
- <a>
- <o:any/>
- </a>
-
- <a>
- <o:any x="xxx">aaa<a>bbb</a>ccc</o:any>
- </a>
-
- <a x="x">
- <a>a</a>
- <o:any x="xxx">aaa<a>bbb</a>ccc</o:any>
- </a>
-
- <!-- anyType extension -->
-
- <a-extension>
- <o:any/>
- </a-extension>
-
- <a-extension>
- <o:any x="xxx">aaa<a>bbb</a>ccc</o:any>
- </a-extension>
-
- <a-extension x="x">
- <a>a</a>
- <o:any x="xxx">aaa<a>bbb</a>ccc</o:any>
- </a-extension>
-
- <!-- anySimpleType extension -->
-
- <as-extension x="x">abc123</as-extension>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/built-in/any-type/test.xsd b/tests/cxx/parser/validation/built-in/any-type/test.xsd
deleted file mode 100644
index 86a4e13..0000000
--- a/tests/cxx/parser/validation/built-in/any-type/test.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="any-extension">
- <complexContent mixed="true">
- <extension base="anyType">
- <attribute name="x" type="string"/>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="any-simple-extension">
- <simpleContent>
- <extension base="anySimpleType">
- <attribute name="x" type="string"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <complexType name="type">
- <choice maxOccurs="unbounded">
- <element name="a" type="anyType"/>
- <element name="a-extension" type="t:any-extension"/>
- <element name="as-extension" type="t:any-simple-extension"/>
- </choice>
- <attribute name="as" type="anySimpleType"/>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/parser/validation/built-in/binary/driver.cxx b/tests/cxx/parser/validation/built-in/binary/driver.cxx
deleted file mode 100644
index 86575f4..0000000
--- a/tests/cxx/parser/validation/built-in/binary/driver.cxx
+++ /dev/null
@@ -1,153 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/binary/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in base64Binary and hexBinary types validation.
-//
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace xsd::cxx::parser::validating;
-
-template <typename T>
-bool
-test_post_fail (T& p)
-{
- try
- {
- p._post ();
- }
- catch (invalid_value<char> const&)
- {
- return true;
- }
-
- return false;
-}
-
-int
-main ()
-{
- typedef xsd::cxx::parser::buffer buffer;
-
- // Good.
- //
-
- // hexBinary
- //
- {
- hex_binary_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \t\n ");
- p._characters (" ");
- p._post ();
- assert (*p.post_hex_binary () == buffer ());
- }
-
- {
- hex_binary_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \t\n313");
- p._characters ("23334356162636a6b ");
- p._post ();
- assert (*p.post_hex_binary () == buffer ("12345abcjk", 10));
- }
-
- // base64Binary
- //
- {
- base64_binary_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \t\n ");
- p._characters ("MTIzND ");
- p._characters ("VhYmNqaw = = ");
- p._post ();
- assert (*p.post_base64_binary () == buffer ("12345abcjk", 10));
- }
-
- {
- base64_binary_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("YQ==");
- p._post ();
- assert (*p.post_base64_binary () == buffer ("a", 1));
- }
-
- {
- base64_binary_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("YWI=");
- p._post ();
- assert (*p.post_base64_binary () == buffer ("ab", 2));
- }
-
- {
- base64_binary_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("YWJj");
- p._post ();
- assert (*p.post_base64_binary () == buffer ("abc", 3));
- }
-
- // Bad
- //
-
- // hexBinary
- //
- {
- hex_binary_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("313");
- assert (test_post_fail (p));
- }
-
- {
- hex_binary_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("313233343X6162636a6b");
- assert (test_post_fail (p));
- }
-
- // base64Binary
- //
- {
- base64_binary_pimpl<char> p;
- p.pre ();
- p._pre ();
- // p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- base64_binary_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("YQ");
- assert (test_post_fail (p));
- }
-
- {
- base64_binary_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("==");
- assert (test_post_fail (p));
- }
-
- {
- base64_binary_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("MTIzNDVhYmNqaw=A");
- assert (test_post_fail (p));
- }
-}
diff --git a/tests/cxx/parser/validation/built-in/binary/makefile b/tests/cxx/parser/validation/built-in/binary/makefile
deleted file mode 100644
index f0c5ae6..0000000
--- a/tests/cxx/parser/validation/built-in/binary/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/binary/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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)
diff --git a/tests/cxx/parser/validation/built-in/boolean/driver.cxx b/tests/cxx/parser/validation/built-in/boolean/driver.cxx
deleted file mode 100644
index 6a21cb7..0000000
--- a/tests/cxx/parser/validation/built-in/boolean/driver.cxx
+++ /dev/null
@@ -1,145 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/boolean/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in boolean type validation.
-//
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace xsd::cxx::parser::validating;
-
-bool
-test_post_fail (boolean_pimpl<char>& p)
-{
- try
- {
- p._post ();
- }
- catch (invalid_value<char> const&)
- {
- return true;
- }
-
- return false;
-}
-
-int
-main ()
-{
- // Good.
- //
- {
- boolean_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("true");
- p._post ();
- assert (p.post_boolean ());
- }
-
- {
- boolean_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("1");
- p._post ();
- assert (p.post_boolean ());
- }
-
- {
- boolean_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("false");
- p._post ();
- assert (!p.post_boolean ());
- }
-
- {
- boolean_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (!p.post_boolean ());
- }
-
-
- {
- boolean_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" true ");
- p._post ();
- assert (p.post_boolean ());
- }
-
- {
- boolean_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" ");
- p._characters (" \n ");
- p._characters (" fa");
- p._characters ("l");
- p._characters ("se ");
- p._characters (" \n ");
- p._characters (" ");
- p._post ();
- assert (!p.post_boolean ());
- }
-
- // Bad
- //
- {
- boolean_pimpl<char> p;
- p.pre ();
- p._pre ();
- //p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- boolean_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- boolean_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" ");
- assert (test_post_fail (p));
- }
-
- {
- boolean_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" ");
- assert (test_post_fail (p));
- }
-
- {
- boolean_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("fal");
- p._characters ("s ");
- p._characters ("e");
- assert (test_post_fail (p));
- }
-
- {
- boolean_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("01");
- assert (test_post_fail (p));
- }
-}
diff --git a/tests/cxx/parser/validation/built-in/boolean/makefile b/tests/cxx/parser/validation/built-in/boolean/makefile
deleted file mode 100644
index 52f4e88..0000000
--- a/tests/cxx/parser/validation/built-in/boolean/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/boolean/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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)
diff --git a/tests/cxx/parser/validation/built-in/byte/driver.cxx b/tests/cxx/parser/validation/built-in/byte/driver.cxx
deleted file mode 100644
index c0e2b99..0000000
--- a/tests/cxx/parser/validation/built-in/byte/driver.cxx
+++ /dev/null
@@ -1,256 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/byte/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in byte and unsigned byte types validation.
-//
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace xsd::cxx::parser::validating;
-
-template <typename T>
-bool
-test_post_fail (T& p)
-{
- try
- {
- p._post ();
- }
- catch (invalid_value<char> const&)
- {
- return true;
- }
-
- return false;
-}
-
-int
-main ()
-{
- // Good.
- //
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("123");
- p._post ();
- assert (p.post_byte () == 123);
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("\t +123 \n ");
- p._post ();
- assert (p.post_byte () == 123);
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-123");
- p._post ();
- assert (p.post_byte () == -123);
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("+123");
- p._post ();
- assert (p.post_byte () == 123);
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0000000000000000123");
- p._post ();
- assert (p.post_byte () == 123);
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("+0000000000000000123");
- p._post ();
- assert (p.post_byte () == 123);
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-0000000000000000123");
- p._post ();
- assert (p.post_byte () == -123);
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("\t \n");
- p._characters (" -");
- p._characters ("00000");
- p._characters ("001");
- p._characters ("23 \n\t");
- p._post ();
- assert (p.post_byte () == -123);
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-128");
- p._post ();
- assert (p.post_byte () == -128);
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("127");
- p._post ();
- assert (p.post_byte () == 127);
- }
-
- {
- unsigned_byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("+123");
- p._post ();
- assert (p.post_unsigned_byte () == 123);
- }
-
- {
- unsigned_byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (p.post_unsigned_byte () == 0);
- }
-
- {
- unsigned_byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("255");
- p._post ();
- assert (p.post_unsigned_byte () == 255);
- }
-
- // Bad
- //
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- // p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n \t ");
- assert (test_post_fail (p));
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("+");
- assert (test_post_fail (p));
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-");
- assert (test_post_fail (p));
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("++01");
- assert (test_post_fail (p));
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--01");
- assert (test_post_fail (p));
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-01");
- p._characters (" ");
- p._characters ("23 ");
- assert (test_post_fail (p));
- }
-
- {
- unsigned_byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-123");
- assert (test_post_fail (p));
- }
-
- // Ranges
- //
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-129");
- assert (test_post_fail (p));
- }
-
- {
- byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("128");
- assert (test_post_fail (p));
- }
-
- {
- unsigned_byte_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("256");
- assert (test_post_fail (p));
- }
-}
diff --git a/tests/cxx/parser/validation/built-in/byte/makefile b/tests/cxx/parser/validation/built-in/byte/makefile
deleted file mode 100644
index afc8174..0000000
--- a/tests/cxx/parser/validation/built-in/byte/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/byte/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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)
diff --git a/tests/cxx/parser/validation/built-in/date-time/driver.cxx b/tests/cxx/parser/validation/built-in/date-time/driver.cxx
deleted file mode 100644
index 8aa3943..0000000
--- a/tests/cxx/parser/validation/built-in/date-time/driver.cxx
+++ /dev/null
@@ -1,1533 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/date-time/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in date and time types validation.
-//
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace xsd::cxx::parser::validating;
-
-template <typename T>
-bool
-test_post_fail (T& p)
-{
- try
- {
- p._post ();
- }
- catch (invalid_value<char> const&)
- {
- return true;
- }
-
- return false;
-}
-
-int
-main ()
-{
- typedef xsd::cxx::parser::gday gday;
- typedef xsd::cxx::parser::gmonth gmonth;
- typedef xsd::cxx::parser::gyear gyear;
- typedef xsd::cxx::parser::gmonth_day gmonth_day;
- typedef xsd::cxx::parser::gyear_month gyear_month;
- typedef xsd::cxx::parser::date date;
- typedef xsd::cxx::parser::time time;
- typedef xsd::cxx::parser::date_time date_time;
- typedef xsd::cxx::parser::duration duration;
-
- // Good.
- //
-
- // gday & time zone parsing
- //
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \t\n ");
- p._characters ("---1");
- p._characters ("2+12:00");
- p._post ();
- assert (p.post_gday () == gday (12, 12, 00));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---01");
- p._post ();
- assert (p.post_gday () == gday (1));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---31");
- p._post ();
- assert (p.post_gday () == gday (31));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---15Z");
- p._post ();
- assert (p.post_gday () == gday (15, 0, 0));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---15-14:00");
- p._post ();
- assert (p.post_gday () == gday (15, -14, 0));
- }
-
- // gmonth
- //
- {
- gmonth_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \t\n ");
- p._characters ("--1");
- p._characters ("0+12:00");
- p._post ();
- assert (p.post_gmonth () == gmonth (10, 12, 0));
- }
-
- {
- gmonth_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--01");
- p._post ();
- assert (p.post_gmonth () == gmonth (1));
- }
-
- {
- gmonth_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--12Z");
- p._post ();
- assert (p.post_gmonth () == gmonth (12, 0, 0));
- }
-
- // gyear
- //
- {
- gyear_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \t\n ");
- p._characters ("20");
- p._characters ("07+12:00");
- p._post ();
- assert (p.post_gyear () == gyear (2007, 12, 00));
- }
-
- {
- gyear_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0001");
- p._post ();
- assert (p.post_gyear () == gyear (1));
- }
-
- {
- gyear_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-20000Z");
- p._post ();
- assert (p.post_gyear () == gyear (-20000, 0, 0));
- }
-
- // gmonth_day
- //
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \t\n ");
- p._characters ("--1");
- p._characters ("0-28+12:00 ");
- p._post ();
- assert (p.post_gmonth_day () == gmonth_day (10, 28, 12, 00));
- }
-
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--12-31");
- p._post ();
- assert (p.post_gmonth_day () == gmonth_day (12, 31));
- }
-
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--01-01Z");
- p._post ();
- assert (p.post_gmonth_day () == gmonth_day (1, 1, 0, 0));
- }
-
- // gyear_month
- //
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \t\n ");
- p._characters ("200");
- p._characters ("7-12+12:00 ");
- p._post ();
- assert (p.post_gyear_month () == gyear_month (2007, 12, 12, 00));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-2007-10");
- p._post ();
- assert (p.post_gyear_month () == gyear_month (-2007, 10));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("20007-10Z");
- p._post ();
- assert (p.post_gyear_month () == gyear_month (20007, 10, 0, 0));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-20007-01");
- p._post ();
- assert (p.post_gyear_month () == gyear_month (-20007, 1));
- }
-
- // date
- //
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \t\n ");
- p._characters ("200");
- p._characters ("7-12-26+12:00 ");
- p._post ();
- assert (p.post_date () == date (2007, 12, 26, 12, 0));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-2007-10-15");
- p._post ();
- assert (p.post_date () == date (-2007, 10, 15));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("20007-12-31Z");
- p._post ();
- assert (p.post_date () == date (20007, 12, 31, 0, 0));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-20007-01-01");
- p._post ();
- assert (p.post_date () == date (-20007, 1, 1));
- }
-
- // time
- //
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \t\n ");
- p._characters ("12:");
- p._characters ("46:23.456+12:00 ");
- p._post ();
- assert (p.post_time () == time (12, 46, 23.456, 12, 0));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("12:13:14");
- p._post ();
- assert (p.post_time () == time (12, 13, 14.0));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("12:13:14Z");
- p._post ();
- assert (p.post_time () == time (12, 13, 14.0, 0, 0));
- }
-
- // date_time
- //
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \t\n ");
- p._characters ("200");
- p._characters ("7-12-26T12:13:14.123+12:00 ");
- p._post ();
- assert (p.post_date_time () ==
- date_time (2007, 12, 26, 12, 13, 14.123, 12, 0));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-2007-10-15T12:13:14");
- p._post ();
- assert (p.post_date_time () == date_time (-2007, 10, 15, 12, 13, 14.0));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("20007-12-31T12:13:14Z");
- p._post ();
- assert (p.post_date_time () ==
- date_time (20007, 12, 31, 12, 13, 14.0, 0, 0));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-20007-01-01T12:13:14");
- p._post ();
- assert (p.post_date_time () == date_time (-20007, 1, 1, 12, 13, 14.0));
- }
-
- // duration
- //
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \t\n ");
- p._characters ("-P200");
- p._characters ("7Y13M32DT25H61M61.123S ");
- p._post ();
- assert (p.post_duration () ==
- duration (true, 2007, 13, 32, 25, 61, 61.123));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("P1Y");
- p._post ();
- assert (p.post_duration () == duration (false, 1, 0, 0, 0, 0, 0.0));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("P1M");
- p._post ();
- assert (p.post_duration () == duration (false, 0, 1, 0, 0, 0, 0.0));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("P1D");
- p._post ();
- assert (p.post_duration () == duration (false, 0, 0, 1, 0, 0, 0.0));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("PT1H");
- p._post ();
- assert (p.post_duration () == duration (false, 0, 0, 0, 1, 0, 0.0));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("PT1M");
- p._post ();
- assert (p.post_duration () == duration (false, 0, 0, 0, 0, 1, 0.0));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("PT1.1S");
- p._post ();
- assert (p.post_duration () == duration (false, 0, 0, 0, 0, 0, 1.1));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("P1YT1S");
- p._post ();
- assert (p.post_duration () == duration (false, 1, 0, 0, 0, 0, 1.0));
- }
-
- // Bad
- //
-
- // gday & time zone parsing
- //
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- // p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--12");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---1");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---00");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---32");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---2X");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---12asd");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---12X");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---1212:00");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---12+2:00");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---12+1200");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---12+15:00");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---12+12:60");
- assert (test_post_fail (p));
- }
-
- {
- gday_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("---12+14:01");
- assert (test_post_fail (p));
- }
-
- // gmonth
- //
- {
- gmonth_pimpl<char> p;
- p.pre ();
- p._pre ();
- // p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-12");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--00");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--13");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--1X");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--11+12:3o");
- assert (test_post_fail (p));
- }
-
- // gyear
- //
- {
- gyear_pimpl<char> p;
- p.pre ();
- p._pre ();
- // p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- gyear_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("207");
- assert (test_post_fail (p));
- }
-
- {
- gyear_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-207");
- assert (test_post_fail (p));
- }
-
- {
- gyear_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-0000");
- assert (test_post_fail (p));
- }
-
- {
- gyear_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("20X7");
- assert (test_post_fail (p));
- }
-
- {
- gyear_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007+12:3o");
- assert (test_post_fail (p));
- }
-
- // gmonth_day
- //
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- // p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-12-12");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--1212");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--12?12");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--00-12");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--12-00");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--13-23");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--12-32");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--1X-12");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--12-2X");
- assert (test_post_fail (p));
- }
-
- {
- gmonth_day_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("--11-11+12:3o");
- assert (test_post_fail (p));
- }
-
- // gyear_month
- //
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- // p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("207-01");
- assert (test_post_fail (p));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-207-01");
- assert (test_post_fail (p));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0000-01");
- assert (test_post_fail (p));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("20X7-01");
- assert (test_post_fail (p));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007");
- assert (test_post_fail (p));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007?12");
- assert (test_post_fail (p));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-0");
- assert (test_post_fail (p));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-00");
- assert (test_post_fail (p));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-13");
- assert (test_post_fail (p));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-1X");
- assert (test_post_fail (p));
- }
-
- {
- gyear_month_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01+12:3o");
- assert (test_post_fail (p));
- }
-
- // date
- //
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- // p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("207-01-01");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-207-01-01");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0000-01-01");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("20X7-01-01");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007?01-01");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-0-01");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-00-01");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-13-01");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-1X-01");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10?12");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10-");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10-0");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10-00");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10-32");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10-2X");
- assert (test_post_fail (p));
- }
-
- {
- date_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01+12:3o");
- assert (test_post_fail (p));
- }
-
- // time
- //
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- // p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("1:01:01");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2X:01:01");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23?01:01");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23:0:01");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23:60:01");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23:4X:01");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23:10");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23:10?12");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23:10:");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23:10:0");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23:10:01.");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23:10:60");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23:10:2X");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("24:01:00");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("24:00:01");
- assert (test_post_fail (p));
- }
-
- {
- time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23:01:01+12:3o");
- assert (test_post_fail (p));
- }
-
- // date_time
- //
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- // p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("207-01-01T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-207-01-01T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0000-01-01T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("20X7-01-01T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007?01-01T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-0-01T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-00-01T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-13-01T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-1X-01T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10?12T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10-T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10-0T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10-00T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10-32T12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-10-2XT12:13:14");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T1:01:01");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T2X:01:01");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T23");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T23?01:01");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T23:0:01");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T23:60:01");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T23:4X:01");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T23:10");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T23:10?12");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T23:10:");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T23:10:0");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T23:10:01.");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T23:10:60");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T23:10:2X");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T24:01:00");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T24:00:01");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("23:01:01+12:3o");
- assert (test_post_fail (p));
- }
-
- {
- date_time_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007-01-01T12:13:14+12:3o");
- assert (test_post_fail (p));
- }
-
- // duration
- //
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- // p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2007Y");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-2007Y");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("P-2007Y");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("P-1M");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("P-1D");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("PT-1H");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("PT-1M");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("PT-1.1S");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("P1H1M1S");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("P1M1Y");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("PT1S1H");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("PT1H1Y");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("P1Ygarbage");
- assert (test_post_fail (p));
- }
-
- {
- duration_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("P1YT");
- assert (test_post_fail (p));
- }
-}
diff --git a/tests/cxx/parser/validation/built-in/date-time/makefile b/tests/cxx/parser/validation/built-in/date-time/makefile
deleted file mode 100644
index 42d60e8..0000000
--- a/tests/cxx/parser/validation/built-in/date-time/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/date-time/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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)
diff --git a/tests/cxx/parser/validation/built-in/float/driver.cxx b/tests/cxx/parser/validation/built-in/float/driver.cxx
deleted file mode 100644
index 7563aa7..0000000
--- a/tests/cxx/parser/validation/built-in/float/driver.cxx
+++ /dev/null
@@ -1,285 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/float/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in float, double, and decimal types validation.
-//
-#include <math.h>
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace xsd::cxx::parser::validating;
-
-template <typename T>
-bool
-test_post_fail (T& p)
-{
- try
- {
- p._post ();
- }
- catch (invalid_value<char> const&)
- {
- return true;
- }
-
- return false;
-}
-
-int
-main ()
-{
- // Good.
- //
-
- // float
- //
- {
- float_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" 0000123.456 ");
- p._post ();
- assert (p.post_float () == 123.456F);
- }
-
- {
- float_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-12.345E2");
- p._post ();
- assert (p.post_float () == -12.345E2F);
- }
-
- {
- float_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (p.post_float () == 0.0F);
- }
-
- {
- float_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-0");
- p._post ();
- assert (p.post_float () == -0.0F);
- }
-
- {
- float_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("INF");
- p._post ();
- assert (isinf (p.post_float ()));
- }
-
- {
- float_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-INF");
- p._post ();
- assert (isinf (p.post_float ()));
- }
-
- {
- float_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("NaN");
- p._post ();
- assert (isnan (p.post_float ()));
- }
-
- // double
- //
- {
- double_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" 0000123.456789 ");
- p._post ();
- assert (p.post_double () == 123.456789);
- }
-
- {
- double_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-12.3456789E2");
- p._post ();
- assert (p.post_double () == -12.3456789E2);
- }
-
- {
- double_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (p.post_double () == 0.0);
- }
-
- {
- double_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-0");
- p._post ();
- assert (p.post_double () == -0.0);
- }
-
- {
- double_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("INF");
- p._post ();
- assert (isinf (p.post_double ()));
- }
-
- {
- double_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-INF");
- p._post ();
- assert (isinf (p.post_double ()));
- }
-
- {
- double_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("NaN");
- p._post ();
- assert (isnan (p.post_double ()));
- }
-
- // decimal
- //
- {
- decimal_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" 0000123.456789 ");
- p._post ();
- assert (p.post_decimal () == 123.456789);
- }
-
- {
- decimal_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-123.45678912345");
- p._post ();
- assert (p.post_decimal () == -123.45678912345);
- }
-
- {
- decimal_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (p.post_decimal () == 0.0);
- }
-
- {
- decimal_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-0");
- p._post ();
- assert (p.post_decimal () == -0.0);
- }
-
-
- // Bad
- //
-
- // float
- //
- {
- float_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("+INF");
- assert (test_post_fail (p));
- }
-
- {
- float_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("1.45 E2");
- assert (test_post_fail (p));
- }
-
- // double
- //
- {
- double_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("+INF");
- assert (test_post_fail (p));
- }
-
- {
- double_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("1.45 E2");
- assert (test_post_fail (p));
- }
-
- // decimal
- //
- {
- decimal_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("INF");
- assert (test_post_fail (p));
- }
-
- {
- decimal_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("+INF");
- assert (test_post_fail (p));
- }
-
- {
- decimal_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-INF");
- assert (test_post_fail (p));
- }
-
- {
- decimal_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("NaN");
- assert (test_post_fail (p));
- }
-
- {
- decimal_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("1.45 2");
- assert (test_post_fail (p));
- }
-}
diff --git a/tests/cxx/parser/validation/built-in/float/makefile b/tests/cxx/parser/validation/built-in/float/makefile
deleted file mode 100644
index 68fac22..0000000
--- a/tests/cxx/parser/validation/built-in/float/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/float/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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)
diff --git a/tests/cxx/parser/validation/built-in/int/driver.cxx b/tests/cxx/parser/validation/built-in/int/driver.cxx
deleted file mode 100644
index 18e83ca..0000000
--- a/tests/cxx/parser/validation/built-in/int/driver.cxx
+++ /dev/null
@@ -1,116 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/int/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in int and unsigned int types validation.
-//
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace xsd::cxx::parser::validating;
-
-template <typename T>
-bool
-test_post_fail (T& p)
-{
- try
- {
- p._post ();
- }
- catch (invalid_value<char> const&)
- {
- return true;
- }
-
- return false;
-}
-
-int
-main ()
-{
- // Good.
- //
- {
- int_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-2147483648");
- p._post ();
- assert (p.post_int () == -2147483648);
- }
-
- {
- int_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (p.post_int () == 0);
- }
-
- {
- int_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2147483647");
- p._post ();
- assert (p.post_int () == 2147483647);
- }
-
- {
- unsigned_int_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (p.post_unsigned_int () == 0);
- }
-
- {
- unsigned_int_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("4294967295");
- p._post ();
- assert (p.post_unsigned_int () == 4294967295);
- }
-
- // Bad
- //
-
- {
- unsigned_int_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-123");
- assert (test_post_fail (p));
- }
-
-
- // Ranges
- //
- {
- int_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-2147483649");
- assert (test_post_fail (p));
- }
-
- {
- int_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("2147483648");
- assert (test_post_fail (p));
- }
-
- {
- unsigned_int_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("4294967296");
- assert (test_post_fail (p));
- }
-}
diff --git a/tests/cxx/parser/validation/built-in/int/makefile b/tests/cxx/parser/validation/built-in/int/makefile
deleted file mode 100644
index 7a13105..0000000
--- a/tests/cxx/parser/validation/built-in/int/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/int/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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)
diff --git a/tests/cxx/parser/validation/built-in/integer/driver.cxx b/tests/cxx/parser/validation/built-in/integer/driver.cxx
deleted file mode 100644
index 7eeb708..0000000
--- a/tests/cxx/parser/validation/built-in/integer/driver.cxx
+++ /dev/null
@@ -1,303 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/int/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in integer & friends types validation.
-//
-#include <limits.h>
-
-#include <string>
-#include <sstream>
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace std;
-using namespace xsd::cxx::parser::validating;
-
-template <typename T>
-bool
-test_post_fail (T& p)
-{
- try
- {
- p._post ();
- }
- catch (invalid_value<char> const&)
- {
- return true;
- }
-
- return false;
-}
-
-int
-main ()
-{
- // Good.
- //
-
- std::string min;
- std::string max;
- std::string umax;
-
- {
- ostringstream ostr;
- ostr << LLONG_MIN;
- min = ostr.str ();
- }
-
- {
- ostringstream ostr;
- ostr << LLONG_MAX;
- max = ostr.str ();
- }
-
- {
- ostringstream ostr;
- ostr << ULLONG_MAX;
- umax = ostr.str ();
- }
-
- // integer
- //
- {
- integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (min.c_str ());
- p._post ();
- assert (p.post_integer () == LLONG_MIN);
- }
-
- {
- integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (p.post_integer () == 0);
- }
-
- {
- integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (max.c_str ());
- p._post ();
- assert (p.post_integer () == LLONG_MAX);
- }
-
- // negative_integer
- //
- {
- negative_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (min.c_str ());
- p._post ();
- assert (p.post_negative_integer () == LLONG_MIN);
- }
-
- {
- negative_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-1");
- p._post ();
- assert (p.post_negative_integer () == -1);
- }
-
- // non_positive_integer
- //
- {
- non_positive_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (min.c_str ());
- p._post ();
- assert (p.post_non_positive_integer () == LLONG_MIN);
- }
-
- {
- non_positive_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("+0");
- p._post ();
- assert (p.post_non_positive_integer () == 0);
- }
-
- // positive_integer
- //
- {
- positive_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("1");
- p._post ();
- assert (p.post_positive_integer () == 1);
- }
-
- {
- positive_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (umax.c_str ());
- p._post ();
- assert (p.post_positive_integer () == ULLONG_MAX);
- }
-
- // non_negative_integer
- //
- /*
- {
- non_negative_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-0");
- p._post ();
- assert (p.post_non_negative_integer () == 0);
- }
- */
-
- {
- non_negative_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (p.post_non_negative_integer () == 0);
- }
-
- {
- non_negative_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (umax.c_str ());
- p._post ();
- assert (p.post_non_negative_integer () == ULLONG_MAX);
- }
-
-
- // Bad
- //
-
- std::string past_min (min);
- std::string past_max (max);
- std::string past_umax (umax);
-
- assert (*past_min.rbegin () != '9');
- assert (*past_max.rbegin () != '9');
- assert (*past_umax.rbegin () != '9');
-
- (*past_min.rbegin ())++;
- (*past_max.rbegin ())++;
- (*past_umax.rbegin ())++;
-
- // integer
- //
- {
- integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (past_min.c_str ());
- assert (test_post_fail (p));
- }
-
- {
- integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (past_max.c_str ());
- assert (test_post_fail (p));
- }
-
- // negative_integer
- //
- {
- negative_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (past_min.c_str ());
- assert (test_post_fail (p));
- }
-
- {
- negative_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-0");
- assert (test_post_fail (p));
- }
-
- {
- negative_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("1");
- assert (test_post_fail (p));
- }
-
- // non_positive_integer
- //
- {
- non_positive_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (past_min.c_str ());
- assert (test_post_fail (p));
- }
-
- {
- non_positive_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("1");
- assert (test_post_fail (p));
- }
-
- // positive_integer
- //
- {
- positive_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-1");
- assert (test_post_fail (p));
- }
-
- {
- positive_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("+0");
- assert (test_post_fail (p));
- }
-
- {
- positive_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (past_umax.c_str ());
- assert (test_post_fail (p));
- }
-
- // non_negative_integer
- //
- {
- non_negative_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-1");
- assert (test_post_fail (p));
- }
-
- {
- non_negative_integer_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (past_umax.c_str ());
- assert (test_post_fail (p));
- }
-}
diff --git a/tests/cxx/parser/validation/built-in/integer/makefile b/tests/cxx/parser/validation/built-in/integer/makefile
deleted file mode 100644
index 66a7dd6..0000000
--- a/tests/cxx/parser/validation/built-in/integer/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/integer/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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)
diff --git a/tests/cxx/parser/validation/built-in/long/driver.cxx b/tests/cxx/parser/validation/built-in/long/driver.cxx
deleted file mode 100644
index a44ae70..0000000
--- a/tests/cxx/parser/validation/built-in/long/driver.cxx
+++ /dev/null
@@ -1,116 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/long/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in long and unsigned long types validation.
-//
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace xsd::cxx::parser::validating;
-
-template <typename T>
-bool
-test_post_fail (T& p)
-{
- try
- {
- p._post ();
- }
- catch (invalid_value<char> const&)
- {
- return true;
- }
-
- return false;
-}
-
-int
-main ()
-{
- // Good.
- //
- {
- long_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-9223372036854775808");
- p._post ();
- assert (p.post_long () == (-9223372036854775807LL - 1));
- }
-
- {
- long_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (p.post_long () == 0);
- }
-
- {
- long_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("9223372036854775807");
- p._post ();
- assert (p.post_long () == 9223372036854775807LL);
- }
-
- {
- unsigned_long_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (p.post_unsigned_long () == 0);
- }
-
- {
- unsigned_long_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("18446744073709551615");
- p._post ();
- assert (p.post_unsigned_long () == 18446744073709551615ULL);
- }
-
- // Bad
- //
-
- {
- unsigned_long_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-123");
- assert (test_post_fail (p));
- }
-
-
- // Ranges
- //
- {
- long_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-9223372036854775809");
- assert (test_post_fail (p));
- }
-
- {
- long_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("9223372036854775808");
- assert (test_post_fail (p));
- }
-
- {
- unsigned_long_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("18446744073709551616");
- assert (test_post_fail (p));
- }
-}
diff --git a/tests/cxx/parser/validation/built-in/long/makefile b/tests/cxx/parser/validation/built-in/long/makefile
deleted file mode 100644
index 5854363..0000000
--- a/tests/cxx/parser/validation/built-in/long/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/long/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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)
diff --git a/tests/cxx/parser/validation/built-in/makefile b/tests/cxx/parser/validation/built-in/makefile
deleted file mode 100644
index 79eab4f..0000000
--- a/tests/cxx/parser/validation/built-in/makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make
-
-tests := any-type binary boolean byte date-time float int integer long \
-qname short string uri
-
-default := $(out_base)/
-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)))
-
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
diff --git a/tests/cxx/parser/validation/built-in/qname/driver.cxx b/tests/cxx/parser/validation/built-in/qname/driver.cxx
deleted file mode 100644
index 6da6f2f..0000000
--- a/tests/cxx/parser/validation/built-in/qname/driver.cxx
+++ /dev/null
@@ -1,105 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/qname/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in QName type validation.
-//
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace xsd::cxx::parser::validating;
-
-bool
-test_post_fail (qname_pimpl<char>& p)
-{
- try
- {
- p._post ();
- }
- catch (invalid_value<char> const&)
- {
- return true;
- }
-
- return false;
-}
-
-int
-main ()
-{
- typedef xsd::cxx::parser::qname<char> qname;
-
- // Good.
- //
- {
- qname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" xsi");
- p._characters (":");
- p._characters ("schemaLocation");
- p._post ();
- assert (p.post_qname () == qname ("xsi", "schemaLocation"));
- }
-
- {
- qname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("schemaLocation");
- p._post ();
- assert (p.post_qname () == qname ("schemaLocation"));
- }
-
-
- // Bad
- //
- {
- qname_pimpl<char> p;
- p.pre ();
- p._pre ();
- //p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- qname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (":");
- assert (test_post_fail (p));
- }
-
- {
- qname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("xsi:");
- assert (test_post_fail (p));
- }
-
- {
- qname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (":schemaLocation");
- assert (test_post_fail (p));
- }
-
- {
- qname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("x?i:schemaLocation");
- assert (test_post_fail (p));
- }
-
- {
- qname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("xsi:schema Location");
- assert (test_post_fail (p));
- }
-}
diff --git a/tests/cxx/parser/validation/built-in/qname/makefile b/tests/cxx/parser/validation/built-in/qname/makefile
deleted file mode 100644
index c442812..0000000
--- a/tests/cxx/parser/validation/built-in/qname/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/qname/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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)
diff --git a/tests/cxx/parser/validation/built-in/short/driver.cxx b/tests/cxx/parser/validation/built-in/short/driver.cxx
deleted file mode 100644
index 42009a1..0000000
--- a/tests/cxx/parser/validation/built-in/short/driver.cxx
+++ /dev/null
@@ -1,116 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/short/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in short and unsigned short types validation.
-//
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace xsd::cxx::parser::validating;
-
-template <typename T>
-bool
-test_post_fail (T& p)
-{
- try
- {
- p._post ();
- }
- catch (invalid_value<char> const&)
- {
- return true;
- }
-
- return false;
-}
-
-int
-main ()
-{
- // Good.
- //
- {
- short_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-32768");
- p._post ();
- assert (p.post_short () == -32768);
- }
-
- {
- short_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (p.post_short () == 0);
- }
-
- {
- short_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("32767");
- p._post ();
- assert (p.post_short () == 32767);
- }
-
- {
- unsigned_short_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("0");
- p._post ();
- assert (p.post_unsigned_short () == 0);
- }
-
- {
- unsigned_short_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("65535");
- p._post ();
- assert (p.post_unsigned_short () == 65535);
- }
-
- // Bad
- //
-
- {
- unsigned_short_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-1234");
- assert (test_post_fail (p));
- }
-
-
- // Ranges
- //
- {
- short_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-32769");
- assert (test_post_fail (p));
- }
-
- {
- short_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("32768");
- assert (test_post_fail (p));
- }
-
- {
- unsigned_short_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("65536");
- assert (test_post_fail (p));
- }
-}
diff --git a/tests/cxx/parser/validation/built-in/short/makefile b/tests/cxx/parser/validation/built-in/short/makefile
deleted file mode 100644
index 05f8e2c..0000000
--- a/tests/cxx/parser/validation/built-in/short/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/short/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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)
diff --git a/tests/cxx/parser/validation/built-in/string/driver.cxx b/tests/cxx/parser/validation/built-in/string/driver.cxx
deleted file mode 100644
index b5da70d..0000000
--- a/tests/cxx/parser/validation/built-in/string/driver.cxx
+++ /dev/null
@@ -1,512 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/string/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in string & friends types validation.
-//
-#include <string>
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace xsd::cxx::parser::validating;
-
-template <typename T>
-bool
-test_post_fail (T& p)
-{
- try
- {
- p._post_impl (); // List implementation needs this to be post_impl.
- }
- catch (invalid_value<char> const&)
- {
- return true;
- }
-
- return false;
-}
-
-int
-main ()
-{
- typedef xsd::cxx::parser::string_sequence<char> strings;
-
- // Good.
- //
-
- // string
- //
- {
- string_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n\t");
- p._characters (" aaa ");
- p._characters ("bbb");
- p._characters (" ");
- p._post ();
- assert (p.post_string () == " \n\t aaa bbb ");
- }
-
- // normalized_string
- //
- {
- normalized_string_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n\t");
- p._characters (" aaa \n\t ");
- p._characters (" bbb");
- p._characters (" ");
- p._post ();
- assert (p.post_normalized_string () == " aaa bbb ");
- }
-
- // token
- //
- {
- token_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n\t");
- p._characters (" aaa \n\t ");
- p._characters (" bbb \n\t");
- p._characters (" ");
- p._post ();
- assert (p.post_token () == "aaa bbb");
- }
-
- // name
- //
- {
- name_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n\t");
- p._characters (" a:b-c_d123 ");
- p._characters (" ");
- p._post ();
- assert (p.post_name () == "a:b-c_d123");
- }
-
- {
- name_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n\t");
- p._characters (" _12 ");
- p._characters (" ");
- p._post ();
- assert (p.post_name () == "_12");
- }
-
- {
- name_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n\t");
- p._characters (" :12 ");
- p._characters (" ");
- p._post ();
- assert (p.post_name () == ":12");
- }
-
- // nmtoken
- //
- {
- nmtoken_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n\t");
- p._characters (" 123a:b-c_d123 ");
- p._characters (" \n\t");
- p._characters (" ");
- p._post ();
- assert (p.post_nmtoken () == "123a:b-c_d123");
- }
-
- // nmtokens
- //
- {
- strings s;
- s.push_back ("123");
- s.push_back ("abc");
-
- nmtokens_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n\t");
- p._characters (" 123 ");
- p._characters (" \n\t abc ");
- p._characters (" ");
- p._post ();
- assert (p.post_nmtokens () == s);
- }
-
- // ncname
- //
- {
- ncname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n\t");
- p._characters (" a.b-c_d123 ");
- p._characters (" ");
- p._post ();
- assert (p.post_ncname () == "a.b-c_d123");
- }
-
- // id
- //
- {
- id_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n\t");
- p._characters (" a.b-c_d123 ");
- p._characters (" ");
- p._post ();
- assert (p.post_id () == "a.b-c_d123");
- }
-
- // idref
- //
- {
- idref_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n\t");
- p._characters (" a.b-c_d123 ");
- p._characters (" ");
- p._post ();
- assert (p.post_idref () == "a.b-c_d123");
- }
-
- // idrefs
- //
- {
- strings s;
- s.push_back ("a123");
- s.push_back ("abc");
-
- idrefs_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" \n\t");
- p._characters (" a123 ");
- p._characters (" \n\t abc ");
- p._characters (" ");
- p._post ();
- assert (p.post_idrefs () == s);
- }
-
- // language
- //
- {
- language_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" x ");
- p._post ();
- assert (p.post_language () == "x");
- }
-
- {
- language_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" en ");
- p._post ();
- assert (p.post_language () == "en");
- }
-
- {
- language_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" en");
- p._characters ("-us ");
- p._post ();
- assert (p.post_language () == "en-us");
- }
-
- {
- language_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("one-two-three-four44-seven77-eight888");
- p._post ();
- assert (p.post_language () == "one-two-three-four44-seven77-eight888");
- }
-
-
- // Bad
- //
-
- // name
- //
- {
- name_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- name_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (".a");
- assert (test_post_fail (p));
- }
-
- {
- name_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-a");
- assert (test_post_fail (p));
- }
-
- {
- name_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("1a");
- assert (test_post_fail (p));
- }
-
- {
- name_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("a,b");
- assert (test_post_fail (p));
- }
-
- {
- name_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("a b");
- assert (test_post_fail (p));
- }
-
- {
- name_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("a<b");
- assert (test_post_fail (p));
- }
-
- // nmtoken
- //
- {
- nmtoken_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- nmtoken_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("a,b");
- assert (test_post_fail (p));
- }
-
- {
- nmtoken_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("a b");
- assert (test_post_fail (p));
- }
-
- {
- nmtoken_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("a<b");
- assert (test_post_fail (p));
- }
-
- // nmtokens
- //
- {
- nmtokens_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" ");
- p._characters (" \t\n ");
- assert (test_post_fail (p));
- }
-
- {
- nmtokens_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("ab a,b");
- assert (test_post_fail (p));
- }
-
- // ncname
- //
- {
- ncname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("");
- assert (test_post_fail (p));
- }
-
- {
- ncname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (".a");
- assert (test_post_fail (p));
- }
-
- {
- ncname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("-a");
- assert (test_post_fail (p));
- }
-
- {
- ncname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (":a");
- assert (test_post_fail (p));
- }
-
- {
- ncname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("1a");
- assert (test_post_fail (p));
- }
-
- {
- ncname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("1:a");
- assert (test_post_fail (p));
- }
-
- {
- ncname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("a,b");
- assert (test_post_fail (p));
- }
-
- {
- ncname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("a b");
- assert (test_post_fail (p));
- }
-
- {
- ncname_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("a<b");
- assert (test_post_fail (p));
- }
-
- // id
- //
- {
- id_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("a b");
- assert (test_post_fail (p));
- }
-
- // idref
- //
- {
- idref_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("a b");
- assert (test_post_fail (p));
- }
-
- // idrefs
- //
- {
- idrefs_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" ");
- p._characters (" \t\n ");
- assert (test_post_fail (p));
- }
-
- {
- idrefs_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("ab a<b");
- assert (test_post_fail (p));
- }
-
- // language
- //
- {
- language_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" ");
- assert (test_post_fail (p));
- }
-
- {
- language_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("en-");
- assert (test_post_fail (p));
- }
-
- {
- language_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("a1");
- assert (test_post_fail (p));
- }
-
- {
- language_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("en+us");
- assert (test_post_fail (p));
- }
-
- {
- language_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("en-nine99999");
- assert (test_post_fail (p));
- }
-}
diff --git a/tests/cxx/parser/validation/built-in/string/makefile b/tests/cxx/parser/validation/built-in/string/makefile
deleted file mode 100644
index bcdae7e..0000000
--- a/tests/cxx/parser/validation/built-in/string/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/string/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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)
diff --git a/tests/cxx/parser/validation/built-in/uri/driver.cxx b/tests/cxx/parser/validation/built-in/uri/driver.cxx
deleted file mode 100644
index 9e487e6..0000000
--- a/tests/cxx/parser/validation/built-in/uri/driver.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-// file : tests/cxx/parser/validation/built-in/uri/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in anyURI type validation.
-//
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace xsd::cxx::parser::validating;
-
-int
-main ()
-{
- // Good.
- //
- {
- uri_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters (" ");
- p._post ();
- assert (p.post_uri () == "");
- }
-
- {
- uri_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("relative");
- p._post ();
- assert (p.post_uri () == "relative");
- }
-
- {
- uri_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("#id");
- p._post ();
- assert (p.post_uri () == "#id");
- }
-
- {
- uri_pimpl<char> p;
- p.pre ();
- p._pre ();
- p._characters ("http://www.example.com/foo#bar");
- p._post ();
- assert (p.post_uri () == "http://www.example.com/foo#bar");
- }
-}
diff --git a/tests/cxx/parser/validation/built-in/uri/makefile b/tests/cxx/parser/validation/built-in/uri/makefile
deleted file mode 100644
index ae7e8bd..0000000
--- a/tests/cxx/parser/validation/built-in/uri/makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# file : tests/cxx/parser/validation/built-in/uri/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver
-$(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)
diff --git a/tests/cxx/parser/validation/choice/driver.cxx b/tests/cxx/parser/validation/choice/driver.cxx
deleted file mode 100644
index af30727..0000000
--- a/tests/cxx/parser/validation/choice/driver.cxx
+++ /dev/null
@@ -1,126 +0,0 @@
-// file : tests/cxx/parser/validation/choice/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the choice compositor validation.
-//
-
-#include <string>
-#include <fstream>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-using xml_schema::ro_string;
-
-struct choice_pimpl: choice_pskel
-{
- virtual void
- pre ()
- {
- cout << "{" << endl;
- }
-
- virtual void
- a (string const& v)
- {
- cout << " a = " << v << endl;
- }
-
- virtual void
- b (string const& v)
- {
- cout << " b = " << v << endl;
- }
-
- virtual void
- c (string const& v)
- {
- cout << " c = " << v << endl;
- }
-
- virtual void
- d (string const& v)
- {
- cout << " d = " << v << endl;
- }
-
- virtual void
- _start_any_element (ro_string const& ns,
- ro_string const& name,
- ro_string const*)
- {
- cout << " any: " << ns << "#" << name << endl
- << " {" << endl;
- }
-
- virtual void
- _any_characters (ro_string const& v)
- {
- cout << " chars = " << v << endl;
- }
-
- virtual void
- _end_any_element (ro_string const&, ro_string const&)
- {
- cout << " }" << endl;
- }
-
- virtual void
- post_choice ()
- {
- 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;
- choice_pimpl choice_p;
- type_pimpl type_p;
-
- choice_p.parsers (string_p, string_p, string_p, string_p);
- type_p.parsers (choice_p);
-
- xml_schema::document doc_p (type_p, "test", "root");
-
- try
- {
- ifstream ifs (argv[1]);
- type_p.pre ();
- doc_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate);
- type_p.post_type ();
- }
- catch (xml_schema::exception const& e)
- {
- cout << " " << e << endl
- << "}" << endl
- << endl;
- }
- }
- 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/tests/cxx/parser/validation/choice/makefile b/tests/cxx/parser/validation/choice/makefile
deleted file mode 100644
index 93b05c5..0000000
--- a/tests/cxx/parser/validation/choice/makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-# file : tests/cxx/parser/validation/choice/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make
-
-xsd := test.xsd
-cxx := driver.cxx
-
-tests := 000 001 002 003 004
-
-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): xsd_options += --generate-validation
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Test.
-#
-test_targets := $(addprefix $(out_base)/.test-,$(tests))
-
-$(test): $(test_targets)
-$(test_targets): driver := $(driver)
-
-.PHONY: $(out_base)/.test-%
-$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std
- $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -)
-
-
-# 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/tests/cxx/parser/validation/choice/test-000.std b/tests/cxx/parser/validation/choice/test-000.std
deleted file mode 100644
index 856b7f5..0000000
--- a/tests/cxx/parser/validation/choice/test-000.std
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- a = a
- b = b
-}
-
-{
- c = c
- d = d
- any: other#any
- {
- chars = any
- }
- a = a
-}
-
-{
- c = c
- d = d
- d = d
- a = a
-}
-
diff --git a/tests/cxx/parser/validation/choice/test-000.xml b/tests/cxx/parser/validation/choice/test-000.xml
deleted file mode 100644
index 39b9614..0000000
--- a/tests/cxx/parser/validation/choice/test-000.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <choice>
- <a>a</a>
-
- <b>b</b>
- </choice>
-
- <choice>
- <c>c</c>
- <d>d</d>
-
- <o:any>any</o:any>
-
- <a>a</a>
- </choice>
-
- <choice>
- <c>c</c>
- <d>d</d>
-
- <d>d</d>
-
- <a>a</a>
- </choice>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/choice/test-001.std b/tests/cxx/parser/validation/choice/test-001.std
deleted file mode 100644
index 8a78666..0000000
--- a/tests/cxx/parser/validation/choice/test-001.std
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- :8:12 error: expected element 'a'
-}
-
diff --git a/tests/cxx/parser/validation/choice/test-001.xml b/tests/cxx/parser/validation/choice/test-001.xml
deleted file mode 100644
index c509e0d..0000000
--- a/tests/cxx/parser/validation/choice/test-001.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- invalid -->
- <choice>
- </choice>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/choice/test-002.std b/tests/cxx/parser/validation/choice/test-002.std
deleted file mode 100644
index 1dc1a3a..0000000
--- a/tests/cxx/parser/validation/choice/test-002.std
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- c = c
- d = d
- any: other#any
- {
- chars = any
- }
- a = a
- :14:8 error: unexpected element 'b'
-}
-
diff --git a/tests/cxx/parser/validation/choice/test-002.xml b/tests/cxx/parser/validation/choice/test-002.xml
deleted file mode 100644
index 3b7e663..0000000
--- a/tests/cxx/parser/validation/choice/test-002.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- invalid -->
- <choice>
- <c>c</c>
- <d>d</d>
-
- <o:any>any</o:any>
-
- <a>a</a>
- <b>b</b>
- </choice>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/choice/test-003.std b/tests/cxx/parser/validation/choice/test-003.std
deleted file mode 100644
index 29d5e44..0000000
--- a/tests/cxx/parser/validation/choice/test-003.std
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- c = c
- :9:12 error: expected element 'd'
-}
-
diff --git a/tests/cxx/parser/validation/choice/test-003.xml b/tests/cxx/parser/validation/choice/test-003.xml
deleted file mode 100644
index ba15c7e..0000000
--- a/tests/cxx/parser/validation/choice/test-003.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- invalid -->
- <choice>
- <c>c</c>
- </choice>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/choice/test-004.std b/tests/cxx/parser/validation/choice/test-004.std
deleted file mode 100644
index 4a7530b..0000000
--- a/tests/cxx/parser/validation/choice/test-004.std
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- :8:8 error: expected element 'a' instead of 'x'
-}
-
diff --git a/tests/cxx/parser/validation/choice/test-004.xml b/tests/cxx/parser/validation/choice/test-004.xml
deleted file mode 100644
index f6960dd..0000000
--- a/tests/cxx/parser/validation/choice/test-004.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- invalid -->
- <choice>
- <x>x</x>
- </choice>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/choice/test.xsd b/tests/cxx/parser/validation/choice/test.xsd
deleted file mode 100644
index 8132bbb..0000000
--- a/tests/cxx/parser/validation/choice/test.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="choice">
- <choice maxOccurs="3">
- <element name="a" type="string"/>
- <element name="b" type="string" maxOccurs="unbounded"/>
- <sequence>
- <element name="c" type="string" minOccurs="0"/>
- <element name="d" type="string"/>
- </sequence>
- <any namespace="other" maxOccurs="unbounded"/>
- </choice>
- </complexType>
-
- <complexType name="type">
- <sequence>
- <element name="choice" type="t:choice" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/parser/validation/makefile b/tests/cxx/parser/validation/makefile
deleted file mode 100644
index 600d9dd..0000000
--- a/tests/cxx/parser/validation/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# file : tests/cxx/parser/validation/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
-
-tests := all any attribute built-in choice restriction sequence
-
-default := $(out_base)/
-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)))
-
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
diff --git a/tests/cxx/parser/validation/restriction/driver.cxx b/tests/cxx/parser/validation/restriction/driver.cxx
deleted file mode 100644
index 6f9a871..0000000
--- a/tests/cxx/parser/validation/restriction/driver.cxx
+++ /dev/null
@@ -1,107 +0,0 @@
-// file : tests/cxx/parser/validation/restriction/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the restriction compositor validation.
-//
-
-#include <string>
-#include <fstream>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-
-struct base_a_pimpl: base_a_pskel
-{
-};
-
-struct restriction_a_pimpl: restriction_a_pskel
-{
-};
-
-struct extension_b_pimpl: extension_b_pskel
-{
-};
-
-struct restriction_b_pimpl: restriction_b_pskel
-{
-};
-
-struct type_b_pimpl: type_b_pskel
-{
-};
-
-struct type_r_pimpl: type_r_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;
- base_a_pimpl base_a_p;
- restriction_a_pimpl restriction_a_p;
- extension_b_pimpl extension_b_p;
- restriction_b_pimpl restriction_b_p;
- type_b_pimpl type_b_p;
- type_r_pimpl type_r_p;
-
- base_a_p.parsers (string_p, string_p, string_p,
- string_p, string_p, string_p);
-
- restriction_a_p.parsers (string_p, string_p, string_p,
- string_p, string_p, string_p);
-
- extension_b_p.parsers (string_p, string_p, string_p,
- string_p, string_p);
-
- restriction_b_p.parsers (string_p, string_p, string_p,
- string_p, string_p);
-
- type_b_p.parsers (base_a_p, extension_b_p);
- type_r_p.parsers (restriction_a_p, restriction_b_p);
-
- xml_schema::document doc_b_p (type_b_p, "test", "root");
- xml_schema::document doc_r_p (type_r_p, "test", "root");
-
- {
- ifstream ifs (argv[1]);
- type_b_p.pre ();
- doc_b_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate);
- type_b_p.post_type_b ();
- }
-
- try
- {
- ifstream ifs (argv[1]);
- type_r_p.pre ();
- doc_r_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate);
- type_r_p.post_type_r ();
- }
- catch (xml_schema::exception const& e)
- {
- cout << e << endl;
- }
- }
- 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/tests/cxx/parser/validation/restriction/makefile b/tests/cxx/parser/validation/restriction/makefile
deleted file mode 100644
index 61af2bf..0000000
--- a/tests/cxx/parser/validation/restriction/makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-# file : tests/cxx/parser/validation/restriction/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make
-
-xsd := test.xsd
-cxx := driver.cxx
-
-tests := 000 001 002 003 004 005
-
-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): xsd_options += --generate-validation
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Test.
-#
-test_targets := $(addprefix $(out_base)/.test-,$(tests))
-
-$(test): $(test_targets)
-$(test_targets): driver := $(driver)
-
-.PHONY: $(out_base)/.test-%
-$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std
- $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -)
-
-
-# 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/tests/cxx/parser/validation/restriction/test-000.std b/tests/cxx/parser/validation/restriction/test-000.std
deleted file mode 100644
index e69de29..0000000
--- a/tests/cxx/parser/validation/restriction/test-000.std
+++ /dev/null
diff --git a/tests/cxx/parser/validation/restriction/test-000.xml b/tests/cxx/parser/validation/restriction/test-000.xml
deleted file mode 100644
index 21402b4..0000000
--- a/tests/cxx/parser/validation/restriction/test-000.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <restriction-a z="z">
- <a>a</a>
- <b>b</b>
- <c>c</c>
- </restriction-a>
-
- <restriction-a x="x" y="y" z="z">
- <a>a</a>
- <b>b</b>
- <c>c</c>
- </restriction-a>
-
- <restriction-b y="y">
- <a>a</a>
- <b>b</b>
- </restriction-b>
-
- <restriction-b y="y">
- <a>a</a>
- <c>c</c>
- </restriction-b>
-
- <restriction-b x="x" y="y">
- <a>a</a>
- </restriction-b>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/restriction/test-001.std b/tests/cxx/parser/validation/restriction/test-001.std
deleted file mode 100644
index 5077837..0000000
--- a/tests/cxx/parser/validation/restriction/test-001.std
+++ /dev/null
@@ -1 +0,0 @@
-:7:8 error: expected element 'a' instead of 'b'
diff --git a/tests/cxx/parser/validation/restriction/test-001.xml b/tests/cxx/parser/validation/restriction/test-001.xml
deleted file mode 100644
index 4015302..0000000
--- a/tests/cxx/parser/validation/restriction/test-001.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">
-
- <!-- valid base but not restriction: a element -->
- <restriction-a z="z">
- <b>b</b>
- <c>c</c>
- </restriction-a>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/restriction/test-002.std b/tests/cxx/parser/validation/restriction/test-002.std
deleted file mode 100644
index f12c342..0000000
--- a/tests/cxx/parser/validation/restriction/test-002.std
+++ /dev/null
@@ -1 +0,0 @@
-:10:19 error: expected attribute 'z'
diff --git a/tests/cxx/parser/validation/restriction/test-002.xml b/tests/cxx/parser/validation/restriction/test-002.xml
deleted file mode 100644
index eb7684c..0000000
--- a/tests/cxx/parser/validation/restriction/test-002.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- valid base but not restriction: z attribute -->
- <restriction-a>
- <a>a</a>
- <b>b</b>
- <c>c</c>
- </restriction-a>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/restriction/test-003.std b/tests/cxx/parser/validation/restriction/test-003.std
deleted file mode 100644
index 0c65175..0000000
--- a/tests/cxx/parser/validation/restriction/test-003.std
+++ /dev/null
@@ -1 +0,0 @@
-:11:8 error: unexpected element 'a'
diff --git a/tests/cxx/parser/validation/restriction/test-003.xml b/tests/cxx/parser/validation/restriction/test-003.xml
deleted file mode 100644
index 49f18c7..0000000
--- a/tests/cxx/parser/validation/restriction/test-003.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- valid base but not restriction: sequence maxOccurs="1" -->
- <restriction-a z="z">
- <a>a</a>
- <b>b</b>
- <c>c</c>
-
- <a>a</a>
- <b>b</b>
- <c>c</c>
- </restriction-a>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/restriction/test-004.std b/tests/cxx/parser/validation/restriction/test-004.std
deleted file mode 100644
index 5077837..0000000
--- a/tests/cxx/parser/validation/restriction/test-004.std
+++ /dev/null
@@ -1 +0,0 @@
-:7:8 error: expected element 'a' instead of 'b'
diff --git a/tests/cxx/parser/validation/restriction/test-004.xml b/tests/cxx/parser/validation/restriction/test-004.xml
deleted file mode 100644
index 115cd38..0000000
--- a/tests/cxx/parser/validation/restriction/test-004.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- valid extension but not restriction: a element -->
- <restriction-b y="y">
- <b>b</b>
- </restriction-b>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/restriction/test-005.std b/tests/cxx/parser/validation/restriction/test-005.std
deleted file mode 100644
index e92de14..0000000
--- a/tests/cxx/parser/validation/restriction/test-005.std
+++ /dev/null
@@ -1 +0,0 @@
-:9:19 error: expected attribute 'y'
diff --git a/tests/cxx/parser/validation/restriction/test-005.xml b/tests/cxx/parser/validation/restriction/test-005.xml
deleted file mode 100644
index e9ab7d9..0000000
--- a/tests/cxx/parser/validation/restriction/test-005.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">
-
- <!-- valid extension but not restriction: y attribute -->
- <restriction-b>
- <a>a</a>
- <b>b</b>
- </restriction-b>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/restriction/test.xsd b/tests/cxx/parser/validation/restriction/test.xsd
deleted file mode 100644
index 158ded5..0000000
--- a/tests/cxx/parser/validation/restriction/test.xsd
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <!-- simple case -->
- <complexType name="base-a">
- <sequence minOccurs="1" maxOccurs="2">
- <element name="a" type="string" minOccurs="0"/>
- <element name="b" type="string"/>
- <element name="c" type="string"/>
- </sequence>
- <attribute name="x" type="string"/>
- <attribute name="y" type="string"/>
- <attribute name="z" type="string"/>
- </complexType>
-
- <complexType name="restriction-a">
- <complexContent>
- <restriction base="t:base-a">
- <sequence minOccurs="1" maxOccurs="1">
- <element name="a" type="string" minOccurs="1"/>
- <element name="b" type="string"/>
- <element name="c" type="string"/>
- </sequence>
- <!-- Can be ommited if not changed, e.g., 'x'. -->
- <attribute name="y" type="string"/> <!-- But can also be repeated without change. -->
- <attribute name="z" type="string" use="required"/>
- </restriction>
- </complexContent>
- </complexType>
-
- <!-- restriction of an extension -->
- <complexType name="base-b">
- <sequence>
- <element name="a" type="string" minOccurs="0"/>
- </sequence>
- <attribute name="x" type="string"/>
- </complexType>
-
- <complexType name="extension-b">
- <complexContent>
- <extension base="t:base-b">
- <choice>
- <element name="b" type="string" minOccurs="0"/>
- <element name="c" type="string"/>
- </choice>
- <attribute name="y" type="string"/>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="restriction-b">
- <complexContent>
- <restriction base="t:extension-b">
- <sequence>
- <sequence>
- <element name="a" type="string" minOccurs="1"/>
- </sequence>
- <choice>
- <element name="b" type="string" minOccurs="0"/>
- <element name="c" type="string"/>
- </choice>
- </sequence>
- <attribute name="y" type="string" use="required"/>
- </restriction>
- </complexContent>
- </complexType>
-
- <complexType name="type-b">
- <choice maxOccurs="unbounded">
- <element name="restriction-a" type="t:base-a"/>
- <element name="restriction-b" type="t:extension-b"/>
- </choice>
- </complexType>
-
- <complexType name="type-r">
- <choice maxOccurs="unbounded">
- <element name="restriction-a" type="t:restriction-a"/>
- <element name="restriction-b" type="t:restriction-b"/>
- </choice>
- </complexType>
-
-</schema>
diff --git a/tests/cxx/parser/validation/sequence/driver.cxx b/tests/cxx/parser/validation/sequence/driver.cxx
deleted file mode 100644
index 61652b3..0000000
--- a/tests/cxx/parser/validation/sequence/driver.cxx
+++ /dev/null
@@ -1,139 +0,0 @@
-// file : tests/cxx/parser/validation/sequence/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the sequence compositor validation.
-//
-
-#include <string>
-#include <fstream>
-#include <iostream>
-
-#include "test-pskel.hxx"
-
-using namespace std;
-using namespace test;
-using xml_schema::ro_string;
-
-struct sequence_pimpl: sequence_pskel
-{
- virtual void
- pre ()
- {
- cout << "{" << endl;
- }
-
- virtual void
- a (string const& v)
- {
- cout << " a = " << v << endl;
- }
-
- virtual void
- b (string const& v)
- {
- cout << " b = " << v << endl;
- }
-
- virtual void
- c (string const& v)
- {
- cout << " c = " << v << endl;
- }
-
- virtual void
- d (string const& v)
- {
- cout << " d = " << v << endl;
- }
-
- virtual void
- e (string const& v)
- {
- cout << " e = " << v << endl;
- }
-
- virtual void
- f (string const& v)
- {
- cout << " f = " << v << endl;
- }
-
- virtual void
- _start_any_element (ro_string const& ns,
- ro_string const& name,
- ro_string const*)
- {
- cout << " any: " << ns << "#" << name << endl
- << " {" << endl;
- }
-
- virtual void
- _any_characters (ro_string const& v)
- {
- cout << " chars = " << v << endl;
- }
-
- virtual void
- _end_any_element (ro_string const&, ro_string const&)
- {
- cout << " }" << endl;
- }
-
- virtual void
- post_sequence ()
- {
- 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;
- sequence_pimpl sequence_p;
- type_pimpl type_p;
-
- sequence_p.parsers (string_p, string_p, string_p,
- string_p, string_p, string_p);
- type_p.parsers (sequence_p);
-
- xml_schema::document doc_p (type_p, "test", "root");
-
- try
- {
- ifstream ifs (argv[1]);
- type_p.pre ();
- doc_p.parse (ifs, argv[1], "", xml_schema::flags::dont_validate);
- type_p.post_type ();
- }
- catch (xml_schema::exception const& e)
- {
- cout << " " << e << endl
- << "}" << endl
- << endl;
- }
- }
- 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/tests/cxx/parser/validation/sequence/makefile b/tests/cxx/parser/validation/sequence/makefile
deleted file mode 100644
index f0a7b14..0000000
--- a/tests/cxx/parser/validation/sequence/makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-# file : tests/cxx/parser/validation/sequence/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make
-
-xsd := test.xsd
-cxx := driver.cxx
-
-tests := 000 001 002 003 004 005 006
-
-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): xsd_options += --generate-validation
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Test.
-#
-test_targets := $(addprefix $(out_base)/.test-,$(tests))
-
-$(test): $(test_targets)
-$(test_targets): driver := $(driver)
-
-.PHONY: $(out_base)/.test-%
-$(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src_base)/test-%.std
- $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -)
-
-
-# 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/tests/cxx/parser/validation/sequence/test-000.std b/tests/cxx/parser/validation/sequence/test-000.std
deleted file mode 100644
index 8a44762..0000000
--- a/tests/cxx/parser/validation/sequence/test-000.std
+++ /dev/null
@@ -1,56 +0,0 @@
-{
- c = c
- d = d
- any: test#any
- {
- chars = aaa
- any: #a
- {
- chars = bbb
- }
- chars = ccc
- }
- f = f
- e = e
-}
-
-{
- a = a
- b = b
- c = c
- d = d
- d = d
- d = d
- any: other#any
- {
- chars = any
- }
- f = f
- e = e
- e = e
-}
-
-{
- a = a
- b = b
- c = c
- d = d
- d = d
- d = d
- any: other#any
- {
- chars = any
- }
- f = f
- e = e
- e = e
- c = c
- d = d
- any: test#any
- {
- chars = any
- }
- f = f
- e = e
-}
-
diff --git a/tests/cxx/parser/validation/sequence/test-000.xml b/tests/cxx/parser/validation/sequence/test-000.xml
deleted file mode 100644
index 9bcbd7e..0000000
--- a/tests/cxx/parser/validation/sequence/test-000.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <sequence>
- <c>c</c>
- <d>d</d>
- <t:any>aaa<a>bbb</a>ccc</t:any>
- <f>f</f>
- <e>e</e>
- </sequence>
-
- <sequence>
- <a>a</a>
- <b>b</b>
- <c>c</c>
- <d>d</d>
- <d>d</d>
- <d>d</d>
- <o:any>any</o:any>
- <f>f</f>
- <e>e</e>
- <e>e</e>
- </sequence>
-
- <sequence>
- <a>a</a>
- <b>b</b>
- <c>c</c>
- <d>d</d>
- <d>d</d>
- <d>d</d>
- <o:any>any</o:any>
- <f>f</f>
- <e>e</e>
- <e>e</e>
-
- <c>c</c>
- <d>d</d>
- <t:any>any</t:any>
- <f>f</f>
- <e>e</e>
- </sequence>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/sequence/test-001.std b/tests/cxx/parser/validation/sequence/test-001.std
deleted file mode 100644
index 20dea34..0000000
--- a/tests/cxx/parser/validation/sequence/test-001.std
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- :8:14 error: expected element 'a'
-}
-
diff --git a/tests/cxx/parser/validation/sequence/test-001.xml b/tests/cxx/parser/validation/sequence/test-001.xml
deleted file mode 100644
index 67d33ce..0000000
--- a/tests/cxx/parser/validation/sequence/test-001.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- fail minOccurs="1" -->
- <sequence>
- </sequence>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/sequence/test-002.std b/tests/cxx/parser/validation/sequence/test-002.std
deleted file mode 100644
index 61343e7..0000000
--- a/tests/cxx/parser/validation/sequence/test-002.std
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- c = c
- d = d
- any: test#any
- {
- chars = any
- }
- f = f
- e = e
- c = c
- d = d
- any: test#any
- {
- chars = any
- }
- f = f
- e = e
- :20:8 error: unexpected element 'c'
-}
-
diff --git a/tests/cxx/parser/validation/sequence/test-002.xml b/tests/cxx/parser/validation/sequence/test-002.xml
deleted file mode 100644
index be25fcf..0000000
--- a/tests/cxx/parser/validation/sequence/test-002.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- fail maxOccurs="2" -->
- <sequence>
- <c>c</c>
- <d>d</d>
- <t:any>any</t:any>
- <f>f</f>
- <e>e</e>
-
- <c>c</c>
- <d>d</d>
- <t:any>any</t:any>
- <f>f</f>
- <e>e</e>
-
- <c>c</c>
- <d>d</d>
- <t:any>any</t:any>
- <f>f</f>
- <e>e</e>
- </sequence>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/sequence/test-003.std b/tests/cxx/parser/validation/sequence/test-003.std
deleted file mode 100644
index c4e1e46..0000000
--- a/tests/cxx/parser/validation/sequence/test-003.std
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- a = a
- :9:8 error: expected element 'b' instead of 'a'
-}
-
diff --git a/tests/cxx/parser/validation/sequence/test-003.xml b/tests/cxx/parser/validation/sequence/test-003.xml
deleted file mode 100644
index af7d21d..0000000
--- a/tests/cxx/parser/validation/sequence/test-003.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- fail a maxOccurs="1" -->
- <sequence>
- <a>a</a>
- <a>a</a>
- <c>c</c>
- <d>d</d>
- <t:any>any</t:any>
- <f>f</f>
- <e>e</e>
- </sequence>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/sequence/test-004.std b/tests/cxx/parser/validation/sequence/test-004.std
deleted file mode 100644
index f4c1d4d..0000000
--- a/tests/cxx/parser/validation/sequence/test-004.std
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- :8:8 error: expected element 'a' instead of 'd'
-}
-
diff --git a/tests/cxx/parser/validation/sequence/test-004.xml b/tests/cxx/parser/validation/sequence/test-004.xml
deleted file mode 100644
index a58b6d4..0000000
--- a/tests/cxx/parser/validation/sequence/test-004.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- fail c minOccurs="1" -->
- <sequence>
- <d>d</d>
- <t:any>any</t:any>
- <f>f</f>
- <e>e</e>
- </sequence>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/sequence/test-005.std b/tests/cxx/parser/validation/sequence/test-005.std
deleted file mode 100644
index 9fa7904..0000000
--- a/tests/cxx/parser/validation/sequence/test-005.std
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- c = c
- d = d
- :10:13 error: expected element '##targetNamespace#*' instead of 'other1#any'
-}
-
diff --git a/tests/cxx/parser/validation/sequence/test-005.xml b/tests/cxx/parser/validation/sequence/test-005.xml
deleted file mode 100644
index e3dd03d..0000000
--- a/tests/cxx/parser/validation/sequence/test-005.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o1="other1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- fail any namespace="##targetNamespace other" -->
- <sequence>
- <c>c</c>
- <d>d</d>
- <o1:any>any</o1:any>
- <f>f</f>
- <e>e</e>
- </sequence>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/sequence/test-006.std b/tests/cxx/parser/validation/sequence/test-006.std
deleted file mode 100644
index eb79f47..0000000
--- a/tests/cxx/parser/validation/sequence/test-006.std
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- c = c
- d = d
- any: test#any
- {
- chars = any
- }
- f = f
- e = e
- e = e
- :14:8 error: unexpected element 'e'
-}
-
diff --git a/tests/cxx/parser/validation/sequence/test-006.xml b/tests/cxx/parser/validation/sequence/test-006.xml
deleted file mode 100644
index e1ecd69..0000000
--- a/tests/cxx/parser/validation/sequence/test-006.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <!-- fail e maxOccurs="2" -->
- <sequence>
- <c>c</c>
- <d>d</d>
- <t:any>any</t:any>
- <f>f</f>
- <e>e</e>
- <e>e</e>
- <e>e</e>
- </sequence>
-
-</t:root>
diff --git a/tests/cxx/parser/validation/sequence/test.xsd b/tests/cxx/parser/validation/sequence/test.xsd
deleted file mode 100644
index 8753f54..0000000
--- a/tests/cxx/parser/validation/sequence/test.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="sequence">
- <sequence minOccurs="1" maxOccurs="2">
- <element name="a" type="string" minOccurs="0"/>
- <sequence>
- <element name="b" type="string" minOccurs="0"/>
- <element name="c" type="string"/>
- </sequence>
- <element name="d" type="string" maxOccurs="unbounded"/>
- <sequence>
- <any namespace="##targetNamespace other"/>
- <element name="f" type="string"/>
- </sequence>
- <element name="e" type="string" maxOccurs="2"/>
- </sequence>
- </complexType>
-
- <complexType name="type">
- <sequence>
- <element name="sequence" type="t:sequence" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/tree/any-type/driver.cxx b/tests/cxx/tree/any-type/driver.cxx
deleted file mode 100644
index ae81081..0000000
--- a/tests/cxx/tree/any-type/driver.cxx
+++ /dev/null
@@ -1,144 +0,0 @@
-// file : tests/cxx/tree/any-type/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test anyType and anySimpleType content extraction.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <utility> // std::move
-#include <sstream>
-#include <iostream>
-
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-
-#include "test.hxx" // Get XSD_CXX11 defined.
-
-#include <xsd/cxx/xml/string.hxx>
-
-using namespace std;
-using namespace test;
-using namespace xercesc;
-
-namespace xml = xsd::cxx::xml;
-
-int
-main (int argc, char* argv[])
-{
- if (argc != 2)
- {
- cerr << "usage: " << argv[0] << " test.xml" << endl;
- return 1;
- }
-
- XMLPlatformUtils::Initialize ();
-
- try
- {
- // Test parsing
- //
- XSD_AUTO_PTR<type> r (root (argv[1]));
-
- // Test API.
- //
- {
- assert (type::a_default_value ().text_content () == "default value");
- }
-
- {
- xml_schema::simple_type x ("fox");
- assert (x.text_content () == "fox");
- x.text_content ("foo");
- assert (x.text_content () == "foo");
- x.text_content ().clear ();
- assert (x.text_content () == "");
- x.text_content () = "baz";
- r->s ().push_back (x);
- }
-
- {
- xml_schema::type x;
-
- DOMDocument& doc (x.dom_content_document ());
-
- // Copy.
- //
- DOMElement* e (doc.createElement (xml::string ("dummy").c_str ()));
- e->setAttribute (xml::string ("x").c_str (),
- xml::string ("foo").c_str ());
- e->setTextContent (xml::string ("data").c_str ());
- x.dom_content ().set (*e);
- e->release ();
-
- r->t ().push_back (x);
- }
-
- {
- XSD_AUTO_PTR<xml_schema::type> x (new xml_schema::type);
-
- DOMDocument& doc (x->dom_content_document ());
-
- // Assume ownership.
- //
- DOMElement* e (doc.createElement (xml::string ("dummy").c_str ()));
- e->setAttribute (xml::string ("x").c_str (),
- xml::string ("foo").c_str ());
- e->setTextContent (xml::string ("data").c_str ());
- x->dom_content ().set (e);
-
-#ifdef XSD_CXX11
- r->t ().push_back (std::move (x));
-#else
- r->t ().push_back (x);
-#endif
- }
-
- // Test printing.
- //
- cout << *r << endl
- << endl;
-
- // Test serialization.
- //
- xml_schema::namespace_infomap map;
-
- map["t"].name = "test";
- map["t"].schema = "test.xsd";
- map["o"].name = "other";
-
- stringstream iostr;
- root (iostr, *r, map);
-
- cout << iostr.str () << endl
- << endl;
-
- {
- XSD_AUTO_PTR<type> r1 (root (iostr, argv[1]));
-
- // Xerces-C++ mis-indentation of mixed content messes this up.
- // assert (*r == *r);
-
- stringstream iostr;
- root (iostr, *r1, map);
-
- cout << iostr.str () << endl
- << endl;
- }
-
- // Test comparison.
- //
- assert (*r == *r);
-
- // Test copy c-tor.
- //
- type copy (*r);
- assert (copy == *r);
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- return 1;
- }
-
- XMLPlatformUtils::Terminate ();
-}
diff --git a/tests/cxx/tree/any-type/makefile b/tests/cxx/tree/any-type/makefile
deleted file mode 100644
index 1267cd4..0000000
--- a/tests/cxx/tree/any-type/makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# file : tests/cxx/tree/any-type/makefile
-# 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 += --generate-any-type --generate-serialization \
---generate-ostream --generate-comparison
-$(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=.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/tests/cxx/tree/any-type/output b/tests/cxx/tree/any-type/output
deleted file mode 100644
index 580e7db..0000000
--- a/tests/cxx/tree/any-type/output
+++ /dev/null
@@ -1,73 +0,0 @@
-
-t:
-t:
-t:
-t:
-t:
-t:
-t:
-t:
-s:
-s: simple
-s: baz
-l: one two three
-a: any simple content
-
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<t:root xmlns:t="test" a="any simple content" xmlns:o="other" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="test test.xsd">
- <t/>
- <t x="x"/>
- <t>any</t>
- <t x="x">any</t>
- <t o:y="y" x="x">
- <n1>
- <n2>nested 1</n2>
- <n2>nested 2</n2>
- </n1>
- <o:n2 o:x="x">more</o:n2>
- </t><t x="x">
- <n1>mi
- <n2>nested 1</n2>x
- <n2>nested 2</n2>ed
- </n1>content
- </t>
- <t x="foo">data</t>
- <t x="foo">data</t>
- <s/>
- <s>simple</s>
- <s>baz</s>
- <l>one two three</l>
-</t:root>
-
-
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<t:root xmlns:t="test" a="any simple content" xmlns:o="other" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="test test.xsd">
- <t/>
- <t x="x"/>
- <t>any</t>
- <t x="x">any</t>
- <t o:y="y" x="x">
- <n1>
- <n2>nested 1</n2>
- <n2>nested 2</n2>
- </n1>
- <o:n2 o:x="x">more</o:n2>
- </t><t x="x">
- <n1>mi
-
- <n2>nested 1</n2>x
-
- <n2>nested 2</n2>ed
-
- </n1>content
-
- </t>
- <t x="foo">data</t>
- <t x="foo">data</t>
- <s/>
- <s>simple</s>
- <s>baz</s>
- <l>one two three</l>
-</t:root>
-
-
diff --git a/tests/cxx/tree/any-type/test.xml b/tests/cxx/tree/any-type/test.xml
deleted file mode 100644
index 7c9035a..0000000
--- a/tests/cxx/tree/any-type/test.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:o="other"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd"
-
- a="any simple content">
-
- <t/>
- <t x="x"/>
- <t>any</t>
- <t x="x">any</t>
- <t x="x" o:y="y">
- <n1>
- <n2>nested 1</n2>
- <n2>nested 2</n2>
- </n1>
- <o:n2 o:x="x">more</o:n2>
- </t>
- <t x="x"><n1>mi<n2>nested 1</n2>x<n2>nested 2</n2>ed</n1>content</t>
-
- <s/>
- <s>simple</s>
-
- <l>one two three</l>
-
-</t:root>
diff --git a/tests/cxx/tree/any-type/test.xsd b/tests/cxx/tree/any-type/test.xsd
deleted file mode 100644
index 37dcc8d..0000000
--- a/tests/cxx/tree/any-type/test.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <simpleType name="any-list">
- <!--Not allowed? list itemType="anySimpleType"/-->
- <list itemType="string"/>
- </simpleType>
-
- <complexType name="type">
- <sequence>
- <element name="t" type="anyType" maxOccurs="unbounded"/>
- <element name="s" type="anySimpleType" maxOccurs="unbounded"/>
- <element name="l" type="t:any-list" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="a" type="anySimpleType" default="default value"/>
- </complexType>
-
- <element name="root" type="t:type"/>
-</schema>
diff --git a/tests/cxx/tree/binary/cdr/driver.cxx b/tests/cxx/tree/binary/cdr/driver.cxx
deleted file mode 100644
index fe74bb5..0000000
--- a/tests/cxx/tree/binary/cdr/driver.cxx
+++ /dev/null
@@ -1,143 +0,0 @@
-// file : tests/cxx/tree/binary/cdr/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test non-polymorphic binary serialization to ACE CDR.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
-#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
- {
- XSD_AUTO_PTR<type> r (root (argv[1]));
-
- // Save to a CDR stream.
- //
- ACE_OutputCDR ace_ocdr;
- xml_schema::ostream<ACE_OutputCDR> ocdr (ace_ocdr);
- ocdr << *r;
-
- // Load from a CDR stream.
- //
- ACE_InputCDR ace_icdr (ace_ocdr);
- xml_schema::istream<ACE_InputCDR> icdr (ace_icdr);
- XSD_AUTO_PTR<type> c (new type (icdr));
-
- // Compare the two.
- //
- assert (r->list () == c->list ());
- assert (r->union_ () == c->union_ ());
- assert (r->enumeration () == c->enumeration ());
-
- type::complex_sequence rs (r->complex ()), cs (c->complex ());
-
- for (type::complex_iterator ri (rs.begin ()), ci (cs.begin ());
- ri != rs.end () && ci != rs.end (); ++ri, ++ci)
- {
- assert (ri->a () == ci->a ());
- if (ri->b ())
- assert (ri->b () == ci->b ());
- assert (ri->c () == ci->c ());
-
- assert (ri->x () == ci->x ());
- if (ri->y ())
- assert (ri->y () == ci->y ());
- }
-
- // integers
- //
- assert (r->byte () == c->byte ());
- assert (r->unsigned_byte () == c->unsigned_byte ());
- assert (r->short_ () == c->short_ ());
- assert (r->unsigned_short () == c->unsigned_short ());
- assert (r->int_ () == c->int_ ());
- assert (r->unsigned_int () == c->unsigned_int ());
- assert (r->long_ () == c->long_ ());
- assert (r->unsigned_long () == c->unsigned_long ());
- assert (r->integer () == c->integer ());
- assert (r->non_positive_integer () == c->non_positive_integer ());
- assert (r->non_negative_integer () == c->non_negative_integer ());
- assert (r->positive_integer () == c->positive_integer ());
- assert (r->negative_integer () == c->negative_integer ());
-
- // boolean
- //
- assert (r->boolean () == c->boolean ());
-
- // floats
- //
- assert (r->float_ () == c->float_ ());
- assert (r->double_ () == c->double_ ());
- assert (r->decimal () == c->decimal ());
-
- // strings
- //
- assert (r->string () == c->string ());
- assert (r->normalized_string () == c->normalized_string ());
- assert (r->token () == c->token ());
- assert (r->name () == c->name ());
- assert (r->name_token () == c->name_token ());
- assert (r->name_tokens () == c->name_tokens ());
- assert (r->ncname () == c->ncname ());
- assert (r->language () == c->language ());
-
- // qualified name
- //
- assert (r->qname () == c->qname ());
-
- // ID/IDREF
- //
- assert (r->id () == c->id ());
- assert (r->id_ref () == c->id_ref ());
- assert (r->id_refs () == c->id_refs ());
-
- // URI
- //
- assert (r->any_uri () == c->any_uri ());
-
- // binary
- //
- assert (r->base64_binary () == c->base64_binary ());
- assert (r->hex_binary () == c->hex_binary ());
-
- // date/time
- //
- assert (r->day () == c->day ());
- assert (r->month () == c->month ());
- assert (r->year () == c->year ());
- assert (r->month_day () == c->month_day ());
- assert (r->year_month () == c->year_month ());
- assert (r->date () == c->date ());
- assert (r->time () == c->time ());
- assert (r->date_time () == c->date_time ());
- assert (r->duration () == c->duration ());
-
- // anySimpleType
- //
- assert (!r->any_simple_type_attr ().text_content ().empty ());
- assert (r->any_simple_type_attr () == c->any_simple_type_attr ());
-
- assert (!r->any_simple_type ().text_content ().empty ());
- assert (r->any_simple_type () == c->any_simple_type ());
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/tree/binary/cdr/makefile b/tests/cxx/tree/binary/cdr/makefile
deleted file mode 100644
index 2d452ee..0000000
--- a/tests/cxx/tree/binary/cdr/makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# file : tests/cxx/tree/binary/cdr/makefile
-# 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)
-
-$(call import,\
- $(scf_root)/import/libace/stub.make,\
- l: ace.l,cpp-options: ace.l.cpp-options)
-
-# Build.
-#
-$(driver): $(obj) $(xerces_c.l) $(ace.l)
-
-$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd
-$(obj) $(dep): $(xerces_c.l.cpp-options) $(ace.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-insertion ACE_OutputCDR \
---generate-extraction ACE_InputCDR --generate-comparison
-$(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
- $(call message,test $$1,$$1 $(src_base)/test.xml,$(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/tests/cxx/tree/binary/cdr/test.xml b/tests/cxx/tree/binary/cdr/test.xml
deleted file mode 100644
index 5cedd98..0000000
--- a/tests/cxx/tree/binary/cdr/test.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd"
- any_simple_type_attr="any simple content">
-
- <list>1 2 3</list>
-
- <union>abc</union>
-
- <enumeration>left</enumeration>
-
- <complex x="1">
- <a>aaa</a>
- </complex>
- <complex x="1" y="2">
- <a>aaa</a>
- <b>bbb</b>
- <c>c</c>
- <c>cc</c>
- <c>ccc</c>
- </complex>
-
-
- <!-- integers -->
- <byte>65</byte>
- <unsigned_byte>66</unsigned_byte>
- <short>-222</short>
- <unsigned_short>57005</unsigned_short>
- <int>-57005</int>
- <unsigned_int>3735928559</unsigned_int>
- <long>-3735928559</long>
- <unsigned_long>16045690984833335023</unsigned_long>
- <integer>-3735928559</integer>
- <non_positive_integer>-3735928559</non_positive_integer>
- <non_negative_integer>3735928559</non_negative_integer>
- <positive_integer>3735928559</positive_integer>
- <negative_integer>-3735928559</negative_integer>
-
-
- <!-- boolean -->
- <boolean>true</boolean>
-
-
- <!-- floats -->
- <float>1234.1234</float>
- <double>12345678.12345678</double>
- <decimal>1234567812345678.1234567812345678</decimal>
-
-
- <!-- strings -->
- <string>string</string>
- <normalized_string>normalized string</normalized_string>
- <token>one two three</token>
- <name>name</name>
- <name_token>name-token</name_token>
- <name_tokens>name tokens</name_tokens>
- <ncname>ncname</ncname>
- <language>en-us</language>
-
- <!-- qualified name -->
- <qname>xsi:schemaLocation</qname>
-
-
- <!-- ID/IDREF -->
- <id>elements1</id>
- <id>elements2</id>
- <id_ref>elements1</id_ref>
- <id_refs>elements1 elements2</id_refs>
-
-
- <!-- URI -->
- <any_uri>http://www.codesynthesis.com</any_uri>
-
-
- <!-- binary -->
- <base64_binary>YmFzZTY0IGJpbmFyeQ==</base64_binary>
- <hex_binary>6865782052696E617279</hex_binary>
-
-
- <!-- date/time -->
- <date>2001-10-26+02:00</date>
- <date_time>2001-10-26T21:32:52+02:00</date_time>
- <duration>P1Y2M3DT5H20M30S</duration>
- <day>---01+02:00</day>
- <month>--11+02:00</month>
- <month_day>--11-02+02:00</month_day>
- <year>2001+02:00</year>
- <year_month>2001-11+02:00</year_month>
- <time>21:32:52+02:00</time>
-
- <any_simple_type>any simple content in element</any_simple_type>
-
-</t:root>
diff --git a/tests/cxx/tree/binary/cdr/test.xsd b/tests/cxx/tree/binary/cdr/test.xsd
deleted file mode 100644
index 0629e94..0000000
--- a/tests/cxx/tree/binary/cdr/test.xsd
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:t="test"
- targetNamespace="test">
-
- <simpleType name="list">
- <list itemType="int"/>
- </simpleType>
-
- <simpleType name="union">
- <union memberTypes="int string"/>
- </simpleType>
-
- <simpleType name="enumeration">
- <restriction base="string">
- <enumeration value="top"/>
- <enumeration value="left"/>
- <enumeration value="bottom"/>
- <enumeration value="right"/>
- </restriction>
- </simpleType>
-
- <complexType name="base">
- <sequence>
- <element name="a" type="string"/>
- </sequence>
- <attribute name="x" type="int" use="required"/>
- </complexType>
-
- <complexType name="complex">
- <complexContent>
- <extension base="t:base">
- <sequence>
- <element name="b" type="string" minOccurs="0"/>
- <element name="c" type="string" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="y" type="int"/>
- </extension>
- </complexContent>
- </complexType>
-
-
- <complexType name="type">
- <sequence>
- <element name="list" type="t:list"/>
- <element name="union" type="t:union"/>
- <element name="enumeration" type="t:enumeration"/>
- <element name="complex" type="t:complex" maxOccurs="unbounded"/>
-
- <!-- integers -->
- <element name="byte" type="byte"/>
- <element name="unsigned_byte" type="unsignedByte"/>
- <element name="short" type="short"/>
- <element name="unsigned_short" type="unsignedShort"/>
- <element name="int" type="int"/>
- <element name="unsigned_int" type="unsignedInt"/>
- <element name="long" type="long"/>
- <element name="unsigned_long" type="unsignedLong"/>
- <element name="integer" type="integer"/>
- <element name="non_positive_integer" type="nonPositiveInteger"/>
- <element name="non_negative_integer" type="nonNegativeInteger"/>
- <element name="positive_integer" type="positiveInteger"/>
- <element name="negative_integer" type="negativeInteger"/>
-
-
- <!-- boolean -->
- <element name="boolean" type="boolean"/>
-
-
- <!-- floats -->
- <element name="float" type="float"/>
- <element name="double" type="double"/>
- <element name="decimal" type="decimal"/>
-
-
- <!-- strings -->
- <element name="string" type="string"/>
- <element name="normalized_string" type="normalizedString"/>
- <element name="token" type="token"/>
- <element name="name" type="Name"/>
- <element name="name_token" type="NMTOKEN"/>
- <element name="name_tokens" type="NMTOKENS"/>
- <element name="ncname" type="NCName"/>
- <element name="language" type="language"/>
-
- <!-- qualified name -->
- <element name="qname" type="QName"/>
-
-
- <!-- ID/IDREF -->
- <element name="id" maxOccurs="2" type="ID"/>
- <element name="id_ref" type="IDREF"/>
- <element name="id_refs" type="IDREFS"/>
-
-
- <!-- URI -->
- <element name="any_uri" type="anyURI"/>
-
-
- <!-- binary -->
- <element name="base64_binary" type="base64Binary"/>
- <element name="hex_binary" type="hexBinary"/>
-
-
- <!-- date/time -->
- <element name="date" type="date"/>
- <element name="date_time" type="dateTime"/>
- <element name="duration" type="duration"/>
- <element name="day" type="gDay"/>
- <element name="month" type="gMonth"/>
- <element name="month_day" type="gMonthDay"/>
- <element name="year" type="gYear"/>
- <element name="year_month" type="gYearMonth"/>
- <element name="time" type="time"/>
-
- <element name="any_simple_type" type="anySimpleType"/>
- </sequence>
- <attribute name="any_simple_type_attr" type="anySimpleType" use="required"/>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/tree/binary/makefile b/tests/cxx/tree/binary/makefile
deleted file mode 100644
index 9ccc93f..0000000
--- a/tests/cxx/tree/binary/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# file : tests/cxx/tree/binary/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
-
-tests := cdr polymorphic xdr xdr-ordered
-
-default := $(out_base)/
-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)))
-
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
diff --git a/tests/cxx/tree/binary/polymorphic/driver.cxx b/tests/cxx/tree/binary/polymorphic/driver.cxx
deleted file mode 100644
index 15ebf17..0000000
--- a/tests/cxx/tree/binary/polymorphic/driver.cxx
+++ /dev/null
@@ -1,164 +0,0 @@
-// file : tests/cxx/tree/binary/polymorphic/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test polymorphic binary serialization.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
-#include <iostream>
-#include <typeinfo>
-
-#include <ace/Log_Msg.h> // ACE_HEX_DUMP
-
-#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
- {
- XSD_AUTO_PTR<type> r (root (argv[1]));
-
- // Save to a CDR stream.
- //
- ACE_OutputCDR ace_ocdr;
- xml_schema::ostream<ACE_OutputCDR> ocdr (ace_ocdr);
- ocdr << *r;
-
- /*
- // Print the binary representation.
- //
- cerr << "binary representation size: " << ace_ocdr.total_length () << endl;
-
- for (const ACE_Message_Block* mb = ace_ocdr.begin ();
- mb != 0;
- mb = mb->cont ())
- {
- ACE_HEX_DUMP ((LM_DEBUG, mb->rd_ptr (), mb->length ()));
- }
- */
-
- // Load from a CDR stream.
- //
- ACE_InputCDR ace_icdr (ace_ocdr);
- xml_schema::istream<ACE_InputCDR> icdr (ace_icdr);
- XSD_AUTO_PTR<type> c (new type (icdr));
-
- // Compare the two.
- //
- assert (r->list () == c->list ());
- assert (r->union_ () == c->union_ ());
- assert (r->enumeration () == c->enumeration ());
-
- {
- complex& rc (dynamic_cast<complex&> (r->base ()));
- complex& cc (dynamic_cast<complex&> (c->base ()));
-
- assert (rc.a () == cc.a ());
- if (rc.b ())
- assert (rc.b () == cc.b ());
- assert (rc.c () == cc.c ());
-
- assert (rc.x () == cc.x ());
- if (rc.y ())
- assert (rc.y () == cc.y ());
- }
-
- {
- complex& rc (dynamic_cast<complex&> (r->sbase ()));
- complex& cc (dynamic_cast<complex&> (c->sbase ()));
-
- assert (rc.a () == cc.a ());
- if (rc.b ())
- assert (rc.b () == cc.b ());
- assert (rc.c () == cc.c ());
-
- assert (rc.x () == cc.x ());
- if (rc.y ())
- assert (rc.y () == cc.y ());
- }
-
- // integers
- //
- assert (r->byte () == c->byte ());
- assert (r->unsigned_byte () == c->unsigned_byte ());
- assert (r->short_ () == c->short_ ());
- assert (r->unsigned_short () == c->unsigned_short ());
- assert (r->int_ () == c->int_ ());
- assert (r->unsigned_int () == c->unsigned_int ());
- assert (r->long_ () == c->long_ ());
- assert (r->unsigned_long () == c->unsigned_long ());
- assert (r->integer () == c->integer ());
- assert (r->non_positive_integer () == c->non_positive_integer ());
- assert (r->non_negative_integer () == c->non_negative_integer ());
- assert (r->positive_integer () == c->positive_integer ());
- assert (r->negative_integer () == c->negative_integer ());
-
- // boolean
- //
- assert (r->boolean () == c->boolean ());
-
- // floats
- //
- assert (r->float_ () == c->float_ ());
- assert (r->double_ () == c->double_ ());
- assert (r->decimal () == c->decimal ());
-
- // strings
- //
- assert (r->string () == c->string ());
- assert (r->normalized_string () == c->normalized_string ());
- assert (r->token () == c->token ());
- assert (r->name () == c->name ());
- assert (r->name_token () == c->name_token ());
- assert (r->name_tokens () == c->name_tokens ());
- assert (r->ncname () == c->ncname ());
- assert (r->language () == c->language ());
-
- // qualified name
- //
- assert (r->qname () == c->qname ());
-
- // ID/IDREF
- //
- assert (r->id () == c->id ());
- assert (r->id_ref () == c->id_ref ());
- assert (r->id_refs () == c->id_refs ());
-
- // URI
- //
- assert (r->any_uri () == c->any_uri ());
-
- // binary
- //
- assert (r->base64_binary () == c->base64_binary ());
- assert (r->hex_binary () == c->hex_binary ());
-
- // date/time
- //
- assert (r->date () == c->date ());
- assert (r->date_time () == c->date_time ());
- assert (r->duration () == c->duration ());
- assert (r->day () == c->day ());
- assert (r->month () == c->month ());
- assert (r->month_day () == c->month_day ());
- assert (r->year () == c->year ());
- assert (r->year_month () == c->year_month ());
- assert (r->time () == c->time ());
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/tree/binary/polymorphic/makefile b/tests/cxx/tree/binary/polymorphic/makefile
deleted file mode 100644
index c88b79c..0000000
--- a/tests/cxx/tree/binary/polymorphic/makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-# file : tests/cxx/tree/binary/polymorphic/makefile
-# 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)
-
-$(call import,\
- $(scf_root)/import/libace/stub.make,\
- l: ace.l,cpp-options: ace.l.cpp-options)
-
-# Build.
-#
-$(driver): $(obj) $(xerces_c.l) $(ace.l)
-
-$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd
-$(obj) $(dep): $(xerces_c.l.cpp-options) $(ace.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-polymorphic --root-element-last \
---generate-insertion ACE_OutputCDR --generate-extraction ACE_InputCDR \
- --generate-comparison
-$(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
- $(call message,test $$1,$$1 $(src_base)/test.xml,$(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/tests/cxx/tree/binary/polymorphic/test.xml b/tests/cxx/tree/binary/polymorphic/test.xml
deleted file mode 100644
index ad3a403..0000000
--- a/tests/cxx/tree/binary/polymorphic/test.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <list>1 2 3</list>
-
- <union>abc</union>
-
- <enumeration>left</enumeration>
-
- <base x="1" xsi:type="t:complex">
- <a>aaa</a>
- </base>
-
- <t:scomplex x="1" y="2">
- <a>aaa</a>
- <b>bbb</b>
- <c>c</c>
- <c>cc</c>
- <c>ccc</c>
- </t:scomplex>
-
-
- <!-- integers -->
- <byte>65</byte>
- <unsigned_byte>66</unsigned_byte>
- <short>-222</short>
- <unsigned_short>57005</unsigned_short>
- <int>-57005</int>
- <unsigned_int>3735928559</unsigned_int>
- <long>-3735928559</long>
- <unsigned_long>16045690984833335023</unsigned_long>
- <integer>-3735928559</integer>
- <non_positive_integer>-3735928559</non_positive_integer>
- <non_negative_integer>3735928559</non_negative_integer>
- <positive_integer>3735928559</positive_integer>
- <negative_integer>-3735928559</negative_integer>
-
-
- <!-- boolean -->
- <boolean>true</boolean>
-
-
- <!-- floats -->
- <float>1234.1234</float>
- <double>12345678.12345678</double>
- <decimal>1234567812345678.1234567812345678</decimal>
-
-
- <!-- strings -->
- <string>string</string>
- <normalized_string>normalized string</normalized_string>
- <token>one two three</token>
- <name>name</name>
- <name_token>name-token</name_token>
- <name_tokens>name tokens</name_tokens>
- <ncname>ncname</ncname>
- <language>en-us</language>
-
- <!-- qualified name -->
- <qname>xsi:schemaLocation</qname>
-
-
- <!-- ID/IDREF -->
- <id>elements1</id>
- <id>elements2</id>
- <id_ref>elements1</id_ref>
- <id_refs>elements1 elements2</id_refs>
-
-
- <!-- URI -->
- <any_uri>http://www.codesynthesis.com</any_uri>
-
-
- <!-- binary -->
- <base64_binary>YmFzZTY0IGJpbmFyeQ==</base64_binary>
- <hex_binary>6865782052696E617279</hex_binary>
-
-
- <!-- date/time -->
- <date>2001-10-26+02:00</date>
- <date_time>2001-10-26T21:32:52+02:00</date_time>
- <duration>P1Y2M3DT5H20M30S</duration>
- <day>---01+02:00</day>
- <month>--11+02:00</month>
- <month_day>--11-02+02:00</month_day>
- <year>2001+02:00</year>
- <year_month>2001-11+02:00</year_month>
- <time>21:32:52+02:00</time>
-
-
-</t:root>
diff --git a/tests/cxx/tree/binary/polymorphic/test.xsd b/tests/cxx/tree/binary/polymorphic/test.xsd
deleted file mode 100644
index 8c214e5..0000000
--- a/tests/cxx/tree/binary/polymorphic/test.xsd
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:t="test"
- targetNamespace="test">
-
- <simpleType name="list">
- <list itemType="int"/>
- </simpleType>
-
- <simpleType name="union">
- <union memberTypes="int string"/>
- </simpleType>
-
- <simpleType name="enumeration">
- <restriction base="string">
- <enumeration value="top"/>
- <enumeration value="left"/>
- <enumeration value="bottom"/>
- <enumeration value="right"/>
- </restriction>
- </simpleType>
-
- <complexType name="base">
- <sequence>
- <element name="a" type="string"/>
- </sequence>
- <attribute name="x" type="int" use="required"/>
- </complexType>
-
- <element name="sbase" type="t:base"/>
-
- <complexType name="complex">
- <complexContent>
- <extension base="t:base">
- <sequence>
- <element name="b" type="string" minOccurs="0"/>
- <element name="c" type="string" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="y" type="int"/>
- </extension>
- </complexContent>
- </complexType>
-
- <element name="scomplex" type="t:complex" substitutionGroup="t:sbase"/>
-
- <complexType name="type">
- <sequence>
- <element name="list" type="t:list"/>
- <element name="union" type="t:union"/>
- <element name="enumeration" type="t:enumeration"/>
-
- <element name="base" type="t:base"/>
- <element ref="t:sbase"/>
-
- <!-- integers -->
- <element name="byte" type="byte"/>
- <element name="unsigned_byte" type="unsignedByte"/>
- <element name="short" type="short"/>
- <element name="unsigned_short" type="unsignedShort"/>
- <element name="int" type="int"/>
- <element name="unsigned_int" type="unsignedInt"/>
- <element name="long" type="long"/>
- <element name="unsigned_long" type="unsignedLong"/>
- <element name="integer" type="integer"/>
- <element name="non_positive_integer" type="nonPositiveInteger"/>
- <element name="non_negative_integer" type="nonNegativeInteger"/>
- <element name="positive_integer" type="positiveInteger"/>
- <element name="negative_integer" type="negativeInteger"/>
-
-
- <!-- boolean -->
- <element name="boolean" type="boolean"/>
-
-
- <!-- floats -->
- <element name="float" type="float"/>
- <element name="double" type="double"/>
- <element name="decimal" type="decimal"/>
-
-
- <!-- strings -->
- <element name="string" type="string"/>
- <element name="normalized_string" type="normalizedString"/>
- <element name="token" type="token"/>
- <element name="name" type="Name"/>
- <element name="name_token" type="NMTOKEN"/>
- <element name="name_tokens" type="NMTOKENS"/>
- <element name="ncname" type="NCName"/>
- <element name="language" type="language"/>
-
- <!-- qualified name -->
- <element name="qname" type="QName"/>
-
-
- <!-- ID/IDREF -->
- <element name="id" maxOccurs="2" type="ID"/>
- <element name="id_ref" type="IDREF"/>
- <element name="id_refs" type="IDREFS"/>
-
-
- <!-- URI -->
- <element name="any_uri" type="anyURI"/>
-
-
- <!-- binary -->
- <element name="base64_binary" type="base64Binary"/>
- <element name="hex_binary" type="hexBinary"/>
-
-
- <!-- date/time -->
- <element name="date" type="date"/>
- <element name="date_time" type="dateTime"/>
- <element name="duration" type="duration"/>
- <element name="day" type="gDay"/>
- <element name="month" type="gMonth"/>
- <element name="month_day" type="gMonthDay"/>
- <element name="year" type="gYear"/>
- <element name="year_month" type="gYearMonth"/>
- <element name="time" type="time"/>
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/tree/binary/xdr-ordered/driver.cxx b/tests/cxx/tree/binary/xdr-ordered/driver.cxx
deleted file mode 100644
index 8e2d845..0000000
--- a/tests/cxx/tree/binary/xdr-ordered/driver.cxx
+++ /dev/null
@@ -1,189 +0,0 @@
-// file : tests/cxx/tree/binary/xdr-ordered/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test non-polymorphic ordered binary serialization to XDR.
-//
-// Note: just a copy of xdr test with --ordered-type-all option.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <cstring> // std::memcpy
-#include <cassert>
-#include <iostream>
-
-#include "test.hxx"
-
-using namespace std;
-using namespace test;
-
-extern "C" int
-overflow (char* p, char* buf, int in)
-{
- xml_schema::buffer* dst (reinterpret_cast<xml_schema::buffer*> (p));
-
- size_t n (static_cast<size_t> (in)), size (dst->size ());
- dst->size (size + n);
- memcpy (dst->data () + size, buf, n);
-
- return static_cast<int> (n);
-}
-
-struct underflow_info
-{
- xml_schema::buffer* buf;
- std::size_t pos;
-};
-
-extern "C" int
-underflow (char* p, char* buf, int in)
-{
- underflow_info* ui (reinterpret_cast<underflow_info*> (p));
-
- size_t n (static_cast<size_t> (in)), size (ui->buf->size () - ui->pos);
- n = size > n ? n : size;
-
- memcpy (buf, ui->buf->data () + ui->pos, n);
- ui->pos += n;
-
- return static_cast<int> (n);
-}
-
-int
-main (int argc, char* argv[])
-{
- if (argc != 2)
- {
- cerr << "usage: " << argv[0] << " test.xml" << endl;
- return 1;
- }
-
- try
- {
- XSD_AUTO_PTR<type> r (root (argv[1]));
-
- // Save to an XDR stream.
- //
- XDR xdr;
- xml_schema::buffer buf;
- xdrrec_create (&xdr, 0, 0, reinterpret_cast<char*> (&buf), 0, &overflow);
- xdr.x_op = XDR_ENCODE;
- xsd::cxx::tree::ostream<XDR> oxdr (xdr);
- oxdr << *r;
- xdrrec_endofrecord (&xdr, true); // flush the data
- xdr_destroy (&xdr);
-
- // Load from an XDR stream.
- //
- underflow_info ui;
- ui.buf = &buf;
- ui.pos = 0;
- xdrrec_create (&xdr, 0, 0, reinterpret_cast<char*> (&ui), &underflow, 0);
- xdr.x_op = XDR_DECODE;
- xdrrec_skiprecord (&xdr);
- xsd::cxx::tree::istream<XDR> ixdr (xdr);
- XSD_AUTO_PTR<type> c (new type (ixdr));
- xdr_destroy (&xdr);
-
- // Compare the two.
- //
- assert (r->list () == c->list ());
- assert (r->union_ () == c->union_ ());
- assert (r->enumeration () == c->enumeration ());
-
- type::complex_sequence rs (r->complex ()), cs (c->complex ());
-
- for (type::complex_iterator ri (rs.begin ()), ci (cs.begin ());
- ri != rs.end () && ci != rs.end (); ++ri, ++ci)
- {
- assert (ri->a () == ci->a ());
- if (ri->b ())
- assert (ri->b () == ci->b ());
- assert (ri->c () == ci->c ());
-
- assert (ri->x () == ci->x ());
- if (ri->y ())
- assert (ri->y () == ci->y ());
- }
-
- // integers
- //
- assert (r->byte () == c->byte ());
- assert (r->unsigned_byte () == c->unsigned_byte ());
- assert (r->short_ () == c->short_ ());
- assert (r->unsigned_short () == c->unsigned_short ());
- assert (r->int_ () == c->int_ ());
- assert (r->unsigned_int () == c->unsigned_int ());
- assert (r->long_ () == c->long_ ());
- assert (r->unsigned_long () == c->unsigned_long ());
- assert (r->integer () == c->integer ());
- assert (r->non_positive_integer () == c->non_positive_integer ());
- assert (r->non_negative_integer () == c->non_negative_integer ());
- assert (r->positive_integer () == c->positive_integer ());
- assert (r->negative_integer () == c->negative_integer ());
-
- // boolean
- //
- assert (r->boolean () == c->boolean ());
-
- // floats
- //
- assert (r->float_ () == c->float_ ());
- assert (r->double_ () == c->double_ ());
- assert (r->decimal () == c->decimal ());
-
- // strings
- //
- assert (r->string () == c->string ());
- assert (r->normalized_string () == c->normalized_string ());
- assert (r->token () == c->token ());
- assert (r->name () == c->name ());
- assert (r->name_token () == c->name_token ());
- assert (r->name_tokens () == c->name_tokens ());
- assert (r->ncname () == c->ncname ());
- assert (r->language () == c->language ());
-
- // qualified name
- //
- assert (r->qname () == c->qname ());
-
- // ID/IDREF
- //
- assert (r->id () == c->id ());
- assert (r->id_ref () == c->id_ref ());
- assert (r->id_refs () == c->id_refs ());
-
- // URI
- //
- assert (r->any_uri () == c->any_uri ());
-
- // binary
- //
- assert (r->base64_binary () == c->base64_binary ());
- assert (r->hex_binary () == c->hex_binary ());
-
- // date/time
- //
- assert (r->date () == c->date ());
- assert (r->date_time () == c->date_time ());
- assert (r->duration () == c->duration ());
- assert (r->day () == c->day ());
- assert (r->month () == c->month ());
- assert (r->month_day () == c->month_day ());
- assert (r->year () == c->year ());
- assert (r->year_month () == c->year_month ());
- assert (r->time () == c->time ());
-
- // anySimpleType
- //
- assert (!r->any_simple_type_attr ().text_content ().empty ());
- assert (r->any_simple_type_attr () == c->any_simple_type_attr ());
-
- assert (!r->any_simple_type ().text_content ().empty ());
- assert (r->any_simple_type () == c->any_simple_type ());
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/tree/binary/xdr-ordered/makefile b/tests/cxx/tree/binary/xdr-ordered/makefile
deleted file mode 100644
index df3a945..0000000
--- a/tests/cxx/tree/binary/xdr-ordered/makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# file : tests/cxx/tree/binary/xdr-ordered/makefile
-# 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 += --generate-insertion XDR --generate-extraction XDR \
---generate-comparison --ordered-type-all
-$(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
- $(call message,test $$1,$$1 $(src_base)/test.xml,$(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/tests/cxx/tree/binary/xdr-ordered/test.xml b/tests/cxx/tree/binary/xdr-ordered/test.xml
deleted file mode 100644
index 5cedd98..0000000
--- a/tests/cxx/tree/binary/xdr-ordered/test.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd"
- any_simple_type_attr="any simple content">
-
- <list>1 2 3</list>
-
- <union>abc</union>
-
- <enumeration>left</enumeration>
-
- <complex x="1">
- <a>aaa</a>
- </complex>
- <complex x="1" y="2">
- <a>aaa</a>
- <b>bbb</b>
- <c>c</c>
- <c>cc</c>
- <c>ccc</c>
- </complex>
-
-
- <!-- integers -->
- <byte>65</byte>
- <unsigned_byte>66</unsigned_byte>
- <short>-222</short>
- <unsigned_short>57005</unsigned_short>
- <int>-57005</int>
- <unsigned_int>3735928559</unsigned_int>
- <long>-3735928559</long>
- <unsigned_long>16045690984833335023</unsigned_long>
- <integer>-3735928559</integer>
- <non_positive_integer>-3735928559</non_positive_integer>
- <non_negative_integer>3735928559</non_negative_integer>
- <positive_integer>3735928559</positive_integer>
- <negative_integer>-3735928559</negative_integer>
-
-
- <!-- boolean -->
- <boolean>true</boolean>
-
-
- <!-- floats -->
- <float>1234.1234</float>
- <double>12345678.12345678</double>
- <decimal>1234567812345678.1234567812345678</decimal>
-
-
- <!-- strings -->
- <string>string</string>
- <normalized_string>normalized string</normalized_string>
- <token>one two three</token>
- <name>name</name>
- <name_token>name-token</name_token>
- <name_tokens>name tokens</name_tokens>
- <ncname>ncname</ncname>
- <language>en-us</language>
-
- <!-- qualified name -->
- <qname>xsi:schemaLocation</qname>
-
-
- <!-- ID/IDREF -->
- <id>elements1</id>
- <id>elements2</id>
- <id_ref>elements1</id_ref>
- <id_refs>elements1 elements2</id_refs>
-
-
- <!-- URI -->
- <any_uri>http://www.codesynthesis.com</any_uri>
-
-
- <!-- binary -->
- <base64_binary>YmFzZTY0IGJpbmFyeQ==</base64_binary>
- <hex_binary>6865782052696E617279</hex_binary>
-
-
- <!-- date/time -->
- <date>2001-10-26+02:00</date>
- <date_time>2001-10-26T21:32:52+02:00</date_time>
- <duration>P1Y2M3DT5H20M30S</duration>
- <day>---01+02:00</day>
- <month>--11+02:00</month>
- <month_day>--11-02+02:00</month_day>
- <year>2001+02:00</year>
- <year_month>2001-11+02:00</year_month>
- <time>21:32:52+02:00</time>
-
- <any_simple_type>any simple content in element</any_simple_type>
-
-</t:root>
diff --git a/tests/cxx/tree/binary/xdr-ordered/test.xsd b/tests/cxx/tree/binary/xdr-ordered/test.xsd
deleted file mode 100644
index 0629e94..0000000
--- a/tests/cxx/tree/binary/xdr-ordered/test.xsd
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:t="test"
- targetNamespace="test">
-
- <simpleType name="list">
- <list itemType="int"/>
- </simpleType>
-
- <simpleType name="union">
- <union memberTypes="int string"/>
- </simpleType>
-
- <simpleType name="enumeration">
- <restriction base="string">
- <enumeration value="top"/>
- <enumeration value="left"/>
- <enumeration value="bottom"/>
- <enumeration value="right"/>
- </restriction>
- </simpleType>
-
- <complexType name="base">
- <sequence>
- <element name="a" type="string"/>
- </sequence>
- <attribute name="x" type="int" use="required"/>
- </complexType>
-
- <complexType name="complex">
- <complexContent>
- <extension base="t:base">
- <sequence>
- <element name="b" type="string" minOccurs="0"/>
- <element name="c" type="string" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="y" type="int"/>
- </extension>
- </complexContent>
- </complexType>
-
-
- <complexType name="type">
- <sequence>
- <element name="list" type="t:list"/>
- <element name="union" type="t:union"/>
- <element name="enumeration" type="t:enumeration"/>
- <element name="complex" type="t:complex" maxOccurs="unbounded"/>
-
- <!-- integers -->
- <element name="byte" type="byte"/>
- <element name="unsigned_byte" type="unsignedByte"/>
- <element name="short" type="short"/>
- <element name="unsigned_short" type="unsignedShort"/>
- <element name="int" type="int"/>
- <element name="unsigned_int" type="unsignedInt"/>
- <element name="long" type="long"/>
- <element name="unsigned_long" type="unsignedLong"/>
- <element name="integer" type="integer"/>
- <element name="non_positive_integer" type="nonPositiveInteger"/>
- <element name="non_negative_integer" type="nonNegativeInteger"/>
- <element name="positive_integer" type="positiveInteger"/>
- <element name="negative_integer" type="negativeInteger"/>
-
-
- <!-- boolean -->
- <element name="boolean" type="boolean"/>
-
-
- <!-- floats -->
- <element name="float" type="float"/>
- <element name="double" type="double"/>
- <element name="decimal" type="decimal"/>
-
-
- <!-- strings -->
- <element name="string" type="string"/>
- <element name="normalized_string" type="normalizedString"/>
- <element name="token" type="token"/>
- <element name="name" type="Name"/>
- <element name="name_token" type="NMTOKEN"/>
- <element name="name_tokens" type="NMTOKENS"/>
- <element name="ncname" type="NCName"/>
- <element name="language" type="language"/>
-
- <!-- qualified name -->
- <element name="qname" type="QName"/>
-
-
- <!-- ID/IDREF -->
- <element name="id" maxOccurs="2" type="ID"/>
- <element name="id_ref" type="IDREF"/>
- <element name="id_refs" type="IDREFS"/>
-
-
- <!-- URI -->
- <element name="any_uri" type="anyURI"/>
-
-
- <!-- binary -->
- <element name="base64_binary" type="base64Binary"/>
- <element name="hex_binary" type="hexBinary"/>
-
-
- <!-- date/time -->
- <element name="date" type="date"/>
- <element name="date_time" type="dateTime"/>
- <element name="duration" type="duration"/>
- <element name="day" type="gDay"/>
- <element name="month" type="gMonth"/>
- <element name="month_day" type="gMonthDay"/>
- <element name="year" type="gYear"/>
- <element name="year_month" type="gYearMonth"/>
- <element name="time" type="time"/>
-
- <element name="any_simple_type" type="anySimpleType"/>
- </sequence>
- <attribute name="any_simple_type_attr" type="anySimpleType" use="required"/>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/tree/binary/xdr/driver.cxx b/tests/cxx/tree/binary/xdr/driver.cxx
deleted file mode 100644
index f5912c5..0000000
--- a/tests/cxx/tree/binary/xdr/driver.cxx
+++ /dev/null
@@ -1,187 +0,0 @@
-// file : tests/cxx/tree/binary/xdr/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test non-polymorphic binary serialization to XDR.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <cstring> // std::memcpy
-#include <cassert>
-#include <iostream>
-
-#include "test.hxx"
-
-using namespace std;
-using namespace test;
-
-extern "C" int
-overflow (char* p, char* buf, int in)
-{
- xml_schema::buffer* dst (reinterpret_cast<xml_schema::buffer*> (p));
-
- size_t n (static_cast<size_t> (in)), size (dst->size ());
- dst->size (size + n);
- memcpy (dst->data () + size, buf, n);
-
- return static_cast<int> (n);
-}
-
-struct underflow_info
-{
- xml_schema::buffer* buf;
- std::size_t pos;
-};
-
-extern "C" int
-underflow (char* p, char* buf, int in)
-{
- underflow_info* ui (reinterpret_cast<underflow_info*> (p));
-
- size_t n (static_cast<size_t> (in)), size (ui->buf->size () - ui->pos);
- n = size > n ? n : size;
-
- memcpy (buf, ui->buf->data () + ui->pos, n);
- ui->pos += n;
-
- return static_cast<int> (n);
-}
-
-int
-main (int argc, char* argv[])
-{
- if (argc != 2)
- {
- cerr << "usage: " << argv[0] << " test.xml" << endl;
- return 1;
- }
-
- try
- {
- XSD_AUTO_PTR<type> r (root (argv[1]));
-
- // Save to an XDR stream.
- //
- XDR xdr;
- xml_schema::buffer buf;
- xdrrec_create (&xdr, 0, 0, reinterpret_cast<char*> (&buf), 0, &overflow);
- xdr.x_op = XDR_ENCODE;
- xsd::cxx::tree::ostream<XDR> oxdr (xdr);
- oxdr << *r;
- xdrrec_endofrecord (&xdr, true); // flush the data
- xdr_destroy (&xdr);
-
- // Load from an XDR stream.
- //
- underflow_info ui;
- ui.buf = &buf;
- ui.pos = 0;
- xdrrec_create (&xdr, 0, 0, reinterpret_cast<char*> (&ui), &underflow, 0);
- xdr.x_op = XDR_DECODE;
- xdrrec_skiprecord (&xdr);
- xsd::cxx::tree::istream<XDR> ixdr (xdr);
- XSD_AUTO_PTR<type> c (new type (ixdr));
- xdr_destroy (&xdr);
-
- // Compare the two.
- //
- assert (r->list () == c->list ());
- assert (r->union_ () == c->union_ ());
- assert (r->enumeration () == c->enumeration ());
-
- type::complex_sequence rs (r->complex ()), cs (c->complex ());
-
- for (type::complex_iterator ri (rs.begin ()), ci (cs.begin ());
- ri != rs.end () && ci != rs.end (); ++ri, ++ci)
- {
- assert (ri->a () == ci->a ());
- if (ri->b ())
- assert (ri->b () == ci->b ());
- assert (ri->c () == ci->c ());
-
- assert (ri->x () == ci->x ());
- if (ri->y ())
- assert (ri->y () == ci->y ());
- }
-
- // integers
- //
- assert (r->byte () == c->byte ());
- assert (r->unsigned_byte () == c->unsigned_byte ());
- assert (r->short_ () == c->short_ ());
- assert (r->unsigned_short () == c->unsigned_short ());
- assert (r->int_ () == c->int_ ());
- assert (r->unsigned_int () == c->unsigned_int ());
- assert (r->long_ () == c->long_ ());
- assert (r->unsigned_long () == c->unsigned_long ());
- assert (r->integer () == c->integer ());
- assert (r->non_positive_integer () == c->non_positive_integer ());
- assert (r->non_negative_integer () == c->non_negative_integer ());
- assert (r->positive_integer () == c->positive_integer ());
- assert (r->negative_integer () == c->negative_integer ());
-
- // boolean
- //
- assert (r->boolean () == c->boolean ());
-
- // floats
- //
- assert (r->float_ () == c->float_ ());
- assert (r->double_ () == c->double_ ());
- assert (r->decimal () == c->decimal ());
-
- // strings
- //
- assert (r->string () == c->string ());
- assert (r->normalized_string () == c->normalized_string ());
- assert (r->token () == c->token ());
- assert (r->name () == c->name ());
- assert (r->name_token () == c->name_token ());
- assert (r->name_tokens () == c->name_tokens ());
- assert (r->ncname () == c->ncname ());
- assert (r->language () == c->language ());
-
- // qualified name
- //
- assert (r->qname () == c->qname ());
-
- // ID/IDREF
- //
- assert (r->id () == c->id ());
- assert (r->id_ref () == c->id_ref ());
- assert (r->id_refs () == c->id_refs ());
-
- // URI
- //
- assert (r->any_uri () == c->any_uri ());
-
- // binary
- //
- assert (r->base64_binary () == c->base64_binary ());
- assert (r->hex_binary () == c->hex_binary ());
-
- // date/time
- //
- assert (r->date () == c->date ());
- assert (r->date_time () == c->date_time ());
- assert (r->duration () == c->duration ());
- assert (r->day () == c->day ());
- assert (r->month () == c->month ());
- assert (r->month_day () == c->month_day ());
- assert (r->year () == c->year ());
- assert (r->year_month () == c->year_month ());
- assert (r->time () == c->time ());
-
- // anySimpleType
- //
- assert (!r->any_simple_type_attr ().text_content ().empty ());
- assert (r->any_simple_type_attr () == c->any_simple_type_attr ());
-
- assert (!r->any_simple_type ().text_content ().empty ());
- assert (r->any_simple_type () == c->any_simple_type ());
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/tree/binary/xdr/makefile b/tests/cxx/tree/binary/xdr/makefile
deleted file mode 100644
index dca3230..0000000
--- a/tests/cxx/tree/binary/xdr/makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# file : tests/cxx/tree/binary/xdr/makefile
-# 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 += --generate-insertion XDR --generate-extraction XDR \
---generate-comparison
-$(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
- $(call message,test $$1,$$1 $(src_base)/test.xml,$(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/tests/cxx/tree/binary/xdr/test.xml b/tests/cxx/tree/binary/xdr/test.xml
deleted file mode 100644
index 5cedd98..0000000
--- a/tests/cxx/tree/binary/xdr/test.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd"
- any_simple_type_attr="any simple content">
-
- <list>1 2 3</list>
-
- <union>abc</union>
-
- <enumeration>left</enumeration>
-
- <complex x="1">
- <a>aaa</a>
- </complex>
- <complex x="1" y="2">
- <a>aaa</a>
- <b>bbb</b>
- <c>c</c>
- <c>cc</c>
- <c>ccc</c>
- </complex>
-
-
- <!-- integers -->
- <byte>65</byte>
- <unsigned_byte>66</unsigned_byte>
- <short>-222</short>
- <unsigned_short>57005</unsigned_short>
- <int>-57005</int>
- <unsigned_int>3735928559</unsigned_int>
- <long>-3735928559</long>
- <unsigned_long>16045690984833335023</unsigned_long>
- <integer>-3735928559</integer>
- <non_positive_integer>-3735928559</non_positive_integer>
- <non_negative_integer>3735928559</non_negative_integer>
- <positive_integer>3735928559</positive_integer>
- <negative_integer>-3735928559</negative_integer>
-
-
- <!-- boolean -->
- <boolean>true</boolean>
-
-
- <!-- floats -->
- <float>1234.1234</float>
- <double>12345678.12345678</double>
- <decimal>1234567812345678.1234567812345678</decimal>
-
-
- <!-- strings -->
- <string>string</string>
- <normalized_string>normalized string</normalized_string>
- <token>one two three</token>
- <name>name</name>
- <name_token>name-token</name_token>
- <name_tokens>name tokens</name_tokens>
- <ncname>ncname</ncname>
- <language>en-us</language>
-
- <!-- qualified name -->
- <qname>xsi:schemaLocation</qname>
-
-
- <!-- ID/IDREF -->
- <id>elements1</id>
- <id>elements2</id>
- <id_ref>elements1</id_ref>
- <id_refs>elements1 elements2</id_refs>
-
-
- <!-- URI -->
- <any_uri>http://www.codesynthesis.com</any_uri>
-
-
- <!-- binary -->
- <base64_binary>YmFzZTY0IGJpbmFyeQ==</base64_binary>
- <hex_binary>6865782052696E617279</hex_binary>
-
-
- <!-- date/time -->
- <date>2001-10-26+02:00</date>
- <date_time>2001-10-26T21:32:52+02:00</date_time>
- <duration>P1Y2M3DT5H20M30S</duration>
- <day>---01+02:00</day>
- <month>--11+02:00</month>
- <month_day>--11-02+02:00</month_day>
- <year>2001+02:00</year>
- <year_month>2001-11+02:00</year_month>
- <time>21:32:52+02:00</time>
-
- <any_simple_type>any simple content in element</any_simple_type>
-
-</t:root>
diff --git a/tests/cxx/tree/binary/xdr/test.xsd b/tests/cxx/tree/binary/xdr/test.xsd
deleted file mode 100644
index 0629e94..0000000
--- a/tests/cxx/tree/binary/xdr/test.xsd
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:t="test"
- targetNamespace="test">
-
- <simpleType name="list">
- <list itemType="int"/>
- </simpleType>
-
- <simpleType name="union">
- <union memberTypes="int string"/>
- </simpleType>
-
- <simpleType name="enumeration">
- <restriction base="string">
- <enumeration value="top"/>
- <enumeration value="left"/>
- <enumeration value="bottom"/>
- <enumeration value="right"/>
- </restriction>
- </simpleType>
-
- <complexType name="base">
- <sequence>
- <element name="a" type="string"/>
- </sequence>
- <attribute name="x" type="int" use="required"/>
- </complexType>
-
- <complexType name="complex">
- <complexContent>
- <extension base="t:base">
- <sequence>
- <element name="b" type="string" minOccurs="0"/>
- <element name="c" type="string" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="y" type="int"/>
- </extension>
- </complexContent>
- </complexType>
-
-
- <complexType name="type">
- <sequence>
- <element name="list" type="t:list"/>
- <element name="union" type="t:union"/>
- <element name="enumeration" type="t:enumeration"/>
- <element name="complex" type="t:complex" maxOccurs="unbounded"/>
-
- <!-- integers -->
- <element name="byte" type="byte"/>
- <element name="unsigned_byte" type="unsignedByte"/>
- <element name="short" type="short"/>
- <element name="unsigned_short" type="unsignedShort"/>
- <element name="int" type="int"/>
- <element name="unsigned_int" type="unsignedInt"/>
- <element name="long" type="long"/>
- <element name="unsigned_long" type="unsignedLong"/>
- <element name="integer" type="integer"/>
- <element name="non_positive_integer" type="nonPositiveInteger"/>
- <element name="non_negative_integer" type="nonNegativeInteger"/>
- <element name="positive_integer" type="positiveInteger"/>
- <element name="negative_integer" type="negativeInteger"/>
-
-
- <!-- boolean -->
- <element name="boolean" type="boolean"/>
-
-
- <!-- floats -->
- <element name="float" type="float"/>
- <element name="double" type="double"/>
- <element name="decimal" type="decimal"/>
-
-
- <!-- strings -->
- <element name="string" type="string"/>
- <element name="normalized_string" type="normalizedString"/>
- <element name="token" type="token"/>
- <element name="name" type="Name"/>
- <element name="name_token" type="NMTOKEN"/>
- <element name="name_tokens" type="NMTOKENS"/>
- <element name="ncname" type="NCName"/>
- <element name="language" type="language"/>
-
- <!-- qualified name -->
- <element name="qname" type="QName"/>
-
-
- <!-- ID/IDREF -->
- <element name="id" maxOccurs="2" type="ID"/>
- <element name="id_ref" type="IDREF"/>
- <element name="id_refs" type="IDREFS"/>
-
-
- <!-- URI -->
- <element name="any_uri" type="anyURI"/>
-
-
- <!-- binary -->
- <element name="base64_binary" type="base64Binary"/>
- <element name="hex_binary" type="hexBinary"/>
-
-
- <!-- date/time -->
- <element name="date" type="date"/>
- <element name="date_time" type="dateTime"/>
- <element name="duration" type="duration"/>
- <element name="day" type="gDay"/>
- <element name="month" type="gMonth"/>
- <element name="month_day" type="gMonthDay"/>
- <element name="year" type="gYear"/>
- <element name="year_month" type="gYearMonth"/>
- <element name="time" type="time"/>
-
- <element name="any_simple_type" type="anySimpleType"/>
- </sequence>
- <attribute name="any_simple_type_attr" type="anySimpleType" use="required"/>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/tree/built-in/attributes.xml b/tests/cxx/tree/built-in/attributes.xml
deleted file mode 100644
index 609a757..0000000
--- a/tests/cxx/tree/built-in/attributes.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test:attributes
- xmlns:test="http://www.codesynthesis.com/xmlns/test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.codesynthesis.com/xmlns/test types.xsd"
-
-
- byte="65"
- unsigned_byte="66"
- short="-222"
- unsigned_short="57005"
- int="-57005"
- unsigned_int="3735928559"
- long="-3735928559"
- unsigned_long="16045690984833335023"
- integer="-3735928559"
- non_positive_integer="-3735928559"
- non_negative_integer="3735928559"
- positive_integer="3735928559"
- negative_integer="-3735928559"
-
-
-
- boolean="false"
-
-
-
- float="1234.1234"
- double="12345678.12345678"
- decimal="12345678.12345678"
-
-
-
- string="string"
- normalized_string="normalized string"
- token=" one two three "
- name="name"
- name_token="name-token"
- name_tokens="name tokens"
- ncname="ncname"
- language="en-us"
-
-
- qname="xsi:schemaLocation"
-
-
-
- id="attributes"
- id_ref="attributes"
- id_refs="attributes"
-
-
-
- any_uri="http://www.codesynthesis.com"
-
-
-
- base64_binary="YmFzZTY0IGJpbmFyeQ=="
- hex_binary="6865782052696E617279"
-
-
-
- date="2001-10-26+02:00"
- date_time="2001-10-26T21:32:52+02:00"
- duration="P1Y2M3DT5H20M30S"
- day="---01+02:00"
- month="--11+02:00"
- month_day="--11-02+02:00"
- year="2001+02:00"
- year_month="2001-11+02:00"
- time="21:32:52+02:00"
-
-/>
diff --git a/tests/cxx/tree/built-in/driver.cxx b/tests/cxx/tree/built-in/driver.cxx
deleted file mode 100644
index f000f5a..0000000
--- a/tests/cxx/tree/built-in/driver.cxx
+++ /dev/null
@@ -1,93 +0,0 @@
-// file : tests/cxx/tree/built-in/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test built-in type mapping.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <sstream>
-#include <iostream>
-
-
-#include "types.hxx"
-
-using std::cerr;
-using std::endl;
-
-int
-main (int argc, char* argv[])
-{
- if (argc != 4)
- {
- cerr << "usage: " << argv[0] << " elements.xml attributes.xml inherited.xml" << endl;
- return 1;
- }
-
- XSD_AUTO_PTR<xmlns::test::Elements> elements (
- xmlns::test::elements (argv[1]));
-
- XSD_AUTO_PTR<xmlns::test::Attributes> attributes (
- xmlns::test::attributes (argv[2]));
-
- XSD_AUTO_PTR<xmlns::test::Inherited> inherited (
- xmlns::test::inherited (argv[3]));
-
- cerr << "elements: " << *elements << endl
- << endl
- << "attributes: " << *attributes << endl
- << endl
- << "inherited: " << *inherited << endl;
-
- // Test parsing/serialization.
- //
-
- xml_schema::namespace_infomap map;
-
- map["test"].name = "http://www.codesynthesis.com/xmlns/test";
- map["test"].schema = "types.xsd";
-
- {
- std::ostringstream ostr;
- xmlns::test::elements (ostr, *elements, map);
-
- std::istringstream istr (ostr.str ());
- XSD_AUTO_PTR<xmlns::test::Elements> elements1 (
- xmlns::test::elements (istr));
-
- std::ostringstream ostr1;
- xmlns::test::elements (ostr1, *elements1, map);
-
- if (ostr.str () != ostr1.str ())
- return 1;
- }
-
- {
- std::ostringstream ostr;
- xmlns::test::attributes (ostr, *attributes, map);
-
- std::istringstream istr (ostr.str ());
- XSD_AUTO_PTR<xmlns::test::Attributes> attributes1 (
- xmlns::test::attributes (istr));
-
- std::ostringstream ostr1;
- xmlns::test::attributes (ostr1, *attributes1, map);
-
- if (ostr.str () != ostr1.str ())
- return 1;
- }
-
- {
- std::ostringstream ostr;
- xmlns::test::inherited (ostr, *inherited, map);
-
- std::istringstream istr (ostr.str ());
- XSD_AUTO_PTR<xmlns::test::Inherited> inherited1 (
- xmlns::test::inherited (istr));
-
- std::ostringstream ostr1;
- xmlns::test::inherited (ostr1, *inherited1, map);
-
- if (ostr.str () != ostr1.str ())
- return 1;
- }
-}
diff --git a/tests/cxx/tree/built-in/elements.xml b/tests/cxx/tree/built-in/elements.xml
deleted file mode 100644
index f76f019..0000000
--- a/tests/cxx/tree/built-in/elements.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test:elements
- xmlns:test="http://www.codesynthesis.com/xmlns/test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.codesynthesis.com/xmlns/test types.xsd">
-
- <!-- integers -->
- <byte>65</byte>
- <unsigned_byte>66</unsigned_byte>
- <short>-222</short>
- <unsigned_short>57005</unsigned_short>
- <int>-57005</int>
- <unsigned_int>3735928559</unsigned_int>
- <long>-3735928559</long>
- <unsigned_long>16045690984833335023</unsigned_long>
- <integer>-3735928559</integer>
- <non_positive_integer>-3735928559</non_positive_integer>
- <non_negative_integer>3735928559</non_negative_integer>
- <positive_integer>3735928559</positive_integer>
- <negative_integer>-3735928559</negative_integer>
-
-
- <!-- boolean -->
- <boolean>true</boolean>
-
-
- <!-- floats -->
- <float>1234.1234</float>
- <double>12345678.12345678</double>
- <decimal>12345678.12345678</decimal>
-
-
- <!-- strings -->
- <string>string</string>
- <normalized_string>normalized
-string</normalized_string>
- <token>
- one
- two three </token>
- <name>name</name>
- <name_token>name-token</name_token>
- <name_tokens>name tokens</name_tokens>
- <ncname>ncname</ncname>
- <language>en-us</language>
-
- <!-- qualified name -->
- <qname>xsi:schemaLocation</qname>
-
-
- <!-- ID/IDREF -->
- <id>elements1</id>
- <id>elements2</id>
- <id_ref>elements1</id_ref>
- <id_refs>elements1 elements2</id_refs>
-
-
- <!-- URI -->
- <any_uri>http://www.codesynthesis.com</any_uri>
-
-
- <!-- binary -->
- <base64_binary>YmFzZTY0IGJpbmFyeQ==</base64_binary>
- <hex_binary>6865782052696E617279</hex_binary>
-
-
- <!-- date/time -->
- <date>2001-10-26+02:00</date>
- <date_time>2001-10-26T21:32:52+02:00</date_time>
- <duration>P1Y2M3DT5H20M30S</duration>
- <day>---01+02:00</day>
- <month>--11+02:00</month>
- <month_day>--11-02+02:00</month_day>
- <year>2001+02:00</year>
- <year_month>2001-11+02:00</year_month>
- <time>21:32:52+02:00</time>
-
-
- <!-- entity -->
- <!--
- <entity>foo</entity>
- <entities>foo bar</entities>
- -->
-
-</test:elements>
diff --git a/tests/cxx/tree/built-in/inherited.xml b/tests/cxx/tree/built-in/inherited.xml
deleted file mode 100644
index 1781a69..0000000
--- a/tests/cxx/tree/built-in/inherited.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test:inherited
- xmlns:test="http://www.codesynthesis.com/xmlns/test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.codesynthesis.com/xmlns/test types.xsd">
-
- <!-- integers -->
- <byte>65</byte>
- <unsigned_byte>66</unsigned_byte>
- <short>-222</short>
- <unsigned_short>57005</unsigned_short>
- <int>-57005</int>
- <unsigned_int>3735928559</unsigned_int>
- <long>-3735928559</long>
- <unsigned_long>16045690984833335023</unsigned_long>
- <integer>-3735928559</integer>
- <non_positive_integer>-3735928559</non_positive_integer>
- <non_negative_integer>3735928559</non_negative_integer>
- <positive_integer>3735928559</positive_integer>
- <negative_integer>-3735928559</negative_integer>
-
-
- <!-- boolean -->
- <boolean>true</boolean>
-
-
- <!-- floats -->
- <float>1234.1234</float>
- <double>12345678.12345678</double>
- <decimal>12345678.12345678</decimal>
-
-
- <!-- strings -->
- <string>string</string>
- <normalized_string>normalized
-string</normalized_string>
- <token>
- one
- two three </token>
- <name>name</name>
- <name_token>name-token</name_token>
- <name_tokens>name tokens</name_tokens>
- <ncname>ncname</ncname>
- <language>en-us</language>
-
- <!-- qualified name -->
- <qname>xsi:schemaLocation</qname>
-
-
- <!-- ID/IDREF -->
- <id>elements1</id>
- <id>elements2</id>
- <id_ref>elements1</id_ref>
- <id_refs>elements1 elements2</id_refs>
-
-
- <!-- URI -->
- <any_uri>http://www.codesynthesis.com</any_uri>
-
-
- <!-- binary -->
- <base64_binary>YmFzZTY0IGJpbmFyeQ==</base64_binary>
- <hex_binary>6865782052696E617279</hex_binary>
-
-
- <!-- date/time -->
- <date>2001-10-26+02:00</date>
- <date_time>2001-10-26T21:32:52+02:00</date_time>
- <duration>P1Y2M3DT5H20M30S</duration>
- <day>---01+02:00</day>
- <month>--11+02:00</month>
- <month_day>--11-02+02:00</month_day>
- <year>2001+02:00</year>
- <year_month>2001-11+02:00</year_month>
- <time>21:32:52+02:00</time>
-
-
- <!-- entity -->
- <!--
- <entity>foo</entity>
- <entities>foo bar</entities>
- -->
-
-</test:inherited>
diff --git a/tests/cxx/tree/built-in/makefile b/tests/cxx/tree/built-in/makefile
deleted file mode 100644
index b989fd1..0000000
--- a/tests/cxx/tree/built-in/makefile
+++ /dev/null
@@ -1,99 +0,0 @@
-# file : tests/cxx/tree/built-in/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
-
-xsd := types.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 += \
---char-type char \
---generate-inline \
---generate-ostream \
---generate-serialization \
---generate-default-ctor \
---generate-from-base-ctor \
---root-element-all
-
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-
-# Test.
-#
-# We need to cd to src_base in order to have the schema in the working
-# directory.
-#
-$(test): driver := $(driver)
-$(test): $(driver) $(src_base)/elements.xml $(src_base)/attributes.xml \
-$(src_base)/inherited.xml
- cd $(src_base) && $(driver) $(src_base)/elements.xml \
-$(src_base)/attributes.xml $(src_base)/inherited.xml
-
-
-# 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/tests/cxx/tree/built-in/types.xsd b/tests/cxx/tree/built-in/types.xsd
deleted file mode 100644
index 22582cb..0000000
--- a/tests/cxx/tree/built-in/types.xsd
+++ /dev/null
@@ -1,460 +0,0 @@
-<?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">
-
- <!-- elements -->
-
- <xsd:complexType name="Elements">
- <xsd:sequence>
-
- <!-- integers -->
- <xsd:element name="byte" type="xsd:byte"/>
- <xsd:element name="unsigned_byte" type="xsd:unsignedByte"/>
- <xsd:element name="short" type="xsd:short"/>
- <xsd:element name="unsigned_short" type="xsd:unsignedShort"/>
- <xsd:element name="int" type="xsd:int"/>
- <xsd:element name="unsigned_int" type="xsd:unsignedInt"/>
- <xsd:element name="long" type="xsd:long"/>
- <xsd:element name="unsigned_long" type="xsd:unsignedLong"/>
- <xsd:element name="integer" type="xsd:integer"/>
- <xsd:element name="non_positive_integer" type="xsd:nonPositiveInteger"/>
- <xsd:element name="non_negative_integer" type="xsd:nonNegativeInteger"/>
- <xsd:element name="positive_integer" type="xsd:positiveInteger"/>
- <xsd:element name="negative_integer" type="xsd:negativeInteger"/>
-
-
- <!-- boolean -->
- <xsd:element name="boolean" type="xsd:boolean"/>
-
-
- <!-- floats -->
- <xsd:element name="float" type="xsd:float"/>
- <xsd:element name="double" type="xsd:double"/>
- <xsd:element name="decimal" type="xsd:decimal"/>
-
-
- <!-- strings -->
- <xsd:element name="string" type="xsd:string"/>
- <xsd:element name="normalized_string" type="xsd:normalizedString"/>
- <xsd:element name="token" type="xsd:token"/>
- <xsd:element name="name" type="xsd:Name"/>
- <xsd:element name="name_token" type="xsd:NMTOKEN"/>
- <xsd:element name="name_tokens" type="xsd:NMTOKENS"/>
- <xsd:element name="ncname" type="xsd:NCName"/>
- <xsd:element name="language" type="xsd:language"/>
-
- <!-- qualified name -->
- <xsd:element name="qname" type="xsd:QName"/>
-
-
- <!-- ID/IDREF -->
- <xsd:element name="id" maxOccurs="2" type="xsd:ID"/>
- <xsd:element name="id_ref" type="xsd:IDREF"/>
- <xsd:element name="id_refs" type="xsd:IDREFS"/>
-
-
- <!-- URI -->
- <xsd:element name="any_uri" type="xsd:anyURI"/>
-
-
- <!-- binary -->
- <xsd:element name="base64_binary" type="xsd:base64Binary"/>
- <xsd:element name="hex_binary" type="xsd:hexBinary"/>
-
-
- <!-- date/time -->
- <xsd:element name="date" type="xsd:date"/>
- <xsd:element name="date_time" type="xsd:dateTime"/>
- <xsd:element name="duration" type="xsd:duration"/>
- <xsd:element name="day" type="xsd:gDay"/>
- <xsd:element name="month" type="xsd:gMonth"/>
- <xsd:element name="month_day" type="xsd:gMonthDay"/>
- <xsd:element name="year" type="xsd:gYear"/>
- <xsd:element name="year_month" type="xsd:gYearMonth"/>
- <xsd:element name="time" type="xsd:time"/>
-
-
- <!-- entity -->
- <!--
- <xsd:element name="entity" type="xsd:ENTITY"/>
- <xsd:element name="entities" type="xsd:ENTITIES"/>
- -->
-
-
- <!-- notation -->
- <!-- xsd:element name="notation" type="xsd:NOTATION"/ -->
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="elements" type="Elements"/>
-
-
-
- <!-- attributes -->
-
- <xsd:complexType name="Attributes">
- <!-- integers -->
- <xsd:attribute name="byte" type="xsd:byte"/>
- <xsd:attribute name="unsigned_byte" type="xsd:unsignedByte"/>
- <xsd:attribute name="short" type="xsd:short"/>
- <xsd:attribute name="unsigned_short" type="xsd:unsignedShort"/>
- <xsd:attribute name="int" type="xsd:int"/>
- <xsd:attribute name="unsigned_int" type="xsd:unsignedInt"/>
- <xsd:attribute name="long" type="xsd:long"/>
- <xsd:attribute name="unsigned_long" type="xsd:unsignedLong"/>
- <xsd:attribute name="integer" type="xsd:integer"/>
- <xsd:attribute name="non_positive_integer" type="xsd:nonPositiveInteger"/>
- <xsd:attribute name="non_negative_integer" type="xsd:nonNegativeInteger"/>
- <xsd:attribute name="positive_integer" type="xsd:positiveInteger"/>
- <xsd:attribute name="negative_integer" type="xsd:negativeInteger"/>
-
-
- <!-- boolean -->
- <xsd:attribute name="boolean" type="xsd:boolean"/>
-
-
- <!-- floats -->
- <xsd:attribute name="float" type="xsd:float"/>
- <xsd:attribute name="double" type="xsd:double"/>
- <xsd:attribute name="decimal" type="xsd:decimal"/>
-
-
- <!-- strings -->
- <xsd:attribute name="string" type="xsd:string"/>
- <xsd:attribute name="normalized_string" type="xsd:normalizedString"/>
- <xsd:attribute name="token" type="xsd:token"/>
- <xsd:attribute name="name" type="xsd:Name"/>
- <xsd:attribute name="name_token" type="xsd:NMTOKEN"/>
- <xsd:attribute name="name_tokens" type="xsd:NMTOKENS"/>
- <xsd:attribute name="ncname" type="xsd:NCName"/>
- <xsd:attribute name="language" type="xsd:language"/>
-
- <!-- qualified name -->
- <xsd:attribute name="qname" type="xsd:QName"/>
-
-
- <!-- ID/IDREF -->
- <xsd:attribute name="id" type="xsd:ID"/>
- <xsd:attribute name="id_ref" type="xsd:IDREF"/>
- <xsd:attribute name="id_refs" type="xsd:IDREFS"/>
-
-
- <!-- URI -->
- <xsd:attribute name="any_uri" type="xsd:anyURI"/>
-
-
- <!-- binary -->
- <xsd:attribute name="base64_binary" type="xsd:base64Binary"/>
- <xsd:attribute name="hex_binary" type="xsd:hexBinary"/>
-
-
- <!-- date/time -->
- <xsd:attribute name="date" type="xsd:date"/>
- <xsd:attribute name="date_time" type="xsd:dateTime"/>
- <xsd:attribute name="duration" type="xsd:duration"/>
- <xsd:attribute name="day" type="xsd:gDay"/>
- <xsd:attribute name="month" type="xsd:gMonth"/>
- <xsd:attribute name="month_day" type="xsd:gMonthDay"/>
- <xsd:attribute name="year" type="xsd:gYear"/>
- <xsd:attribute name="year_month" type="xsd:gYearMonth"/>
- <xsd:attribute name="time" type="xsd:time"/>
-
-
- <!-- entity -->
- <!--
- <xsd:attribute name="entity" type="xsd:ENTITY"/>
- <xsd:attribute name="entities" type="xsd:ENTITIES"/>
- -->
-
-
- <!-- notation -->
- <!-- xsd:element name="notation" type="xsd:NOTATION"/ -->
- </xsd:complexType>
-
- <xsd:element name="attributes" type="Attributes"/>
-
-
- <!-- inheritance -->
-
- <!-- integers -->
- <xsd:simpleType name="Byte">
- <xsd:restriction base="xsd:byte"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="UnsignedByte">
- <xsd:restriction base="xsd:unsignedByte"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Short">
- <xsd:restriction base="xsd:short"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="UnsignedShort">
- <xsd:restriction base="xsd:unsignedShort"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Int">
- <xsd:restriction base="xsd:int"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="UnsignedInt">
- <xsd:restriction base="xsd:unsignedInt"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Long">
- <xsd:restriction base="xsd:long"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="UnsignedLong">
- <xsd:restriction base="xsd:unsignedLong"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Integer">
- <xsd:restriction base="xsd:integer"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="NonPositiveInteger">
- <xsd:restriction base="xsd:nonPositiveInteger"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="NonNegativeInteger">
- <xsd:restriction base="xsd:nonNegativeInteger"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="PositiveInteger">
- <xsd:restriction base="xsd:positiveInteger"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="NegativeInteger">
- <xsd:restriction base="xsd:negativeInteger"/>
- </xsd:simpleType>
-
-
- <!-- boolean -->
- <xsd:simpleType name="Boolean">
- <xsd:restriction base="xsd:boolean"/>
- </xsd:simpleType>
-
-
- <!-- floats -->
- <xsd:simpleType name="Float">
- <xsd:restriction base="xsd:float"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Double">
- <xsd:restriction base="xsd:double"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Decimal">
- <xsd:restriction base="xsd:decimal"/>
- </xsd:simpleType>
-
-
- <!-- strings -->
- <xsd:simpleType name="String">
- <xsd:restriction base="xsd:string"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="NormalizedString">
- <xsd:restriction base="xsd:normalizedString"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Token">
- <xsd:restriction base="xsd:token"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Name">
- <xsd:restriction base="xsd:Name"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="NameToken">
- <xsd:restriction base="xsd:NMTOKEN"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="NameTokens">
- <xsd:restriction base="xsd:NMTOKENS"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="NCName">
- <xsd:restriction base="xsd:NCName"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Language">
- <xsd:restriction base="xsd:language"/>
- </xsd:simpleType>
-
-
- <!-- qualified name -->
- <xsd:simpleType name="QName">
- <xsd:restriction base="xsd:QName"/>
- </xsd:simpleType>
-
-
- <!-- ID/IDREF -->
- <xsd:simpleType name="Id">
- <xsd:restriction base="xsd:ID"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="IdRef">
- <xsd:restriction base="xsd:IDREF"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="IdRefs">
- <xsd:restriction base="xsd:IDREFS"/>
- </xsd:simpleType>
-
-
- <!-- URI -->
- <xsd:simpleType name="URI">
- <xsd:restriction base="xsd:anyURI"/>
- </xsd:simpleType>
-
-
- <!-- binary -->
- <xsd:simpleType name="Base64Binary">
- <xsd:restriction base="xsd:base64Binary"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="HexBinary">
- <xsd:restriction base="xsd:hexBinary"/>
- </xsd:simpleType>
-
-
- <!-- date/time -->
- <xsd:simpleType name="Date">
- <xsd:restriction base="xsd:date"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="DateTime">
- <xsd:restriction base="xsd:dateTime"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Duration">
- <xsd:restriction base="xsd:duration"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Day">
- <xsd:restriction base="xsd:gDay"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Month">
- <xsd:restriction base="xsd:gMonth"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="MonthDay">
- <xsd:restriction base="xsd:gMonthDay"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Year">
- <xsd:restriction base="xsd:gYear"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="YearMonth">
- <xsd:restriction base="xsd:gYearMonth"/>
- </xsd:simpleType>
-
- <xsd:simpleType name="Time">
- <xsd:restriction base="xsd:time"/>
- </xsd:simpleType>
-
-
- <!-- entity -->
- <!--
- <xsd:element name="entity" type="xsd:ENTITY"/>
- <xsd:element name="entities" type="xsd:ENTITIES"/>
- -->
-
-
- <!-- notation -->
- <!-- xsd:element name="notation" type="xsd:NOTATION"/ -->
-
- <!-- elements -->
-
- <xsd:complexType name="Inherited">
- <xsd:sequence>
-
- <!-- integers -->
- <xsd:element name="byte" type="Byte"/>
- <xsd:element name="unsigned_byte" type="UnsignedByte"/>
- <xsd:element name="short" type="Short"/>
- <xsd:element name="unsigned_short" type="UnsignedShort"/>
- <xsd:element name="int" type="Int"/>
- <xsd:element name="unsigned_int" type="UnsignedInt"/>
- <xsd:element name="long" type="Long"/>
- <xsd:element name="unsigned_long" type="UnsignedLong"/>
- <xsd:element name="integer" type="Integer"/>
- <xsd:element name="non_positive_integer" type="NonPositiveInteger"/>
- <xsd:element name="non_negative_integer" type="NonNegativeInteger"/>
- <xsd:element name="positive_integer" type="PositiveInteger"/>
- <xsd:element name="negative_integer" type="NegativeInteger"/>
-
-
- <!-- boolean -->
- <xsd:element name="boolean" type="Boolean"/>
-
-
- <!-- floats -->
- <xsd:element name="float" type="Float"/>
- <xsd:element name="double" type="Double"/>
- <xsd:element name="decimal" type="Decimal"/>
-
-
- <!-- strings -->
- <xsd:element name="string" type="String"/>
- <xsd:element name="normalized_string" type="NormalizedString"/>
- <xsd:element name="token" type="Token"/>
- <xsd:element name="name" type="Name"/>
- <xsd:element name="name_token" type="NameToken"/>
- <xsd:element name="name_tokens" type="NameTokens"/>
- <xsd:element name="ncname" type="NCName"/>
- <xsd:element name="language" type="Language"/>
-
- <!-- qualified name -->
- <xsd:element name="qname" type="QName"/>
-
-
- <!-- ID/IDREF -->
- <xsd:element name="id" maxOccurs="2" type="Id"/>
- <xsd:element name="id_ref" type="IdRef"/>
- <xsd:element name="id_refs" type="IdRefs"/>
-
-
- <!-- URI -->
- <xsd:element name="any_uri" type="URI"/>
-
-
- <!-- binary -->
- <xsd:element name="base64_binary" type="Base64Binary"/>
- <xsd:element name="hex_binary" type="HexBinary"/>
-
-
- <!-- date/time -->
- <xsd:element name="date" type="Date"/>
- <xsd:element name="date_time" type="DateTime"/>
- <xsd:element name="duration" type="Duration"/>
- <xsd:element name="day" type="Day"/>
- <xsd:element name="month" type="Month"/>
- <xsd:element name="month_day" type="MonthDay"/>
- <xsd:element name="year" type="Year"/>
- <xsd:element name="year_month" type="YearMonth"/>
- <xsd:element name="time" type="Time"/>
-
-
- <!-- entity -->
- <!--
- <xsd:element name="entity" type="xsd:ENTITY"/>
- <xsd:element name="entities" type="xsd:ENTITIES"/>
- -->
-
-
- <!-- notation -->
- <!-- xsd:element name="notation" type="xsd:NOTATION"/ -->
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="inherited" type="Inherited"/>
-
-</xsd:schema>
diff --git a/tests/cxx/tree/chameleon/driver.cxx b/tests/cxx/tree/chameleon/driver.cxx
deleted file mode 100644
index f196128..0000000
--- a/tests/cxx/tree/chameleon/driver.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-// file : tests/cxx/tree/chameleon/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test chameleon inclusion.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <iostream>
-
-#include "includer.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
- {
- XSD_AUTO_PTR<root_t> r (root (argv[1]));
-
- cout << *r << endl;
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/tree/chameleon/includee.xsd b/tests/cxx/tree/chameleon/includee.xsd
deleted file mode 100644
index 531a7d0..0000000
--- a/tests/cxx/tree/chameleon/includee.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <xsd:complexType name="root_t">
- <xsd:sequence>
- <xsd:element name="a" type="type"/>
- <xsd:element ref="b"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="root" type="root_t"/>
-
-</xsd:schema>
diff --git a/tests/cxx/tree/chameleon/includer.xsd b/tests/cxx/tree/chameleon/includer.xsd
deleted file mode 100644
index a1c850a..0000000
--- a/tests/cxx/tree/chameleon/includer.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="test" targetNamespace="test">
-
- <xsd:include schemaLocation="includee.xsd"/>
-
- <xsd:simpleType name="type">
- <xsd:restriction base="xsd:string"/>
- </xsd:simpleType>
-
- <xsd:element name="b" type="xsd:string"/>
-
-</xsd:schema>
diff --git a/tests/cxx/tree/chameleon/makefile b/tests/cxx/tree/chameleon/makefile
deleted file mode 100644
index b647ae3..0000000
--- a/tests/cxx/tree/chameleon/makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# file : tests/cxx/tree/chameleon/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
-
-xsd := includer.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 += --root-element root --generate-ostream
-$(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=.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/tests/cxx/tree/chameleon/output b/tests/cxx/tree/chameleon/output
deleted file mode 100644
index c40f715..0000000
--- a/tests/cxx/tree/chameleon/output
+++ /dev/null
@@ -1,3 +0,0 @@
-
-a: a
-b: b
diff --git a/tests/cxx/tree/chameleon/test.xml b/tests/cxx/tree/chameleon/test.xml
deleted file mode 100644
index 12ff279..0000000
--- a/tests/cxx/tree/chameleon/test.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test includer.xsd">
-
- <a>a</a>
- <t:b>b</t:b>
-
-</t:root>
diff --git a/tests/cxx/tree/comparison/driver.cxx b/tests/cxx/tree/comparison/driver.cxx
deleted file mode 100644
index c44598c..0000000
--- a/tests/cxx/tree/comparison/driver.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-// file : tests/cxx/tree/comparison/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test generated comparison operators.
-//
-
-#include <memory> // std::auto_ptr/unique_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
- {
- XSD_AUTO_PTR<type> r (root (argv[1]));
-
- type::complex_sequence s (r->complex ());
-
- assert (s[0] == s[0]);
- assert (s[0] != s[1]);
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/tree/comparison/makefile b/tests/cxx/tree/comparison/makefile
deleted file mode 100644
index 373391b..0000000
--- a/tests/cxx/tree/comparison/makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# file : tests/cxx/tree/comparison/makefile
-# 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 += --generate-comparison
-$(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
- $(call message,test $$1,$$1 $(src_base)/test.xml,$(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/tests/cxx/tree/comparison/test.xml b/tests/cxx/tree/comparison/test.xml
deleted file mode 100644
index b5d8158..0000000
--- a/tests/cxx/tree/comparison/test.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <complex x="123" y="abc">
- <a>123</a>
- <b>abc</b>
- <c x="123">abc</c>
- <c x="456">def</c>
- </complex>
-
- <complex x="123" y="abc">
- <a>123</a>
- <b>abc</b>
- <c x="123">abc</c>
- <c x="456">xyz</c>
- </complex>
-
-</t:root>
diff --git a/tests/cxx/tree/comparison/test.xsd b/tests/cxx/tree/comparison/test.xsd
deleted file mode 100644
index c234add..0000000
--- a/tests/cxx/tree/comparison/test.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="member">
- <simpleContent>
- <extension base="string">
- <attribute name="x" type="int" use="required"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <complexType name="complex">
- <sequence>
- <element name="a" type="int"/>
- <element name="b" type="string" minOccurs="0"/>
- <element name="c" type="t:member" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="x" type="int"/>
- <attribute name="y" type="string" use="required"/>
- </complexType>
-
- <complexType name="type">
- <sequence>
- <element name="complex" type="t:complex" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/tree/compilation/driver.cxx b/tests/cxx/tree/compilation/driver.cxx
deleted file mode 100644
index 4318d97..0000000
--- a/tests/cxx/tree/compilation/driver.cxx
+++ /dev/null
@@ -1,116 +0,0 @@
-// file : tests/cxx/tree/compilation/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Make sure the runtime library compiles by explicitly instantiating
-// all the types.
-//
-
-#include <iostream>
-
-#include "test.hxx"
-
-using namespace std;
-using namespace test;
-
-template class xsd::cxx::tree::simple_type<char, xml_schema::type>;
-
-// String types.
-//
-template class xsd::cxx::tree::string< char, xml_schema::simple_type >;
-template class xsd::cxx::tree::normalized_string< char, xml_schema::string >;
-template class xsd::cxx::tree::token< char, xml_schema::normalized_string >;
-template class xsd::cxx::tree::name< char, xml_schema::token >;
-template class xsd::cxx::tree::nmtoken< char, xml_schema::token >;
-template class xsd::cxx::tree::nmtokens< char, xml_schema::simple_type, xml_schema::nmtoken >;
-template class xsd::cxx::tree::ncname< char, xml_schema::name >;
-template class xsd::cxx::tree::language< char, xml_schema::token >;
-
-// ID/IDREF.
-//
-template class xsd::cxx::tree::id< char, xml_schema::ncname >;
-template class xsd::cxx::tree::idref< char, xml_schema::ncname, xml_schema::type >;
-template class xsd::cxx::tree::idrefs< char, xml_schema::simple_type, xml_schema::idref >;
-
-// URI.
-//
-template class xsd::cxx::tree::uri< char, xml_schema::simple_type >;
-
-// Qualified name.
-//
-template class xsd::cxx::tree::qname< char, xml_schema::simple_type, xml_schema::uri, xml_schema::ncname >;
-
-// Binary.
-//
-template class xsd::cxx::tree::buffer< char >;
-template class xsd::cxx::tree::base64_binary< char, xml_schema::simple_type >;
-template class xsd::cxx::tree::hex_binary< char, xml_schema::simple_type >;
-
-// Date/time.
-//
-template class xsd::cxx::tree::date< char, xml_schema::simple_type >;
-template class xsd::cxx::tree::date_time< char, xml_schema::simple_type >;
-template class xsd::cxx::tree::duration< char, xml_schema::simple_type >;
-template class xsd::cxx::tree::gday< char, xml_schema::simple_type >;
-template class xsd::cxx::tree::gmonth< char, xml_schema::simple_type >;
-template class xsd::cxx::tree::gmonth_day< char, xml_schema::simple_type >;
-template class xsd::cxx::tree::gyear< char, xml_schema::simple_type >;
-template class xsd::cxx::tree::gyear_month< char, xml_schema::simple_type >;
-template class xsd::cxx::tree::time< char, xml_schema::simple_type >;
-
-// Entity.
-//
-template class xsd::cxx::tree::entity< char, xml_schema::ncname >;
-template class xsd::cxx::tree::entities< char, xml_schema::simple_type, xml_schema::entity >;
-
-// Namespace information and list stream. Used in
-// serialization functions.
-//
-template class xsd::cxx::xml::dom::namespace_info < char >;
-template class xsd::cxx::xml::dom::namespace_infomap < char >;
-template class xsd::cxx::tree::list_stream < char >;
-
-// Flags and properties.
-//
-template class xsd::cxx::tree::properties< char >;
-
-// Exceptions.
-//
-template class xsd::cxx::tree::exception< char >;
-template class xsd::cxx::tree::parsing< char >;
-template class xsd::cxx::tree::expected_element< char >;
-template class xsd::cxx::tree::unexpected_element< char >;
-template class xsd::cxx::tree::expected_attribute< char >;
-template class xsd::cxx::tree::unexpected_enumerator< char >;
-template class xsd::cxx::tree::expected_text_content< char >;
-template class xsd::cxx::tree::no_type_info< char >;
-template class xsd::cxx::tree::not_derived< char >;
-template class xsd::cxx::tree::duplicate_id< char >;
-template class xsd::cxx::tree::serialization< char >;
-template class xsd::cxx::tree::no_prefix_mapping< char >;
-template class xsd::cxx::tree::bounds< char >;
-
-// Parsing/serialization diagnostics.
-//
-template class xsd::cxx::tree::error< char >;
-template class xsd::cxx::tree::diagnostics< char >;
-
-// Error handler interface.
-//
-template class xsd::cxx::xml::error_handler< char >;
-
-
-//
-//
-template class xsd::cxx::tree::fundamental_base<int, char, xml_schema::type>;
-template class xsd::cxx::tree::one<int>;
-template class xsd::cxx::tree::one<xml_schema::string>;
-template class xsd::cxx::tree::optional<int>;
-template class xsd::cxx::tree::optional<xml_schema::string>;
-template class xsd::cxx::tree::sequence<int>;
-template class xsd::cxx::tree::sequence<xml_schema::string>;
-
-
-int
-main ()
-{
-}
diff --git a/tests/cxx/tree/compilation/makefile b/tests/cxx/tree/compilation/makefile
deleted file mode 100644
index 3856416..0000000
--- a/tests/cxx/tree/compilation/makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# file : tests/cxx/tree/compilation/makefile
-# 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 += --generate-serialization
-$(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/tests/cxx/tree/compilation/test.xsd b/tests/cxx/tree/compilation/test.xsd
deleted file mode 100644
index 07bebc7..0000000
--- a/tests/cxx/tree/compilation/test.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="type">
- <sequence>
- <element name="a" type="string"/>
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/tree/complex/ctor/driver.cxx b/tests/cxx/tree/complex/ctor/driver.cxx
deleted file mode 100644
index 0d691ac..0000000
--- a/tests/cxx/tree/complex/ctor/driver.cxx
+++ /dev/null
@@ -1,122 +0,0 @@
-// file : tests/cxx/tree/complex/ctor/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test generation of varous complex type constructors.
-//
-
-#include <cassert>
-#include <memory>
-
-#include "test.hxx"
-
-#ifdef XSD_CXX11
-# include <utility> // std::move
-# define XSD_MOVE(x) std::move(x)
-#else
-# define XSD_MOVE(x) x
-#endif
-
-using namespace std;
-using namespace test;
-
-int
-main ()
-{
- // Test case A.
- //
- {
- a_base b1;
- a_base b2 ("abc"); // empty ultimate base + required
- a_base b3 ("abc", "foo"); // ultimate base + required
-
- a_derived a1;
- a_derived a2 ("foo", "bar"); // empty ultimate base + required
- a_derived a3 (b3, "bar"); // base + required
- a_derived a4 ("abc", "foo", "bar"); // ultimate base + required
- }
-
- // Test case B.
- //
- {
- b_simple s ("base");
- b_base b ("base", "foo");
- b_derived d ("base", "foo", "bar");
- b_type t ("base");
- }
-
- // Test case C.
- //
- {
- c_simple s (c_enum::a);
- c_base b (c_enum::a, "foo");
- c_derived d (c_enum::a, "foo", "bar");
- c_type t (c_enum::a);
- }
-
- // Test case D.
- //
- {
- d_simple s (1);
- d_base b (1, "foo");
- d_derived d (1, "foo", "bar");
- d_type t (1);
- }
-
- // Test case E.
- //
- {
- // e_base
- //
- e_base b1 (1, "foo", e_complex_type ("bar"));
-
- XSD_AUTO_PTR<e_complex_type> c2 (new e_complex_type ("bar"));
- e_base b2 (1, "foo", XSD_MOVE (c2));
-
- XSD_AUTO_PTR<e_simple_type> s3 (new e_simple_type ("foo"));
- XSD_AUTO_PTR<e_complex_type> c3 (new e_complex_type ("bar"));
- e_base b3 (1, XSD_MOVE (s3), XSD_MOVE (c3));
-
- assert (b1 == b2);
- assert (b1 == b3);
-
- // e_derived
- //
- e_derived d1 (1, "foo", e_complex_type ("bar"),
- true, "baz", e_complex_type ("biz"));
-
- XSD_AUTO_PTR<e_complex_type> c2a (new e_complex_type ("bar"));
- XSD_AUTO_PTR<e_complex_type> c2b (new e_complex_type ("biz"));
- e_derived d2 (1, "foo", XSD_MOVE (c2a), true, "baz", XSD_MOVE (c2b));
-
- XSD_AUTO_PTR<e_simple_type> s3a (new e_simple_type ("foo"));
- XSD_AUTO_PTR<xml_schema::string> s3b (new xml_schema::string ("baz"));
- XSD_AUTO_PTR<e_complex_type> c3a (new e_complex_type ("bar"));
- XSD_AUTO_PTR<e_complex_type> c3b (new e_complex_type ("biz"));
- e_derived d3 (1,
- XSD_MOVE (s3a),
- XSD_MOVE (c3a),
- true,
- XSD_MOVE (s3b),
- XSD_MOVE (c3b));
-
- assert (d1 == d2);
- assert (d1 == d3);
-
- }
-
- // Test case F.
- //
- {
- f_type f1 (xml_schema::type (), 1, "foo", f_complex_type ("bar"));
-
- XSD_AUTO_PTR<f_complex_type> c2 (new f_complex_type ("bar"));
- f_type f2 (1, "foo", XSD_MOVE (c2));
-
- XSD_AUTO_PTR<f_simple_type> s3 (new f_simple_type ("foo"));
- XSD_AUTO_PTR<f_complex_type> c3 (new f_complex_type ("bar"));
- f_type f3 (1, XSD_MOVE (s3), XSD_MOVE (c3));
-
- assert (f1 == f2);
- assert (f1 == f3);
- }
-}
diff --git a/tests/cxx/tree/complex/ctor/makefile b/tests/cxx/tree/complex/ctor/makefile
deleted file mode 100644
index db592ff..0000000
--- a/tests/cxx/tree/complex/ctor/makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# file : tests/cxx/tree/complex/ctor/makefile
-# 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 += --generate-default-ctor --generate-from-base-ctor \
---generate-doxygen --generate-polymorphic --polymorphic-type-all \
---generate-comparison
-$(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/tests/cxx/tree/complex/ctor/test.xsd b/tests/cxx/tree/complex/ctor/test.xsd
deleted file mode 100644
index b8dd95e..0000000
--- a/tests/cxx/tree/complex/ctor/test.xsd
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <!-- Test case A: several levels of inheritance with ultimate base. -->
-
- <complexType name="a_base">
- <simpleContent>
- <extension base="string">
- <attribute name="foo" type="string" use="required"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <complexType name="a_derived">
- <simpleContent>
- <extension base="t:a_base">
- <attribute name="bar" type="string" use="required"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <!-- Test case B: string-based c-tors. -->
-
- <simpleType name="b_simple">
- <restriction base="string">
- </restriction>
- </simpleType>
-
- <complexType name="b_base">
- <simpleContent>
- <extension base="t:b_simple">
- <attribute name="foo" type="string" use="required"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <complexType name="b_derived">
- <simpleContent>
- <extension base="t:b_base">
- <attribute name="bar" type="string" use="required"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <complexType name="b_type">
- <sequence>
- <element name="a" type="t:b_simple"/>
- </sequence>
- </complexType>
-
- <!-- Test case C: enum-based c-tors. -->
-
- <simpleType name="c_enum_base">
- <restriction base="string">
- <enumeration value="a"/>
- <enumeration value="b"/>
- <enumeration value="c"/>
- </restriction>
- </simpleType>
-
- <simpleType name="c_enum">
- <restriction base="t:c_enum_base">
- <enumeration value="a"/>
- <enumeration value="c"/>
- </restriction>
- </simpleType>
-
- <simpleType name="c_simple">
- <restriction base="t:c_enum">
- </restriction>
- </simpleType>
-
- <complexType name="c_base">
- <simpleContent>
- <extension base="t:c_simple">
- <attribute name="foo" type="string" use="required"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <complexType name="c_derived">
- <simpleContent>
- <extension base="t:c_base">
- <attribute name="bar" type="string" use="required"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <complexType name="c_type">
- <sequence>
- <element name="a" type="t:c_simple"/>
- </sequence>
- </complexType>
-
- <!-- Test case D: fundamental type c-tors. -->
-
- <simpleType name="d_simple">
- <restriction base="int">
- </restriction>
- </simpleType>
-
- <complexType name="d_base">
- <simpleContent>
- <extension base="t:d_simple">
- <attribute name="foo" type="string" use="required"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <complexType name="d_derived">
- <simpleContent>
- <extension base="t:d_base">
- <attribute name="bar" type="string" use="required"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <complexType name="d_type">
- <sequence>
- <element name="a" type="t:d_simple"/>
- </sequence>
- </complexType>
-
- <!-- Test case E: auto_ptr ctors. -->
-
- <simpleType name="e_simple_type">
- <restriction base="string">
- </restriction>
- </simpleType>
-
- <complexType name="e_complex_type">
- <sequence>
- <element name="a" type="string"/>
- </sequence>
- </complexType>
-
- <complexType name="e_base">
- <sequence>
- <element name="fund" type="int"/>
- <element name="simple" type="t:e_simple_type"/>
- <element name="complex" type="t:e_complex_type"/>
- </sequence>
- </complexType>
-
- <complexType name="e_derived">
- <complexContent>
- <extension base="t:e_base">
- <sequence>
- <element name="fund1" type="boolean"/>
- <element name="simple1" type="string"/>
- <element name="complex1" type="t:e_complex_type"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- Test case F: auto_ptr args in c-tor (all-non-optional-members) -->
-
- <simpleType name="f_simple_type">
- <restriction base="string">
- </restriction>
- </simpleType>
-
- <complexType name="f_complex_type">
- <sequence>
- <element name="a" type="string"/>
- </sequence>
- </complexType>
-
- <complexType name="f_type">
- <complexContent>
- <restriction base="anyType">
- <sequence>
- <element name="fund" type="int"/>
- <element name="simple" type="t:f_simple_type"/>
- <element name="complex" type="t:f_complex_type"/>
- </sequence>
- </restriction>
- </complexContent>
- </complexType>
-
-</schema>
diff --git a/tests/cxx/tree/complex/makefile b/tests/cxx/tree/complex/makefile
deleted file mode 100644
index 95ff3f6..0000000
--- a/tests/cxx/tree/complex/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# file : tests/cxx/tree/complex/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
-
-tests := ctor
-
-default := $(out_base)/
-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)))
-
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
diff --git a/tests/cxx/tree/containment/driver.cxx b/tests/cxx/tree/containment/driver.cxx
deleted file mode 100644
index 954b76b..0000000
--- a/tests/cxx/tree/containment/driver.cxx
+++ /dev/null
@@ -1,118 +0,0 @@
-// file : tests/cxx/tree/containment/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test tree node containment.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
-
-#include "test.hxx"
-
-#ifdef XSD_CXX11
-# include <utility> // std::move
-# define XSD_MOVE(x) std::move(x)
-#else
-# define XSD_MOVE(x) x
-#endif
-
-using namespace std;
-using namespace test;
-
-int
-main ()
-{
- // Change of a container in a sub-tree without ID.
- //
- {
- XSD_AUTO_PTR<inner> i (new inner ());
- i->ref ("foo");
-
- outer o;
- o.i (XSD_MOVE (i));
- o.ref ("foo");
-
- assert (o.i ()->ref ()->get () == 0);
- assert (o.ref ()->get () == 0);
- }
-
- // Change of container in a sub-tree with ID inside.
- //
- {
- XSD_AUTO_PTR<inner> i (new inner ());
- inner* p (i.get ());
- i->id ("foo");
- i->ref ("foo");
- assert (i->ref ()->get () == p);
-
- outer o;
- o.i (XSD_MOVE (i));
- o.ref ("foo");
-
- assert (o.i ()->ref ()->get () == p);
- assert (o.ref ()->get () == p);
- }
-
- // Change of a container in ID.
- //
- {
- XSD_AUTO_PTR<xml_schema::id> id (new xml_schema::id ("foo"));
-
- inner i;
- i.id (XSD_MOVE (id));
- i.ref ("foo");
- assert (i.ref ()->get () == &i);
- }
-
- // Change of a container in a type derived from ID with ID inside.
- //
- {
- XSD_AUTO_PTR<id_ex> id (new id_ex ("foo"));
- id_ex* p (id.get ());
- id->id ("bar");
-
- inner i;
- i.id_ex (XSD_MOVE (id));
-
- i.ref ("foo");
- assert (i.ref ()->get () == &i);
-
- i.ref ("bar");
- assert (i.ref ()->get () == p);
- }
-
- // IDREF lists
- //
- {
- id i1 ("a"), i2 ("b");
-
- XSD_AUTO_PTR<ids> ic (new ids);
- ic->id ().push_back (i1);
- ic->id ().push_back (i2);
-
- XSD_AUTO_PTR<xml_schema::idrefs> r1 (new xml_schema::idrefs);
- r1->push_back (xml_schema::idref ("a"));
- r1->push_back (xml_schema::idref ("b"));
-
- XSD_AUTO_PTR<idref_list> r2 (new idref_list);
- r2->push_back (xml_schema::idref ("a"));
- r2->push_back (xml_schema::idref ("b"));
-
- XSD_AUTO_PTR<idrefs1> rc1 (new idrefs1);
- XSD_AUTO_PTR<idrefs2> rc2 (new idrefs2);
-
- rc1->idrefs (XSD_MOVE (r1));
- rc2->idrefs (XSD_MOVE (r2));
-
- model m;
- m.ids (XSD_MOVE (ic));
- m.idrefs1 (XSD_MOVE (rc1));
- m.idrefs2 (XSD_MOVE (rc2));
-
- assert (m.idrefs1 ().idrefs ()[0].get () != 0);
- assert (m.idrefs1 ().idrefs ()[1].get () != 0);
-
- assert (m.idrefs2 ().idrefs ()[0].get () != 0);
- assert (m.idrefs2 ().idrefs ()[1].get () != 0);
- }
-}
diff --git a/tests/cxx/tree/containment/makefile b/tests/cxx/tree/containment/makefile
deleted file mode 100644
index dc7ca7b..0000000
--- a/tests/cxx/tree/containment/makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# file : tests/cxx/tree/containment/makefile
-# 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 += --generate-default-ctor
-$(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/tests/cxx/tree/containment/test.xsd b/tests/cxx/tree/containment/test.xsd
deleted file mode 100644
index 72c9379..0000000
--- a/tests/cxx/tree/containment/test.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="id-ex">
- <simpleContent>
- <extension base="ID">
- <attribute name="id" type="ID"/>
- </extension>
- </simpleContent>
- </complexType>
-
- <complexType name="inner">
- <sequence>
- <element name="id" type="ID" minOccurs="0"/>
- <element name="id-ex" type="t:id-ex" minOccurs="0"/>
- <element name="ref" type="IDREF" minOccurs="0"/>
- </sequence>
- </complexType>
-
- <complexType name="outer">
- <sequence>
- <element name="i" type="t:inner" minOccurs="0"/>
- <element name="ref" type="IDREF" minOccurs="0"/>
- </sequence>
- </complexType>
-
- <!-- IDREF lists -->
-
- <complexType name="id">
- <attribute name="id" type="ID" use="required"/>
- </complexType>
-
- <complexType name="ids">
- <sequence>
- <element name="id" type="t:id" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
- <complexType name="idrefs1">
- <attribute name="idrefs" type="IDREFS" use="required"/>
- </complexType>
-
- <simpleType name="idref-list">
- <list itemType="IDREF"/>
- </simpleType>
-
- <complexType name="idrefs2">
- <attribute name="idrefs" type="t:idref-list" use="required"/>
- </complexType>
-
- <complexType name="model">
- <sequence>
- <element name="ids" type="t:ids"/>
- <element name="idrefs1" type="t:idrefs1"/>
- <element name="idrefs2" type="t:idrefs2"/>
- </sequence>
- </complexType>
-
-</schema>
diff --git a/tests/cxx/tree/default/general/driver.cxx b/tests/cxx/tree/default/general/driver.cxx
deleted file mode 100644
index 97d0a7d..0000000
--- a/tests/cxx/tree/default/general/driver.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-// file : tests/cxx/tree/default/general/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test default attribute/element values.
-//
-
-#include <memory> // std::auto_ptr/unique_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
- {
- XSD_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
deleted file mode 100644
index fc1bca1..0000000
--- a/tests/cxx/tree/default/general/makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# file : tests/cxx/tree/default/general/makefile
-# 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 += --generate-ostream --generate-serialization \
---generate-default-ctor --generate-from-base-ctor
-$(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=.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/tests/cxx/tree/default/general/output b/tests/cxx/tree/default/general/output
deleted file mode 100644
index 396a698..0000000
--- a/tests/cxx/tree/default/general/output
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<t:root xmlns:t="test" base64_bin1="" base64_bin2="YmFzZTY0IGJpbmFyeQ==&#xA;" 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" hex_bin1="" hex_bin2="6865782052696E617279" 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
deleted file mode 100644
index 11bd0a7..0000000
--- a/tests/cxx/tree/default/general/test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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
deleted file mode 100644
index 9d9cd38..0000000
--- a/tests/cxx/tree/default/general/test.xsd
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <!-- union -->
-
- <xs:simpleType name="union">
- <xs:union memberTypes="xs:int xs:string"/>
- </xs:simpleType>
-
- <xs:complexType name="union-test">
- <xs:attribute default="abc" name="a" type="t:union"/>
- </xs:complexType>
-
- <!-- list -->
-
- <xs:simpleType name="fix-list">
- <xs:list itemType="xs:int"/>
- </xs:simpleType>
-
- <xs:simpleType name="var-list">
- <xs:list itemType="xs:string"/>
- </xs:simpleType>
-
- <xs:simpleType name="list-item">
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
- <xs:simpleType name="usr-list">
- <xs:list itemType="t:list-item"/>
- </xs:simpleType>
-
- <xs:simpleType name="union-list">
- <xs:list itemType="t:union"/>
- </xs:simpleType>
-
- <xs:complexType name="list-test">
- <xs:attribute default="123 345 678" name="a" type="t:fix-list"/>
- <xs:attribute default=" ab cd ef " name="b" type="t:var-list"/>
- <xs:attribute default="abc" name="c" type="t:usr-list"/>
- <xs:attribute default="abc def" name="d" type="t:union-list"/>
- </xs:complexType>
-
- <!-- simple type -->
-
- <xs:simpleType name="int-base">
- <xs:restriction base="xs:int"/>
- </xs:simpleType>
-
- <xs:simpleType name="str-base">
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
- <xs:simpleType name="int">
- <xs:restriction base="t:int-base"/>
- </xs:simpleType>
-
- <xs:simpleType name="str">
- <xs:restriction base="t:str-base"/>
- </xs:simpleType>
-
- <xs:simpleType name="union-derived">
- <xs:restriction base="t:union"/>
- </xs:simpleType>
-
- <xs:simpleType name="list-derived">
- <xs:restriction base="t:usr-list"/>
- </xs:simpleType>
-
- <xs:complexType name="simple-test">
- <xs:attribute default="123" name="a" type="t:int-base"/>
- <xs:attribute default="abc" name="b" type="t:str-base"/>
- <xs:attribute default="123" name="c" type="t:int"/>
- <xs:attribute default="abc" name="d" type="t:str"/>
- <xs:attribute default="abc" name="e" type="t:union-derived"/>
- <xs:attribute default="abc 123" name="f" type="t:list-derived"/>
- </xs:complexType>
-
- <!-- date/time types -->
-
- <xs:simpleType name="date-derived">
- <xs:restriction base="xs:date"/>
- </xs:simpleType>
-
- <xs:complexType name="date-test">
- <xs:attribute default="2009-03-31" name="a" type="xs:date"/>
- <xs:attribute default="2009-03-31Z" name="b" type="xs:date"/>
- <xs:attribute default="2009-03-31+00:00" name="c" type="xs:date"/>
- <xs:attribute default="2009-03-31-00:00" name="d" type="xs:date"/>
- <xs:attribute default="2009-03-31+12:30" name="e" type="xs:date"/>
- <xs:attribute default="2009-03-31-12:30" name="f" type="xs:date"/>
- <xs:attribute default="2002009-03-31-12:30" name="g" type="t:date-derived"/>
- </xs:complexType>
-
- <xs:complexType name="time-test">
- <xs:attribute default="12:03:45" name="a" type="xs:time"/>
- <xs:attribute default="12:03:45.123Z" name="b" type="xs:time"/>
- <xs:attribute default="12:03:05.123+00:00" name="c" type="xs:time"/>
- <xs:attribute default="12:03:45.123-00:00" name="d" type="xs:time"/>
- <xs:attribute default="12:03:45.123+12:30" name="e" type="xs:time"/>
- <xs:attribute default="12:03:45-12:30" name="f" type="xs:time"/>
- </xs:complexType>
-
- <xs:complexType name="date-time-test">
- <xs:attribute default="2009-03-31T12:03:45" name="a" type="xs:dateTime"/>
- <xs:attribute default="2009-03-31T12:03:45.123Z" name="b" type="xs:dateTime"/>
- <xs:attribute default="2002009-03-31T12:03:05.123-12:30" name="c" type="xs:dateTime"/>
- </xs:complexType>
-
- <xs:complexType name="duration-test">
- <xs:attribute default="P100Y" name="a" type="xs:duration"/>
- <xs:attribute default="P100M" name="b" type="xs:duration"/>
- <xs:attribute default="P100D" name="c" type="xs:duration"/>
- <xs:attribute default="PT12H" name="d" type="xs:duration"/>
- <xs:attribute default="PT12M" name="e" type="xs:duration"/>
- <xs:attribute default="PT12.123S" name="f" type="xs:duration"/>
- <xs:attribute default="-P100Y10M20DT12H12M1.123S" name="g" type="xs:duration"/>
- </xs:complexType>
-
- <xs:complexType name="day-test">
- <xs:attribute default="---02" name="a" type="xs:gDay"/>
- <xs:attribute default="---22Z" name="b" type="xs:gDay"/>
- <xs:attribute default="---22-12:30" name="c" type="xs:gDay"/>
- </xs:complexType>
-
- <xs:complexType name="month-test">
- <xs:attribute default="--02" name="a" type="xs:gMonth"/>
- <xs:attribute default="--12Z" name="b" type="xs:gMonth"/>
- <xs:attribute default="--12+12:30" name="c" type="xs:gMonth"/>
- </xs:complexType>
-
- <xs:complexType name="year-test">
- <xs:attribute default="2009" name="a" type="xs:gYear"/>
- <xs:attribute default="-2002009Z" name="b" type="xs:gYear"/>
- <xs:attribute default="2009-12:30" name="c" type="xs:gYear"/>
- </xs:complexType>
-
- <xs:complexType name="month-day-test">
- <xs:attribute default="--02-02" name="a" type="xs:gMonthDay"/>
- <xs:attribute default="--12-22Z" name="b" type="xs:gMonthDay"/>
- <xs:attribute default="--12-22+12:30" name="c" type="xs:gMonthDay"/>
- </xs:complexType>
-
- <xs:complexType name="year-month-test">
- <xs:attribute default="2009-02" name="a" type="xs:gYearMonth"/>
- <xs:attribute default="-2002009-12Z" name="b" type="xs:gYearMonth"/>
- <xs:attribute default="2009-12-12:30" name="c" type="xs:gYearMonth"/>
- </xs:complexType>
-
-
- <xs:complexType name="type">
- <xs:sequence>
- <xs:element name="union" type="t:union-test"/>
- <xs:element name="list" type="t:list-test"/>
- <xs:element name="simple" type="t:simple-test"/>
- <xs:element name="date" type="t:date-test"/>
- <xs:element name="time" type="t:time-test"/>
- <xs:element name="date-time" type="t:date-time-test"/>
- <xs:element name="duration" type="t:duration-test"/>
- <xs:element name="day" type="t:day-test"/>
- <xs:element name="month" type="t:month-test"/>
- <xs:element name="year" type="t:year-test"/>
- <xs:element name="month-day" type="t:month-day-test"/>
- <xs:element name="year-month" type="t:year-month-test"/>
- </xs:sequence>
-
-<!--
- <xs:attribute name="any" type="xs:anySimpleType" default=""/>
--->
-
- <xs:attribute name="bool1" type="xs:boolean" default="true"/>
- <xs:attribute name="bool2" type="xs:boolean" default="1"/>
- <xs:attribute name="bool3" type="xs:boolean" default="false"/>
- <xs:attribute name="bool4" type="xs:boolean" default="0"/>
-
- <xs:attribute name="byte" type="xs:byte" default="-99"/>
- <xs:attribute name="ubyte" type="xs:unsignedByte" default="99"/>
- <xs:attribute name="short" type="xs:short" default="-999"/>
- <xs:attribute name="ushort" type="xs:unsignedShort" default="999"/>
- <xs:attribute name="int" type="xs:int" default="-99999"/>
- <xs:attribute name="uint" type="xs:unsignedInt" default="99999"/>
- <xs:attribute name="long" type="xs:long" default="-99999"/>
- <xs:attribute name="ulong" type="xs:unsignedLong" default="99999"/>
-
- <xs:attribute name="integer" type="xs:integer" default="-99999"/>
- <xs:attribute name="npinteger" type="xs:nonPositiveInteger" default="-99999"/>
- <xs:attribute name="nninteger" type="xs:nonNegativeInteger" default="99999"/>
- <xs:attribute name="pinteger" type="xs:positiveInteger" default="99999"/>
- <xs:attribute name="ninteger" type="xs:negativeInteger" default="-99999"/>
-
- <xs:attribute name="float1" type="xs:float" default="1.123"/>
- <xs:attribute name="float2" type="xs:float" default="1.123e3"/>
- <xs:attribute name="float3" type="xs:float" default="-.123E-3"/>
- <xs:attribute name="float4" type="xs:float" default="NaN"/>
- <xs:attribute name="float5" type="xs:float" default="-INF"/>
-
- <xs:attribute name="double1" type="xs:double" default="1.12345"/>
- <xs:attribute name="double2" type="xs:double" default="1.12345e3"/>
- <xs:attribute name="double3" type="xs:double" default="-.12345E-3"/>
- <xs:attribute name="double4" type="xs:double" default="NaN"/>
- <xs:attribute name="double5" type="xs:double" default="-INF"/>
-
- <xs:attribute name="decimal1" type="xs:decimal" default="1.12345"/>
- <xs:attribute name="decimal2" type="xs:decimal" default="-.456"/>
-
- <xs:attribute name="string1" type="xs:string" default=""/>
- <xs:attribute name="string2" type="xs:string" default=" a b "/>
- <xs:attribute name="nstring" type="xs:normalizedString" default=" a b "/>
- <xs:attribute name="token" type="xs:token" default=" a b "/>
- <xs:attribute name="nmtoken" type="xs:NMTOKEN" default="ab:cd"/>
- <xs:attribute name="nmtokens1" type="xs:NMTOKENS" default=" a:b efg aaa "/>
- <xs:attribute name="nmtokens2" type="xs:NMTOKENS" default="abc"/>
- <xs:attribute name="ncname" type="xs:NCName" default=" abcd "/>
- <xs:attribute name="language" type="xs:language" default=" en-us "/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:attribute name="idref" type="xs:IDREF" default="this"/>
- <xs:attribute name="idrefs" type="xs:IDREFS" default=" this "/>
- <xs:attribute name="uri" type="xs:anyURI" default=" http://example.com "/>
-
- <xs:attribute name="qname1" type="xs:QName" default="foo"/>
- <xs:attribute name="qname2" type="xs:QName" default="t:bar"/>
-
- <xs:attribute name="base64_bin1" type="xs:base64Binary" default=""/>
- <xs:attribute name="base64_bin2" type="xs:base64Binary" default="YmFzZTY0IGJpbmFyeQ=="/>
-
- <xs:attribute name="hex_bin1" type="xs:hexBinary" default=""/>
- <xs:attribute name="hex_bin2" type="xs:hexBinary" default="6865782052696E617279"/>
-
- <!-- fixed -->
-
- <xs:attribute name="fix1" type="xs:int" fixed="123"/>
- <xs:attribute name="fix2" type="xs:int" fixed="123" use="required"/>
- <xs:attribute name="fix3" type="xs:string" fixed="abc"/>
- <xs:attribute name="fix4" type="xs:string" fixed="abc" use="required"/>
- <xs:attribute name="fix5" type="xs:NMTOKENS" fixed="aaa bbb ccc"/>
- <xs:attribute name="fix6" type="xs:NMTOKENS" fixed="aaa bbb ccc" use="required"/>
-
- </xs:complexType>
-
- <xs:element name="root" type="t:type"/>
-
-</xs:schema>
diff --git a/tests/cxx/tree/default/makefile b/tests/cxx/tree/default/makefile
deleted file mode 100644
index 304640e..0000000
--- a/tests/cxx/tree/default/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# file : tests/cxx/tree/default/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
-
-tests := general omit
-
-default := $(out_base)/
-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)))
-
-$(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
deleted file mode 100644
index e588a34..0000000
--- a/tests/cxx/tree/default/omit/driver.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-// file : tests/cxx/tree/default/omit/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test default attribute omission from the output.
-//
-
-#include <memory> // std::auto_ptr/unique_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
- {
- XSD_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
deleted file mode 100644
index 93a9cd2..0000000
--- a/tests/cxx/tree/default/omit/makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# file : tests/cxx/tree/default/omit/makefile
-# 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 += --generate-ostream --generate-serialization \
---generate-default-ctor --generate-from-base-ctor --omit-default-attributes
-$(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=.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/tests/cxx/tree/default/omit/output b/tests/cxx/tree/default/omit/output
deleted file mode 100644
index 150ad58..0000000
--- a/tests/cxx/tree/default/omit/output
+++ /dev/null
@@ -1,19 +0,0 @@
-
-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
deleted file mode 100644
index dec39b4..0000000
--- a/tests/cxx/tree/default/omit/test.xml
+++ /dev/null
@@ -1,9 +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>
-
-</t:root>
diff --git a/tests/cxx/tree/default/omit/test.xsd b/tests/cxx/tree/default/omit/test.xsd
deleted file mode 100644
index bfc68d4..0000000
--- a/tests/cxx/tree/default/omit/test.xsd
+++ /dev/null
@@ -1,30 +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="type">
- <sequence>
- <element name="derived" type="t:derived"/>
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/tree/detach/driver.cxx b/tests/cxx/tree/detach/driver.cxx
deleted file mode 100644
index d1a8f6f..0000000
--- a/tests/cxx/tree/detach/driver.cxx
+++ /dev/null
@@ -1,108 +0,0 @@
-// file : tests/cxx/tree/detach/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the detach functionality.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
-
-#include "test.hxx"
-
-#ifdef XSD_CXX11
-# include <utility> // std::move
-# define XSD_MOVE(x) std::move(x)
-#else
-# define XSD_MOVE(x) x
-#endif
-
-using namespace std;
-using namespace test;
-
-int
-main ()
-{
- using test::ref;
-
- // Construct the model.
- //
- object o1 ("o1");
- o1.data ().push_back ("1-1");
- o1.data ().push_back ("1-2");
- o1.data ().push_back ("1-3");
-
- object o2 ("o2");
- o1.data ().push_back ("2-1");
- o1.data ().push_back ("2-2");
- o1.data ().push_back ("2-3");
-
- object o3 ("o3");
- o1.data ().push_back ("3-1");
- o1.data ().push_back ("3-2");
- o1.data ().push_back ("3-3");
-
- object o4 ("o4");
- o1.data ().push_back ("4-1");
- o1.data ().push_back ("4-2");
- o1.data ().push_back ("4-3");
-
- subtree s1;
- s1.o ().push_back (o1);
- s1.o ().push_back (o2);
- s1.r ().push_back (ref ("o2"));
- s1.r ().push_back (ref ("o3"));
-
- subtree s2;
- s2.o ().push_back (o3);
- s2.o ().push_back (o4);
- s2.r ().push_back (ref ("o4"));
- s2.r ().push_back (ref ("o1"));
-
- model m;
- m.one (s1);
- m.opt (s2);
-
- // Detach one.
- //
- XSD_AUTO_PTR<subtree> p (m.detach_one ());
- assert (p->_container () == 0);
- assert (p->r ()[0].get () == &p->o ()[1]);
- assert (m.opt ()->r ()[1].get () == 0);
-
- m.one (XSD_MOVE (p));
- assert (m.opt ()->r ()[1].get () == &m.one ().o ()[0]);
- p = m.detach_one ();
-
- model m1;
- m1.one (XSD_MOVE (p));
- m1.opt (s2);
- assert (m1.opt ()->r ()[1].get () == &m1.one ().o ()[0]);
-
- p = m1.detach_one ();
- m.seq ().push_back (XSD_MOVE (p));
-
- // Detach opt.
- //
- p = m.opt ().detach ();
- assert (!m.opt ());
- assert (p->_container () == 0);
- assert (p->r ()[0].get () == &p->o ()[1]);
- assert (m.seq ()[0].r ()[1].get () == 0);
-
- m.seq ().push_back (XSD_MOVE (p));
-
- // Detach seq.
- //
- p = m.seq ().detach_back ();
- assert (p->_container () == 0);
- assert (p->r ()[0].get () == &p->o ()[1]);
- assert (m.seq ()[0].r ()[1].get () == 0);
-
- m.seq ().push_back (XSD_MOVE (p));
- assert (m.seq ()[0].r ()[1].get () == &m.seq ()[1].o ()[0]);
-
- m.seq ().detach (m.seq ().begin (), p);
- assert (p->_container () == 0);
- assert (p->r ()[0].get () == &p->o ()[1]);
- assert (m.seq ()[0].r ()[1].get () == 0);
-}
diff --git a/tests/cxx/tree/detach/makefile b/tests/cxx/tree/detach/makefile
deleted file mode 100644
index 56c59fa..0000000
--- a/tests/cxx/tree/detach/makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# file : tests/cxx/tree/detach/makefile
-# 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 += --generate-detach --generate-default-ctor
-$(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/tests/cxx/tree/detach/test.xsd b/tests/cxx/tree/detach/test.xsd
deleted file mode 100644
index b9f5166..0000000
--- a/tests/cxx/tree/detach/test.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="object">
- <sequence>
- <element name="data" type="string" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="id" type="ID" use="required"/>
- </complexType>
-
- <complexType name="ref">
- <simpleContent>
- <extension base="IDREF"/>
- </simpleContent>
- </complexType>
-
- <complexType name="subtree">
- <sequence>
- <element name="o" type="t:object" minOccurs="0" maxOccurs="unbounded"/>
- <element name="r" type="t:ref" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
- <complexType name="model">
- <sequence>
- <element name="one" type="t:subtree"/>
- <element name="opt" type="t:subtree" minOccurs="0"/>
- <element name="seq" type="t:subtree" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
-</schema>
diff --git a/tests/cxx/tree/dom-association/dom-parse.cxx b/tests/cxx/tree/dom-association/dom-parse.cxx
deleted file mode 100644
index 0d26d02..0000000
--- a/tests/cxx/tree/dom-association/dom-parse.cxx
+++ /dev/null
@@ -1,95 +0,0 @@
-// file : tests/cxx/tree/dom-association/dom-parse.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-#include "dom-parse.hxx"
-
-#include <istream>
-
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/util/XMLUniDefs.hpp> // chLatin_*
-#include <xercesc/framework/Wrapper4InputSource.hpp>
-
-#include <xsd/cxx/xml/sax/std-input-source.hxx>
-#include <xsd/cxx/xml/dom/bits/error-handler-proxy.hxx>
-
-#include <xsd/cxx/tree/exceptions.hxx>
-#include <xsd/cxx/tree/error-handler.hxx>
-
-using namespace xercesc;
-namespace xml = xsd::cxx::xml;
-namespace tree = xsd::cxx::tree;
-
-XSD_DOM_AUTO_PTR<DOMDocument>
-parse (std::istream& is,
- const std::string& id,
- bool validate)
-{
- const XMLCh ls_id [] = {chLatin_L, chLatin_S, chNull};
-
- // Get an implementation of the Load-Store (LS) interface.
- //
- DOMImplementation* impl (
- DOMImplementationRegistry::getDOMImplementation (ls_id));
-
- XSD_DOM_AUTO_PTR<DOMLSParser> parser (
- impl->createLSParser (DOMImplementationLS::MODE_SYNCHRONOUS, 0));
-
- DOMConfiguration* conf (parser->getDomConfig ());
-
- // Discard comment nodes in the document.
- //
- conf->setParameter (XMLUni::fgDOMComments, false);
-
- // Enable datatype normalization.
- //
- conf->setParameter (XMLUni::fgDOMDatatypeNormalization, true);
-
- // Do not create EntityReference nodes in the DOM tree. No
- // EntityReference nodes will be created, only the nodes
- // corresponding to their fully expanded substitution text
- // will be created.
- //
- conf->setParameter (XMLUni::fgDOMEntities, false);
-
- // Perform namespace processing.
- //
- conf->setParameter (XMLUni::fgDOMNamespaces, true);
-
- // Do not include ignorable whitespace in the DOM tree.
- //
- conf->setParameter (XMLUni::fgDOMElementContentWhitespace, false);
-
- // Enable/Disable validation.
- //
- conf->setParameter (XMLUni::fgDOMValidate, validate);
- conf->setParameter (XMLUni::fgXercesSchema, validate);
- conf->setParameter (XMLUni::fgXercesSchemaFullChecking, false);
-
- // Xerces-C++ 3.1.0 is the first version with working multi import
- // support.
- //
-#if _XERCES_VERSION >= 30100
- conf->setParameter (XMLUni::fgXercesHandleMultipleImports, true);
-#endif
-
- // We will release the DOM document ourselves.
- //
- conf->setParameter (XMLUni::fgXercesUserAdoptsDOMDocument, true);
-
- // Set error handler.
- //
- tree::error_handler<char> eh;
- xml::dom::bits::error_handler_proxy<char> ehp (eh);
- conf->setParameter (XMLUni::fgDOMErrorHandler, &ehp);
-
- // Prepare input stream.
- //
- xml::sax::std_input_source isrc (is, id);
- Wrapper4InputSource wrap (&isrc, false);
-
- XSD_DOM_AUTO_PTR<DOMDocument> doc (parser->parse (&wrap));
-
- eh.throw_if_failed<tree::parsing<char> > ();
-
- return doc;
-}
diff --git a/tests/cxx/tree/dom-association/dom-parse.hxx b/tests/cxx/tree/dom-association/dom-parse.hxx
deleted file mode 100644
index c1c9326..0000000
--- a/tests/cxx/tree/dom-association/dom-parse.hxx
+++ /dev/null
@@ -1,23 +0,0 @@
-// file : tests/cxx/tree/dom-association/dom-parse.hxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-#ifndef DOM_PARSE
-#define DOM_PARSE
-
-#include <string>
-#include <iosfwd>
-
-#include <xercesc/dom/DOMDocument.hpp>
-
-#include <xsd/cxx/xml/dom/auto-ptr.hxx>
-
-// Parse an XML document from the standard input stream with an
-// optional resource id. Resource id is used in diagnostics as
-// well as to locate schemas referenced from inside the document.
-//
-XSD_DOM_AUTO_PTR<xercesc::DOMDocument>
-parse (std::istream& is,
- const std::string& id,
- bool validate);
-
-#endif // DOM_PARSE
diff --git a/tests/cxx/tree/dom-association/driver.cxx b/tests/cxx/tree/dom-association/driver.cxx
deleted file mode 100644
index 44343a3..0000000
--- a/tests/cxx/tree/dom-association/driver.cxx
+++ /dev/null
@@ -1,71 +0,0 @@
-// file : tests/cxx/tree/dom-association/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test DOM association/ownership.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <fstream>
-#include <iostream>
-
-#include <xercesc/dom/DOM.hpp>
-
-#include "dom-parse.hxx"
-#include "test.hxx"
-
-using namespace std;
-using namespace test;
-using namespace xercesc;
-
-int
-main (int argc, char* argv[])
-{
- if (argc != 2)
- {
- cerr << "usage: " << argv[0] << " test.xml" << endl;
- return 1;
- }
-
- int r (0);
-
- XMLPlatformUtils::Initialize ();
-
- try
- {
- ifstream ifs;
- ifs.exceptions (ifstream::badbit | ifstream::failbit);
- ifs.open (argv[1]);
-
- DOMDocument* ptr;
-
-#ifdef XSD_CXX11
- xml_schema::dom::unique_ptr<DOMDocument> doc (parse (ifs, argv[1], true));
- ptr = doc.get ();
- unique_ptr<type> r (
- root (std::move (doc),
- xml_schema::flags::keep_dom | xml_schema::flags::own_dom));
-#else
- xml_schema::dom::auto_ptr<DOMDocument> doc (parse (ifs, argv[1], true));
- ptr = doc.get ();
- auto_ptr<type> r (
- root (doc,
- xml_schema::flags::keep_dom | xml_schema::flags::own_dom));
-#endif
-
- assert (doc.get () == 0);
- assert (r->_node ()->getOwnerDocument () == ptr);
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- r = 1;
- }
- catch (const std::ios_base::failure&)
- {
- cerr << argv[1] << ": unable to open or read failure" << endl;
- r = 1;
- }
-
- XMLPlatformUtils::Terminate ();
- return r;
-}
diff --git a/tests/cxx/tree/dom-association/makefile b/tests/cxx/tree/dom-association/makefile
deleted file mode 100644
index 6c1f44c..0000000
--- a/tests/cxx/tree/dom-association/makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# file : tests/cxx/tree/dom-association/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
-
-xsd := test.xsd
-cxx := driver.cxx dom-parse.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-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
-$(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=.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)
-
-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/tests/cxx/tree/dom-association/output b/tests/cxx/tree/dom-association/output
deleted file mode 100644
index e69de29..0000000
--- a/tests/cxx/tree/dom-association/output
+++ /dev/null
diff --git a/tests/cxx/tree/dom-association/test.xml b/tests/cxx/tree/dom-association/test.xml
deleted file mode 100644
index 624a80c..0000000
--- a/tests/cxx/tree/dom-association/test.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <a>a</a>
-
-</t:root>
diff --git a/tests/cxx/tree/dom-association/test.xsd b/tests/cxx/tree/dom-association/test.xsd
deleted file mode 100644
index 07bebc7..0000000
--- a/tests/cxx/tree/dom-association/test.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="type">
- <sequence>
- <element name="a" type="string"/>
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>
diff --git a/tests/cxx/tree/encoding/char/iso-8859-