crystal-lang · Sep 10, 2016 · Sep 10, 2016
Showing with 28 additions and 4 deletions.

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

+1 −1 spec/compiler/parser/to_s_spec.cr

+8 −0 spec/std/regex_spec.cr

+5 −1 src/compiler/crystal/syntax/lexer.cr

+12 −2 src/regex.cr
diff --git a/spec/compiler/parser/parser_spec.cr b/spec/compiler/parser/parser_spec.cr
@@ -824,6 +824,8 @@ describe "Parser" do
   it_parses "{/ /, / /}", TupleLiteral.new([regex(" "), regex(" ")] of ASTNode)
   it_parses "begin; / /; end", Expressions.new([regex(" ")] of ASTNode)
   it_parses "begin\n/ /\nend", Expressions.new([regex(" ")] of ASTNode)
+  it_parses "/\\//", regex("/")
+  it_parses "%r(/)", regex("/")
 
   it_parses "1 =~ 2", Call.new(1.int32, "=~", 2.int32)
   it_parses "1.=~(2)", Call.new(1.int32, "=~", 2.int32)

diff --git a/spec/compiler/parser/to_s_spec.cr b/spec/compiler/parser/to_s_spec.cr
@@ -24,7 +24,7 @@ describe "ASTNode#to_s" do
   expect_to_s %(/\\s/)
   expect_to_s %(/\\?/)
   expect_to_s %(/\\(group\\)/)
-  expect_to_s %(/\\//), "/\\\\//"
+  expect_to_s %(/\\//), "/\\//"
   expect_to_s %(/\#{1 / 2}/)
   expect_to_s %<%r(/)>, %(/\\//)
   expect_to_s %(foo &.bar), %(foo(&.bar))

diff --git a/spec/std/regex_spec.cr b/spec/std/regex_spec.cr
@@ -31,6 +31,14 @@ describe "Regex" do
     md["foo"].should eq("r")
   end
 
+  it "does inspect with slash" do
+    %r(/).inspect.should eq("/\\//")
+  end
+
+  it "does to_s with slash" do
+    %r(/).to_s.should eq("(?-imsx:\\/)")
+  end
+
   it "doesn't crash when PCRE tries to free some memory (#771)" do
     expect_raises(ArgumentError) { Regex.new("foo)") }
   end

diff --git a/src/compiler/crystal/syntax/lexer.cr b/src/compiler/crystal/syntax/lexer.cr
@@ -1722,7 +1722,11 @@ module Crystal
             char = next_char
             next_char
             @token.type = :STRING
-            @token.value = "\\#{char}"
+            if string_end == '/' && char == '/'
+              @token.value = "/"
+            else
+              @token.value = "\\#{char}"
+            end
           else
             case char = next_char
             when 'b'

diff --git a/src/regex.cr b/src/regex.cr
@@ -392,7 +392,7 @@ class Regex
   # ```
   def inspect(io : IO)
     io << "/"
-    io << source
+    append_source(io)
     io << "/"
     io << "i" if options.includes?(Options::IGNORE_CASE)
     io << "m" if options.includes?(Options::MULTILINE)
@@ -499,10 +499,20 @@ class Regex
     io << "x" unless options.includes?(Options::EXTENDED)
 
     io << ":"
-    io << source
+    append_source(io)
     io << ")"
   end
 
+  private def append_source(io)
+    source.each_char do |char|
+      if char == '/'
+        io << "\\/"
+      else
+        io << char
+      end
+    end
+  end
+
   def dup
     self
   end