Fix bug for parsing operators before \n in command calls (#334)

adambeynon · adambeynon · commit d19a7ec34875 · 2013-07-30T18:57:55.000+01:00
diff --git a/lib/opal/lexer.rb b/lib/opal/lexer.rb
@@ -469,6 +469,11 @@ def next_token
           return :OP_ASGN, '**'
 
         elsif scanner.scan(/\*\*/)
+          if @lex_state == :expr_fname or @lex_state == :expr_dot
+            @lex_state = :expr_arg
+          else
+            @lex_state = :expr_beg
+          end
           return '**', '**'
 
         elsif scanner.scan(/\*\=/)
@@ -570,9 +575,15 @@ def next_token
               return '&@', '&'
             elsif [:expr_beg, :expr_mid].include? @lex_state
               return '&@', '&'
+            end
+
+            if @lex_state == :expr_fname or @lex_state == :expr_dot
+              @lex_state = :expr_arg
             else
-              return '&', '&'
+              @lex_state = :expr_beg
             end
+
+            return '&', '&'
           end
 
         elsif scanner.check(/\</)
@@ -624,6 +635,11 @@ def next_token
           if scanner.scan(/\>\>\=/)
             return :OP_ASGN, '>>'
           elsif scanner.scan(/\>\>/)
+            if @lex_state == :expr_fname or @lex_state == :expr_dot
+              @lex_state = :expr_arg
+            else
+              @lex_state = :expr_beg
+            end
             return '>>', '>>'
           elsif scanner.scan(/\>\=/)
             if @lex_state == :expr_fname
diff --git a/spec/parser/parse_spec.rb b/spec/parser/parse_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Opal::Parser do
+  it "parses operators before \n in command calls" do
+    [:<<, :>>, :|, :^, :&, :<=>, :==, :===, :=~, :>, :>=, :<, :<=, :<<, :>>, :%, :**].each do |mid|
+      opal_parse("self #{mid}\nself").should == [:call, [:self], mid, [:arglist, [:self]]]
+    end
+  end
+end
