AST: generalized a way to handle STAR node type

lifo · May 23, 2012 · d59c75e · d59c75e
1 parent 622f535
commit d59c75e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 27 deletions.
diff --git a/lib/journey/nodes/node.rb b/lib/journey/nodes/node.rb
@@ -29,7 +29,7 @@ def to_sym
       end
 
       def name
-        left.tr ':', ''
+        left.tr '*:', ''
       end
 
       def type

diff --git a/lib/journey/parser.rb b/lib/journey/parser.rb
diff --git a/lib/journey/parser.y b/lib/journey/parser.y
@@ -20,7 +20,7 @@ rule
     : expressions OR expression { result = Or.new([val.first, val.last]) }
     ;
   star
-    : STAR literal       { result = Star.new(Symbol.new(val.last.left)) }
+    : STAR       { result = Star.new(Symbol.new(val.last)) }
     ;
   terminal
     : symbol

diff --git a/lib/journey/scanner.rb b/lib/journey/scanner.rb
@@ -35,7 +35,7 @@ def scan
         # /
       when text = @ss.scan(/\//)
         [:SLASH, text]
-      when text = @ss.scan(/\*/)
+      when text = @ss.scan(/\*\w+/)
         [:STAR, text]
       when text = @ss.scan(/\(/)
         [:LPAREN, text]

diff --git a/lib/journey/visitors.rb b/lib/journey/visitors.rb
@@ -68,10 +68,6 @@ def terminal node
         node.left
       end
 
-      def visit_STAR node
-        "*" + super
-      end
-
       def visit_GROUP node
         "(#{visit node.left})"
       end

diff --git a/test/route/definition/test_scanner.rb b/test/route/definition/test_scanner.rb
@@ -11,7 +11,7 @@ def setup
       def test_tokens
         [
           ['/',      [[:SLASH, '/']]],
-          ['*omg',   [[:STAR, '*'], [:LITERAL, 'omg']]],
+          ['*omg',   [[:STAR, '*omg']]],
           ['/page',  [[:SLASH, '/'], [:LITERAL, 'page']]],
           ['/~page', [[:SLASH, '/'], [:LITERAL, '~page']]],
           ['/pa-ge', [[:SLASH, '/'], [:LITERAL, 'pa-ge']]],