Tue May 31 20:35:27 PDT 2005 William Brack <wbrack@mmm.com.hk>

* xinclude.c: Enhanced handling of xml:base for included

<a href="html/libxml-dict.html#xmlDictCreateSub">xmlDictCreateSub</a><br />

<a href="html/libxml-dict.html#xmlDictReference">xmlDictReference</a><br />

<a href="html/libxml-hash.html#xmlHashCreateDict">xmlHashCreateDict</a><br />

<a href="html/libxml-pattern.html#xmlStreamPush">xmlStreamPush</a><br />

<a href="html/libxml-pattern.html#xmlStreamPushAttr">xmlStreamPushAttr</a><br />

</dd><dt>dictionnary</dt><dd><a href="html/libxml-parser.html#_xmlParserCtxt">_xmlParserCtxt</a><br />

<a href="html/libxml-dict.html#xmlDictQLookup">xmlDictQLookup</a><br />

<a href="html/libxml-dict.html#xmlDictReference">xmlDictReference</a><br />

<a href="html/libxml-dict.html#xmlDictSize">xmlDictSize</a><br />

</dd><dt>did</dt><dd><a href="html/libxml-schemasInternals.html#XML_SCHEMAS_TYPE_BLOCK_DEFAULT">XML_SCHEMAS_TYPE_BLOCK_DEFAULT</a><br />

<a href="html/libxml-xmlreader.html#xmlTextReaderGetRemainder">xmlTextReaderGetRemainder</a><br />

<a href="html/libxml-xmlreader.html#xmlTextReaderStandalone">xmlTextReaderStandalone</a><br />

<a href="html/libxml-HTMLparser.html#htmlSAXParseFile">htmlSAXParseFile</a><br />

<a href="html/libxml-tree.html#xmlNodeListGetRawString">xmlNodeListGetRawString</a><br />

<a href="html/libxml-tree.html#xmlNodeListGetString">xmlNodeListGetString</a><br />

<a href="html/libxml-xpathInternals.html#xmlXPathStringFunction">xmlXPathStringFunction</a><br />

</dd><dt>formatted</dt><dd><a href="html/libxml-xmlwriter.html#xmlTextWriterWriteFormatAttribute">xmlTextWriterWriteFormatAttribute</a><br />

<a href="html/libxml-xmlwriter.html#xmlTextWriterWriteFormatAttributeNS">xmlTextWriterWriteFormatAttributeNS</a><br />

<a href="html/libxml-parser.html#xmlCtxtResetPush">xmlCtxtResetPush</a><br />

<a href="html/libxml-xmlIO.html#xmlParserInputBufferPush">xmlParserInputBufferPush</a><br />

<a href="html/libxml-pattern.html#xmlStreamPop">xmlStreamPop</a><br />

<a href="html/libxml-xpathInternals.html#xmlXPathEvalExpr">xmlXPathEvalExpr</a><br />

</dd><dt>pushed</dt><dd><a href="html/libxml-xmlregexp.html#xmlRegExecErrInfo">xmlRegExecErrInfo</a><br />

<a href="html/libxml-xpath.html#xmlXPathFunction">xmlXPathFunction</a><br />

<a href="html/libxml-xinclude.html#xmlXIncludeProcessTree">xmlXIncludeProcessTree</a><br />

<a href="html/libxml-xinclude.html#xmlXIncludeProcessTreeFlags">xmlXIncludeProcessTreeFlags</a><br />

</dd><dt>wether</dt><dd><a href="html/libxml-xpath.html#_xmlNodeSet">_xmlNodeSet</a><br />

</dd><dt>what</dt><dd><a href="html/libxml-catalog.html#xmlCatalogGetDefaults">xmlCatalogGetDefaults</a><br />

<a href="html/libxml-catalog.html#xmlCatalogSetDefaults">xmlCatalogSetDefaults</a><br />

<a href="html/libxml-parserInternals.html#xmlParseNamespace">xmlParseNamespace</a><br />

