lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

fixed a determinism detection problem exposed by ##other tests commited by

Browse Source 
* xmlregexp.c: fixed a determinism detection problem exposed by
  ##other tests commited by Kasimier, also added a small speedup
  of determinism detection.
* test/results/any6_2_0* any8_1_0* any7_1_2* any7_2_2*: added
  the results to the regression tests now
Daniel
This commit is contained in:
Daniel Veillard
2005-08-09 21:40:08 +00:00
parent 76d73f5bc5
commit 4f82c8a161
10 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Aug 9 23:37:22 CEST 2005 Daniel Veillard <daniel@veillard.com>
* xmlregexp.c: fixed a determinism detection problem exposed by
##other tests commited by Kasimier, also added a small speedup
of determinism detection.
* test/results/any6_2_0* any8_1_0* any7_1_2* any7_2_2*: added
the results to the regression tests now
Tue Aug 9 15:54:09 CEST 2005 Kasimier Buchcik <libxml2-cvs@cazic.net> Tue Aug 9 15:54:09 CEST 2005 Kasimier Buchcik <libxml2-cvs@cazic.net>
* test/schemas/any7_2.xml test/schemas/any6_2.xsd * test/schemas/any7_2.xml test/schemas/any6_2.xsd

1
result/schemas/any6_2_0 Normal file
View File

@ -0,0 +1 @@
./test/schemas/any6_0.xml validates

0
result/schemas/any6_2_0.err Normal file
View File

1
result/schemas/any7_1_2 Normal file
View File

@ -0,0 +1 @@
./test/schemas/any7_2.xml validates

0
result/schemas/any7_1_2.err Normal file
View File

1
result/schemas/any7_2_2 Normal file
View File

@ -0,0 +1 @@
./test/schemas/any7_2.xml validates

0
result/schemas/any7_2_2.err Normal file
View File

1
result/schemas/any8_1_0 Normal file
View File

@ -0,0 +1 @@
./test/schemas/any8_0.xml validates

0
result/schemas/any8_1_0.err Normal file
View File

10
xmlregexp.c
View File

@ -1981,6 +1981,8 @@ xmlFAComputesDeterminism(xmlRegParserCtxtPtr ctxt) {
state = ctxt->states[statenr]; state = ctxt->states[statenr];
if (state == NULL) if (state == NULL)
continue; continue;
if (state->nbTrans < 2)
continue;
for (transnr = 0;transnr < state->nbTrans;transnr++) { for (transnr = 0;transnr < state->nbTrans;transnr++) {
t1 = &(state->trans[transnr]); t1 = &(state->trans[transnr]);
/* /*
@ -2804,6 +2806,14 @@ xmlRegStrEqualWildcard(const xmlChar *expStr, const xmlChar *valStr) {
* Eval if we have a wildcard for the current item. * Eval if we have a wildcard for the current item.
*/ */
if (*expStr != *valStr) { if (*expStr != *valStr) {
/* if one of them starts with a wildcard make valStr be it */
if (*valStr == '*') {
const xmlChar *tmp;
tmp = valStr;
valStr = expStr;
expStr = tmp;
}
if ((*valStr != 0) && (*expStr != 0) && (*expStr++ == '*')) { if ((*valStr != 0) && (*expStr != 0) && (*expStr++ == '*')) {
do { do {
if (*valStr == XML_REG_STRING_SEPARATOR) if (*valStr == XML_REG_STRING_SEPARATOR)