make the AST go from left to right, rather than right to left

rails · May 20, 2014 · fe06e9a · fe06e9a
1 parent dc2e3ea
commit fe06e9a
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 45 deletions.
diff --git a/actionpack/lib/action_dispatch/journey/parser.rb b/actionpack/lib/action_dispatch/journey/parser.rb
diff --git a/actionpack/lib/action_dispatch/journey/parser.y b/actionpack/lib/action_dispatch/journey/parser.y
@@ -4,7 +4,7 @@ token SLASH LITERAL SYMBOL LPAREN RPAREN DOT STAR OR
 
 rule
   expressions
-    : expressions expression  { result = Cat.new(val.first, val.last) }
+    : expression expressions  { result = Cat.new(val.first, val.last) }
     | expression              { result = val.first }
     | or
     ;
@@ -17,7 +17,8 @@ rule
     : LPAREN expressions RPAREN { result = Group.new(val[1]) }
     ;
   or
-    : expressions OR expression { result = Or.new([val.first, val.last]) }
+    : expression OR expression { result = Or.new([val.first, val.last]) }
+    | expression OR or { result = Or.new([val.first, val.last]) }
     ;
   star
     : STAR       { result = Star.new(Symbol.new(val.last)) }