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

Remove redefined starts and defines inside include elements

Browse Source 
When including a grammar from another grammar, we need to make sure that any
redefines of starts and includes that that grammar does inside any of its
include elements are also removed.
This commit is contained in:
Nikolai Weibull 2018-10-13 00:12:12 +02:00 committed by Daniel Veillard
parent 46da8fc529
commit c64d4efb31
9 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
relaxng.c
View File

@ -1573,6 +1573,9 @@ xmlRelaxNGRemoveRedefine(xmlRelaxNGParserCtxtPtr ctxt,
#endif
}
}
if (xmlRelaxNGRemoveRedefine(ctxt, URL, tmp->children, name) == 1) {
found = 1;
}
}
tmp = tmp2;
}

0
result/relaxng/include1_0 Normal file
View File

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

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

1
result/relaxng/include1_err Normal file
View File

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

0
result/relaxng/include1_valid Normal file
View File

12
test/relaxng/include1-0.inc Normal file
View File

@ -0,0 +1,12 @@
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
<include href="include1-1.inc">
<start>
<notAllowed/>
</start>
</include>
<start combine="choice">
<element name="b">
<empty/>
</element>
</start>
</grammar>

7
test/relaxng/include1-1.inc Normal file
View File

@ -0,0 +1,7 @@
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
<start>
<element name="c">
<empty/>
</element>
</start>
</grammar>

12
test/relaxng/include1.rng Normal file
View File

@ -0,0 +1,12 @@
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
<include href="include1-0.inc">
<start>
<notAllowed/>
</start>
</include>
<start combine="choice">
<element name="a">
<empty/>
</element>
</start>
</grammar>

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

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