From: Jean Privat <jean@pryen.org>
Date: Thu, 18 Dec 2014 20:02:25 +0000 (-0500)
Subject: parser: promote `collect_X` from `parser_util`
X-Git-Tag: v0.7~13^2~3
X-Git-Url: http://nitlanguage.org

parser: promote `collect_X` from `parser_util`

Signed-off-by: Jean Privat <jean@pryen.org>
---

diff --git a/src/parser/parser_nodes.nit b/src/parser/parser_nodes.nit
index 1cc8a31..47f879e 100644
--- a/src/parser/parser_nodes.nit
+++ b/src/parser/parser_nodes.nit
@@ -117,8 +117,48 @@ abstract class ANode
 	# Visit all nodes in order.
 	# Thus, call `v.enter_visit(e)` for each child `e`
 	fun visit_all(v: Visitor) is abstract
+
+	# Do a deep search and return an array of tokens that match a given text
+	fun collect_tokens_by_text(text: String): Array[Token]
+	do
+		var v = new CollectTokensByTextVisitor(text)
+		v.enter_visit(self)
+		return v.result
+	end
+
+	# Do a deep search and return an array of node that are annotated
+	# The attached node can be retrieved by two invocations of parent
+	fun collect_annotations_by_name(name: String): Array[AAnnotation]
+	do
+		var v = new CollectAnnotationsByNameVisitor(name)
+		v.enter_visit(self)
+		return v.result
+	end
 end
 
+private class CollectTokensByTextVisitor
+	super Visitor
+	var text: String
+	var result = new Array[Token]
+	redef fun visit(node)
+	do
+		node.visit_all(self)
+		if node isa Token and node.text == text then result.add(node)
+	end
+end
+
+private class CollectAnnotationsByNameVisitor
+	super Visitor
+	var name: String
+	var result = new Array[AAnnotation]
+	redef fun visit(node)
+	do
+		node.visit_all(self)
+		if node isa AAnnotation and node.n_atid.n_id.text == name then result.add(node)
+	end
+end
+
+
 # A sequence of nodes
 # It is a specific class (instead of using a Array) to track the parent/child relation when nodes are added or removed
 class ANodes[E: ANode]
diff --git a/src/parser_util.nit b/src/parser_util.nit
index 82aec57..17aa012 100644
--- a/src/parser_util.nit
+++ b/src/parser_util.nit
@@ -246,44 +246,3 @@ class InjectedLexer
 		return tok
 	end
 end
-
-redef class ANode
-	# Do a deep search and return an array of tokens that match a given text
-	fun collect_tokens_by_text(text: String): Array[Token]
-	do
-		var v = new CollectTokensByTextVisitor(text)
-		v.enter_visit(self)
-		return v.result
-	end
-
-	# Do a deep search and return an array of node that are annotated
-	# The attached node can be retrieved by two invocation of parent
-	fun collect_annotations_by_name(name: String): Array[AAnnotation]
-	do
-		var v = new CollectAnnotationsByNameVisitor(name)
-		v.enter_visit(self)
-		return v.result
-	end
-end
-
-private class CollectTokensByTextVisitor
-	super Visitor
-	var text: String
-	var result = new Array[Token]
-	redef fun visit(node)
-	do
-		node.visit_all(self)
-		if node isa Token and node.text == text then result.add(node)
-	end
-end
-
-private class CollectAnnotationsByNameVisitor
-	super Visitor
-	var name: String
-	var result = new Array[AAnnotation]
-	redef fun visit(node)
-	do
-		node.visit_all(self)
-		if node isa AAnnotation and node.n_atid.n_id.text == name then result.add(node)
-	end
-end