diff --git a/ChangeLog b/ChangeLog index 54aa18e2..88bcf6bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Oct 25 15:27:19 CEST 2000 Daniel Veillard + + * configure.in: release 2.2.6 + * xpath.[ch] xpointer.c xpathInternals.h: added xpathInternals.h + exporting the inner functions of xpath for extension modules + * doc/*: updated and rebuilt the doc + Wed Oct 25 12:48:55 CEST 2000 Daniel Veillard * nanohttp.c : applied Wayne HTTP cleanup patch diff --git a/configure.in b/configure.in index 1fd2ea3b..0b7c3216 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=2 -LIBXML_MICRO_VERSION=5 +LIBXML_MICRO_VERSION=6 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION @@ -348,11 +348,11 @@ then rm -f $srcdir/libxml (cd $srcdir/include ; ln -s .. libxml) fi -if test ! -e $srcdir/libxml +if test ! -r $srcdir/libxml then (cd $srcdir ; ln -s include/libxml libxml) fi -if test ! -e include/libxml +if test ! -r include/libxml then if test ! -d include then @@ -361,7 +361,7 @@ then fi (cd include ; ln -s ../libxml libxml) fi -if test ! -e libxml +if test ! -r libxml then rm -rf libxml ln -s $srcdir/include/libxml libxml diff --git a/doc/gnome-xml.sgml b/doc/gnome-xml.sgml index 2712ae5d..bc387090 100644 --- a/doc/gnome-xml.sgml +++ b/doc/gnome-xml.sgml @@ -11,6 +11,7 @@ + @@ -85,6 +86,7 @@ &HTMLparser; &HTMLtree; &xpath; + &xpathInternals; &xpointer; &nanohttp; &nanoftp; diff --git a/doc/html/book1.html b/doc/html/book1.html index 481367ae..a4cbed8f 100644 --- a/doc/html/book1.html +++ b/doc/html/book1.html @@ -163,6 +163,11 @@ HREF="gnome-xml-xpath.html" > —
xpathInternals —
xpointer —

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

xmlEntityPtr; -#define XML_MIN_ENTITIES_TABLE -struct xmlEntitiesTable; typedef xmlEntitiesTablePtrxmlCleanupPredefinedEntities (void); -int xmlEntityAddReference (xmlEntityPtr ent, - const xmlChar *to); (void);

Description

Details

XML_MIN_ENTITIES_TABLE

#define XML_MIN_ENTITIES_TABLE	32

struct xmlEntitiesTable

struct xmlEntitiesTable {
-    int nb_entities;		/* number of elements stored */
-    int max_entities;		/* maximum number of elements */
-    xmlEntityPtr *table;	/* the table of entities */
-};

xmlEntityAddReference ()

int         xmlEntityAddReference           (xmlEntityPtr ent,
-                                             const xmlChar *to);

Function to register reuse of an existing entity from a (new) one -Used to keep track of references and detect cycles (well formedness -errors !).

ent : an existing entity
to : the entity name it's referencing
Returns : 0 if Okay, -1 in case of general error, 1 in case of loop -detection.

Name

Synopsis

htmlIsScriptAttribute (const xmlChar *name); void htmlFreeParserCtxt

Description

Details

htmlIsScriptAttribute ()

int         htmlIsScriptAttribute           (const xmlChar *name);

Check if an attribute is of content type Script

name : an attribute name
Returns :1 is the attribute is a script 0 otherwise

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

xmlNodePtr cur); +void xmlNodeSetSpacePreserve (xmlNodePtr cur, + intval); xmlCharxmlNodePtr cur); +void xmlNodeSetBase (xmlNodePtr cur, + xmlChar *uri); int xmlRemoveProp

Description

Details

Searches the language of a node, i.e. the values of the xml:lang -attribute or the one carried by the nearest ancestor.

Set (or reset) the name of a node.

parent, at the end of the child list.

, at the end of the child list +merging adjacent TEXT nodes (in which case cur is freed)

Add a list of node at the end of the child list of the parent

Add a list of node at the end of the child list of the parent +merging adjacent TEXT nodes (cur may be freed)

cur +merging adjacent TEXT nodes (elem may be freed) If the new element was already inserted in a document it is first unlinked from its existing context.

cur +merging adjacent TEXT nodes (elem may be freed) If the new element was already inserted in a document it is first unlinked from its existing context.

If the new element was already inserted in a document it is -first unlinked from its existing context.

elem may be freed.

Searches the language of a node, i.e. the values of the xml:space -attribute or the one carried by the nearest ancestor.

Searches the space preserving behaviour of a node, i.e. the values +of the xml:space attribute or the one carried by the nearest +ancestor.

