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

bugfixes around the streaming patterns Daniel

Browse Source 
* pattern.c xmllint.c: bugfixes around the streaming patterns
Daniel
This commit is contained in:
Daniel Veillard 2005-01-31 00:27:50 +00:00
parent f9d169142d
commit 16ef800bd6
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon Jan 31 01:27:22 CET 2005 Daniel Veillard <daniel@veillard.com>
* pattern.c xmllint.c: bugfixes around the streaming patterns
Sun Jan 30 23:35:19 CET 2005 Daniel Veillard <daniel@veillard.com> Sun Jan 30 23:35:19 CET 2005 Daniel Veillard <daniel@veillard.com>
* Makefile.am configure.in result/pattern/simple * Makefile.am configure.in result/pattern/simple

19
pattern.c
View File

@ -1289,7 +1289,7 @@ xmlStreamCtxtAddState(xmlStreamCtxtPtr comp, int idx, int level) {
int int
xmlStreamPush(xmlStreamCtxtPtr stream, xmlStreamPush(xmlStreamCtxtPtr stream,
const xmlChar *name, const xmlChar *ns) { const xmlChar *name, const xmlChar *ns) {
int ret = 0, tmp, i, m, match, step; int ret = 0, tmp, i, m, match, step, desc, final;
xmlStreamCompPtr comp; xmlStreamCompPtr comp;
if ((stream == NULL) || (stream->nbState < 0)) if ((stream == NULL) || (stream->nbState < 0))
@ -1318,6 +1318,9 @@ xmlStreamPush(xmlStreamCtxtPtr stream,
if (step < 0) continue; if (step < 0) continue;
/* skip new states just added */ /* skip new states just added */
if (stream->states[(2 * i) + 1] > stream->level) continue; if (stream->states[(2 * i) + 1] > stream->level) continue;
/* skip continuations */
desc = comp->steps[step].flags & XML_STREAM_STEP_DESC;
if ((stream->states[(2 * i) + 1] < stream->level) && (!desc))continue;
/* discard old states */ /* discard old states */
/* something needed about old level discarded */ /* something needed about old level discarded */
@ -1344,23 +1347,29 @@ xmlStreamPush(xmlStreamCtxtPtr stream,
} }
} }
if (match) { if (match) {
if (comp->steps[step].flags & XML_STREAM_STEP_DESC) { final = comp->steps[step].flags & XML_STREAM_STEP_FINAL;
if (comp->steps[step].flags & XML_STREAM_STEP_FINAL) { if (desc) {
if (final) {
ret = 1; ret = 1;
} else { } else {
/* descending match create a new state */ /* descending match create a new state */
xmlStreamCtxtAddState(stream, step + 1, stream->level + 1); xmlStreamCtxtAddState(stream, step + 1, stream->level + 1);
} }
} else { } else {
if (comp->steps[step].flags & XML_STREAM_STEP_FINAL) { if (final) {
ret = 1; ret = 1;
#if 0
stream->states[2 * i] = -1; stream->states[2 * i] = -1;
#endif
} else { } else {
#if 0
stream->states[2 * i] = step + 1; stream->states[2 * i] = step + 1;
stream->states[2 * i + 1] = stream->level + 1; stream->states[2 * i + 1] = stream->level + 1;
#endif
xmlStreamCtxtAddState(stream, step + 1, stream->level + 1);
} }
} }
} else if (!(comp->steps[step].flags & XML_STREAM_STEP_DESC)) { } else if (!desc) {
/* didn't match, discard */ /* didn't match, discard */
stream->states[2 * i] = -1; stream->states[2 * i] = -1;
} }

9
xmllint.c
View File

@ -806,9 +806,10 @@ static void myClose(FILE *f) {
************************************************************************/ ************************************************************************/
static void processNode(xmlTextReaderPtr reader) { static void processNode(xmlTextReaderPtr reader) {
const xmlChar *name, *value; const xmlChar *name, *value;
int type; int type, empty;
type = xmlTextReaderNodeType(reader); type = xmlTextReaderNodeType(reader);
empty = xmlTextReaderIsEmptyElement(reader);
if (debug) { if (debug) {
name = xmlTextReaderConstName(reader); name = xmlTextReaderConstName(reader);
@ -822,7 +823,7 @@ static void processNode(xmlTextReaderPtr reader) {
xmlTextReaderDepth(reader), xmlTextReaderDepth(reader),
type, type,
name, name,
xmlTextReaderIsEmptyElement(reader), empty,
xmlTextReaderHasValue(reader)); xmlTextReaderHasValue(reader));
if (value == NULL) if (value == NULL)
printf("\n"); printf("\n");
@ -868,7 +869,9 @@ static void processNode(xmlTextReaderPtr reader) {
} }
} else if (type == XML_READER_TYPE_END_ELEMENT) { }
if ((type == XML_READER_TYPE_END_ELEMENT) ||
((type == XML_READER_TYPE_ELEMENT) && (empty))) {
ret = xmlStreamPop(patstream); ret = xmlStreamPop(patstream);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "xmlStreamPop() failure\n"); fprintf(stderr, "xmlStreamPop() failure\n");