debugging of externalRef augmented/updated the regression tests Daniel

* relaxng.c: debugging of externalRef
* test/relaxng/* result/relaxng/*: augmented/updated the
  regression tests
Daniel
This commit is contained in:
Daniel Veillard 2003-01-29 23:02:33 +00:00
parent 03e6e8d489
commit e431a27d45
23 changed files with 63 additions and 26 deletions

View File

@ -1,3 +1,9 @@
Wed Jan 29 23:44:58 CET 2003 Daniel Veillard <daniel@veillard.com>
* relaxng.c: debugging of externalRef
* test/relaxng/* result/relaxng/*: augmented/updated the
regression tests
Wed Jan 29 22:06:04 CET 2003 Daniel Veillard <daniel@veillard.com>
* relaxng.c: more work on Relax-NG, implementing externalRef

View File

@ -2703,6 +2703,7 @@ static xmlRelaxNGPtr
xmlRelaxNGParseDocument(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node) {
xmlRelaxNGPtr schema = NULL;
const xmlChar *olddefine;
xmlRelaxNGGrammarPtr old;
if ((ctxt == NULL) || (node == NULL))
return (NULL);
@ -2721,8 +2722,11 @@ xmlRelaxNGParseDocument(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node) {
return(schema);
}
schema->topgrammar->parent = NULL;
old = ctxt->grammar;
ctxt->grammar = schema->topgrammar;
xmlRelaxNGParseStart(ctxt, node);
if (old != NULL)
ctxt->grammar = old;
}
ctxt->define = olddefine;
@ -3318,8 +3322,12 @@ xmlRelaxNGDumpDefine(FILE * output, xmlRelaxNGDefinePtr define) {
xmlRelaxNGDumpDefines(output, define->content);
fprintf(output, "</ref>\n");
break;
case XML_RELAXNG_DATATYPE:
case XML_RELAXNG_EXTERNALREF:
fprintf(output, "<externalRef");
xmlRelaxNGDumpDefines(output, define->content);
fprintf(output, "</externalRef>\n");
break;
case XML_RELAXNG_DATATYPE:
case XML_RELAXNG_VALUE:
TODO
break;

View File

@ -1,3 +1,3 @@
error detected at relaxng.c:4252
error detected at relaxng.c:4300
error detected at relaxng.c:4260
error detected at relaxng.c:4308
xmlRelaxNGValidateDefinition(): validated card : -1

View File

@ -1,5 +1,5 @@
xmlRelaxNGValidateAttribute(name): -1
xmlRelaxNGValidateDefinition(): validated email : 0
xmlRelaxNGValidateDefinition(): validated card : -1
error detected at relaxng.c:4300
error detected at relaxng.c:4308
xmlRelaxNGValidateDefinition(): validated addressBook : -1

View File

@ -1,3 +1,3 @@
error detected at relaxng.c:4431
error detected at relaxng.c:4439
xmlRelaxNGValidateDefinition(): validated note : 0
xmlRelaxNGValidateDefinition(): validated bad : -1

View File

@ -1,5 +1,5 @@
xmlRelaxNGValidateAttribute(preferredFormat): -1
xmlRelaxNGValidateAttribute(email): 0
xmlRelaxNGValidateAttribute(name): 0
error detected at relaxng.c:4308
error detected at relaxng.c:4316
xmlRelaxNGValidateDefinition(): validated card : -1

View File

@ -1,5 +1,5 @@
xmlRelaxNGValidateDefinition(): validated name : 0
xmlRelaxNGValidateDefinition(): validated email : 0
error detected at relaxng.c:4300
error detected at relaxng.c:4308
xmlRelaxNGValidateDefinition(): validated preferredFormat : -1
xmlRelaxNGValidateDefinition(): validated card : -1

View File

@ -1,5 +1,5 @@
xmlRelaxNGValidateAttribute(preferredFormat): -1
xmlRelaxNGValidateAttribute(email): 0
xmlRelaxNGValidateAttribute(name): 0
error detected at relaxng.c:4308
error detected at relaxng.c:4316
xmlRelaxNGValidateDefinition(): validated card : -1

View File

@ -1,5 +1,5 @@
Unimplemented block at xmlschemastypes.c:1132
error detected at relaxng.c:3510
error detected at relaxng.c:4485
error detected at relaxng.c:4300
error detected at relaxng.c:3518
error detected at relaxng.c:4493
error detected at relaxng.c:4308
xmlRelaxNGValidateDefinition(): validated vector : -1

View File

@ -1,6 +1,6 @@
Unimplemented block at xmlschemastypes.c:1132
Unimplemented block at xmlschemastypes.c:1132
error detected at relaxng.c:3698
error detected at relaxng.c:4485
error detected at relaxng.c:4300
error detected at relaxng.c:3706
error detected at relaxng.c:4493
error detected at relaxng.c:4308
xmlRelaxNGValidateDefinition(): validated vector : -1

View File

@ -1,3 +1,3 @@
error detected at relaxng.c:3673
error detected at relaxng.c:4485
error detected at relaxng.c:3681
error detected at relaxng.c:4493
xmlRelaxNGValidateDefinition(): validated vector : -1

View File

@ -1,7 +1,7 @@
Unimplemented block at xmlschemastypes.c:1135
Unimplemented block at xmlschemastypes.c:1135
Unimplemented block at xmlschemastypes.c:1135
error detected at relaxng.c:3698
error detected at relaxng.c:4485
error detected at relaxng.c:4300
error detected at relaxng.c:3706
error detected at relaxng.c:4493
error detected at relaxng.c:4308
xmlRelaxNGValidateDefinition(): validated path : -1

View File

@ -1,5 +1,5 @@
Unimplemented block at xmlschemastypes.c:1135
error detected at relaxng.c:3510
error detected at relaxng.c:4485
error detected at relaxng.c:4300
error detected at relaxng.c:3518
error detected at relaxng.c:4493
error detected at relaxng.c:4308
xmlRelaxNGValidateDefinition(): validated path : -1

View File

@ -3,5 +3,5 @@ xmlRelaxNGComputeInterleaves(interleave0)
6 groups
xmlRelaxNGValidateDefinition(): validated title : 0
xmlRelaxNGValidateDefinition(): validated title : 0
error detected at relaxng.c:4300
error detected at relaxng.c:4308
xmlRelaxNGValidateDefinition(): validated head : -1

View File

@ -1,6 +1,6 @@
xmlRelaxNGComputeInterleaves(interleave0)
6 child
6 groups
error detected at relaxng.c:4246
error detected at relaxng.c:4300
error detected at relaxng.c:4254
error detected at relaxng.c:4308
xmlRelaxNGValidateDefinition(): validated head : -1

View File

@ -4,5 +4,5 @@ xmlRelaxNGComputeInterleaves(interleave0)
xmlRelaxNGValidateDefinition(): validated title : 0
xmlRelaxNGValidateDefinition(): validated base : 0
xmlRelaxNGValidateDefinition(): validated base : 0
error detected at relaxng.c:4300
error detected at relaxng.c:4308
xmlRelaxNGValidateDefinition(): validated head : -1

View File

@ -0,0 +1 @@
./test/relaxng/tutor9_2_1.xml validates

View File

@ -0,0 +1,3 @@
xmlRelaxNGValidateDefinition(): validated a : 0
xmlRelaxNGValidateDefinition(): validated b : 0
xmlRelaxNGValidateDefinition(): validated data : 0

View File

@ -0,0 +1 @@
./test/relaxng/tutor9_2_2.xml validates

View File

@ -0,0 +1,3 @@
xmlRelaxNGValidateDefinition(): validated a : 0
xmlRelaxNGValidateDefinition(): validated b : 0
xmlRelaxNGValidateDefinition(): validated data : 0

View File

@ -0,0 +1,7 @@
<element name="data" xmlns="http://relaxng.org/ns/structure/1.0">
<choice>
<externalRef href="pattern1.rng"/>
<externalRef href="pattern2.rng"/>
</choice>
</element>

View File

@ -0,0 +1,4 @@
<data>
<a>a</a>
<b>a</b>
</data>

View File

@ -0,0 +1,4 @@
<data>
<a>a</a>
<b>a</b>
</data>