xmlNodeSetSpacePreserve ()

void        xmlNodeSetSpacePreserve         (xmlNodePtr cur,
+                                             intval);

Set (or reset) the space preserving behaviour of a node, i.e. the +value of the xml:space attribute.

cur : the node being changed
Param2 : 

xmlNodeSetBase ()

void        xmlNodeSetBase                  (xmlNodePtr cur,
+                                             xmlChar *uri);

Set (or reset) the base URI of a node, i.e. the value of the +xml:base attribute.

cur : the node being changed
uri : the new base URI

Name

Synopsis

Description

Details

Name

Synopsis

xmlValidCtxtPtr; -#define XML_MIN_NOTATION_TABLE -struct xmlNotationTable; typedef xmlNotationTablePtr; -#define XML_MIN_ELEMENT_TABLE -struct xmlElementTable; typedef xmlElementTablePtr; -#define XML_MIN_ATTRIBUTE_TABLE -struct xmlAttributeTable; typedef xmlAttributeTablePtr; -#define XML_MIN_ID_TABLE -struct xmlIDTable; typedef xmlIDTablePtr; -#define XML_MIN_REF_TABLE -struct xmlRefTable; typedef xmlRefTablePtr

Description

Details

XML_MIN_NOTATION_TABLE

#define XML_MIN_NOTATION_TABLE	32

struct xmlNotationTable

struct xmlNotationTable {
-    int nb_notations;		/* number of notations stored */
-    int max_notations;		/* maximum number of notations */
-    xmlNotationPtr *table;	/* the table of attributes */
-};

XML_MIN_ELEMENT_TABLE

#define XML_MIN_ELEMENT_TABLE	32

struct xmlElementTable

struct xmlElementTable {
-    int nb_elements;		/* number of elements stored */
-    int max_elements;		/* maximum number of elements */
-    xmlElementPtr *table;	/* the table of elements */
-    int last;			/* last element accessed */
-};

XML_MIN_ATTRIBUTE_TABLE

#define XML_MIN_ATTRIBUTE_TABLE	32

struct xmlAttributeTable

struct xmlAttributeTable {
-    int nb_attributes;		/* number of attributes stored */
-    int max_attributes;		/* maximum number of attributes */
-    xmlAttributePtr *table;	/* the table of attributes */
-};

XML_MIN_ID_TABLE

#define XML_MIN_ID_TABLE	32

struct xmlIDTable

struct xmlIDTable {
-    int nb_ids;			/* number of ids stored */
-    int max_ids;		/* maximum number of ids */
-    xmlIDPtr *table;		/* the table of ids */
-};

XML_MIN_REF_TABLE

#define XML_MIN_REF_TABLE	32

struct xmlRefTable

struct xmlRefTable {
-    int nb_refs;			/* number of refs stored */
-    int max_refs;		/* maximum number of refs */
-    xmlRefPtr *table;		/* the table of refs */
-};

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

xmlXPathParserContextPtr ctxt, int nargs); -#define CHECK_ERROR -#define CHECK_ERROR0 -#define XP_ERROR (X) -#define XP_ERROR0 (X) -#define CHECK_TYPE (typeval) -void xmlXPathDebugDumpObject (FILE *output, - xmlXPathObjectPtr cur, - int depth); -xmlXPathParserContextPtr xmlXPathNewParserContext - (const xmlChar *str, - xmlXPathContextPtr ctxt); -void xmlXPathFreeParserContext (xmlXPathParserContextPtr ctxt); -xmlXPathObjectPtr valuePop (xmlXPathParserContextPtr ctxt); -int valuePush (xmlXPathParserContextPtr ctxt, - xmlXPathObjectPtr value); -xmlXPathObjectPtr xmlXPathNewString (const xmlChar *val); -xmlXPathObjectPtr xmlXPathNewNodeSet (xmlNodePtr val); -void xmlXPathNodeSetAdd (xmlNodeSetPtr cur, - xmlNodePtr val); -void xmlXPathIdFunction (xmlXPathParserContextPtr ctxt, - int nargs); -void xmlXPathRoot (xmlXPathParserContextPtr ctxt); -void xmlXPathEvalExpr (xmlXPathParserContextPtr ctxt); -xmlChar* xmlXPathParseName (xmlXPathParserContextPtr ctxt); -int xmlXPathRegisterFunc (xmlXPathContextPtr ctxt, - const xmlChar *name, - xmlXPathFunction f); -int xmlXPathRegisterVariable (xmlXPathContextPtr ctxt, - const xmlChar *name, - xmlXPathObjectPtr value); void xmlXPathInit

