Merge pull request scala#13273 from ansvonwa/fix-13183

Emit unicode instead of octal literals
rolang · Aug 17, 2021 · 86c9a7e · 86c9a7e
2 parents 26a27cb + b261427
commit 86c9a7e
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 3 deletions.
diff --git a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala
@@ -12,7 +12,6 @@ import typer.Implicits._
 import typer.ImportInfo
 import Variances.varianceSign
 import util.SourcePosition
-import java.lang.Integer.toOctalString
 import scala.util.control.NonFatal
 import scala.annotation.switch
 
@@ -525,7 +524,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
     case '"' => "\\\""
     case '\'' => "\\\'"
     case '\\' => "\\\\"
-    case _ => if (ch.isControl) "\\0" + toOctalString(ch) else String.valueOf(ch)
+    case _ => if (ch.isControl) f"\u${ch.toInt}%04x" else String.valueOf(ch)
   }
 
   def toText(const: Constant): Text = const.tag match {

diff --git a/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala b/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala
@@ -1419,7 +1419,7 @@ object SourceCode {
       case '"' => "\\\""
       case '\'' => "\\\'"
       case '\\' => "\\\\"
-      case _ => if (ch.isControl) "\\0" + Integer.toOctalString(ch) else String.valueOf(ch)
+      case _ => if (ch.isControl) f"\u${ch.toInt}%04x" else String.valueOf(ch)
     }
 
     private def escapedString(str: String): String = str flatMap escapedChar

diff --git a/tests/run-macros/i13183.check b/tests/run-macros/i13183.check
@@ -0,0 +1,5 @@
+"\u001b"
+"\u0000\u0001\u0003"
+"ABC"
+"\u0080\u0081翿"
+"\t\n\r👋👌🥳"
diff --git a/tests/run-macros/i13183/Macro_1.scala b/tests/run-macros/i13183/Macro_1.scala
@@ -0,0 +1,5 @@
+import scala.quoted.*
+
+object Macro_1:
+  inline def stringLiteral(inline s: String): String = ${showExpr('s)}
+  def showExpr(s: Expr[?])(using Quotes): Expr[String] = Expr(s.show.toString)
diff --git a/tests/run-macros/i13183/Test_2.scala b/tests/run-macros/i13183/Test_2.scala
@@ -0,0 +1,6 @@
+@main def Test =
+  println(Macro_1.stringLiteral("\u001b")) // "\u001b"
+  println(Macro_1.stringLiteral("\u0000\u0001\u0003")) // "\u0000\u0001\u0003"
+  println(Macro_1.stringLiteral("A\u0042C")) // "ABC"
+  println(Macro_1.stringLiteral("\u0080\u0081\u7fff")) // "\u0080\u0081翿"
+  println(Macro_1.stringLiteral("\t\n\r👋👌🥳")) // "\t\n\r👋👌🥳"
diff --git a/tests/run/i13183.check b/tests/run/i13183.check
@@ -0,0 +1 @@
+"\u001b"
diff --git a/tests/run/i13183.scala b/tests/run/i13183.scala
@@ -0,0 +1,2 @@
+@main def Test(): Unit =
+  println(scala.compiletime.codeOf("\u001b"))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@main def Test(): Unit =
		println(scala.compiletime.codeOf("\u001b"))