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

further xpath enhancement

Browse Source
This commit is contained in:
William M. Brack
2002-06-28 15:01:24 +00:00
parent 6000af549b
commit 692092b588
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xpath.c
View File

@ -9591,6 +9591,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
xmlNodePtr bak; xmlNodePtr bak;
xmlDocPtr bakd; xmlDocPtr bakd;
int pp; int pp;
int cs;
CHECK_ERROR0; CHECK_ERROR0;
comp = ctxt->comp; comp = ctxt->comp;
@ -9601,6 +9602,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
bakd = ctxt->context->doc; bakd = ctxt->context->doc;
bak = ctxt->context->node; bak = ctxt->context->node;
pp = ctxt->context->proximityPosition; pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
xmlXPathBooleanFunction(ctxt, 1); xmlXPathBooleanFunction(ctxt, 1);
@ -9610,6 +9612,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
ctxt->context->doc = bakd; ctxt->context->doc = bakd;
ctxt->context->node = bak; ctxt->context->node = bak;
ctxt->context->proximityPosition = pp; ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
if (ctxt->error) { if (ctxt->error) {
xmlXPathFreeObject(arg2); xmlXPathFreeObject(arg2);
@ -9625,6 +9628,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
bakd = ctxt->context->doc; bakd = ctxt->context->doc;
bak = ctxt->context->node; bak = ctxt->context->node;
pp = ctxt->context->proximityPosition; pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
xmlXPathBooleanFunction(ctxt, 1); xmlXPathBooleanFunction(ctxt, 1);
@ -9634,6 +9638,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
ctxt->context->doc = bakd; ctxt->context->doc = bakd;
ctxt->context->node = bak; ctxt->context->node = bak;
ctxt->context->proximityPosition = pp; ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
if (ctxt->error) { if (ctxt->error) {
xmlXPathFreeObject(arg2); xmlXPathFreeObject(arg2);
@ -9649,11 +9654,13 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
bakd = ctxt->context->doc; bakd = ctxt->context->doc;
bak = ctxt->context->node; bak = ctxt->context->node;
pp = ctxt->context->proximityPosition; pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
ctxt->context->doc = bakd; ctxt->context->doc = bakd;
ctxt->context->node = bak; ctxt->context->node = bak;
ctxt->context->proximityPosition = pp; ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0; CHECK_ERROR0;
equal = xmlXPathEqualValues(ctxt); equal = xmlXPathEqualValues(ctxt);
@ -9666,11 +9673,13 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
bakd = ctxt->context->doc; bakd = ctxt->context->doc;
bak = ctxt->context->node; bak = ctxt->context->node;
pp = ctxt->context->proximityPosition; pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
ctxt->context->doc = bakd; ctxt->context->doc = bakd;
ctxt->context->node = bak; ctxt->context->node = bak;
ctxt->context->proximityPosition = pp; ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0; CHECK_ERROR0;
ret = xmlXPathCompareValues(ctxt, op->value, op->value2); ret = xmlXPathCompareValues(ctxt, op->value, op->value2);
@ -9680,12 +9689,14 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
bakd = ctxt->context->doc; bakd = ctxt->context->doc;
bak = ctxt->context->node; bak = ctxt->context->node;
pp = ctxt->context->proximityPosition; pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
if (op->ch2 != -1) { if (op->ch2 != -1) {
ctxt->context->doc = bakd; ctxt->context->doc = bakd;
ctxt->context->node = bak; ctxt->context->node = bak;
ctxt->context->proximityPosition = pp; ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
} }
CHECK_ERROR0; CHECK_ERROR0;
@ -9704,11 +9715,13 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
bakd = ctxt->context->doc; bakd = ctxt->context->doc;
bak = ctxt->context->node; bak = ctxt->context->node;
pp = ctxt->context->proximityPosition; pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
ctxt->context->doc = bakd; ctxt->context->doc = bakd;
ctxt->context->node = bak; ctxt->context->node = bak;
ctxt->context->proximityPosition = pp; ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0; CHECK_ERROR0;
if (op->value == 0) if (op->value == 0)
@ -9722,11 +9735,13 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
bakd = ctxt->context->doc; bakd = ctxt->context->doc;
bak = ctxt->context->node; bak = ctxt->context->node;
pp = ctxt->context->proximityPosition; pp = ctxt->context->proximityPosition;
cs = ctxt->context->contextSize;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
CHECK_ERROR0; CHECK_ERROR0;
ctxt->context->doc = bakd; ctxt->context->doc = bakd;
ctxt->context->node = bak; ctxt->context->node = bak;
ctxt->context->proximityPosition = pp; ctxt->context->proximityPosition = pp;
ctxt->context->contextSize = cs;
total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]); total += xmlXPathCompOpEval(ctxt, &comp->steps[op->ch2]);
CHECK_ERROR0; CHECK_ERROR0;
CHECK_TYPE0(XPATH_NODESET); CHECK_TYPE0(XPATH_NODESET);