diff --git a/ChangeLog b/ChangeLog index 3434c8b8..6d1a1af8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 18 16:40:42 CEST 2002 Daniel Veillard + + * Makefile.am xmlschemas.c: more Schemas work + * test/schemas/* result/schemas/*: added more tests coming + from the spec. + Thu Apr 18 13:52:52 CEST 2002 Daniel Veillard * HTMLtree.c: fixed & serialization bug introduced in 2.4.20 diff --git a/Makefile.am b/Makefile.am index 73106e5d..002595e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,8 +5,8 @@ SUBDIRS = include . doc example python INCLUDES = -I@srcdir@/include -I$(top_builddir)/include @THREAD_CFLAGS@ @Z_CFLAGS@ -noinst_PROGRAMS=testSAX testHTML testXPath testURI testDocbook testThreads \ - testC14N testAutomata testSchemas testRegexp +noinst_PROGRAMS=testSchemas testSAX testHTML testXPath testURI testDocbook \ + testThreads testC14N testAutomata testRegexp bin_PROGRAMS = xmllint xmlcatalog diff --git a/result/schemas/choice_0_0.err b/result/schemas/choice_0_0.err index f655977b..75e6efff 100644 --- a/result/schemas/choice_0_0.err +++ b/result/schemas/choice_0_0.err @@ -18,7 +18,5 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a Element doc content check succeeded diff --git a/result/schemas/choice_0_1.err b/result/schemas/choice_0_1.err index 63681abd..815464eb 100644 --- a/result/schemas/choice_0_1.err +++ b/result/schemas/choice_0_1.err @@ -18,7 +18,5 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b xmlSchemaValidateCallback: b, b, b Element doc content check succeeded diff --git a/result/schemas/choice_0_2.err b/result/schemas/choice_0_2.err index a4025c9d..4f46528e 100644 --- a/result/schemas/choice_0_2.err +++ b/result/schemas/choice_0_2.err @@ -18,7 +18,5 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a Element doc content check failed diff --git a/result/schemas/choice_0_3.err b/result/schemas/choice_0_3.err index a4025c9d..4f46528e 100644 --- a/result/schemas/choice_0_3.err +++ b/result/schemas/choice_0_3.err @@ -18,7 +18,5 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a Element doc content check failed diff --git a/result/schemas/choice_0_4.err b/result/schemas/choice_0_4.err index 87ec6fbb..822ffd9f 100644 --- a/result/schemas/choice_0_4.err +++ b/result/schemas/choice_0_4.err @@ -18,6 +18,4 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b Element doc content check failed diff --git a/result/schemas/choice_0_5.err b/result/schemas/choice_0_5.err index a4025c9d..4f46528e 100644 --- a/result/schemas/choice_0_5.err +++ b/result/schemas/choice_0_5.err @@ -18,7 +18,5 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a Element doc content check failed diff --git a/result/schemas/choice_0_6.err b/result/schemas/choice_0_6.err index a4025c9d..4f46528e 100644 --- a/result/schemas/choice_0_6.err +++ b/result/schemas/choice_0_6.err @@ -18,7 +18,5 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a Element doc content check failed diff --git a/result/schemas/choice_1_0.err b/result/schemas/choice_1_0.err index 306b246f..a7828a70 100644 --- a/result/schemas/choice_1_0.err +++ b/result/schemas/choice_1_0.err @@ -19,7 +19,5 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a Element doc content check succeeded diff --git a/result/schemas/choice_1_1.err b/result/schemas/choice_1_1.err index d9e0051e..2e8e23be 100644 --- a/result/schemas/choice_1_1.err +++ b/result/schemas/choice_1_1.err @@ -19,7 +19,5 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b xmlSchemaValidateCallback: b, b, b Element doc content check succeeded diff --git a/result/schemas/choice_1_2.err b/result/schemas/choice_1_2.err index 3d3bd985..9446fe16 100644 --- a/result/schemas/choice_1_2.err +++ b/result/schemas/choice_1_2.err @@ -19,7 +19,5 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a Element doc content check failed diff --git a/result/schemas/choice_1_3.err b/result/schemas/choice_1_3.err index 3d3bd985..9446fe16 100644 --- a/result/schemas/choice_1_3.err +++ b/result/schemas/choice_1_3.err @@ -19,7 +19,5 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a Element doc content check failed diff --git a/result/schemas/choice_1_4.err b/result/schemas/choice_1_4.err index 610e947d..1c763d14 100644 --- a/result/schemas/choice_1_4.err +++ b/result/schemas/choice_1_4.err @@ -19,6 +19,4 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b Element doc content check succeeded diff --git a/result/schemas/choice_1_5.err b/result/schemas/choice_1_5.err index 3d3bd985..9446fe16 100644 --- a/result/schemas/choice_1_5.err +++ b/result/schemas/choice_1_5.err @@ -19,7 +19,5 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a Element doc content check failed diff --git a/result/schemas/choice_1_6.err b/result/schemas/choice_1_6.err index 3d3bd985..9446fe16 100644 --- a/result/schemas/choice_1_6.err +++ b/result/schemas/choice_1_6.err @@ -19,7 +19,5 @@ Content model of doc: state: FINAL 3, 1 transitions: trans: removed 0 counters: -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a Element doc content check failed diff --git a/result/schemas/choice_2_0.err b/result/schemas/choice_2_0.err index 9596021e..2a782955 100644 --- a/result/schemas/choice_2_0.err +++ b/result/schemas/choice_2_0.err @@ -34,7 +34,5 @@ Content model of doc: trans: counted 0, atom 1, to 4 1 counters: 0: min 0 max 2 -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a Element doc content check succeeded diff --git a/result/schemas/choice_2_1.err b/result/schemas/choice_2_1.err index 393f6ff8..d349147e 100644 --- a/result/schemas/choice_2_1.err +++ b/result/schemas/choice_2_1.err @@ -34,8 +34,6 @@ Content model of doc: trans: counted 0, atom 1, to 4 1 counters: 0: min 0 max 2 -Building content model for a -Building content model for b xmlSchemaValidateCallback: b, b, b Element doc content check succeeded (nil) : Freed() diff --git a/result/schemas/choice_2_2.err b/result/schemas/choice_2_2.err index 041d0178..8935b611 100644 --- a/result/schemas/choice_2_2.err +++ b/result/schemas/choice_2_2.err @@ -34,8 +34,6 @@ Content model of doc: trans: counted 0, atom 1, to 4 1 counters: 0: min 0 max 2 -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a xmlSchemaValidateCallback: b, b, b Element doc content check succeeded diff --git a/result/schemas/choice_2_3.err b/result/schemas/choice_2_3.err index 1d2e304c..1f11884c 100644 --- a/result/schemas/choice_2_3.err +++ b/result/schemas/choice_2_3.err @@ -34,8 +34,6 @@ Content model of doc: trans: counted 0, atom 1, to 4 1 counters: 0: min 0 max 2 -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a xmlSchemaValidateCallback: a, a, a Element doc content check succeeded diff --git a/result/schemas/choice_2_4.err b/result/schemas/choice_2_4.err index d4ef0434..7a461a24 100644 --- a/result/schemas/choice_2_4.err +++ b/result/schemas/choice_2_4.err @@ -34,6 +34,4 @@ Content model of doc: trans: counted 0, atom 1, to 4 1 counters: 0: min 0 max 2 -Building content model for a -Building content model for b Element doc content check failed diff --git a/result/schemas/choice_2_5.err b/result/schemas/choice_2_5.err index e2fc216a..7c1fa63c 100644 --- a/result/schemas/choice_2_5.err +++ b/result/schemas/choice_2_5.err @@ -34,8 +34,6 @@ Content model of doc: trans: counted 0, atom 1, to 4 1 counters: 0: min 0 max 2 -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a xmlSchemaValidateCallback: b, b, b xmlSchemaValidateCallback: a, a, a diff --git a/result/schemas/choice_2_6.err b/result/schemas/choice_2_6.err index 2d03b134..2943d070 100644 --- a/result/schemas/choice_2_6.err +++ b/result/schemas/choice_2_6.err @@ -34,8 +34,6 @@ Content model of doc: trans: counted 0, atom 1, to 4 1 counters: 0: min 0 max 2 -Building content model for a -Building content model for b xmlSchemaValidateCallback: a, a, a xmlSchemaValidateCallback: b, b, b xmlSchemaValidateCallback: a, a, a diff --git a/result/schemas/length1_0_0 b/result/schemas/length1_0_0 new file mode 100644 index 00000000..58cbe242 --- /dev/null +++ b/result/schemas/length1_0_0 @@ -0,0 +1 @@ +./test/schemas/length1_0.xml validates diff --git a/result/schemas/length1_0_0.err b/result/schemas/length1_0_0.err new file mode 100644 index 00000000..f76c9324 --- /dev/null +++ b/result/schemas/length1_0_0.err @@ -0,0 +1,6 @@ +Type of nonNegativeInteger :basic +Type of extension 2 : ./test/schemas/length1_0.xsd:5 :basic +Type of complexContent 1 : ./test/schemas/length1_0.xsd:4 :basic +Type of length1 : ./test/schemas/length1_0.xsd:3 :basic +Type of extension 2 : ./test/schemas/length1_0.xsd:5 :basic +Type of complexContent 1 : ./test/schemas/length1_0.xsd:4 :basic diff --git a/result/schemas/po0_0_0.err b/result/schemas/po0_0_0.err index 1707abab..59b46ba1 100644 --- a/result/schemas/po0_0_0.err +++ b/result/schemas/po0_0_0.err @@ -14,9 +14,6 @@ Type of restriction 10 : ./test/schemas/po0_0.xsd:54 :empty Type of sequence 1 : ./test/schemas/po0_0.xsd:12 :elements Type of sequence 3 : ./test/schemas/po0_0.xsd:21 :elements Type of USAddress : ./test/schemas/po0_0.xsd:20 :elements -Building content model for anonelem2 -Building content model for street -Building content model for state Building content model for shipTo Content model of shipTo: regexp: '(null)' @@ -39,8 +36,6 @@ Content model of shipTo: trans: atom 4, to 5 state: FINAL 5, 0 transitions: 0 counters: -Building content model for comment -Building content model for name Building content model for item Content model of item: regexp: '(null)' @@ -66,9 +61,6 @@ Content model of item: trans: removed state: FINAL 5, 0 transitions: 0 counters: -Building content model for productName -Building content model for anonelem9 -Building content model for quantity Building content model for purchaseOrder Content model of purchaseOrder: regexp: '(null)' @@ -112,8 +104,6 @@ Content model of billTo: trans: atom 4, to 5 state: FINAL 5, 0 transitions: 0 counters: -Building content model for zip -Building content model for USPrice Building content model for items Content model of items: regexp: '(null)' @@ -127,8 +117,6 @@ Content model of items: trans: removed trans: atom 0, to 1 0 counters: -Building content model for city -Building content model for shipDate xmlSchemaValidateCallback: shipTo, shipTo, shipTo xmlSchemaValidateCallback: name, name, name xmlSchemaValidateCallback: street, street, street diff --git a/test/schemas/extension0_0.xml b/test/schemas/extension0_0.xml new file mode 100644 index 00000000..60dd3483 --- /dev/null +++ b/test/schemas/extension0_0.xml @@ -0,0 +1,7 @@ + + + Albert + Arnold + Gore + Jr + diff --git a/test/schemas/extension0_0.xsd b/test/schemas/extension0_0.xsd new file mode 100644 index 00000000..d89751a7 --- /dev/null +++ b/test/schemas/extension0_0.xsd @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/test/schemas/length1_0.xml b/test/schemas/length1_0.xml new file mode 100644 index 00000000..0a8cd3f2 --- /dev/null +++ b/test/schemas/length1_0.xml @@ -0,0 +1 @@ +25 diff --git a/test/schemas/length1_0.xsd b/test/schemas/length1_0.xsd new file mode 100644 index 00000000..8a1ba0fb --- /dev/null +++ b/test/schemas/length1_0.xsd @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/xmlschemas.c b/xmlschemas.c index a7566c31..3a96b635 100644 --- a/xmlschemas.c +++ b/xmlschemas.c @@ -2676,7 +2676,7 @@ xmlSchemaParseComplexType(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema, child = child->next; } if (IS_SCHEMA(child, "simpleContent")) { - subtype = xmlSchemaParseSimpleContent(ctxt, schema, child); + type->subtypes = xmlSchemaParseSimpleContent(ctxt, schema, child); child = child->next; } else if (IS_SCHEMA(child, "complexContent")) { type->subtypes = xmlSchemaParseComplexContent(ctxt, schema, child); @@ -3085,17 +3085,20 @@ xmlSchemaBuildContentModel(xmlSchemaElementPtr elem, const xmlChar *name) { xmlAutomataStatePtr start; -#ifdef DEBUG_CONTENT - xmlGenericError(xmlGenericErrorContext, - "Building content model for %s\n", name); -#endif - if (elem->contModel != NULL) return; if (elem->subtypes == NULL) return; if (elem->subtypes->type != XML_SCHEMA_TYPE_COMPLEX) return; + if (elem->subtypes->contentType == XML_SCHEMA_CONTENT_BASIC) + return; + +#ifdef DEBUG_CONTENT + xmlGenericError(xmlGenericErrorContext, + "Building content model for %s\n", name); +#endif + ctxt->am = xmlNewAutomata(); if (ctxt->am == NULL) { xmlGenericError(xmlGenericErrorContext, @@ -3351,9 +3354,14 @@ xmlSchemaTypeFixup(xmlSchemaTypePtr typeDecl, } } #ifdef DEBUG_TYPE - xmlGenericError(xmlGenericErrorContext, - "Type of %s : %s:%d :", name, typeDecl->node->doc->URL, - xmlGetLineNo(typeDecl->node)); + if (typeDecl->node != NULL) { + xmlGenericError(xmlGenericErrorContext, + "Type of %s : %s:%d :", name, typeDecl->node->doc->URL, + xmlGetLineNo(typeDecl->node)); + } else { + xmlGenericError(xmlGenericErrorContext, + "Type of %s :", name); + } switch (typeDecl->contentType) { case XML_SCHEMA_CONTENT_SIMPLE: xmlGenericError(xmlGenericErrorContext, @@ -4465,6 +4473,21 @@ xmlSchemaValidateComplexType(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr node) { child = xmlSchemaSkipIgnored(ctxt, type, child); } break; + case XML_SCHEMA_CONTENT_BASIC: { + if (type->subtypes != NULL) { + ctxt->type = type->subtypes; + xmlSchemaValidateComplexType(ctxt, node); + } + if (type->baseType != NULL) { + ctxt->type = type->baseType; + xmlSchemaValidateBasicType(ctxt, node); + } + if (type->attributes != NULL) { + xmlSchemaValidateAttributes(ctxt, node, type->attributes); + } + ctxt->type = type; + break; + } default: TODO xmlGenericError(xmlGenericErrorContext, @@ -4813,29 +4836,29 @@ xmlSchemaValidateElement(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr elem) { #endif } xmlSchemaValidateType(ctxt, elem, elemDecl, elemDecl->subtypes); - ret = xmlRegExecPushString(ctxt->regexp, NULL, NULL); + if (elemDecl->contModel != NULL) { + ret = xmlRegExecPushString(ctxt->regexp, NULL, NULL); #ifdef DEBUG_AUTOMATA - xmlGenericError(xmlGenericErrorContext, - "====> %s : %d\n", elem->name, ret); -#endif - if (ret == 0) { - ctxt->err = XML_SCHEMAS_ERR_ELEMCONT; - if (ctxt->error != NULL) - ctxt->error(ctxt->userData, "Element %s content check failed\n", - elem->name); - } else if (ret < 0) { - ctxt->err = XML_SCHEMAS_ERR_ELEMCONT; - if (ctxt->error != NULL) - ctxt->error(ctxt->userData, "Element %s content check failed\n", - elem->name); -#ifdef DEBUG_CONTENT - } else { xmlGenericError(xmlGenericErrorContext, - "Element %s content check succeeded\n", elem->name); + "====> %s : %d\n", elem->name, ret); +#endif + if (ret == 0) { + ctxt->err = XML_SCHEMAS_ERR_ELEMCONT; + if (ctxt->error != NULL) + ctxt->error(ctxt->userData, "Element %s content check failed\n", + elem->name); + } else if (ret < 0) { + ctxt->err = XML_SCHEMAS_ERR_ELEMCONT; + if (ctxt->error != NULL) + ctxt->error(ctxt->userData, "Element %s content check failed\n", + elem->name); +#ifdef DEBUG_CONTENT + } else { + xmlGenericError(xmlGenericErrorContext, + "Element %s content check succeeded\n", elem->name); #endif - } - if (elemDecl->contModel != NULL) { + } xmlRegFreeExecCtxt(ctxt->regexp); } /* @@ -4881,8 +4904,7 @@ xmlSchemaValidateDocument(xmlSchemaValidCtxtPtr ctxt, xmlDocPtr doc) { if (ctxt->error != NULL) ctxt->error(ctxt->userData, "Element %s not declared\n", root->name); - } - if ((elemDecl->flags & XML_SCHEMAS_ELEM_TOPLEVEL) == 0) { + } else if ((elemDecl->flags & XML_SCHEMAS_ELEM_TOPLEVEL) == 0) { ctxt->err = XML_SCHEMAS_ERR_NOTTOPLEVEL; if (ctxt->error != NULL) ctxt->error(ctxt->userData, "Root element %s not toplevel\n",