From 00fdf370d37d016629b8e27326eab426c6bcb2ee Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Fri, 8 Oct 1999 09:40:39 +0000 Subject: [PATCH] Improvement of doc, Raph patch for CORBA init, support for spaces in XPath, Daniel --- ChangeLog | 6 + doc/gnome-xml.sgml | 57 ++++- doc/html/book1.html | 3 +- doc/html/gnome-xml-entities.html | 3 +- doc/html/gnome-xml-htmlparser.html | 47 ++-- doc/html/gnome-xml-htmltree.html | 23 +- doc/html/gnome-xml-parser.html | 5 +- doc/html/gnome-xml-parserinternals.html | 185 +++++++------- doc/html/gnome-xml-tree.html | 3 +- doc/html/gnome-xml-valid.html | 323 +++++------------------- doc/html/gnome-xml-xml-error.html | 29 ++- doc/html/gnome-xml-xpath.html | 41 +-- doc/html/index.sgml | 3 +- doc/html/libxml.html | 67 ++++- entities.h | 10 +- include/libxml/entities.h | 10 +- include/libxml/nanohttp.h | 3 +- include/libxml/parser.h | 2 +- include/libxml/valid.h | 3 - nanohttp.c | 9 +- nanohttp.h | 3 +- parser.c | 7 +- parser.h | 2 +- tree.c | 26 +- valid.c | 4 +- valid.h | 3 - xmlmemory.c | 8 +- xpath.c | 115 +++++---- 28 files changed, 483 insertions(+), 517 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae248b20..522f60e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Oct 8 11:37:11 CEST 1999 Daniel Veillard + + * tree.c : Raph patch for initialization of CORBA fields + * parser.c, xpath.c, ...: modification of doc comments + * xpath.c : allow spaces in xpath expressions + Mon Sep 27 10:16:43 CEST 1999 Daniel Veillard * xmlmemory.h: turning off memory debug :-( diff --git a/doc/gnome-xml.sgml b/doc/gnome-xml.sgml index c39e959b..abcae9bd 100644 --- a/doc/gnome-xml.sgml +++ b/doc/gnome-xml.sgml @@ -15,11 +15,60 @@ - Gnome XML Library Reference Manual + Gnome XML Library Reference Manual + + + Daniel + Veillard + +
+ Daniel.Veillard@w3.org +
+ + + + + 1999 + Daniel Veillard + + + + Permission is granted to make and distribute verbatim + copies of this manual provided the copyright notice and this + permission notice are preserved on all copies. + + Permission is granted to copy and distribute modified + versions of this manual under the conditions for verbatim + copying, provided also that the entire resulting derived work is + distributed under the terms of a permission notice identical to + this one. + + Permission is granted to copy and distribute translations + of this manual into another language, under the above conditions + for modified versions. + + + + This manual documents the interfaces of the libglade + library and has some short notes to help get you up to speed + with using the library. + - - Gnome XML Library + + Libxml Programming Notes + + Libxml is an XML toolkit library, it allows to parse, edit + search and write XML documents. There is also an HTML parser front-end + so the same range of tools can be used with HTML input. + + + Libxml Library Reference + + This section contains the API reference for libxml. All + the public interfaces are documented here. This reference guide is + build by extracting comments from the code sources. + &parser; &SAX; &tree; @@ -29,9 +78,9 @@ &HTMLparser; &HTMLtree; &xpath; + &nanohttp; &parserInternals; &xmlmemory; - &nanohttp; diff --git a/doc/html/book1.html b/doc/html/book1.html index 77bdef75..08f45155 100644 --- a/doc/html/book1.html +++ b/doc/html/book1.html @@ -115,7 +115,8 @@ HREF="gnome-xml-nanohttp.html" >








Name

Synopsis

Description

Details





Name

Synopsis

Description

Details





typedef enum xmlParserInputState {
+>typedef enum {
     XML_PARSER_EOF = 0,
     XML_PARSER_PROLOG,
     XML_PARSER_CONTENT,
@@ -7506,7 +7506,8 @@ VALIGN="TOP"
 >




Name
Synopsis
Description
Details








)       (void *ctx,
                                              const char *msg,
                                              ...);
-void        xmlParserValidityError          (void *ctx,
-                                             const char *msg,
-                                             ...);
-void        xmlParserValidityWarning        (void *ctx,
-                                             const char *msg,
-                                             ...);
 #define     XML_MIN_NOTATION_TABLE
Description
Details
xmlParserValidityError ()
void        xmlParserValidityError          (void *ctx,
-                                             const char *msg,
-                                             ...);
Display and format an validity error messages, gives file,
-line, position and extra parameters.
ctx : 
msg : 
... : 
xmlParserValidityWarning ()
void        xmlParserValidityWarning        (void *ctx,
-                                             const char *msg,
-                                             ...);
Display and format a validity warning messages, gives file, line,
-position and extra parameters.
ctx : 
msg : 
... : 




Name
Synopsis
xmlParserValidityError          (void *ctx,
                                              const char *msg,
                                              ...);
 void        xmlParserValidityWarning        (void *ctx,
                                              const char *msg,
@@ -187,7 +187,7 @@ HREF="gnome-xml-parser.html#XMLPARSERINPUTPTR"
 >
Description
Details




Name
Synopsis
Description
Details





 
-
-
 
 
 
@@ -409,6 +407,7 @@
 
 
 
+
 
 
 
diff --git a/doc/html/libxml.html b/doc/html/libxml.html
index d314a304..e66d6f79 100644
--- a/doc/html/libxml.html
+++ b/doc/html/libxml.html
@@ -105,10 +105,75 @@ CLASS="CHAPTER"
 NAME="LIBXML"
 >Gnome XML Library
Table of Contents
parser — 
tree — 
entities — 
valid — 
xml-error — 
HTMLparser — 
HTMLtree — 
xpath — 
parserInternals — 
xmlmemory — 
nanohttp — 



 


next = cur;
 	}
     }
+#ifndef XML_WITHOUT_CORBA
+    cur->_private = NULL;
+    cur->vepv = NULL;
+#endif    
     return(cur);
 }
 
