From 9848519841bc53e064a92e837f91e2d3fe1457c1 Mon Sep 17 00:00:00 2001
From: Andrew Stone <andrew@clovar.com>
Date: Wed, 22 Oct 2014 10:38:25 -0400
Subject: [PATCH] filter: Add *Selector for filtering methods that accepts a
 pre-compiled cascadia selector.

---
 filter.go    | 22 ++++++++++++++++------
 traversal.go |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/filter.go b/filter.go
index c79cafe..e2b4ace 100644
--- a/filter.go
+++ b/filter.go
@@ -8,13 +8,25 @@ import (
 // Filter reduces the set of matched elements to those that match the selector string.
 // It returns a new Selection object for this subset of matching elements.
 func (s *Selection) Filter(selector string) *Selection {
-	return pushStack(s, winnow(s, selector, true))
+	return s.FilterSelector(cascadia.MustCompile(selector))
+}
+
+// Filter the set of matched elements by the given cascadia selector.
+func (s *Selection) FilterSelector(cs cascadia.Selector) *Selection {
+	return pushStack(s, winnow(s, cs, true))
 }
 
 // Not removes elements from the Selection that match the selector string.
 // It returns a new Selection object with the matching elements removed.
 func (s *Selection) Not(selector string) *Selection {
-	return pushStack(s, winnow(s, selector, false))
+	return s.NotSelector(cascadia.MustCompile(selector))
+}
+
+// Not removes elements from the Selection that match the given cascadia
+// selector.
+// It returns a new Selection object with the matching elements removed.
+func (s *Selection) NotSelector(cs cascadia.Selector) *Selection {
+	return pushStack(s, winnow(s, cs, false))
 }
 
 // FilterFunction reduces the set of matched elements to those that pass the function's test.
@@ -106,11 +118,9 @@ func (s *Selection) End() *Selection {
 	return newEmptySelection(s.document)
 }
 
-// Filter based on a selector string, and the indicator to keep (Filter) or
+// Filter based on the cascadia selector, and the indicator to keep (Filter) or
 // to get rid of (Not) the matching elements.
-func winnow(sel *Selection, selector string, keep bool) []*html.Node {
-	cs := cascadia.MustCompile(selector)
-
+func winnow(sel *Selection, cs cascadia.Selector, keep bool) []*html.Node {
 	// Optimize if keep is requested
 	if keep {
 		return cs.Filter(sel.Nodes)
diff --git a/traversal.go b/traversal.go
index 8fbeddf..8823f55 100644
--- a/traversal.go
+++ b/traversal.go
@@ -370,7 +370,7 @@ func filterAndPush(srcSel *Selection, nodes []*html.Node, selector string) *Sele
 	// Create a temporary Selection with the specified nodes to filter using winnow
 	sel := &Selection{nodes, srcSel.document, nil}
 	// Filter based on selector and push on stack
-	return pushStack(srcSel, winnow(sel, selector, true))
+	return pushStack(srcSel, winnow(sel, cascadia.MustCompile(selector), true))
 }
 
 // Internal implementation of Find that return raw nodes.