From 3ee2cad5b45197d5f39cf350c1335ad73d97be5d Mon Sep 17 00:00:00 2001
From: Thomas Broyer <tbroyer@src.gnome.org>
Date: Sun, 7 Oct 2001 16:55:36 +0000
Subject: added implementation of SAXON expression(), eval() and evaluate()

	* libexslt/saxon.c libexslt/Makefile.am libexslt/exslt.[ch]:
	  added implementation of SAXON expression(), eval() and
	  evaluate() functions.
	  See http://saxon.sourceforge.net/saxon6.4.4/extensions.html
	* tests/extension/evaluate.xsl tests/extension/list.{xsl,out}:
	  modified to use SAXON namespace (functions are not registered
	  in the LibXSLT namespace)
	* tests/exslt/common/object-type.1.out: modified to take account
	  of the new saxon:expression function
---
 tests/extensions/evaluate.xsl | 16 ++++++++--------
 tests/extensions/list.out     |  5 +----
 tests/extensions/list.xsl     |  8 +-------
 3 files changed, 10 insertions(+), 19 deletions(-)

(limited to 'tests/extensions')

diff --git a/tests/extensions/evaluate.xsl b/tests/extensions/evaluate.xsl
index a58470f6..c44bfc8c 100644
--- a/tests/extensions/evaluate.xsl
+++ b/tests/extensions/evaluate.xsl
@@ -1,24 +1,24 @@
 <?xml version='1.0'?>
 <xsl:stylesheet 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:libxslt="http://xmlsoft.org/XSLT/namespace"
+  xmlns:saxon="http://icl.com/saxon"
   version='1.0'>
 
-<xsl:variable name="expression" select="libxslt:expression('doc/two')"/>
+<xsl:variable name="expression" select="saxon:expression('doc/two')"/>
   
   <xsl:template match="/">
     <xsl:variable name="string">doc/one</xsl:variable>
-    <xsl:value-of select="libxslt:evaluate($string)"/>
-    <xsl:value-of select="count(libxslt:evaluate('/doc/one')/../*)"/>
-    <xsl:value-of select="libxslt:evaluate(/doc/three)"/>
-    <xsl:value-of select="libxslt:eval($expression)"/>
+    <xsl:value-of select="saxon:evaluate($string)"/>
+    <xsl:value-of select="count(saxon:evaluate('/doc/one')/../*)"/>
+    <xsl:value-of select="saxon:evaluate(/doc/three)"/>
+    <xsl:value-of select="saxon:eval($expression)"/>
     <xsl:apply-templates/>
   </xsl:template>
 
   <xsl:template match="four">
     <xsl:variable name="string">doc/one</xsl:variable>
-    <xsl:value-of select="libxslt:evaluate($string)"/>
-    <xsl:value-of select="libxslt:eval($expression)"/>
+    <xsl:value-of select="saxon:evaluate($string)"/>
+    <xsl:value-of select="saxon:eval($expression)"/>
   </xsl:template>
   
   <xsl:template match="text()"/>
diff --git a/tests/extensions/list.out b/tests/extensions/list.out
index c910ba08..e2d9ce12 100644
--- a/tests/extensions/list.out
+++ b/tests/extensions/list.out
@@ -30,14 +30,11 @@ saxon:output available
 xalanredirect:write available
 xt:document available
 libxslt:debug available
- === 9 Extension functions:
+ === 6 Extension functions:
 libxslt:node-set() available
 saxon:node-set() available
 xt:node-set() available
-libxslt:evaluate() available
 saxon:evaluate() available
-libxslt:expression() available
 saxon:expression() available
-libxslt:eval() available
 saxon:eval() available
 
diff --git a/tests/extensions/list.xsl b/tests/extensions/list.xsl
index d4fc6693..0523342b 100644
--- a/tests/extensions/list.xsl
+++ b/tests/extensions/list.xsl
@@ -69,7 +69,7 @@
 </xsl:if>
 <xsl:if test="element-available('libxslt:debug')">libxslt:debug available
 </xsl:if>
-<xsl:text> === 9 Extension functions:
+<xsl:text> === 6 Extension functions:
 </xsl:text>
 <xsl:if test="function-available('libxslt:node-set')">libxslt:node-set() available
 </xsl:if>
@@ -77,16 +77,10 @@
 </xsl:if>
 <xsl:if test="function-available('xt:node-set')">xt:node-set() available
 </xsl:if>
-<xsl:if test="function-available('libxslt:evaluate')">libxslt:evaluate() available
-</xsl:if>
 <xsl:if test="function-available('saxon:evaluate')">saxon:evaluate() available
 </xsl:if>
-<xsl:if test="function-available('libxslt:expression')">libxslt:expression() available
-</xsl:if>
 <xsl:if test="function-available('saxon:expression')">saxon:expression() available
 </xsl:if>
-<xsl:if test="function-available('libxslt:eval')">libxslt:eval() available
-</xsl:if>
 <xsl:if test="function-available('saxon:eval')">saxon:eval() available
 </xsl:if>
 </xsl:template>
-- 
cgit v1.2.3