Fix parsing of hash-arrows in hashes with symbol keys and no whitespace

adambeynon · adambeynon · commit 8b5a84f7427b · 2014-03-07T18:04:06.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## edge
 
+*   Fix parsing `=>` in hash literals where it would sometimes incorrectly
+    parse as a key name.
+
 ## 0.6.0 2014-03-05
 
 *   Fix parsing of escapes in single-strings ('foo\n'). Only ' and \
diff --git a/lib/opal/parser/lexer.rb b/lib/opal/parser/lexer.rb
@@ -510,7 +510,7 @@ def process_identifier(matched, cmd_start)
         result = :tIDENTIFIER
       else
         if @lex_state == :expr_fname
-          if scan(/\=/)
+          if !check(/\=\>/) and scan(/\=/)
             result = :tIDENTIFIER
             matched += scanner.matched
           end
diff --git a/spec/cli/parser/literal_spec.rb b/spec/cli/parser/literal_spec.rb
@@ -94,6 +94,11 @@
       parsed("{ a: 1 }").should == [:hash, [:sym, :a], [:int, 1]]
       parsed("{ a: 1, b: 2 }").should == [:hash, [:sym, :a], [:int, 1], [:sym, :b], [:int, 2]]
     end
+
+    it "parses hash arrows without spaces around arguments" do
+      parsed("{1=>2}").should == [:hash, [:int, 1], [:int, 2]]
+      parsed("{:foo=>2}").should == [:hash, [:sym, :foo], [:int, 2]]
+    end
   end
 
   describe "parsing regexps" do
