Roll libxslt to 891681e3e948f31732229f53cb6db7215f740fc7

third_party/libxslt/libxslt/transform.c

 /*
  * transform.c: Implementation of the XSL Transformation 1.0 engine
  *              transform part, i.e. applying a Stylesheet to a document
  *
  * References:
  *   http://www.w3.org/TR/1999/REC-xslt-19991116
  *
  *   Michael Kay "XSLT Programmer's Reference" pp 637-643
  *   Writing Multiple Output Files
  *
@@ skipping 320 matching lines @@
         }
     }
     if (i == templ->templNr) {
         /* not found, add new one */
         templ->templCalledTab[templ->templNr] = parent;
         templ->templCountTab[templ->templNr] = 1;
         templ->templNr++;
     }
 }
 
+/**
+ * xsltPreCompEval:
+ * @ctxt: transform context
+ * @node: context node
+ * @comp: precompiled expression
+ *
+ * Evaluate a precompiled XPath expression.
+ */
+static xmlXPathObjectPtr
+xsltPreCompEval(xsltTransformContextPtr ctxt, xmlNodePtr node,
+                xsltStylePreCompPtr comp) {
+    xmlXPathObjectPtr res;
+    xmlXPathContextPtr xpctxt;
+    xmlNodePtr oldXPContextNode;
+    xmlNsPtr *oldXPNamespaces;
+    int oldXPProximityPosition, oldXPContextSize, oldXPNsNr;
+
+    xpctxt = ctxt->xpathCtxt;
+    oldXPContextNode = xpctxt->node;
+    oldXPProximityPosition = xpctxt->proximityPosition;
+    oldXPContextSize = xpctxt->contextSize;
+    oldXPNsNr = xpctxt->nsNr;
+    oldXPNamespaces = xpctxt->namespaces;
+
+    xpctxt->node = node;
+#ifdef XSLT_REFACTORED
+    if (comp->inScopeNs != NULL) {
+        xpctxt->namespaces = comp->inScopeNs->list;
+        xpctxt->nsNr = comp->inScopeNs->xpathNumber;
+    } else {
+        xpctxt->namespaces = NULL;
+        xpctxt->nsNr = 0;
+    }
+#else
+    xpctxt->namespaces = comp->nsList;
+    xpctxt->nsNr = comp->nsNr;
+#endif
+
+    res = xmlXPathCompiledEval(comp->comp, xpctxt);
+
+    xpctxt->node = oldXPContextNode;
+    xpctxt->proximityPosition = oldXPProximityPosition;
+    xpctxt->contextSize = oldXPContextSize;
+    xpctxt->nsNr = oldXPNsNr;
+    xpctxt->namespaces = oldXPNamespaces;
+
+    return(res);
+}
+
+/**
+ * xsltPreCompEvalToBoolean:
+ * @ctxt: transform context
+ * @node: context node
+ * @comp: precompiled expression
+ *
+ * Evaluate a precompiled XPath expression as boolean.
+ */
+static int
+xsltPreCompEvalToBoolean(xsltTransformContextPtr ctxt, xmlNodePtr node,
+                         xsltStylePreCompPtr comp) {
+    int res;
+    xmlXPathContextPtr xpctxt;
+    xmlNodePtr oldXPContextNode;
+    xmlNsPtr *oldXPNamespaces;
+    int oldXPProximityPosition, oldXPContextSize, oldXPNsNr;
+
+    xpctxt = ctxt->xpathCtxt;
+    oldXPContextNode = xpctxt->node;
+    oldXPProximityPosition = xpctxt->proximityPosition;
+    oldXPContextSize = xpctxt->contextSize;
+    oldXPNsNr = xpctxt->nsNr;
+    oldXPNamespaces = xpctxt->namespaces;
+
+    xpctxt->node = node;
+#ifdef XSLT_REFACTORED
+    if (comp->inScopeNs != NULL) {
+        xpctxt->namespaces = comp->inScopeNs->list;
+        xpctxt->nsNr = comp->inScopeNs->xpathNumber;
+    } else {
+        xpctxt->namespaces = NULL;
+        xpctxt->nsNr = 0;
+    }
+#else
+    xpctxt->namespaces = comp->nsList;
+    xpctxt->nsNr = comp->nsNr;
+#endif
+
+    res = xmlXPathCompiledEvalToBoolean(comp->comp, xpctxt);
+
+    xpctxt->node = oldXPContextNode;
+    xpctxt->proximityPosition = oldXPProximityPosition;
+    xpctxt->contextSize = oldXPContextSize;
+    xpctxt->nsNr = oldXPNsNr;
+    xpctxt->namespaces = oldXPNamespaces;
+
+    return(res);
+}
+
 /************************************************************************
  *                                                                      *
  *                      XInclude default settings                       *
  *                                                                      *
  ************************************************************************/
 
 static int xsltDoXIncludeDefault = 0;
 
 /**
  * xsltSetXIncludeDefault:
@@ skipping 473 matching lines @@
         /*
         * Default processing.
         */
         if ((target != NULL) && (target->last != NULL) &&
             (target->last->type == XML_TEXT_NODE) &&
             (target->last->name == xmlStringText)) {
             return(xsltAddTextString(ctxt, target->last, string, len));
         }
         copy = xmlNewTextLen(string, len);
     }
