Cleanup parsing '*' tokens

opal · Nov 21, 2013 · 8ebbaa2 · 8ebbaa2
1 parent 614bcff
commit 8ebbaa2
Showing 1 changed file with 5 additions and 25 deletions.
diff --git a/lib/opal/parser/lexer.rb b/lib/opal/parser/lexer.rb
@@ -532,38 +532,18 @@ def yylex
           @lex_state = :expr_beg
           return :tSEMI, ';'
 
-        elsif scan(/\*/)
-          if scan(/\*/)
-            if scan(/\=/)
-              @lex_state = :expr_beg
-              return :tOP_ASGN, '**'
-            end
-
-            self.set_arg_state
-            return :tPOW, '**'
-
-          else
-            if scan(/\=/)
-              @lex_state = :expr_beg
-              return :tOP_ASGN, '*'
-            end
-          end
-
-          if scan(/\*\=/)
+        elsif check(/\*/)
+          if scan(/\*\*\=/)
             @lex_state = :expr_beg
             return :tOP_ASGN, '**'
-          end
-
-          if scan(/\*/)
+          elsif scan(/\*\*/)
             self.set_arg_state
             return :tPOW, '**'
-          end
-
-          if scan(/\=/)
+          elsif scan(/\*\=/)
             @lex_state = :expr_beg
             return :tOP_ASGN, '*'
           else
-            result = '*'
+            result = scan(/\*/)
 
             if after_operator?
               @lex_state = :expr_arg