@@ -1078,6 +1082,10 @@ xmlNewText(const xmlChar *content) {
 	cur->content = xmlStrdup(content);
     else 
 	cur->content = NULL;
+#ifndef XML_WITHOUT_CORBA
+    cur->_private = NULL;
+    cur->vepv = NULL;
+#endif    
     return(cur);
 }
 
@@ -1129,6 +1137,10 @@ xmlNewReference(xmlDocPtr doc, const xmlChar *name) {
 	cur->content = ent->content;
     else
         cur->content = NULL;
+#ifndef XML_WITHOUT_CORBA
+    cur->_private = NULL;
+    cur->vepv = NULL;
+#endif    
     return(cur);
 }
 
@@ -1186,6 +1198,10 @@ xmlNewTextLen(const xmlChar *content, int len) {
 	cur->content = xmlStrndup(content, len);
     else 
 	cur->content = NULL;
+#ifndef XML_WITHOUT_CORBA
+    cur->_private = NULL;
+    cur->vepv = NULL;
+#endif    
     return(cur);
 }
 
@@ -1244,6 +1260,10 @@ xmlNewComment(const xmlChar *content) {
 	cur->content = xmlStrdup(content);
     else 
 	cur->content = NULL;
+#ifndef XML_WITHOUT_CORBA
+    cur->_private = NULL;
+    cur->vepv = NULL;
+#endif    
     return(cur);
 }
 
@@ -1284,6 +1304,10 @@ xmlNewCDataBlock(xmlDocPtr doc, const xmlChar *content, int len) {
 	cur->content = xmlStrndup(content, len);
     } else 
 	cur->content = NULL;
+#ifndef XML_WITHOUT_CORBA
+    cur->_private = NULL;
+    cur->vepv = NULL;
+#endif    
     return(cur);
 }
 
