Use a priority queue when matching templates at the same import precedence

Author: jbowtie

README.md

@@ -12,9 +12,7 @@ TODO
 
 There are several tasks remaining to reach full compliance. Until these tasks are complete the API is subject to change.
 
-* [ ] Distinguish between nodesets and RVTs (needed to pass 11.2-3)
-* [ ] Correctly resolve "/.." to the empty nodeset (needed to pass 11.2-6)
-* [ ] Fully implement xsl:include (no tests in initial suite)
-* [ ] Fully implement xsl:with-param (no tests in initial suite)
-* [ ] Ensure that errors are properly progogated in Go fashion.
+* Fully implement xsl:include (see tests in libxslt general suite)
+* Fully implement xsl:with-param (no tests in initial suite)
+* Ensure that errors are properly progogated in Go fashion.
 

xslt/stylesheet.go

@@ -439,34 +439,48 @@ func (style *Stylesheet) LookupTemplate(node xml.Node, mode string, context *Exe
 	for i := style.IdKeyMatches.Front(); i != nil; i = i.Next() {
 		c := i.Value.(*CompiledMatch)
 		if c.EvalMatch(node, mode, context) {
-			return c.Template
+			insertByPriority(found, c)
+			break
 		}
 	}
 	for i := style.NodeMatches.Front(); i != nil; i = i.Next() {
 		c := i.Value.(*CompiledMatch)
 		if c.EvalMatch(node, mode, context) {
-			return c.Template
+			insertByPriority(found, c)
+			break
 		}
 	}
 	for i := style.TextMatches.Front(); i != nil; i = i.Next() {
 		c := i.Value.(*CompiledMatch)
 		if c.EvalMatch(node, mode, context) {
-			return c.Template
+			insertByPriority(found, c)
+			break
 		}
 	}
 	for i := style.PIMatches.Front(); i != nil; i = i.Next() {
 		c := i.Value.(*CompiledMatch)
 		if c.EvalMatch(node, mode, context) {
-			return c.Template
+			insertByPriority(found, c)
+			break
 		}
 	}
 	for i := style.CommentMatches.Front(); i != nil; i = i.Next() {
 		c := i.Value.(*CompiledMatch)
 		if c.EvalMatch(node, mode, context) {
-			return c.Template
+			insertByPriority(found, c)
+			break
 		}
 	}
 
+	// if there's a match at this import precedence, return
+	// the one with the highest priority
+	f := found.Front()
+	if f != nil {
+		template = f.Value.(*CompiledMatch).Template
+		return
+	}
+
+	// no match at this import precedence,
 	//consult the imported stylesheets
 	for i := style.Imports.Front(); i != nil; i = i.Next() {
 		s := i.Value.(*Stylesheet)
@@ -475,10 +489,6 @@ func (style *Stylesheet) LookupTemplate(node xml.Node, mode string, context *Exe
 			return t
 		}
 	}
-	f := found.Front()
-	if f != nil {
-		template = f.Value.(*CompiledMatch).Template
-	}
 	return
 }
 

xslt/stylesheet_test.go

@@ -115,7 +115,7 @@ func TestXsltGeneral(t *testing.T) {
 	//runGeneralXslTest(t, "bug-5-") //seems to be an issue with for-each select=$ACTIONgrid
 	runGeneralXslTest(t, "bug-6-")
 	runGeneralXslTest(t, "bug-7-")
-	//runGeneralXslTest(t, "bug-8-")
+	//runGeneralXslTest(t, "bug-8-") //issue resolving imported template?
 	runGeneralXslTest(t, "bug-9-")
 	runGeneralXslTest(t, "bug-10-")
 	runGeneralXslTest(t, "bug-11-")
@@ -150,7 +150,7 @@ func TestXsltGeneral(t *testing.T) {
 	//runGeneralXslTest(t, "bug-100") // libxslt:test extension element
 	runGeneralXslTest(t, "bug-101") // xsl:element with default namespace
 	//runGeneralXslTest(t, "bug-102") // imported xsl:attribute-set
-	//runGeneralXslTest(t, "bug-103") //copy-of needs to explcitly set empty namespace when needed
+	//runGeneralXslTest(t, "bug-103") //copy-of needs to explicitly set empty namespace when needed
 	//runGeneralXslTest(t, "bug-104") //copy-of should preserve attr prefix if plausible
 	runGeneralXslTest(t, "bug-105")
 	runGeneralXslTest(t, "bug-106") //copy-of