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

- xpath.c: seems I finally killed that ugly path evaluation

Browse Source 
context bug (tagged 9999 in case is is wrong)
Daniel
This commit is contained in:
Daniel Veillard
2001-01-20 21:15:50 +00:00
parent 8f4d97579a
commit 5a2b697af8
5 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jan 19 18:15:50 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* xpath.c: seems I finally killed that ugly path evaluation
context bug (tagged 9999 in case is is wrong)
Fri Jan 19 06:30:38 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr> Fri Jan 19 06:30:38 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* xpath.[ch] xpathInternals.h: added xmlXPathRegisterVariableLookup() * xpath.[ch] xpathInternals.h: added xmlXPathRegisterVariableLookup()

4
include/libxml/tree.h
View File

@ -570,6 +570,10 @@ xmlChar * xmlGetProp (xmlNodePtr node,
const xmlChar *name); const xmlChar *name);
xmlAttrPtr xmlHasProp (xmlNodePtr node, xmlAttrPtr xmlHasProp (xmlNodePtr node,
const xmlChar *name); const xmlChar *name);
xmlAttrPtr xmlSetNsProp (xmlNodePtr node,
xmlNsPtr ns,
const xmlChar *name,
const xmlChar *value);
xmlChar * xmlGetNsProp (xmlNodePtr node, xmlChar * xmlGetNsProp (xmlNodePtr node,
const xmlChar *name, const xmlChar *name,
const xmlChar *nameSpace); const xmlChar *nameSpace);

4
tree.h
View File

@ -570,6 +570,10 @@ xmlChar * xmlGetProp (xmlNodePtr node,
const xmlChar *name); const xmlChar *name);
xmlAttrPtr xmlHasProp (xmlNodePtr node, xmlAttrPtr xmlHasProp (xmlNodePtr node,
const xmlChar *name); const xmlChar *name);
xmlAttrPtr xmlSetNsProp (xmlNodePtr node,
xmlNsPtr ns,
const xmlChar *name,
const xmlChar *value);
xmlChar * xmlGetNsProp (xmlNodePtr node, xmlChar * xmlGetNsProp (xmlNodePtr node,
const xmlChar *name, const xmlChar *name,
const xmlChar *nameSpace); const xmlChar *nameSpace);

15
xpath.c
View File

@ -1241,7 +1241,10 @@ xmlXPathNewString(const xmlChar *val) {
} }
memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
ret->type = XPATH_STRING; ret->type = XPATH_STRING;
ret->stringval = xmlStrdup(val); if (val != NULL)
ret->stringval = xmlStrdup(val);
else
ret->stringval = xmlStrdup((const xmlChar *)"");
return(ret); return(ret);
} }
@ -3481,7 +3484,8 @@ xmlXPathStringFunction(xmlXPathParserContextPtr ctxt, int nargs) {
int i = 0; /* Should be first in document order !!!!! */ int i = 0; /* Should be first in document order !!!!! */
res = xmlNodeGetContent(cur->nodesetval->nodeTab[i]); res = xmlNodeGetContent(cur->nodesetval->nodeTab[i]);
valuePush(ctxt, xmlXPathNewString(res)); valuePush(ctxt, xmlXPathNewString(res));
xmlFree(res); if (res != NULL)
xmlFree(res);
} }
xmlXPathFreeObject(cur); xmlXPathFreeObject(cur);
return; return;
@ -4560,6 +4564,7 @@ xmlXPathEvalVariableReference(xmlXPathParserContextPtr ctxt) {
if (CUR != '$') { if (CUR != '$') {
XP_ERROR(XPATH_VARIABLE_REF_ERROR); XP_ERROR(XPATH_VARIABLE_REF_ERROR);
} }
NEXT;
name = xmlXPathParseQName(ctxt, &prefix); name = xmlXPathParseQName(ctxt, &prefix);
if (name == NULL) { if (name == NULL) {
XP_ERROR(XPATH_VARIABLE_REF_ERROR); XP_ERROR(XPATH_VARIABLE_REF_ERROR);
@ -4922,6 +4927,10 @@ xmlXPathEvalPathExpr(xmlXPathParserContextPtr ctxt) {
if (lc) { if (lc) {
if (CUR == '/') if (CUR == '/')
xmlXPathRoot(ctxt); xmlXPathRoot(ctxt);
else {
/* TAG:9999 */
valuePush(ctxt, xmlXPathNewNodeSet(ctxt->context->node));
}
xmlXPathEvalLocationPath(ctxt); xmlXPathEvalLocationPath(ctxt);
} else { } else {
xmlXPathEvalFilterExpr(ctxt); xmlXPathEvalFilterExpr(ctxt);
@ -5869,10 +5878,12 @@ xmlXPathEval(const xmlChar *str, xmlXPathContextPtr ctx) {
CHECK_CONTEXT(ctx) CHECK_CONTEXT(ctx)
ctxt = xmlXPathNewParserContext(str, ctx); ctxt = xmlXPathNewParserContext(str, ctx);
/**** TAG:9999
if (ctx->node != NULL) { if (ctx->node != NULL) {
init = xmlXPathNewNodeSet(ctx->node); init = xmlXPathNewNodeSet(ctx->node);
valuePush(ctxt, init); valuePush(ctxt, init);
} }
****/
xmlXPathEvalExpr(ctxt); xmlXPathEvalExpr(ctxt);
if (ctxt->value == NULL) { if (ctxt->value == NULL) {

2
xpointer.c
View File

@ -1337,10 +1337,12 @@ xmlXPtrEval(const xmlChar *str, xmlXPathContextPtr ctx) {
return(NULL); return(NULL);
ctxt = xmlXPathNewParserContext(str, ctx); ctxt = xmlXPathNewParserContext(str, ctx);
/* TAG:9999
if (ctx->node != NULL) { if (ctx->node != NULL) {
init = xmlXPathNewNodeSet(ctx->node); init = xmlXPathNewNodeSet(ctx->node);
valuePush(ctxt, init); valuePush(ctxt, init);
} }
*/
xmlXPtrEvalXPointer(ctxt); xmlXPtrEvalXPointer(ctxt);
if ((ctxt->value != NULL) && if ((ctxt->value != NULL) &&