<a href="html/libxml-xmlregexp.html#xmlRegExecPushString">xmlRegExecPushString</a><br />

<a href="html/libxml-xmlregexp.html#xmlRegExecPushString2">xmlRegExecPushString2</a><br />

<a href="html/libxml-relaxng.html#xmlRelaxNGValidatePushElement">xmlRelaxNGValidatePushElement</a><br />

<a href="html/libxml-valid.html#xmlValidatePushElement">xmlValidatePushElement</a><br />

</dd><dt>Pushes</dt><dd><a href="html/libxml-parserInternals.html#inputPush">inputPush</a><br />

<a href="html/libxml-parserInternals.html#namePush">namePush</a><br />

return token

while token[0] == "name" and (

if self.type == "":

self.type = token[1]

else:

<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>comp</tt></i>:</span></td><td>the precompiled pattern</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>1 if true, 0 if false and -1 in case of error</td></tr></tbody></table></div><h3><a name="xmlPatternGetStreamCtxt" id="xmlPatternGetStreamCtxt"></a>Function: xmlPatternGetStreamCtxt</h3><pre class="programlisting"><a href="libxml-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> xmlPatternGetStreamCtxt (<a href="libxml-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp)<br />

</pre><p>Get a streaming context for that pattern Use <a href="libxml-pattern.html#xmlFreeStreamCtxt">xmlFreeStreamCtxt</a> to free the context.</p>