Description

Details

CHECK_ERROR

#define     CHECK_ERROR

CHECK_ERROR0

#define     CHECK_ERROR0

XP_ERROR()

#define     XP_ERROR(X)

X : 

XP_ERROR0()

#define     XP_ERROR0(X)

X : 

CHECK_TYPE()

#define     CHECK_TYPE(typeval)

typeval : 

xmlXPathDebugDumpObject ()

void        xmlXPathDebugDumpObject         (FILE *output,
-                                             xmlXPathObjectPtr cur,
-                                             int depth);

output : 
cur : 
depth : 

xmlXPathNewParserContext ()

xmlXPathParserContextPtr xmlXPathNewParserContext
-                                            (const xmlChar *str,
-                                             xmlXPathContextPtr ctxt);

Create a new xmlXPathParserContext

str : the XPath expression
ctxt : the XPath context
Returns :the xmlXPathParserContext just allocated.

xmlXPathFreeParserContext ()

void        xmlXPathFreeParserContext       (xmlXPathParserContextPtr ctxt);

Free up an xmlXPathParserContext

ctxt : the context to free

valuePop ()

xmlXPathObjectPtr valuePop                  (xmlXPathParserContextPtr ctxt);

ctxt : 
Returns : 

valuePush ()

int         valuePush                       (xmlXPathParserContextPtr ctxt,
-                                             xmlXPathObjectPtr value);

ctxt : 
value : 
Returns : 

xmlXPathNewString ()

xmlXPathObjectPtr xmlXPathNewString         (const xmlChar *val);

Create a new xmlXPathObjectPtr of type string and of value val

val : the xmlChar * value
Returns :the newly created object.

xmlXPathNewNodeSet ()

xmlXPathObjectPtr xmlXPathNewNodeSet        (xmlNodePtr val);

Create a new xmlXPathObjectPtr of type NodeSet and initialize -it with the single Node val

val : the NodePtr value
Returns :the newly created object.

xmlXPathNodeSetAdd ()

void        xmlXPathNodeSetAdd              (xmlNodeSetPtr cur,
-                                             xmlNodePtr val);

add a new xmlNodePtr ot an existing NodeSet

cur : the initial node set
val : a new xmlNodePtr

xmlXPathIdFunction ()

void        xmlXPathIdFunction              (xmlXPathParserContextPtr ctxt,
-                                             int nargs);

Implement the id() XPath function -The id function selects elements by their unique ID -(see [5.2.1 Unique IDs]). When the argument to id is of type node-set, -then the result is the union of the result of applying id to the -string value of each of the nodes in the argument node-set. When the -argument to id is of any other type, the argument is converted to a -string as if by a call to the string function; the string is split -into a whitespace-separated list of tokens (whitespace is any sequence -of characters matching the production S); the result is a node-set -containing the elements in the same document as the context node that -have a unique ID equal to any of the tokens in the list.

ctxt : the XPath Parser context
nargs : 

xmlXPathRoot ()

void        xmlXPathRoot                    (xmlXPathParserContextPtr ctxt);

Initialize the context to the root of the document

ctxt : the XPath Parser context

xmlXPathEvalExpr ()

void        xmlXPathEvalExpr                (xmlXPathParserContextPtr ctxt);

[14] Expr ::= OrExpr -[21] OrExpr ::= AndExpr -| OrExpr 'or' AndExpr

Parse and evaluate an expression, then push the result on the stack

ctxt : the XPath Parser context

xmlXPathParseName ()

xmlChar*    xmlXPathParseName               (xmlXPathParserContextPtr ctxt);

parse an XML name