@@ -1925,8 +1949,6 @@ xmlCopyDoc(xmlDocPtr doc, int recursive) {
  *
  * Searches the language of a node, i.e. the values of the xml:lang
  * attribute or the one carried by the nearest ancestor.
- *
- * Returns a pointer to the lang value, or NULL if not found
  */
 void
 xmlNodeSetLang(xmlNodePtr cur, const xmlChar *lang) {
diff --git a/valid.c b/valid.c
index e756b0da..123a93c3 100644
--- a/valid.c
+++ b/valid.c
@@ -297,6 +297,7 @@ xmlCreateElementTable(void) {
 
 /**
  * xmlAddElementDecl:
+ * @ctxt:  the validation context
  * @dtd:  pointer to the DTD
  * @name:  the entity name
  * @type:  the element type
@@ -2343,6 +2344,7 @@ xmlValidateElementDecl(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
  * @doc:  a document instance
  * @elem:  an element instance
  * @attr:  an attribute instance
+ * @value:  the attribute value (without entities processing)
  *
  * Try to validate a single attribute for an element
  * basically it * does the following checks as described by the
@@ -2852,8 +2854,6 @@ xmlValidateElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc, xmlNodePtr elem) {
     xmlChar *value;
     int ret = 1;
 
-    /* TODO xmlValidateElement */
-
     if (elem == NULL) return(0);
     CHECK_DTD;
 
diff --git a/valid.h b/valid.h
index 30a2a32f..73a2a543 100644
--- a/valid.h
+++ b/valid.h
@@ -29,9 +29,6 @@ typedef struct xmlValidCtxt {
     xmlValidityWarningFunc warning;	/* the callback in case of warning */
 } xmlValidCtxt, *xmlValidCtxtPtr;
 
-extern void xmlParserValidityError(void *ctx, const char *msg, ...);
-extern void xmlParserValidityWarning(void *ctx, const char *msg, ...);
-
 /*
  * ALl notation declarations are stored in a table
  * there is one table per DTD
diff --git a/xmlmemory.c b/xmlmemory.c
index 5e304f41..ca9e9c01 100644
--- a/xmlmemory.c
+++ b/xmlmemory.c
@@ -27,7 +27,6 @@
 #include "xmlmemory.h"
 
 #ifndef NO_DEBUG_MEMORY
-
 #ifdef xmlMalloc
 #undef xmlMalloc
 #endif
@@ -37,6 +36,7 @@
 #ifdef xmlMemStrdup
 #undef xmlMemStrdup
 #endif
+
 extern void xmlMemoryDump(void);
 
 /*
@@ -233,11 +233,7 @@ xmlRealloc(void *ptr,int size) {
  * @ptr:  the memory block pointer
  *
  * a free() equivalent, with error checking.
- *
- * Returns a pointer to the allocated area or NULL in case of lack of memory.
  */
-
-
 void
 xmlFree(void *ptr)
 {
@@ -468,6 +464,8 @@ xmlMemoryDump(void)
  * xmlInitMemory:
  *
  * Initialize the memory layer.
+ *
+ * Returns 0 on success
  */
 
 
diff --git a/xpath.c b/xpath.c
index 3b0c5355..3a703bb7 100644
--- a/xpath.c
+++ b/xpath.c
@@ -775,8 +775,6 @@ xmlXPathFreeObject(xmlXPathObjectPtr obj) {
 /**
  * xmlXPathNewContext:
  * @doc:  the XML document
- * @variables:  the variable list
- * @functions:  the function list
  *
  * Create a new xmlXPathContext
  *
@@ -3240,6 +3238,8 @@ xmlXPathIsFunction(xmlXPathParserContextPtr ctxt, const xmlChar *name) {
 	        return(xmlXPathNameFunction);
 	    if (!xmlStrcmp(name, BAD_CAST "namespace"))
 	        return(xmlXPathNamespaceFunction);
+	    if (!xmlStrcmp(name, BAD_CAST "normalize-space"))
+	        return(xmlXPathNormalizeFunction);
 	    if (!xmlStrcmp(name, BAD_CAST "normalize"))
 	        return(xmlXPathNormalizeFunction);
 	    if (!xmlStrcmp(name, BAD_CAST "number"))
@@ -3373,6 +3373,7 @@ xmlXPathEvalFunctionCall(xmlXPathParserContextPtr ctxt) {
     if (name == NULL) {
 	ERROR(XPATH_EXPR_ERROR);
     }
+    SKIP_BLANKS;
     func = xmlXPathIsFunction(ctxt, name);
     if (func == NULL) {
         xmlFree(name);
@@ -3387,6 +3388,7 @@ xmlXPathEvalFunctionCall(xmlXPathParserContextPtr ctxt) {
 	ERROR(XPATH_EXPR_ERROR);
     }
     NEXT;
+    SKIP_BLANKS;
 
     while (CUR != ')') {
         xmlXPathEvalExpr(ctxt);
@@ -3397,8 +3399,10 @@ xmlXPathEvalFunctionCall(xmlXPathParserContextPtr ctxt) {
 	    ERROR(XPATH_EXPR_ERROR);
 	}
 	NEXT;
+	SKIP_BLANKS;
     }
     NEXT;
+    SKIP_BLANKS;
     xmlFree(name);
     func(ctxt, nbargs);
 }
@@ -3417,14 +3421,17 @@ xmlXPathEvalFunctionCall(xmlXPathParserContextPtr ctxt) {
  */
 void
 xmlXPathEvalPrimaryExpr(xmlXPathParserContextPtr ctxt) {
+    SKIP_BLANKS;
     if (CUR == '$') xmlXPathEvalVariableReference(ctxt);
     else if (CUR == '(') {
         NEXT;
+	SKIP_BLANKS;
         xmlXPathEvalExpr(ctxt);
 	if (CUR != ')') {
 	    ERROR(XPATH_EXPR_ERROR);
 	}
 	NEXT;
+	SKIP_BLANKS;
     } else if (IS_DIGIT(CUR)) {
         xmlXPathEvalNumber(ctxt);
     } else if ((CUR == '\'') || (CUR == '"')) {
@@ -3458,6 +3465,7 @@ xmlXPathEvalFilterExpr(xmlXPathParserContextPtr ctxt) {
 
     xmlXPathEvalPrimaryExpr(ctxt);
     CHECK_ERROR;
+    SKIP_BLANKS;
     
     if (CUR != '[') return;
 
@@ -3465,6 +3473,7 @@ xmlXPathEvalFilterExpr(xmlXPathParserContextPtr ctxt) {
 
     while (CUR == '[') {
 	xmlXPathEvalPredicate(ctxt);
+	SKIP_BLANKS;
     }
 
     
@@ -3492,6 +3501,7 @@ xmlXPathScanName(xmlXPathParserContextPtr ctxt) {
     xmlChar buf[XML_MAX_NAMELEN];
     int len = 0;
 
+    SKIP_BLANKS;
     if (!IS_LETTER(CUR) && (CUR != '_') &&
         (CUR != ':')) {
 	return(NULL);
@@ -3541,12 +3551,14 @@ void
 xmlXPathEvalPathExpr(xmlXPathParserContextPtr ctxt) {
     xmlNodeSetPtr newset = NULL;
 
+    SKIP_BLANKS;
     if ((CUR == '$') || (CUR == '(') || (IS_DIGIT(CUR)) ||
         (CUR == '\'') || (CUR == '"')) {
 	xmlXPathEvalFilterExpr(ctxt);
 	CHECK_ERROR;
 	if ((CUR == '/') && (NXT(1) == '/')) {
 	    SKIP(2);
+	    SKIP_BLANKS;
 	    if (ctxt->context->nodelist == NULL) {
 		STRANGE
 		xmlXPathRoot(ctxt);
@@ -3562,6 +3574,7 @@ xmlXPathEvalPathExpr(xmlXPathParserContextPtr ctxt) {
 	    xmlXPathEvalRelativeLocationPath(ctxt);
 	}
     } else {
+        /******* !!!!!!!!!! @attname */
         xmlChar *name;
 
 	name = xmlXPathScanName(ctxt);
@@ -3588,9 +3601,12 @@ void
 xmlXPathEvalUnionExpr(xmlXPathParserContextPtr ctxt) {
     xmlXPathEvalPathExpr(ctxt);
     CHECK_ERROR;
+    SKIP_BLANKS;
     if (CUR == '|') {
 	xmlNodeSetPtr old = ctxt->context->nodelist;
 
+	NEXT;
+	SKIP_BLANKS;
 	xmlXPathEvalPathExpr(ctxt);
 
 	if (ctxt->context->nodelist == NULL)
@@ -3617,9 +3633,11 @@ void
 xmlXPathEvalUnaryExpr(xmlXPathParserContextPtr ctxt) {
     int minus = 0;
 
+    SKIP_BLANKS;
     if (CUR == '-') {
         minus = 1;
 	NEXT;
+	SKIP_BLANKS;
     }
     xmlXPathEvalUnionExpr(ctxt);
     CHECK_ERROR;
@@ -3645,6 +3663,7 @@ void
 xmlXPathEvalMultiplicativeExpr(xmlXPathParserContextPtr ctxt) {
     xmlXPathEvalUnaryExpr(ctxt);
     CHECK_ERROR;
+    SKIP_BLANKS;
     while ((CUR == '*') || 
            ((CUR == 'd') && (NXT(1) == 'i') && (NXT(2) == 'v')) ||
            ((CUR == 'm') && (NXT(1) == 'o') && (NXT(2) == 'd'))) {
@@ -3660,6 +3679,7 @@ xmlXPathEvalMultiplicativeExpr(xmlXPathParserContextPtr ctxt) {
 	    op = 2;
 	    SKIP(3);
 	}
+	SKIP_BLANKS;
         xmlXPathEvalUnaryExpr(ctxt);
 	CHECK_ERROR;
 	switch (op) {
@@ -3691,12 +3711,14 @@ void
 xmlXPathEvalAdditiveExpr(xmlXPathParserContextPtr ctxt) {
     xmlXPathEvalMultiplicativeExpr(ctxt);
     CHECK_ERROR;
+    SKIP_BLANKS;
     while ((CUR == '+') || (CUR == '-')) {
 	int plus;
 
         if (CUR == '+') plus = 1;
 	else plus = 0;
 	NEXT;
+	SKIP_BLANKS;
         xmlXPathEvalMultiplicativeExpr(ctxt);
 	CHECK_ERROR;
 	if (plus) xmlXPathAddValues(ctxt);
@@ -3726,6 +3748,7 @@ void
 xmlXPathEvalRelationalExpr(xmlXPathParserContextPtr ctxt) {
     xmlXPathEvalAdditiveExpr(ctxt);
     CHECK_ERROR;
+    SKIP_BLANKS;
     while ((CUR == '<') ||
            (CUR == '>') ||
            ((CUR == '<') && (NXT(1) == '=')) ||
@@ -3738,6 +3761,7 @@ xmlXPathEvalRelationalExpr(xmlXPathParserContextPtr ctxt) {
 	else strict = 1;
 	NEXT;
 	if (!strict) NEXT;
+	SKIP_BLANKS;
         xmlXPathEvalAdditiveExpr(ctxt);
 	CHECK_ERROR;
 	ret = xmlXPathCompareValues(ctxt, inf, strict);
@@ -3765,6 +3789,7 @@ void
 xmlXPathEvalEqualityExpr(xmlXPathParserContextPtr ctxt) {
     xmlXPathEvalRelationalExpr(ctxt);
     CHECK_ERROR;
+    SKIP_BLANKS;
     while ((CUR == '=') || ((CUR == '!') && (NXT(1) == '='))) {
 	xmlXPathObjectPtr res;
 	int eq, equal;
@@ -3773,6 +3798,7 @@ xmlXPathEvalEqualityExpr(xmlXPathParserContextPtr ctxt) {
 	else eq = 0;
 	NEXT;
 	if (!eq) NEXT;
+	SKIP_BLANKS;
         xmlXPathEvalRelationalExpr(ctxt);
 	CHECK_ERROR;
 	equal = xmlXPathEqualValues(ctxt);
@@ -3796,10 +3822,12 @@ void
 xmlXPathEvalAndExpr(xmlXPathParserContextPtr ctxt) {
     xmlXPathEvalEqualityExpr(ctxt);
     CHECK_ERROR;
+    SKIP_BLANKS;
     while ((CUR == 'a') && (NXT(1) == 'n') && (NXT(2) == 'n')) {
 	xmlXPathObjectPtr arg1, arg2;
 
         SKIP(3);
+	SKIP_BLANKS;
         xmlXPathEvalEqualityExpr(ctxt);
 	CHECK_ERROR;
 	arg2 = valuePop(ctxt);
@@ -3825,10 +3853,12 @@ void
 xmlXPathEvalExpr(xmlXPathParserContextPtr ctxt) {
     xmlXPathEvalAndExpr(ctxt);
     CHECK_ERROR;
+    SKIP_BLANKS;
     while ((CUR == 'o') && (NXT(1) == 'r')) {
 	xmlXPathObjectPtr arg1, arg2;
 
         SKIP(2);
+	SKIP_BLANKS;
         xmlXPathEvalAndExpr(ctxt);
 	CHECK_ERROR;
 	arg2 = valuePop(ctxt);
@@ -3892,10 +3922,12 @@ xmlXPathEvalPredicate(xmlXPathParserContextPtr ctxt) {
     xmlNodeSetPtr newset = NULL;
     int i;
 
+    SKIP_BLANKS;
     if (CUR != '[') {
 	ERROR(XPATH_INVALID_PREDICATE_ERROR);
     }
     NEXT;
+    SKIP_BLANKS;
     if ((ctxt->context->nodelist == NULL) ||
         (ctxt->context->nodelist->nodeNr == 0)) {
         ctxt->context->node = NULL;
@@ -3928,6 +3960,7 @@ xmlXPathEvalPredicate(xmlXPathParserContextPtr ctxt) {
 	ERROR(XPATH_INVALID_PREDICATE_ERROR);
     }
     NEXT;
+    SKIP_BLANKS;
 #ifdef DEBUG_STEP
     fprintf(xmlXPathDebug, "After predicate : ");
     xmlXPathDebugNodeSet(xmlXPathDebug, ctxt->context->nodelist);
@@ -4226,8 +4259,10 @@ void
 xmlXPathEvalStep(xmlXPathParserContextPtr ctxt) {
     xmlNodeSetPtr newset = NULL;
 
+    SKIP_BLANKS;
     if ((CUR == '.') && (NXT(1) == '.')) {
 	SKIP(2);
+	SKIP_BLANKS;
 	if (ctxt->context->nodelist == NULL) {
 	    STRANGE
 	    xmlXPathRoot(ctxt);
@@ -4240,8 +4275,10 @@ xmlXPathEvalStep(xmlXPathParserContextPtr ctxt) {
 	ctxt->context->node = NULL;
     } else if (CUR == '.') {
 	NEXT;
+	SKIP_BLANKS;
     } else {
 	xmlXPathEvalBasis(ctxt);
+	SKIP_BLANKS;
 	while (CUR == '[') {
 	    xmlXPathEvalPredicate(ctxt);
 	}
@@ -4266,10 +4303,13 @@ void
 xmlXPathEvalRelativeLocationPath(xmlXPathParserContextPtr ctxt) {
     xmlNodeSetPtr newset = NULL;
 
+    SKIP_BLANKS;
     xmlXPathEvalStep(ctxt);
+    SKIP_BLANKS;
     while (CUR == '/') {
 	if ((CUR == '/') && (NXT(1) == '/')) {
 	    SKIP(2);
+	    SKIP_BLANKS;
 	    if (ctxt->context->nodelist == NULL) {
 		STRANGE
 		xmlXPathRoot(ctxt);
@@ -4283,8 +4323,10 @@ xmlXPathEvalRelativeLocationPath(xmlXPathParserContextPtr ctxt) {
 	    xmlXPathEvalStep(ctxt);
 	} else if (CUR == '/') {
 	    NEXT;
+	    SKIP_BLANKS;
 	    xmlXPathEvalStep(ctxt);
 	}
+	SKIP_BLANKS;
     }
 }
 
@@ -4311,54 +4353,37 @@ void
 xmlXPathEvalLocationPath(xmlXPathParserContextPtr ctxt) {
     xmlNodeSetPtr newset = NULL;
 
-    while (CUR == '/') {
-	if ((CUR == '/') && (NXT(1) == '/')) {
-	    SKIP(2);
-	    if (ctxt->context->nodelist == NULL)
-		xmlXPathRoot(ctxt);
-	    newset = xmlXPathNodeCollectAndTest(ctxt, AXIS_DESCENDANT_OR_SELF,
-			     NODE_TEST_TYPE, XML_ELEMENT_NODE, NULL, NULL);
-	    if (ctxt->context->nodelist != NULL)
-		xmlXPathFreeNodeSet(ctxt->context->nodelist);
-	    ctxt->context->nodelist = newset;
-	    ctxt->context->node = NULL;
-	    xmlXPathEvalRelativeLocationPath(ctxt);
-	} else if (CUR == '/') {
-	    NEXT;
-	    xmlXPathRoot(ctxt);
-	    if (CUR != 0)
+    SKIP_BLANKS;
+    if (CUR != '/') {
+        xmlXPathEvalRelativeLocationPath(ctxt);
+    } else {
+	while (CUR == '/') {
+	    if ((CUR == '/') && (NXT(1) == '/')) {
+		SKIP(2);
+		SKIP_BLANKS;
+		if (ctxt->context->nodelist == NULL)
+		    xmlXPathRoot(ctxt);
+		newset = xmlXPathNodeCollectAndTest(ctxt,
+		                 AXIS_DESCENDANT_OR_SELF, NODE_TEST_TYPE,
+				 XML_ELEMENT_NODE, NULL, NULL);
+		if (ctxt->context->nodelist != NULL)
+		    xmlXPathFreeNodeSet(ctxt->context->nodelist);
+		ctxt->context->nodelist = newset;
+		ctxt->context->node = NULL;
 		xmlXPathEvalRelativeLocationPath(ctxt);
-	} else {
-	    xmlXPathEvalRelativeLocationPath(ctxt);
+	    } else if (CUR == '/') {
+		NEXT;
+		SKIP_BLANKS;
+		xmlXPathRoot(ctxt);
+		if (CUR != 0)
+		    xmlXPathEvalRelativeLocationPath(ctxt);
+	    } else {
+		xmlXPathEvalRelativeLocationPath(ctxt);
+	    }
 	}
     }
 }
 
-/*
- * TODO * extra spaces *
- * more tokenization rules ... Not used currently, especially allowing
- * spaces before and after ExprToken !!!!!!!!!!!!!
- *
- *  [32]   Operator ::=   OperatorName 
- *                    | MultiplyOperator 
- *                    | '/' | '//' | '|' | '+' | '-' | '=' | '!='
- *                    | '<'| '<=' | '>' | '>='
- *  [33]   OperatorName ::=   'and' | 'or' | 'mod' | 'div'
- *  [39]   ExprWhitespace ::=   S 
- *
- *  BUG: ExprToken is never referenced.
- *
- *  [28]   ExprToken ::=   '(' | ')' | '[' | ']' | '.' | '..' | '@' | ',' | '::'
- *                    | WildcardName 
- *                    | NodeType 
- *                    | Operator 
- *                    | FunctionName 
- *                    | AxisName 
- *                    | Literal 
- *                    | Number 
- *                    | VariableReference 
- */
-
 /**
  * xmlXPathEval:
  * @str:  the XPath expression