c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow choice within choice in nameClass in RELAX NG

Browse Source 
The pattern nameClass allows for nested choice elements, for example

  <name>
    <choice>
      <choice>
        <name>a</name>
        <name>b</name>
      </choice>
      <name>c</name>
    </choice>
  </name>

which is semantically equivalent to

  <name>
    <choice>
      <name>a</name>
      <name>b</name>
      <name>c</name>
    </choice>
  </name>

The old code didn’t handle this correctly, as it never expected a choice inside
another choice.  This patch fixes this by flattening any nested choices.

This pattern of nested choice elements comes up in RELAX NG simplification,
where all choice elements are rewritten in this nested manner, see section 4.12
of the RELAX NG specification.
This commit is contained in:
Nikolai Weibull 2018-10-12 23:46:24 +02:00 committed by Daniel Veillard
parent 4338c310eb
commit 46da8fc529
7 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
relaxng.c
View File

@ -5363,11 +5363,15 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node,
xmlNodePtr child;
xmlRelaxNGDefinePtr last = NULL;
ret = xmlRelaxNGNewDefine(ctxt, node);
if (ret == NULL)
return (NULL);
ret->parent = def;
ret->type = XML_RELAXNG_CHOICE;
if (def->type == XML_RELAXNG_CHOICE) {
ret = def;
} else {
ret = xmlRelaxNGNewDefine(ctxt, node);
if (ret == NULL)
return (NULL);
ret->parent = def;
ret->type = XML_RELAXNG_CHOICE;
}
if (node->children == NULL) {
xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_EMPTY,
@ -5379,7 +5383,7 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node,
tmp = xmlRelaxNGParseNameClass(ctxt, child, ret);
if (tmp != NULL) {
if (last == NULL) {
last = ret->nameClass = tmp;
last = tmp;
} else {
last->next = tmp;
last = tmp;

0
result/relaxng/anyName0_0 Normal file
View File

1
result/relaxng/anyName0_0.err Normal file
View File

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

1
result/relaxng/anyName0_err Normal file
View File

@ -0,0 +1 @@
./test/relaxng/anyName0.rng validates

0
result/relaxng/anyName0_valid Normal file
View File

15
test/relaxng/anyName0.rng Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
<start>
<element>
<choice>
<choice>
<name>a</name>
<name>b</name>
</choice>
<name>c</name>
</choice>
<empty/>
</element>
</start>
</grammar>

1
test/relaxng/anyName0_0.xml Normal file
View File

@ -0,0 +1 @@
<b/>