[4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | -CombiningChar | Extender

[5] Name ::= (Letter | '_' | ':') (NameChar)*

ctxt : the XPointer Parser context
Returns :the namespace name or NULL

xmlXPathRegisterFunc ()

int         xmlXPathRegisterFunc            (xmlXPathContextPtr ctxt,
-                                             const xmlChar *name,
-                                             xmlXPathFunction f);

Register a new function. If f is NULL it unregisters the function

ctxt : the XPath context
name : the function name
f : the function implementation or NULL
Returns :0 in case of success, -1 in case of error

xmlXPathRegisterVariable ()

int         xmlXPathRegisterVariable        (xmlXPathContextPtr ctxt,
-                                             const xmlChar *name,
-                                             xmlXPathObjectPtr value);

Register a new variable value. If value is NULL it unregisters -the variable

ctxt : the XPath context
name : the variable name
value : the variable value or NULL
Returns :0 in case of success, -1 in case of error

xpointerxpathInternals

Name

Synopsis

Description

Details

xpathxpathInternals + + @@ -308,8 +310,6 @@ - - @@ -327,26 +327,15 @@ - - - - - - - - - - - @@ -449,6 +438,7 @@ + @@ -490,25 +480,6 @@ - - - - - - - - - - - - - - - - - - - @@ -520,6 +491,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/html/libxml-lib.html b/doc/html/libxml-lib.html index 78a178bd..9e5fae54 100644 --- a/doc/html/libxml-lib.html +++ b/doc/html/libxml-lib.html @@ -164,6 +164,11 @@ HREF="gnome-xml-xpath.html" > —
xpathInternals —
xpointer —
The XML C library for Gnome - + @@ -239,6 +239,18 @@ you want to test those

  • parsing/import of Docbook SGML docs
    • +

    2.2.6: Oct 25 2000:

    +
      +
    • Added an hash table module, migrated a number of internal structure to + those
      • +
    • Fixed a posteriori validation problems
      • +
    • HTTP module cleanups
      • +
    • HTML parser improvements (tag errors, script/style handling, attribute + normalization)
      • +
    • coalescing of adjacent text nodes
      • +
    • couple of XPath bug fixes, exported the internal API
      • +
    +

    2.2.5: Oct 15 2000:

    • XPointer implementation and testsuite
      • @@ -1342,6 +1354,6 @@ Gnome CVS base under gnome-xml/example

      Daniel Veillard

      -

      $Id: xml.html,v 1.55 2000/10/15 21:06:19 veillard Exp $

      +

      $Id: xml.html,v 1.56 2000/10/21 09:25:52 veillard Exp $

      diff --git a/include/Makefile.am b/include/Makefile.am index 6c11a310..c8b4995a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -16,6 +16,7 @@ xmlinc_HEADERS = \ libxml/tree.h \ libxml/hash.h \ libxml/xpath.h \ + libxml/xpathInternals.h \ libxml/xpointer.h \ libxml/xmlIO.h \ libxml/xmlmemory.h \ diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h index 0d2fa168..553b3fc6 100644 --- a/include/libxml/xpath.h +++ b/include/libxml/xpath.h @@ -233,87 +233,12 @@ struct _xmlXPathParserContext { typedef void (*xmlXPathFunction) (xmlXPathParserContextPtr ctxt, int nargs); -/************************************************************************ - * * - * Helpers * - * * - ************************************************************************/ - -#define CHECK_ERROR \ - if (ctxt->error != XPATH_EXPRESSION_OK) return - -#define CHECK_ERROR0 \ - if (ctxt->error != XPATH_EXPRESSION_OK) return(0) - -#define XP_ERROR(X) \ - { xmlXPatherror(ctxt, __FILE__, __LINE__, X); \ - ctxt->error = (X); return; } - -#define XP_ERROR0(X) \ - { xmlXPatherror(ctxt, __FILE__, __LINE__, X); \ - ctxt->error = (X); return(0); } - -#define CHECK_TYPE(typeval) \ - if ((ctxt->value == NULL) || (ctxt->value->type != typeval)) \ - XP_ERROR(XPATH_INVALID_TYPE) \ - -#define CHECK_ARITY(x) \ - if (nargs != (x)) { \ - XP_ERROR(XPATH_INVALID_ARITY); \ - } \ - -void xmlXPatherror (xmlXPathParserContextPtr ctxt, - const char *file, - int line, - int no); - -void xmlXPathDebugDumpObject (FILE *output, - xmlXPathObjectPtr cur, - int depth); - -/** - * Utilities to extend XPath (XPointer) - */ -xmlXPathParserContextPtr - xmlXPathNewParserContext (const xmlChar *str, - xmlXPathContextPtr ctxt); -void xmlXPathFreeParserContext (xmlXPathParserContextPtr ctxt); - -xmlXPathObjectPtr valuePop (xmlXPathParserContextPtr ctxt); -int valuePush (xmlXPathParserContextPtr ctxt, - xmlXPathObjectPtr value); - -xmlXPathObjectPtr xmlXPathNewString (const xmlChar *val); -xmlXPathObjectPtr xmlXPathNewCString (const char *val); -xmlXPathObjectPtr xmlXPathNewFloat (double val); -xmlXPathObjectPtr xmlXPathNewBoolean (int val); -xmlXPathObjectPtr xmlXPathNewNodeSet (xmlNodePtr val); -void xmlXPathNodeSetAdd (xmlNodeSetPtr cur, - xmlNodePtr val); - - -void xmlXPathIdFunction (xmlXPathParserContextPtr ctxt, - int nargs); -void xmlXPathRoot (xmlXPathParserContextPtr ctxt); -void xmlXPathEvalExpr (xmlXPathParserContextPtr ctxt); -xmlChar * xmlXPathParseName (xmlXPathParserContextPtr ctxt); - /************************************************************************ * * * Public API * * * ************************************************************************/ -/** - * Extending a context - */ -int xmlXPathRegisterFunc (xmlXPathContextPtr ctxt, - const xmlChar *name, - xmlXPathFunction f); -int xmlXPathRegisterVariable (xmlXPathContextPtr ctxt, - const xmlChar *name, - xmlXPathObjectPtr value); - /** * Evaluation functions. */ diff --git a/include/libxml/xpathInternals.h b/include/libxml/xpathInternals.h new file mode 100644 index 00000000..c32d3c59 --- /dev/null +++ b/include/libxml/xpathInternals.h @@ -0,0 +1,175 @@ +/* + * xpath.c: internal interfaces for XML Path Language implementation + * used to build new modules on top of XPath + * + * See COPYRIGHT for the status of this software + * + * Author: Daniel.Veillard@w3.org + */ + +#ifndef __XML_XPATH_INTERNALS_H__ +#define __XML_XPATH_INTERNALS_H__ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/************************************************************************ + * * + * Helpers * + * * + ************************************************************************/ + +#define CHECK_ERROR \ + if (ctxt->error != XPATH_EXPRESSION_OK) return + +#define CHECK_ERROR0 \ + if (ctxt->error != XPATH_EXPRESSION_OK) return(0) + +#define XP_ERROR(X) \ + { xmlXPatherror(ctxt, __FILE__, __LINE__, X); \ + ctxt->error = (X); return; } + +#define XP_ERROR0(X) \ + { xmlXPatherror(ctxt, __FILE__, __LINE__, X); \ + ctxt->error = (X); return(0); } + +#define CHECK_TYPE(typeval) \ + if ((ctxt->value == NULL) || (ctxt->value->type != typeval)) \ + XP_ERROR(XPATH_INVALID_TYPE) \ + +#define CHECK_ARITY(x) \ + if (nargs != (x)) { \ + XP_ERROR(XPATH_INVALID_ARITY); \ + } \ + +void xmlXPatherror (xmlXPathParserContextPtr ctxt, + const char *file, + int line, + int no); + +void xmlXPathDebugDumpObject (FILE *output, + xmlXPathObjectPtr cur, + int depth); + +/** + * Extending a context + */ +int xmlXPathRegisterFunc (xmlXPathContextPtr ctxt, + const xmlChar *name, + xmlXPathFunction f); +int xmlXPathRegisterVariable (xmlXPathContextPtr ctxt, + const xmlChar *name, + xmlXPathObjectPtr value); +xmlXPathFunction xmlXPathFunctionLookup (xmlXPathContextPtr ctxt, + const xmlChar *name); +void xmlXPathRegisteredFuncsCleanup(xmlXPathContextPtr ctxt); +xmlXPathObjectPtr xmlXPathVariableLookup (xmlXPathContextPtr ctxt, + const xmlChar *name); +void xmlXPathRegisteredVariablesCleanup(xmlXPathContextPtr ctxt); + +/** + * Utilities to extend XPath + */ +xmlXPathParserContextPtr + xmlXPathNewParserContext (const xmlChar *str, + xmlXPathContextPtr ctxt); +void xmlXPathFreeParserContext (xmlXPathParserContextPtr ctxt); + +xmlXPathObjectPtr valuePop (xmlXPathParserContextPtr ctxt); +int valuePush (xmlXPathParserContextPtr ctxt, + xmlXPathObjectPtr value); + +xmlXPathObjectPtr xmlXPathNewString (const xmlChar *val); +xmlXPathObjectPtr xmlXPathNewCString (const char *val); +xmlXPathObjectPtr xmlXPathNewFloat (double val); +xmlXPathObjectPtr xmlXPathNewBoolean (int val); +xmlXPathObjectPtr xmlXPathNewNodeSet (xmlNodePtr val); +void xmlXPathNodeSetAdd (xmlNodeSetPtr cur, + xmlNodePtr val); + + +void xmlXPathIdFunction (xmlXPathParserContextPtr ctxt, + int nargs); +void xmlXPathRoot (xmlXPathParserContextPtr ctxt); +void xmlXPathEvalExpr (xmlXPathParserContextPtr ctxt); +xmlChar * xmlXPathParseName (xmlXPathParserContextPtr ctxt); + +/* + * Debug + */ +#ifdef LIBXML_DEBUG_ENABLED +double xmlXPathStringEvalNumber(const xmlChar *str); +void xmlXPathDebugDumpObject(FILE *output, xmlXPathObjectPtr cur, int depth); +#endif +/* + * Existing functions + */ + +void xmlXPathInit(void); +void xmlXPathStringFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathRegisterAllFunctions(xmlXPathContextPtr ctxt); +xmlNodeSetPtr xmlXPathNodeSetCreate(xmlNodePtr val); +void xmlXPathNodeSetAdd(xmlNodeSetPtr cur, xmlNodePtr val); +xmlNodeSetPtr xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2); +void xmlXPathNodeSetDel(xmlNodeSetPtr cur, xmlNodePtr val); +void xmlXPathNodeSetRemove(xmlNodeSetPtr cur, int val); +void xmlXPathFreeNodeSet(xmlNodeSetPtr obj); +xmlXPathObjectPtr xmlXPathNewNodeSet(xmlNodePtr val); +xmlXPathObjectPtr xmlXPathNewNodeSetList(xmlNodeSetPtr val); +xmlXPathObjectPtr xmlXPathWrapNodeSet(xmlNodeSetPtr val); +void xmlXPathFreeNodeSetList(xmlXPathObjectPtr obj); + + +xmlXPathObjectPtr xmlXPathNewFloat(double val); +xmlXPathObjectPtr xmlXPathNewBoolean(int val); +xmlXPathObjectPtr xmlXPathNewString(const xmlChar *val); +xmlXPathObjectPtr xmlXPathNewCString(const char *val); +void xmlXPathFreeObject(xmlXPathObjectPtr obj); +xmlXPathContextPtr xmlXPathNewContext(xmlDocPtr doc); +void xmlXPathFreeContext(xmlXPathContextPtr ctxt); + +int xmlXPathEqualValues(xmlXPathParserContextPtr ctxt); +int xmlXPathCompareValues(xmlXPathParserContextPtr ctxt, int inf, int strict); +void xmlXPathValueFlipSign(xmlXPathParserContextPtr ctxt); +void xmlXPathAddValues(xmlXPathParserContextPtr ctxt); +void xmlXPathSubValues(xmlXPathParserContextPtr ctxt); +void xmlXPathMultValues(xmlXPathParserContextPtr ctxt); +void xmlXPathDivValues(xmlXPathParserContextPtr ctxt); +void xmlXPathModValues(xmlXPathParserContextPtr ctxt); + +/* + * The official core of XPath functions + */ +void xmlXPathRoot(xmlXPathParserContextPtr ctxt); +void xmlXPathLastFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathPositionFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathCountFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathIdFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathLocalPartFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathNamespaceFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathStringFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathStringLengthFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathConcatFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathContainsFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathStartsWithFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathSubstringFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathSubstringBeforeFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathSubstringAfterFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathNormalizeFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathNotFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathTrueFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathFalseFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathLangFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathNumberFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathSumFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathFloorFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathCeilingFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathRoundFunction(xmlXPathParserContextPtr ctxt, int nargs); +#ifdef __cplusplus +} +#endif +#endif /* ! __XML_XPATH_INTERNALS_H__ */ diff --git a/xpath.c b/xpath.c index 4cd20e40..5a84d927 100644 --- a/xpath.c +++ b/xpath.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #ifdef LIBXML_XPTR_ENABLED diff --git a/xpath.h b/xpath.h index 0d2fa168..553b3fc6 100644 --- a/xpath.h +++ b/xpath.h @@ -233,87 +233,12 @@ struct _xmlXPathParserContext { typedef void (*xmlXPathFunction) (xmlXPathParserContextPtr ctxt, int nargs); -/************************************************************************ - * * - * Helpers * - * * - ************************************************************************/ - -#define CHECK_ERROR \ - if (ctxt->error != XPATH_EXPRESSION_OK) return - -#define CHECK_ERROR0 \ - if (ctxt->error != XPATH_EXPRESSION_OK) return(0) - -#define XP_ERROR(X) \ - { xmlXPatherror(ctxt, __FILE__, __LINE__, X); \ - ctxt->error = (X); return; } - -#define XP_ERROR0(X) \ - { xmlXPatherror(ctxt, __FILE__, __LINE__, X); \ - ctxt->error = (X); return(0); } - -#define CHECK_TYPE(typeval) \ - if ((ctxt->value == NULL) || (ctxt->value->type != typeval)) \ - XP_ERROR(XPATH_INVALID_TYPE) \ - -#define CHECK_ARITY(x) \ - if (nargs != (x)) { \ - XP_ERROR(XPATH_INVALID_ARITY); \ - } \ - -void xmlXPatherror (xmlXPathParserContextPtr ctxt, - const char *file, - int line, - int no); - -void xmlXPathDebugDumpObject (FILE *output, - xmlXPathObjectPtr cur, - int depth); - -/** - * Utilities to extend XPath (XPointer) - */ -xmlXPathParserContextPtr - xmlXPathNewParserContext (const xmlChar *str, - xmlXPathContextPtr ctxt); -void xmlXPathFreeParserContext (xmlXPathParserContextPtr ctxt); - -xmlXPathObjectPtr valuePop (xmlXPathParserContextPtr ctxt); -int valuePush (xmlXPathParserContextPtr ctxt, - xmlXPathObjectPtr value); - -xmlXPathObjectPtr xmlXPathNewString (const xmlChar *val); -xmlXPathObjectPtr xmlXPathNewCString (const char *val); -xmlXPathObjectPtr xmlXPathNewFloat (double val); -xmlXPathObjectPtr xmlXPathNewBoolean (int val); -xmlXPathObjectPtr xmlXPathNewNodeSet (xmlNodePtr val); -void xmlXPathNodeSetAdd (xmlNodeSetPtr cur, - xmlNodePtr val); - - -void xmlXPathIdFunction (xmlXPathParserContextPtr ctxt, - int nargs); -void xmlXPathRoot (xmlXPathParserContextPtr ctxt); -void xmlXPathEvalExpr (xmlXPathParserContextPtr ctxt); -xmlChar * xmlXPathParseName (xmlXPathParserContextPtr ctxt); - /************************************************************************ * * * Public API * * * ************************************************************************/ -/** - * Extending a context - */ -int xmlXPathRegisterFunc (xmlXPathContextPtr ctxt, - const xmlChar *name, - xmlXPathFunction f); -int xmlXPathRegisterVariable (xmlXPathContextPtr ctxt, - const xmlChar *name, - xmlXPathObjectPtr value); - /** * Evaluation functions. */ diff --git a/xpathInternals.h b/xpathInternals.h new file mode 100644 index 00000000..c32d3c59 --- /dev/null +++ b/xpathInternals.h @@ -0,0 +1,175 @@ +/* + * xpath.c: internal interfaces for XML Path Language implementation + * used to build new modules on top of XPath + * + * See COPYRIGHT for the status of this software + * + * Author: Daniel.Veillard@w3.org + */ + +#ifndef __XML_XPATH_INTERNALS_H__ +#define __XML_XPATH_INTERNALS_H__ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/************************************************************************ + * * + * Helpers * + * * + ************************************************************************/ + +#define CHECK_ERROR \ + if (ctxt->error != XPATH_EXPRESSION_OK) return + +#define CHECK_ERROR0 \ + if (ctxt->error != XPATH_EXPRESSION_OK) return(0) + +#define XP_ERROR(X) \ + { xmlXPatherror(ctxt, __FILE__, __LINE__, X); \ + ctxt->error = (X); return; } + +#define XP_ERROR0(X) \ + { xmlXPatherror(ctxt, __FILE__, __LINE__, X); \ + ctxt->error = (X); return(0); } + +#define CHECK_TYPE(typeval) \ + if ((ctxt->value == NULL) || (ctxt->value->type != typeval)) \ + XP_ERROR(XPATH_INVALID_TYPE) \ + +#define CHECK_ARITY(x) \ + if (nargs != (x)) { \ + XP_ERROR(XPATH_INVALID_ARITY); \ + } \ + +void xmlXPatherror (xmlXPathParserContextPtr ctxt, + const char *file, + int line, + int no); + +void xmlXPathDebugDumpObject (FILE *output, + xmlXPathObjectPtr cur, + int depth); + +/** + * Extending a context + */ +int xmlXPathRegisterFunc (xmlXPathContextPtr ctxt, + const xmlChar *name, + xmlXPathFunction f); +int xmlXPathRegisterVariable (xmlXPathContextPtr ctxt, + const xmlChar *name, + xmlXPathObjectPtr value); +xmlXPathFunction xmlXPathFunctionLookup (xmlXPathContextPtr ctxt, + const xmlChar *name); +void xmlXPathRegisteredFuncsCleanup(xmlXPathContextPtr ctxt); +xmlXPathObjectPtr xmlXPathVariableLookup (xmlXPathContextPtr ctxt, + const xmlChar *name); +void xmlXPathRegisteredVariablesCleanup(xmlXPathContextPtr ctxt); + +/** + * Utilities to extend XPath + */ +xmlXPathParserContextPtr + xmlXPathNewParserContext (const xmlChar *str, + xmlXPathContextPtr ctxt); +void xmlXPathFreeParserContext (xmlXPathParserContextPtr ctxt); + +xmlXPathObjectPtr valuePop (xmlXPathParserContextPtr ctxt); +int valuePush (xmlXPathParserContextPtr ctxt, + xmlXPathObjectPtr value); + +xmlXPathObjectPtr xmlXPathNewString (const xmlChar *val); +xmlXPathObjectPtr xmlXPathNewCString (const char *val); +xmlXPathObjectPtr xmlXPathNewFloat (double val); +xmlXPathObjectPtr xmlXPathNewBoolean (int val); +xmlXPathObjectPtr xmlXPathNewNodeSet (xmlNodePtr val); +void xmlXPathNodeSetAdd (xmlNodeSetPtr cur, + xmlNodePtr val); + + +void xmlXPathIdFunction (xmlXPathParserContextPtr ctxt, + int nargs); +void xmlXPathRoot (xmlXPathParserContextPtr ctxt); +void xmlXPathEvalExpr (xmlXPathParserContextPtr ctxt); +xmlChar * xmlXPathParseName (xmlXPathParserContextPtr ctxt); + +/* + * Debug + */ +#ifdef LIBXML_DEBUG_ENABLED +double xmlXPathStringEvalNumber(const xmlChar *str); +void xmlXPathDebugDumpObject(FILE *output, xmlXPathObjectPtr cur, int depth); +#endif +/* + * Existing functions + */ + +void xmlXPathInit(void); +void xmlXPathStringFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathRegisterAllFunctions(xmlXPathContextPtr ctxt); +xmlNodeSetPtr xmlXPathNodeSetCreate(xmlNodePtr val); +void xmlXPathNodeSetAdd(xmlNodeSetPtr cur, xmlNodePtr val); +xmlNodeSetPtr xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2); +void xmlXPathNodeSetDel(xmlNodeSetPtr cur, xmlNodePtr val); +void xmlXPathNodeSetRemove(xmlNodeSetPtr cur, int val); +void xmlXPathFreeNodeSet(xmlNodeSetPtr obj); +xmlXPathObjectPtr xmlXPathNewNodeSet(xmlNodePtr val); +xmlXPathObjectPtr xmlXPathNewNodeSetList(xmlNodeSetPtr val); +xmlXPathObjectPtr xmlXPathWrapNodeSet(xmlNodeSetPtr val); +void xmlXPathFreeNodeSetList(xmlXPathObjectPtr obj); + + +xmlXPathObjectPtr xmlXPathNewFloat(double val); +xmlXPathObjectPtr xmlXPathNewBoolean(int val); +xmlXPathObjectPtr xmlXPathNewString(const xmlChar *val); +xmlXPathObjectPtr xmlXPathNewCString(const char *val); +void xmlXPathFreeObject(xmlXPathObjectPtr obj); +xmlXPathContextPtr xmlXPathNewContext(xmlDocPtr doc); +void xmlXPathFreeContext(xmlXPathContextPtr ctxt); + +int xmlXPathEqualValues(xmlXPathParserContextPtr ctxt); +int xmlXPathCompareValues(xmlXPathParserContextPtr ctxt, int inf, int strict); +void xmlXPathValueFlipSign(xmlXPathParserContextPtr ctxt); +void xmlXPathAddValues(xmlXPathParserContextPtr ctxt); +void xmlXPathSubValues(xmlXPathParserContextPtr ctxt); +void xmlXPathMultValues(xmlXPathParserContextPtr ctxt); +void xmlXPathDivValues(xmlXPathParserContextPtr ctxt); +void xmlXPathModValues(xmlXPathParserContextPtr ctxt); + +/* + * The official core of XPath functions + */ +void xmlXPathRoot(xmlXPathParserContextPtr ctxt); +void xmlXPathLastFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathPositionFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathCountFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathIdFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathLocalPartFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathNamespaceFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathStringFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathStringLengthFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathConcatFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathContainsFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathStartsWithFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathSubstringFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathSubstringBeforeFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathSubstringAfterFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathNormalizeFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathNotFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathTrueFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathFalseFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathLangFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathNumberFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathSumFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathFloorFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathCeilingFunction(xmlXPathParserContextPtr ctxt, int nargs); +void xmlXPathRoundFunction(xmlXPathParserContextPtr ctxt, int nargs); +#ifdef __cplusplus +} +#endif +#endif /* ! __XML_XPATH_INTERNALS_H__ */ diff --git a/xpointer.c b/xpointer.c index 7674942a..06949eaf 100644 --- a/xpointer.c +++ b/xpointer.c @@ -29,6 +29,7 @@ #include #include #include +#include #ifdef LIBXML_DEBUG_ENABLED #include #endif