<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>comp</tt></i>:</span></td><td>the precompiled pattern</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the context or NULL in case of failure</td></tr></tbody></table></div><h3><a name="xmlPatternMatch" id="xmlPatternMatch"></a>Function: xmlPatternMatch</h3><pre class="programlisting">int xmlPatternMatch (<a href="libxml-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp, <br /> <a href="libxml-tree.html#xmlNodePtr">xmlNodePtr</a> node)<br />

<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>comp</tt></i>:</span></td><td>the precompiled pattern</td></tr><tr><td><span class="term"><i><tt>node</tt></i>:</span></td><td>a node</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>1 if it matches, 0 if it doesn't and -1 in case of failure</td></tr></tbody></table></div><h3><a name="xmlPatternMaxDepth" id="xmlPatternMaxDepth"></a>Function: xmlPatternMaxDepth</h3><pre class="programlisting">int xmlPatternMaxDepth (<a href="libxml-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp)<br />

</pre><p>Check the maximum depth reachable by a pattern</p>

<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>comp</tt></i>:</span></td><td>the precompiled pattern</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>-2 if no limit (using //), otherwise the depth, and -1 in case of error</td></tr></tbody></table></div><h3><a name="xmlPatternStreamable" id="xmlPatternStreamable"></a>Function: xmlPatternStreamable</h3><pre class="programlisting">int xmlPatternStreamable (<a href="libxml-pattern.html#xmlPatternPtr">xmlPatternPtr</a> comp)<br />

</pre><p>Check if the pattern is streamable i.e. xmlPatternGetStreamCtxt() should work.</p>

<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>comp</tt></i>:</span></td><td>the precompiled pattern</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>1 if streamable, 0 if not and -1 in case of error.</td></tr></tbody></table></div><h3><a name="xmlPatterncompile" id="xmlPatterncompile"></a>Function: xmlPatterncompile</h3><pre class="programlisting"><a href="libxml-pattern.html#xmlPatternPtr">xmlPatternPtr</a> xmlPatterncompile (const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * pattern, <br /> <a href="libxml-dict.html#xmlDict">xmlDict</a> * dict, <br /> int flags, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> ** namespaces)<br />

</pre><p>Compile a pattern.</p>

</pre><p>push one level from the stream.</p>

<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>stream</tt></i>:</span></td><td>the stream context</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>-1 in case of error, 0 otherwise.</td></tr></tbody></table></div><h3><a name="xmlStreamPush" id="xmlStreamPush"></a>Function: xmlStreamPush</h3><pre class="programlisting">int xmlStreamPush (<a href="libxml-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> stream, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * name, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * ns)<br />

<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>stream</tt></i>:</span></td><td>the stream context</td></tr><tr><td><span class="term"><i><tt>name</tt></i>:</span></td><td>the current name</td></tr><tr><td><span class="term"><i><tt>ns</tt></i>:</span></td><td>the namespace name</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>-1 in case of error, 1 if the current state in the stream is a match and 0 otherwise.</td></tr></tbody></table></div><h3><a name="xmlStreamPushAttr" id="xmlStreamPushAttr"></a>Function: xmlStreamPushAttr</h3><pre class="programlisting">int xmlStreamPushAttr (<a href="libxml-pattern.html#xmlStreamCtxtPtr">xmlStreamCtxtPtr</a> stream, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * name, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * ns)<br />

<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>stream</tt></i>:</span></td><td>the stream context</td></tr><tr><td><span class="term"><i><tt>name</tt></i>:</span></td><td>the current name</td></tr><tr><td><span class="term"><i><tt>ns</tt></i>:</span></td><td>the namespace name</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>-1 in case of error, 1 if the current state in the stream is a match and 0 otherwise.</td></tr></tbody></table></div><p><a href="../bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html>

</function>

<function name='xmlPatternMatch' file='pattern' module='pattern'>

<cond>defined(LIBXML_PATTERN_ENABLED)</cond>

<return type='int' info='1 if it matches, 0 if it doesn&apos;t and -1 in case of failure'/>

<arg name='comp' type='xmlPatternPtr' info='the precompiled pattern'/>

<arg name='node' type='xmlNodePtr' info='a node'/>

<function name='xmlPatterncompile' file='pattern' module='pattern'>

<cond>defined(LIBXML_PATTERN_ENABLED)</cond>

<info>Compile a pattern.</info>

<arg name='pattern' type='const xmlChar *' info='the pattern to compile'/>

<arg name='flags' type='int' info='compilation flags, undefined yet'/>

<arg name='namespaces' type='const xmlChar **' info='the prefix definitions, array of [URI, prefix] or NULL'/>

</function>

</function>

<function name='xmlStreamPush' file='pattern' module='pattern'>

<cond>defined(LIBXML_PATTERN_ENABLED)</cond>

<return type='int' info='-1 in case of error, 1 if the current state in the stream is a match and 0 otherwise.'/>

<arg name='stream' type='xmlStreamCtxtPtr' info='the stream context'/>

<arg name='name' type='const xmlChar *' info='the current name'/>

</function>

<function name='xmlStreamPushAttr' file='pattern' module='pattern'>

<cond>defined(LIBXML_PATTERN_ENABLED)</cond>

<return type='int' info='-1 in case of error, 1 if the current state in the stream is a match and 0 otherwise.'/>

<arg name='stream' type='xmlStreamCtxtPtr' info='the stream context'/>

<arg name='name' type='const xmlChar *' info='the current name'/>

<ref name='xmlRegExecPushString'/>

<ref name='xmlRegExecPushString2'/>

<ref name='xmlRelaxNGValidatePushElement'/>

<ref name='xmlValidatePushElement'/>

</word>

<word name='Pushes'>

<ref name='xmlDictCreateSub'/>

<ref name='xmlDictReference'/>

<ref name='xmlHashCreateDict'/>

<ref name='xmlStreamPush'/>

<ref name='xmlStreamPushAttr'/>

</word>

<ref name='xmlDictQLookup'/>

<ref name='xmlDictReference'/>

<ref name='xmlDictSize'/>

</word>

<word name='did'>

<ref name='XML_SCHEMAS_TYPE_BLOCK_DEFAULT'/>

<ref name='htmlSAXParseFile'/>

<ref name='xmlNodeListGetRawString'/>

<ref name='xmlNodeListGetString'/>

<ref name='xmlXPathStringFunction'/>

</word>

<word name='formatted'>

<ref name='xmlCtxtResetPush'/>

<ref name='xmlParserInputBufferPush'/>

<ref name='xmlStreamPop'/>

<ref name='xmlXPathEvalExpr'/>

</word>

<word name='pushed'>

</word>

<word name='wether'>

<ref name='_xmlNodeSet'/>

</word>

<word name='what'>

<ref name='xmlCatalogGetDefaults'/>

typedef struct _xmlStreamComp xmlStreamComp;

typedef xmlStreamComp *xmlStreamCompPtr;

struct _xmlStreamComp {

int nbStep; /* number of steps in the automata */

int maxStep; /* allocated number of steps */

xmlStreamStepPtr steps; /* the array of steps */

struct _xmlStreamCtxt {

struct _xmlStreamCtxt *next;/* link to next sub pattern if | */

xmlStreamCompPtr comp; /* the compiled stream */

int level; /* how deep are we ? */

int *states; /* the array of step indexes */

int flags; /* validation options */

struct _xmlPattern {

void *data; /* the associated template */

struct _xmlPattern *next; /* next pattern if | is used */

const xmlChar *pattern; /* the pattern */

const xmlChar *cur; /* the current char being parsed */

const xmlChar *base; /* the full expression */

int error; /* error code */

xmlPatternPtr comp; /* the result */

xmlNodePtr elem; /* the current node if any */

const xmlChar **namespaces; /* the namespaces definitions */

/**

* xmlNewPatParserContext:

* @pattern: the pattern context

* @namespaces: the prefix definitions, array of [URI, prefix] terminated

* with [NULL, NULL] or NULL if no namespace is used

*

* @value: the first value

* @value2: the second value

*

*

* Returns -1 in case of failure, 0 otherwise.

*/

* @comp: the precompiled pattern

* @node: a node

*

*

* Returns 1 if it matches, 0 if it doesn't and -1 in case of failure

*/

NEXT;

xmlCompileAttributeTest(ctxt);

SKIP_BLANKS;

xmlCompileStepPattern(ctxt);

}

} else {

xmlCompileStepPattern(ctxt);

SKIP_BLANKS;

while (CUR == '/') {

PUSH(XML_OP_ANCESTOR, NULL, NULL);

NEXT;

NEXT;

PUSH(XML_OP_PARENT, NULL, NULL);

NEXT;

SKIP_BLANKS;

xmlCompileStepPattern(ctxt);

}

}

* @ns: the namespace name

* @nodeType: the type of the node

*

* to come from the dictionary.

* Both @name and @ns being NULL means the / i.e. the root of the document.

* This can also act as a reset.

err++;

if (comp->nbStep == 0)

ret = 1;

}

stream = stream->next;

continue; /* while */

stream->level++;

goto stream_next;

}

/*

* Check evolution of existing states

* @name: the current name

* @ns: the namespace name

*

* to come from the dictionary.

* Both @name and @ns being NULL means the / i.e. the root of the document.

* This can also act as a reset.

* @name: the current name

* @ns: the namespace name

*

* to come from the dictionary.

* Both @name and @ns being NULL means the / i.e. the root of the document.

* This can also act as a reset.

/**

* xmlPatterncompile:

* @pattern: the pattern to compile

* @flags: compilation flags, undefined yet

* @namespaces: the prefix definitions, array of [URI, prefix] or NULL

*

* Compile a pattern.

*

*/

xmlPatternPtr

xmlPatterncompile(const xmlChar *pattern, xmlDict *dict,

if (ctxt->error != 0)

goto error;

xmlFreePatParserContext(ctxt);

if (streamable) {

xmlStreamCompile(cur);

if (xmlReversePattern(cur) < 0)

goto error;

xmlFree(tmp);

start = or;

}

if (streamable == 0) {

* @comp: the precompiled pattern

* @node: a node

*

*

* Returns 1 if it matches, 0 if it doesn't and -1 in case of failure

*/

}

if ((cur->children == NULL) || (depth >= max_depth)) {

ret = xmlStreamPop(patstream);

}

}

}

do {

cur = cur->parent;

depth--;

if ((cur == NULL) || (cur == limit))

goto done;

if (cur->next != NULL) {

cur = cur->next;

break;