+    if (copy != NULL && target != NULL)
+        copy = xsltAddChild(target, copy);
     if (copy != NULL) {
-        if (target != NULL)
-            copy = xsltAddChild(target, copy);
         ctxt->lasttext = copy->content;
         ctxt->lasttsize = len;
         ctxt->lasttuse = len;
     } else {
         xsltTransformError(ctxt, NULL, target,
                          "xsltCopyTextString: text copy failed\n");
         ctxt->lasttext = NULL;
     }
     return(copy);
 }
@@ skipping 368 matching lines @@
     if ((node->type == XML_DTD_NODE) || (insert == NULL))
         return(NULL);
     if ((node->type == XML_TEXT_NODE) ||
         (node->type == XML_CDATA_SECTION_NODE))
         return(xsltCopyText(ctxt, insert, node, 0));
 
     copy = xmlDocCopyNode(node, insert->doc, 0);
     if (copy != NULL) {
         copy->doc = ctxt->output;
         copy = xsltAddChild(insert, copy);
+        if (copy == NULL) {
+             xsltTransformError(ctxt, NULL, node,
+                "xsltShallowCopyElem: copy failed\n");
+             return (copy);
+        }
 
         if (node->type == XML_ELEMENT_NODE) {
             /*
              * Add namespaces as they are needed
              */
             if (node->nsDef != NULL) {
                 /*
                 * TODO: Remove the LRE case in the refactored code
                 * gets enabled.
                 */
@@ skipping 313 matching lines @@
             copy = xsltCopyTreeList(ctxt, invocNode,
                 node->children, insert, 0, 0);
         else
             copy = NULL;
         return(copy);
     }
     copy = xmlDocCopyNode(node, insert->doc, 0);
     if (copy != NULL) {
         copy->doc = ctxt->output;
         copy = xsltAddChild(insert, copy);
+        if (copy == NULL) {
+            xsltTransformError(ctxt, NULL, invocNode,
+            "xsltCopyTreeInternal: Copying of '%s' failed.\n", node->name);
+            return (copy);
+        }
         /*
          * The node may have been coalesced into another text node.
          */
         if (insert->last != copy)
             return(insert->last);
         copy->next = NULL;
 
         if (node->type == XML_ELEMENT_NODE) {
             /*
             * Copy in-scope namespace nodes.
@@ skipping 2031 matching lines @@
 #endif
                 }
                 res = htmlNewDocNoDtD(doctypeSystem, doctypePublic);
             }
             if (res == NULL)
                 goto error;
             res->dict = ctxt->dict;
             xmlDictReference(res->dict);
         } else if (xmlStrEqual(method, (const xmlChar *) "xhtml")) {
             xsltTransformError(ctxt, NULL, inst,
-             "xsltDocumentElem: unsupported method xhtml\n",
-                             style->method);
+             "xsltDocumentElem: unsupported method xhtml\n");
             ctxt->type = XSLT_OUTPUT_HTML;
             res = htmlNewDocNoDtD(doctypeSystem, doctypePublic);
             if (res == NULL)
                 goto error;
             res->dict = ctxt->dict;
             xmlDictReference(res->dict);
         } else if (xmlStrEqual(method, (const xmlChar *) "text")) {
             ctxt->type = XSLT_OUTPUT_TEXT;
             res = xmlNewDoc(style->version);
             if (res == NULL)
                 goto error;
             res->dict = ctxt->dict;
             xmlDictReference(res->dict);
 #ifdef WITH_XSLT_DEBUG
             xsltGenericDebug(xsltGenericDebugContext,
                      "reusing transformation dict for output\n");
 #endif
         } else {
             xsltTransformError(ctxt, NULL, inst,
-                             "xsltDocumentElem: unsupported method %s\n",
-                             style->method);
+                             "xsltDocumentElem: unsupported method (%s)\n",
+                             method);
             goto error;
         }
     } else {
         ctxt->type = XSLT_OUTPUT_XML;
         res = xmlNewDoc(style->version);
         if (res == NULL)
             goto error;
         res->dict = ctxt->dict;
         xmlDictReference(res->dict);
 #ifdef WITH_XSLT_DEBUG
@@ skipping 385 matching lines @@
         copy = xmlNewDocNodeEatName(ctxt->output, NULL, (xmlChar *)name, NULL);
     } else {
         copy = xmlNewDocNode(ctxt->output, NULL, (xmlChar *)name, NULL);
     }
     if (copy == NULL) {
         xsltTransformError(ctxt, NULL, inst,
             "xsl:element : creation of %s failed\n", name);
         return;
     }
     copy = xsltAddChild(ctxt->insert, copy);
+    if (copy == NULL) {
+        xsltTransformError(ctxt, NULL, inst,
+            "xsl:element : xsltAddChild failed\n");
+        return;
+    }
 
     /*
     * Namespace
     * ---------
     */
     if (comp->has_ns) {
         if (comp->ns != NULL) {
             /*
             * No AVT; just plain text for the namespace name.
             */
@@ skipping 233 matching lines @@
 xsltCopyOf(xsltTransformContextPtr ctxt, xmlNodePtr node,
                    xmlNodePtr inst, xsltStylePreCompPtr castedComp) {
 #ifdef XSLT_REFACTORED
     xsltStyleItemCopyOfPtr comp = (xsltStyleItemCopyOfPtr) castedComp;
 #else
     xsltStylePreCompPtr comp = castedComp;
 #endif
     xmlXPathObjectPtr res = NULL;
     xmlNodeSetPtr list = NULL;
     int i;
-    xmlDocPtr oldXPContextDoc;
-    xmlNsPtr *oldXPNamespaces;
-    xmlNodePtr oldXPContextNode;
-    int oldXPProximityPosition, oldXPContextSize, oldXPNsNr;
-    xmlXPathContextPtr xpctxt;
 
     if ((ctxt == NULL) || (node == NULL) || (inst == NULL))
         return;
     if ((comp == NULL) || (comp->select == NULL) || (comp->comp == NULL)) {
         xsltTransformError(ctxt, NULL, inst,
              "xsl:copy-of : compilation failed\n");
         return;
     }
 
      /*
@@ skipping 15 matching lines @@
     */
 
 #ifdef WITH_XSLT_DEBUG_PROCESS
     XSLT_TRACE(ctxt,XSLT_TRACE_COPY_OF,xsltGenericDebug(xsltGenericDebugContext,
          "xsltCopyOf: select %s\n", comp->select));
 #endif
 
     /*
     * Evaluate the "select" expression.
     */
-    xpctxt = ctxt->xpathCtxt;
-    oldXPContextDoc = xpctxt->doc;
-    oldXPContextNode = xpctxt->node;
-    oldXPProximityPosition = xpctxt->proximityPosition;
-    oldXPContextSize = xpctxt->contextSize;
-    oldXPNsNr = xpctxt->nsNr;
-    oldXPNamespaces = xpctxt->namespaces;
-
-    xpctxt->node = node;
-    if (comp != NULL) {
-
-#ifdef XSLT_REFACTORED
-        if (comp->inScopeNs != NULL) {
-            xpctxt->namespaces = comp->inScopeNs->list;
-            xpctxt->nsNr = comp->inScopeNs->xpathNumber;
-        } else {
-            xpctxt->namespaces = NULL;
-            xpctxt->nsNr = 0;
-        }
-#else
-        xpctxt->namespaces = comp->nsList;
-        xpctxt->nsNr = comp->nsNr;
-#endif
-    } else {
-        xpctxt->namespaces = NULL;
-        xpctxt->nsNr = 0;
-    }
-
-    res = xmlXPathCompiledEval(comp->comp, xpctxt);
-
-    xpctxt->doc = oldXPContextDoc;
-    xpctxt->node = oldXPContextNode;
-    xpctxt->contextSize = oldXPContextSize;
-    xpctxt->proximityPosition = oldXPProximityPosition;
-    xpctxt->nsNr = oldXPNsNr;
-    xpctxt->namespaces = oldXPNamespaces;
+    res = xsltPreCompEval(ctxt, node, comp);
 
     if (res != NULL) {
         if (res->type == XPATH_NODESET) {
             /*
             * Node-set
             * --------
             */
 #ifdef WITH_XSLT_DEBUG_PROCESS
             XSLT_TRACE(ctxt,XSLT_TRACE_COPY_OF,xsltGenericDebug(xsltGenericDebugContext,
                  "xsltCopyOf: result is a node set\n"));
@@ skipping 89 matching lines @@
 xsltValueOf(xsltTransformContextPtr ctxt, xmlNodePtr node,
                    xmlNodePtr inst, xsltStylePreCompPtr castedComp)
 {
 #ifdef XSLT_REFACTORED
     xsltStyleItemValueOfPtr comp = (xsltStyleItemValueOfPtr) castedComp;
 #else
     xsltStylePreCompPtr comp = castedComp;
 #endif
     xmlXPathObjectPtr res = NULL;
     xmlChar *value = NULL;
-    xmlDocPtr oldXPContextDoc;
-    xmlNsPtr *oldXPNamespaces;
-    xmlNodePtr oldXPContextNode;
-    int oldXPProximityPosition, oldXPContextSize, oldXPNsNr;
-    xmlXPathContextPtr xpctxt;
 
     if ((ctxt == NULL) || (node == NULL) || (inst == NULL))
         return;
 
     if ((comp == NULL) || (comp->select == NULL) || (comp->comp == NULL)) {
         xsltTransformError(ctxt, NULL, inst,
             "Internal error in xsltValueOf(): "
             "The XSLT 'value-of' instruction was not compiled.\n");
         return;
     }
 
 #ifdef WITH_XSLT_DEBUG_PROCESS
     XSLT_TRACE(ctxt,XSLT_TRACE_VALUE_OF,xsltGenericDebug(xsltGenericDebugContext,
          "xsltValueOf: select %s\n", comp->select));
 #endif
 
-    xpctxt = ctxt->xpathCtxt;
-    oldXPContextDoc = xpctxt->doc;
-    oldXPContextNode = xpctxt->node;
-    oldXPProximityPosition = xpctxt->proximityPosition;
-    oldXPContextSize = xpctxt->contextSize;
-    oldXPNsNr = xpctxt->nsNr;
-    oldXPNamespaces = xpctxt->namespaces;
-
-    xpctxt->node = node;
-    if (comp != NULL) {
-
-#ifdef XSLT_REFACTORED
-        if (comp->inScopeNs != NULL) {
-            xpctxt->namespaces = comp->inScopeNs->list;
-            xpctxt->nsNr = comp->inScopeNs->xpathNumber;
-        } else {
-            xpctxt->namespaces = NULL;
-            xpctxt->nsNr = 0;
-        }
-#else
-        xpctxt->namespaces = comp->nsList;
-        xpctxt->nsNr = comp->nsNr;
-#endif
-    } else {
-        xpctxt->namespaces = NULL;
-        xpctxt->nsNr = 0;
-    }
-
-    res = xmlXPathCompiledEval(comp->comp, xpctxt);
-
-    xpctxt->doc = oldXPContextDoc;
-    xpctxt->node = oldXPContextNode;
-    xpctxt->contextSize = oldXPContextSize;
-    xpctxt->proximityPosition = oldXPProximityPosition;
-    xpctxt->nsNr = oldXPNsNr;
-    xpctxt->namespaces = oldXPNamespaces;
+    res = xsltPreCompEval(ctxt, node, comp);
 
     /*
     * Cast the XPath object to string.
     */
     if (res != NULL) {
         value = xmlXPathCastToString(res);
         if (value == NULL) {
             xsltTransformError(ctxt, NULL, inst,
                 "Internal error in xsltValueOf(): "
                 "failed to cast an XPath object to string.\n");
@@ skipping 35 matching lines @@
  */
 void
 xsltNumber(xsltTransformContextPtr ctxt, xmlNodePtr node,
            xmlNodePtr inst, xsltStylePreCompPtr castedComp)
 {
 #ifdef XSLT_REFACTORED
     xsltStyleItemNumberPtr comp = (xsltStyleItemNumberPtr) castedComp;
 #else
     xsltStylePreCompPtr comp = castedComp;
 #endif
+    xmlXPathContextPtr xpctxt;
+    xmlNsPtr *oldXPNamespaces;
+    int oldXPNsNr;
+
     if (comp == NULL) {
         xsltTransformError(ctxt, NULL, inst,
              "xsl:number : compilation failed\n");
         return;
     }
 
     if ((ctxt == NULL) || (node == NULL) || (inst == NULL) || (comp == NULL))
         return;
 
     comp->numdata.doc = inst->doc;
     comp->numdata.node = inst;
 
+    xpctxt = ctxt->xpathCtxt;
+    oldXPNsNr = xpctxt->nsNr;
+    oldXPNamespaces = xpctxt->namespaces;
+
+#ifdef XSLT_REFACTORED
+    if (comp->inScopeNs != NULL) {
+        xpctxt->namespaces = comp->inScopeNs->list;
+        xpctxt->nsNr = comp->inScopeNs->xpathNumber;
+    } else {
+        xpctxt->namespaces = NULL;
+        xpctxt->nsNr = 0;
+    }
+#else
+    xpctxt->namespaces = comp->nsList;
+    xpctxt->nsNr = comp->nsNr;
+#endif
+
     xsltNumberFormat(ctxt, &comp->numdata, node);
+
+    xpctxt->nsNr = oldXPNsNr;
+    xpctxt->namespaces = oldXPNamespaces;
 }
 
 /**
  * xsltApplyImports:
  * @ctxt:  an XSLT transformation context
  * @contextNode:  the current node in the source tree.
  * @inst:  the element node of the XSLT 'apply-imports' instruction
  * @comp:  the compiled instruction
  *
  * Process the XSLT apply-imports element.
@@ skipping 173 matching lines @@
 #ifdef XSLT_REFACTORED
     xsltStyleItemApplyTemplatesPtr comp =
         (xsltStyleItemApplyTemplatesPtr) castedComp;
 #else
     xsltStylePreCompPtr comp = castedComp;
 #endif
     int i;
     xmlNodePtr cur, delNode = NULL, oldContextNode;
     xmlNodeSetPtr list = NULL, oldList;
     xsltStackElemPtr withParams = NULL;
-    int oldXPProximityPosition, oldXPContextSize, oldXPNsNr;
+    int oldXPProximityPosition, oldXPContextSize;
     const xmlChar *oldMode, *oldModeURI;
     xmlDocPtr oldXPDoc;
     xsltDocumentPtr oldDocInfo;
     xmlXPathContextPtr xpctxt;
-    xmlNsPtr *oldXPNamespaces;
 
     if (comp == NULL) {
         xsltTransformError(ctxt, NULL, inst,
              "xsl:apply-templates : compilation failed\n");
         return;
     }
     if ((ctxt == NULL) || (node == NULL) || (inst == NULL) || (comp == NULL))
         return;
 
 #ifdef WITH_XSLT_DEBUG_PROCESS
@@ skipping 13 matching lines @@
     oldList = ctxt->nodeList;
 
     /*
      * The xpath context size and proximity position, as
      * well as the xpath and context documents, may be changed
      * so we save their initial state and will restore on exit
      */
     oldXPContextSize = xpctxt->contextSize;
     oldXPProximityPosition = xpctxt->proximityPosition;
     oldXPDoc = xpctxt->doc;
-    oldXPNsNr = xpctxt->nsNr;
-    oldXPNamespaces = xpctxt->namespaces;
 
     /*
     * Set up contexts.
     */
     ctxt->mode = comp->mode;
     ctxt->modeURI = comp->modeURI;
 
     if (comp->select != NULL) {
         xmlXPathObjectPtr res = NULL;
 
         if (comp->comp == NULL) {
             xsltTransformError(ctxt, NULL, inst,
                  "xsl:apply-templates : compilation failed\n");
             goto error;
         }
 #ifdef WITH_XSLT_DEBUG_PROCESS
         XSLT_TRACE(ctxt,XSLT_TRACE_APPLY_TEMPLATES,xsltGenericDebug(xsltGenericDebugContext,
              "xsltApplyTemplates: select %s\n", comp->select));
 #endif
 
-        /*
-        * Set up XPath.
-        */
-        xpctxt->node = node; /* Set the "context node" */
-#ifdef XSLT_REFACTORED
-        if (comp->inScopeNs != NULL) {
-            xpctxt->namespaces = comp->inScopeNs->list;
-            xpctxt->nsNr = comp->inScopeNs->xpathNumber;
-        } else {
-            xpctxt->namespaces = NULL;
-            xpctxt->nsNr = 0;
-        }
-#else
-        xpctxt->namespaces = comp->nsList;
-        xpctxt->nsNr = comp->nsNr;
-#endif
-        res = xmlXPathCompiledEval(comp->comp, xpctxt);
+        res = xsltPreCompEval(ctxt, node, comp);
 
-        xpctxt->contextSize = oldXPContextSize;
-        xpctxt->proximityPosition = oldXPProximityPosition;
         if (res != NULL) {
             if (res->type == XPATH_NODESET) {
                 list = res->nodesetval; /* consume the node set */
                 res->nodesetval = NULL;
             } else {
                 xsltTransformError(ctxt, NULL, inst,
                     "The 'select' expression did not evaluate to a "
                     "node set.\n");
                 ctxt->state = XSLT_STATE_STOPPED;
                 xmlXPathFreeObject(res);
@@ skipping 262 matching lines @@
     /*
     * Free the parameter list.
     */
     if (withParams != NULL)
         xsltFreeStackElemList(withParams);
     if (list != NULL)
         xmlXPathFreeNodeSet(list);
     /*
     * Restore context states.
     */
-    xpctxt->nsNr = oldXPNsNr;
-    xpctxt->namespaces = oldXPNamespaces;
     xpctxt->doc = oldXPDoc;
     xpctxt->contextSize = oldXPContextSize;
     xpctxt->proximityPosition = oldXPProximityPosition;
 
     ctxt->document = oldDocInfo;
     ctxt->nodeList = oldList;
     ctxt->node = oldContextNode;
     ctxt->mode = oldMode;
     ctxt->modeURI = oldModeURI;
 }
@@ skipping 35 matching lines @@
 #else
     if ((! IS_XSLT_ELEM(cur)) || (! IS_XSLT_NAME(cur, "when"))) {
         xsltTransformError(ctxt, NULL, inst,
              "xsl:choose: xsl:when expected first\n");
         return;
     }
 #endif
 
     {
         int testRes = 0, res = 0;
-        xmlXPathContextPtr xpctxt = ctxt->xpathCtxt;
-        xmlDocPtr oldXPContextDoc = xpctxt->doc;
-        int oldXPProximityPosition = xpctxt->proximityPosition;
-        int oldXPContextSize = xpctxt->contextSize;
-        xmlNsPtr *oldXPNamespaces = xpctxt->namespaces;
-        int oldXPNsNr = xpctxt->nsNr;
 
 #ifdef XSLT_REFACTORED
         xsltStyleItemWhenPtr wcomp = NULL;
 #else
         xsltStylePreCompPtr wcomp = NULL;
 #endif
 
         /*
         * Process xsl:when ---------------------------------------------------
         */
@@ skipping 16 matching lines @@
                 * TODO: Isn't comp->templ always NULL for xsl:choose?
                 */
                 xslHandleDebugger(cur, contextNode, NULL, ctxt);
             }
 #endif
 #ifdef WITH_XSLT_DEBUG_PROCESS
             XSLT_TRACE(ctxt,XSLT_TRACE_CHOOSE,xsltGenericDebug(xsltGenericDebugContext,
                 "xsltChoose: test %s\n", wcomp->test));
 #endif
 
-            xpctxt->node = contextNode;
-            xpctxt->doc = oldXPContextDoc;
-            xpctxt->proximityPosition = oldXPProximityPosition;
-            xpctxt->contextSize = oldXPContextSize;
-
-#ifdef XSLT_REFACTORED
-            if (wcomp->inScopeNs != NULL) {
-                xpctxt->namespaces = wcomp->inScopeNs->list;
-                xpctxt->nsNr = wcomp->inScopeNs->xpathNumber;
-            } else {
-                xpctxt->namespaces = NULL;
-                xpctxt->nsNr = 0;
-            }
-#else
-            xpctxt->namespaces = wcomp->nsList;
-            xpctxt->nsNr = wcomp->nsNr;
-#endif
-
-
 #ifdef XSLT_FAST_IF
-            res = xmlXPathCompiledEvalToBoolean(wcomp->comp, xpctxt);
+            res = xsltPreCompEvalToBoolean(ctxt, contextNode, wcomp);
 
             if (res == -1) {
                 ctxt->state = XSLT_STATE_STOPPED;
                 goto error;
             }
             testRes = (res == 1) ? 1 : 0;
 
 #else /* XSLT_FAST_IF */
 
-            res = xmlXPathCompiledEval(wcomp->comp, xpctxt);
+            res = xsltPreCompEval(ctxt, cotextNode, wcomp);
 
             if (res != NULL) {
                 if (res->type != XPATH_BOOLEAN)
                     res = xmlXPathConvertBoolean(res);
                 if (res->type == XPATH_BOOLEAN)
                     testRes = res->boolval;
                 else {
 #ifdef WITH_XSLT_DEBUG_PROCESS
                     XSLT_TRACE(ctxt,XSLT_TRACE_CHOOSE,xsltGenericDebug(xsltGenericDebugContext,
                         "xsltChoose: test didn't evaluate to a boolean\n"));
@@ skipping 28 matching lines @@
             if (xslDebugStatus != XSLT_DEBUG_NONE)
                 xslHandleDebugger(cur, contextNode, NULL, ctxt);
 #endif
 
 #ifdef WITH_XSLT_DEBUG_PROCESS
             XSLT_TRACE(ctxt,XSLT_TRACE_CHOOSE,xsltGenericDebug(xsltGenericDebugContext,
                 "evaluating xsl:otherwise\n"));
 #endif
             goto test_is_true;
         }
-        xpctxt->node = contextNode;
-        xpctxt->doc = oldXPContextDoc;
-        xpctxt->proximityPosition = oldXPProximityPosition;
-        xpctxt->contextSize = oldXPContextSize;
-        xpctxt->namespaces = oldXPNamespaces;
-        xpctxt->nsNr = oldXPNsNr;
         goto exit;
 
 test_is_true:
 
-        xpctxt->node = contextNode;
-        xpctxt->doc = oldXPContextDoc;
-        xpctxt->proximityPosition = oldXPProximityPosition;
-        xpctxt->contextSize = oldXPContextSize;
-        xpctxt->namespaces = oldXPNamespaces;
-        xpctxt->nsNr = oldXPNsNr;
         goto process_sequence;
     }
 
 process_sequence:
 
     /*
     * Instantiate the sequence constructor.
     */
     xsltApplySequenceConstructor(ctxt, ctxt->node, cur->children,
         NULL);
@@ skipping 33 matching lines @@
         return;
     }
 
 #ifdef WITH_XSLT_DEBUG_PROCESS
     XSLT_TRACE(ctxt,XSLT_TRACE_IF,xsltGenericDebug(xsltGenericDebugContext,
          "xsltIf: test %s\n", comp->test));
 #endif
 
 #ifdef XSLT_FAST_IF
     {
-        xmlXPathContextPtr xpctxt = ctxt->xpathCtxt;
-        xmlDocPtr oldXPContextDoc = xpctxt->doc;
-        xmlNsPtr *oldXPNamespaces = xpctxt->namespaces;
-        xmlNodePtr oldXPContextNode = xpctxt->node;
-        int oldXPProximityPosition = xpctxt->proximityPosition;
-        int oldXPContextSize = xpctxt->contextSize;
-        int oldXPNsNr = xpctxt->nsNr;
         xmlDocPtr oldLocalFragmentTop = ctxt->localRVT;
 
-        xpctxt->node = contextNode;
-        if (comp != NULL) {
-
-#ifdef XSLT_REFACTORED
-            if (comp->inScopeNs != NULL) {
-                xpctxt->namespaces = comp->inScopeNs->list;
-                xpctxt->nsNr = comp->inScopeNs->xpathNumber;
-            } else {
-                xpctxt->namespaces = NULL;
-                xpctxt->nsNr = 0;
-            }
-#else
-            xpctxt->namespaces = comp->nsList;
-            xpctxt->nsNr = comp->nsNr;
-#endif
-        } else {
-            xpctxt->namespaces = NULL;
-            xpctxt->nsNr = 0;
-        }
-        /*
-        * This XPath function is optimized for boolean results.
-        */
-        res = xmlXPathCompiledEvalToBoolean(comp->comp, xpctxt);
+        res = xsltPreCompEvalToBoolean(ctxt, contextNode, comp);
 
         /*
         * Cleanup fragments created during evaluation of the
         * "select" expression.
         */
         if (oldLocalFragmentTop != ctxt->localRVT)
             xsltReleaseLocalRVTs(ctxt, oldLocalFragmentTop);
-
-        xpctxt->doc = oldXPContextDoc;
-        xpctxt->node = oldXPContextNode;
-        xpctxt->contextSize = oldXPContextSize;
-        xpctxt->proximityPosition = oldXPProximityPosition;
-        xpctxt->nsNr = oldXPNsNr;
-        xpctxt->namespaces = oldXPNamespaces;
     }
 
 #ifdef WITH_XSLT_DEBUG_PROCESS
     XSLT_TRACE(ctxt,XSLT_TRACE_IF,xsltGenericDebug(xsltGenericDebugContext,
         "xsltIf: test evaluate to %d\n", res));
 #endif
 
     if (res == -1) {
         ctxt->state = XSLT_STATE_STOPPED;
         goto error;
     }
     if (res == 1) {
         /*
         * Instantiate the sequence constructor of xsl:if.
         */
         xsltApplySequenceConstructor(ctxt,
             contextNode, inst->children, NULL);
     }
 
 #else /* XSLT_FAST_IF */
     {
-        xmlXPathObjectPtr xpobj = NULL;
         /*
         * OLD CODE:
         */
-        {
-            xmlXPathContextPtr xpctxt = ctxt->xpathCtxt;
-            xmlDocPtr oldXPContextDoc = xpctxt->doc;
-            xmlNsPtr *oldXPNamespaces = xpctxt->namespaces;
-            xmlNodePtr oldXPContextNode = xpctxt->node;
-            int oldXPProximityPosition = xpctxt->proximityPosition;
-            int oldXPContextSize = xpctxt->contextSize;
-            int oldXPNsNr = xpctxt->nsNr;
-
-            xpctxt->node = contextNode;
-            if (comp != NULL) {
-
-#ifdef XSLT_REFACTORED
-                if (comp->inScopeNs != NULL) {
-                    xpctxt->namespaces = comp->inScopeNs->list;
-                    xpctxt->nsNr = comp->inScopeNs->xpathNumber;
-                } else {
-                    xpctxt->namespaces = NULL;
-                    xpctxt->nsNr = 0;
-                }
-#else
-                xpctxt->namespaces = comp->nsList;
-                xpctxt->nsNr = comp->nsNr;
-#endif
-            } else {
-                xpctxt->namespaces = NULL;
-                xpctxt->nsNr = 0;
-            }
-
-            /*
-            * This XPath function is optimized for boolean results.
-            */
-            xpobj = xmlXPathCompiledEval(comp->comp, xpctxt);
-
-            xpctxt->doc = oldXPContextDoc;
-            xpctxt->node = oldXPContextNode;
-            xpctxt->contextSize = oldXPContextSize;
-            xpctxt->proximityPosition = oldXPProximityPosition;
-            xpctxt->nsNr = oldXPNsNr;
-            xpctxt->namespaces = oldXPNamespaces;
-        }
+        xmlXPathObjectPtr xpobj = xsltPreCompEval(ctxt, contextNode, comp);
         if (xpobj != NULL) {
             if (xpobj->type != XPATH_BOOLEAN)
                 xpobj = xmlXPathConvertBoolean(xpobj);
             if (xpobj->type == XPATH_BOOLEAN) {
                 res = xpobj->boolval;
 
 #ifdef WITH_XSLT_DEBUG_PROCESS
                 XSLT_TRACE(ctxt,XSLT_TRACE_IF,xsltGenericDebug(xsltGenericDebugContext,
                     "xsltIf: test evaluate to %d\n", res));
 #endif
@@ skipping 86 matching lines @@
     /*
     * The "current template rule" is cleared for the instantiation of
     * xsl:for-each.
     */
     oldCurTemplRule = ctxt->currentTemplateRule;
     ctxt->currentTemplateRule = NULL;
 
     oldXPDoc = xpctxt->doc;
     oldXPProximityPosition = xpctxt->proximityPosition;
     oldXPContextSize = xpctxt->contextSize;
-    /*
-    * Set up XPath.
-    */
-    xpctxt->node = contextNode;
-#ifdef XSLT_REFACTORED
-    if (comp->inScopeNs != NULL) {
-        xpctxt->namespaces = comp->inScopeNs->list;
-        xpctxt->nsNr = comp->inScopeNs->xpathNumber;
-    } else {
-        xpctxt->namespaces = NULL;
-        xpctxt->nsNr = 0;
-    }
-#else
-    xpctxt->namespaces = comp->nsList;
-    xpctxt->nsNr = comp->nsNr;
-#endif
 
     /*
     * Evaluate the 'select' expression.
     */
-    res = xmlXPathCompiledEval(comp->comp, ctxt->xpathCtxt);
+    res = xsltPreCompEval(ctxt, contextNode, comp);
 
     if (res != NULL) {
         if (res->type == XPATH_NODESET)
             list = res->nodesetval;
         else {
             xsltTransformError(ctxt, NULL, inst,
                 "The 'select' expression does not evaluate to a node set.\n");
 
 #ifdef WITH_XSLT_DEBUG_PROCESS
             XSLT_TRACE(ctxt,XSLT_TRACE_FOR_EACH,xsltGenericDebug(xsltGenericDebugContext,
@@ skipping 10 matching lines @@
 
     if ((list == NULL) || (list->nodeNr <= 0))
         goto exit;
 
 #ifdef WITH_XSLT_DEBUG_PROCESS
     XSLT_TRACE(ctxt,XSLT_TRACE_FOR_EACH,xsltGenericDebug(xsltGenericDebugContext,
         "xsltForEach: select evaluates to %d nodes\n", list->nodeNr));
 #endif
 
     /*
-    * Restore XPath states for the "current node".
-    */
-    xpctxt->contextSize = oldXPContextSize;
-    xpctxt->proximityPosition = oldXPProximityPosition;
-    xpctxt->node = contextNode;
-
-    /*
     * Set the list; this has to be done already here for xsltDoSortFunction().
     */
     ctxt->nodeList = list;
     /*
     * Handle xsl:sort instructions and skip them for further processing.
     * BUG TODO: We are not using namespaced potentially defined on the
     * xsl:sort element; XPath expression might fail.
     */
     curInst = inst->children;
     if (IS_XSLT_ELEM(curInst) && IS_XSLT_NAME(curInst, "sort")) {
@@ skipping 380 matching lines @@
                 goto error;
             res->dict = ctxt->dict;
             xmlDictReference(res->dict);
 
 #ifdef WITH_XSLT_DEBUG
             xsltGenericDebug(xsltGenericDebugContext,
                 "reusing transformation dict for output\n");
 #endif
         } else if (xmlStrEqual(method, (const xmlChar *) "xhtml")) {
             xsltTransformError(ctxt, NULL, (xmlNodePtr) doc,
-                "xsltApplyStylesheetInternal: unsupported method xhtml, using html\n",
-                style->method);
+                "xsltApplyStylesheetInternal: unsupported method xhtml, using html\n");
             ctxt->type = XSLT_OUTPUT_HTML;
             res = htmlNewDoc(doctypeSystem, doctypePublic);
             if (res == NULL)
                 goto error;
             res->dict = ctxt->dict;
             xmlDictReference(res->dict);
 
 #ifdef WITH_XSLT_DEBUG
             xsltGenericDebug(xsltGenericDebugContext,
                 "reusing transformation dict for output\n");
 #endif
         } else if (xmlStrEqual(method, (const xmlChar *) "text")) {
             ctxt->type = XSLT_OUTPUT_TEXT;
             res = xmlNewDoc(style->version);
             if (res == NULL)
                 goto error;
             res->dict = ctxt->dict;
             xmlDictReference(res->dict);
 
 #ifdef WITH_XSLT_DEBUG
             xsltGenericDebug(xsltGenericDebugContext,
                 "reusing transformation dict for output\n");
 #endif
         } else {
             xsltTransformError(ctxt, NULL, (xmlNodePtr) doc,
-                "xsltApplyStylesheetInternal: unsupported method %s\n",
-                style->method);
+                "xsltApplyStylesheetInternal: unsupported method (%s)\n",
+                method);
             goto error;
         }
     } else {
         ctxt->type = XSLT_OUTPUT_XML;
         res = xmlNewDoc(style->version);
         if (res == NULL)
             goto error;
         res->dict = ctxt->dict;
         xmlDictReference(ctxt->dict);
 #ifdef WITH_XSLT_DEBUG
@@ skipping 458 matching lines @@
                            XSLT_NAMESPACE,
                            (xsltTransformFunction) xsltDebug);
     xsltRegisterExtElement(ctxt, (const xmlChar *) "otherwise",
                            XSLT_NAMESPACE,
                            (xsltTransformFunction) xsltDebug);
     xsltRegisterExtElement(ctxt, (const xmlChar *) "fallback",
                            XSLT_NAMESPACE,
                            (xsltTransformFunction) xsltDebug);
 
 }