crystal-lang · Jul 30, 2016 · Jul 30, 2016
Showing with 12 additions and 4 deletions.

+8 −1 spec/compiler/lexer/lexer_spec.cr

+2 −0 spec/compiler/parser/parser_spec.cr

+1 −2 src/compiler/crystal/macros/interpreter.cr

+1 −1 src/compiler/crystal/syntax/lexer.cr
diff --git a/spec/compiler/lexer/lexer_spec.cr b/spec/compiler/lexer/lexer_spec.cr
@@ -230,7 +230,7 @@ describe "Lexer" do
   assert_syntax_error "'\\", "unterminated char literal"
   it_lexes_operators [:"=", :"<", :"<=", :">", :">=", :"+", :"-", :"*", :"(", :")",
     :"==", :"!=", :"=~", :"!", :",", :".", :"..", :"...", :"&&", :"||",
-    :"|", :"{", :"}", :"?", :":", :"+=", :"-=", :"*=", :"/=", :"%=", :"&=",
+    :"|", :"{", :"}", :"?", :":", :"+=", :"-=", :"*=", :"%=", :"&=",
     :"|=", :"^=", :"**=", :"<<", :">>", :"%", :"&", :"|", :"^", :"**", :"<<=",
     :">>=", :"~", :"[]", :"[]=", :"[", :"]", :"::", :"<=>", :"=>", :"||=",
     :"&&=", :"===", :";", :"->", :"[]?", :"{%", :"{{", :"%}", :"@[", :"!~"]
@@ -438,6 +438,13 @@ describe "Lexer" do
     token.value.should eq("\\")
   end
 
+  it "lexes /=" do
+    lexer = Lexer.new("/=")
+    lexer.slash_is_regex = false
+    token = lexer.next_token
+    token.type.should eq(:"/=")
+  end
+
   assert_syntax_error "'\\uFEDZ'", "expected hexadecimal character in unicode escape"
   assert_syntax_error "'\\u{}'", "expected hexadecimal character in unicode escape"
   assert_syntax_error "'\\u{110000}'", "invalid unicode codepoint (too large)"

diff --git a/spec/compiler/parser/parser_spec.cr b/spec/compiler/parser/parser_spec.cr
@@ -808,13 +808,15 @@ describe "Parser" do
   it_parses "/(fo\#{\"bar\"}\#{1}o)/", RegexLiteral.new(StringInterpolation.new(["(fo".string, "bar".string, 1.int32, "o)".string] of ASTNode))
   it_parses "%r(foo(bar))", regex("foo(bar)")
   it_parses "/ /", regex(" ")
+  it_parses "/=/", regex("=")
   it_parses "/ hi /", regex(" hi ")
   it_parses "self / number", Call.new("self".var, "/", "number".call)
   it_parses "a == / /", Call.new("a".call, "==", regex(" "))
   it_parses "/ /", regex(" ")
   it_parses "/ /; / /", [regex(" "), regex(" ")] of ASTNode
   it_parses "/ /\n/ /", [regex(" "), regex(" ")] of ASTNode
   it_parses "a = / /", Assign.new("a".var, regex(" "))
+  it_parses "a = /=/", Assign.new("a".var, regex("="))
   it_parses "a; if / /; / /; elsif / /; / /; end", ["a".call, If.new(regex(" "), regex(" "), If.new(regex(" "), regex(" ")))]
   it_parses "a; if / /\n/ /\nelsif / /\n/ /\nend", ["a".call, If.new(regex(" "), regex(" "), If.new(regex(" "), regex(" ")))]
   it_parses "a; while / /; / /; end", ["a".call, While.new(regex(" "), regex(" "))]

diff --git a/src/compiler/crystal/macros/interpreter.cr b/src/compiler/crystal/macros/interpreter.cr
@@ -103,8 +103,7 @@ module Crystal
         # are shown in the block instead of in the generated macro source
         is_yield = node.exp.is_a?(Yield) && !@last.is_a?(Nop)
         @str << " begin " if is_yield
-        emit_loc_pragma = is_yield
-        @last.to_s(@str, emit_loc_pragma: emit_loc_pragma)
+        @last.to_s(@str, emit_loc_pragma: is_yield)
         @str << " end " if is_yield
       end
 

diff --git a/src/compiler/crystal/syntax/lexer.cr b/src/compiler/crystal/syntax/lexer.cr
@@ -269,7 +269,7 @@ module Crystal
         line = @line_number
         column = @column_number
         char = next_char
-        if char == '='
+        if !@slash_is_regex && char == '='
           next_char :"/="
         elsif @slash_is_regex
           @token.type = :DELIMITER_START