Add set_arg_state method to lexer to set after operator state

adambeynon · adambeynon · commit 9d970cb55c95 · 2013-11-21T11:30:40.000Z
diff --git a/lib/opal/parser/lexer.rb b/lib/opal/parser/lexer.rb
@@ -75,6 +75,10 @@ def space?
       @scanner.check(/\s/)
     end
 
+    def set_arg_state
+      @lex_state = after_operator? ? :expr_arg : :expr_beg
+    end
+
     def scan(regexp)
       @scanner.scan regexp
     end
@@ -531,8 +535,7 @@ def yylex
               return :tOP_ASGN, '**'
             end
 
-            @lex_state = after_operator? ? :expr_arg : :expr_beg
-
+            self.set_arg_state
             return :tPOW, '**'
 
           else
@@ -548,8 +551,7 @@ def yylex
           end
 
           if scan(/\*/)
-            @lex_state = after_operator? ? :expr_arg : :expr_beg
-
+            self.set_arg_state
             return :tPOW, '**'
           end
 
@@ -620,7 +622,7 @@ def yylex
             end
           end
 
-          @lex_state = after_operator? ? :expr_arg : :expr_beg
+          self.set_arg_state
 
           if scan(/\=/)
             if scan(/\=/)
@@ -675,7 +677,7 @@ def yylex
             result = :tAMPER2
           end
 
-          @lex_state = after_operator? ? :expr_arg : :expr_beg
+          self.set_arg_state
           return result, '&'
 
         elsif scan(/\|/)
@@ -691,7 +693,7 @@ def yylex
             return :tOP_ASGN, '|'
           end
 
-          @lex_state = after_operator? ? :expr_arg : :expr_beg
+          self.set_arg_state
           return :tPIPE, '|'
 
         elsif scan(/\%[QqWwixr]/)
@@ -761,7 +763,7 @@ def yylex
             end
           end
 
-          @lex_state = after_operator? ? :expr_arg : :expr_beg
+          self.set_arg_state
 
           return :tPERCENT, '%'
 
@@ -880,8 +882,7 @@ def yylex
           @lex_state = :expr_beg
           return :tOP_ASGN, '^'
         elsif scan(/\^/)
-          @lex_state = after_operator? ? :expr_arg : :expr_beg
-
+          self.set_arg_state
           return :tCARET, scanner.matched
 
         elsif check(/\</)
@@ -915,27 +916,27 @@ def yylex
 
             return :tCMP, '<=>'
           elsif scan(/\<\=/)
-            @lex_state = after_operator? ? :expr_arg : :expr_beg
+            self.set_arg_state
             return :tLEQ, '<='
 
           elsif scan(/\</)
-            @lex_state = after_operator? ? :expr_arg : :expr_beg
+            self.set_arg_state
             return :tLT, '<'
           end
 
         elsif check(/\>/)
           if scan(/\>\>\=/)
             return :tOP_ASGN, '>>'
           elsif scan(/\>\>/)
-            @lex_state = after_operator? ? :expr_arg : :expr_beg
+            self.set_arg_state
             return :tRSHFT, '>>'
 
           elsif scan(/\>\=/)
-            @lex_state = after_operator? ? :expr_arg : :expr_beg
+            self.set_arg_state
             return :tGEQ, scanner.matched
 
           elsif scan(/\>/)
-            @lex_state = after_operator? ? :expr_arg : :expr_beg
+            self.set_arg_state
             return :tGT, '>'
           end
 
@@ -990,7 +991,7 @@ def yylex
           return :tEH, scanner.matched
 
         elsif scan(/\~/)
-          @lex_state = after_operator? ? :expr_arg : :expr_beg
+          self.set_arg_state
           return :tTILDE, '~'
 
         elsif check(/\$/)
