From 44d5585b4bdc8d93bf8acb0f70eb0aa6000a89e6 Mon Sep 17 00:00:00 2001
From: David Lichteblau <david@lichteblau.com>
Date: Sun, 27 Apr 2008 14:24:07 +0200
Subject: [PATCH] Fixed keys matching the root element

---
 TEST      | 8 +++-----
 test.lisp | 4 ++++
 xslt.lisp | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/TEST b/TEST
index f1ba67f..9ad6a2a 100644
--- a/TEST
+++ b/TEST
@@ -17925,9 +17925,7 @@ FAIL Text__91137 [XSLT-Result-Tree]: output doesn't match
   Expected output (1): MSFT_Conformance_Tests/Text/Text__91137.saxon
   Actual output: MSFT_Conformance_Tests/Text/Text__91137.xuriella
 
-FAIL Text__78282 [XSLT-Result-Tree]: condition of incorrect type: 
-error opening #P"...MSFT_Conformance_Tests/Text/text.xml":
-  No such file or directory
+FAIL Text__78282 [XSLT-Result-Tree]: expected error not signalled: 
   Stylesheet: MSFT_Conformance_Tests/Text/XSLT04116.noindent-xsl
   Data: MSFT_Conformance_Tests/Text/text.xml
   Expected output (1): MSFT_Conformance_Tests/Text/Text__78282.saxon
@@ -18020,7 +18018,7 @@ PASS Value-of_ValueOf_ConcatTextNodesIntoSingle [XSLT-Result-Tree]
   Expected output (1): MSFT_Conformance_Tests/Valueof/Value-of_ValueOf_ConcatTextNodesIntoSingle.saxon
   Actual output: MSFT_Conformance_Tests/Valueof/Value-of_ValueOf_ConcatTextNodesIntoSingle.xuriella
 
-FAIL Value-of_ValueOf_KeyReferenceInSelect [XSLT-Result-Tree]: output doesn't match
+PASS Value-of_ValueOf_KeyReferenceInSelect [XSLT-Result-Tree]
   Stylesheet: MSFT_Conformance_Tests/Valueof/xslt_valueof_KeyFuncInSelect.noindent-xsl
   Data: MSFT_Conformance_Tests/Valueof/xslt_valueof_KeyFuncInSelect.xml
   Expected output (1): MSFT_Conformance_Tests/Valueof/Value-of_ValueOf_KeyReferenceInSelect.saxon
@@ -19294,4 +19292,4 @@ PASS XSLTFunctions_DocumentFuncWithEmptyArg [Mixed]
   Expected output (1): MSFT_Conformance_Tests/XSLTFunctions/XSLTFunctions_DocumentFuncWithEmptyArg.saxon
   Actual output: MSFT_Conformance_Tests/XSLTFunctions/XSLTFunctions_DocumentFuncWithEmptyArg.xuriella
 
-Passed 2982/3070 tests (26 expected failures, 62 unexpected failures).
+Passed 2983/3070 tests (26 expected failures, 61 unexpected failures).
diff --git a/test.lisp b/test.lisp
index 974b7e7..06d1d05 100644
--- a/test.lisp
+++ b/test.lisp
@@ -901,6 +901,10 @@
                                             (merge-pathnames
                                              "MSFT_Conformance_Tests/Output/Outputtext.xml"
                                              *tests-directory*))
+                                           ((search "Text/text.xml" p)
+                                            (merge-pathnames
+                                             "MSFT_Conformance_Tests/Text/Text.xml"
+                                             *tests-directory*))
                                            (t
                                             (pathname p))))
                                        :output s
diff --git a/xslt.lisp b/xslt.lisp
index 5b43bc7..9a49f1b 100644
--- a/xslt.lisp
+++ b/xslt.lisp
@@ -1740,7 +1740,7 @@
       (let ((parsed
              (mapcar #'(lambda (item)
                          `(:path (:root :node)
-                                 (:descendant-or-self *)
+                                 (:descendant-or-self :node)
                                  ,@(cdr item)))
                      (cdr (xpath::parse-pattern-expression str)))))
         (if (null (rest parsed))
-- 
2.11.4.GIT