Fixed MacroLiteral#to_s regarding escapes. Fixes #3330

crystal-lang · Sep 20, 2016 · 91020b3 · 91020b3
1 parent 7547cd8
commit 91020b3
Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/spec/compiler/parser/to_s_spec.cr b/spec/compiler/parser/to_s_spec.cr
@@ -82,4 +82,8 @@ describe "ASTNode#to_s" do
   expect_to_s "!a"
   expect_to_s "!(1 < 2)"
   expect_to_s "(1 + 2)..3"
+  expect_to_s "macro foo\n{{ @type }}\nend"
+  expect_to_s "macro foo\n\\{{ @type }}\nend"
+  expect_to_s "macro foo\n{% @type %}\nend"
+  expect_to_s "macro foo\n\\{%@type %}\nend"
 end
diff --git a/src/compiler/crystal/syntax/to_s.cr b/src/compiler/crystal/syntax/to_s.cr
@@ -753,6 +753,10 @@ module Crystal
     end
 
     def visit(node : MacroLiteral)
+      # These two can only come from an escaped sequence like \{ or \{%
+      if node.value == "{" || node.value.starts_with?("{%")
+        @str << "\\"
+      end
       @str << node.value
       false
     end