From f64de5fcd0b9d16205d8c96c3c789f4c50aafb22 Mon Sep 17 00:00:00 2001
From: Simon Schaefer <mail@antoras.de>
Date: Wed, 25 Sep 2013 21:44:24 +0200
Subject: Remove octal escape literals from the codebase

Octal escape literals are deprecated and will be removed in the
next Scala version.
---
 src/compiler/scala/tools/nsc/CompileServer.scala   |  2 +-
 src/compiler/scala/tools/nsc/CompileSocket.scala   |  2 +-
 .../scala/tools/nsc/transform/Erasure.scala        |  2 +-
 src/library/scala/io/AnsiColor.scala               | 44 +++++++++++-----------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala
index c5366566d9..6f068e179c 100644
--- a/src/compiler/scala/tools/nsc/CompileServer.scala
+++ b/src/compiler/scala/tools/nsc/CompileServer.scala
@@ -85,7 +85,7 @@ class StandardCompileServer extends SocketServer {
     if (input == null || password != guessedPassword)
       return
 
-    val args        = input.split("\0", -1).toList
+    val args        = input.split("\u0000", -1).toList
     val newSettings = new FscSettings(fscError)
     val command     = new OfflineCompilerCommand(args, newSettings)
     this.verbose    = newSettings.verbose.value
diff --git a/src/compiler/scala/tools/nsc/CompileSocket.scala b/src/compiler/scala/tools/nsc/CompileSocket.scala
index 88d5c31b5d..c4f06b59ec 100644
--- a/src/compiler/scala/tools/nsc/CompileSocket.scala
+++ b/src/compiler/scala/tools/nsc/CompileSocket.scala
@@ -24,7 +24,7 @@ trait HasCompileSocket {
 
     sock.applyReaderAndWriter { (in, out) =>
       out println (compileSocket getPassword sock.getPort())
-      out println (args mkString "\0")
+      out println (args mkString "\u0000")
 
       def loop(): Boolean = in.readLine() match {
         case null => noErrors
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala
index 31855bc1ad..28db6a4f6d 100644
--- a/src/compiler/scala/tools/nsc/transform/Erasure.scala
+++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala
@@ -88,7 +88,7 @@ abstract class Erasure extends AddInterfaces
   // more rigorous way up front rather than catching it after the fact,
   // but that will be more involved.
   private def dotCleanup(sig: String): String = {
-    var last: Char = '\0'
+    var last: Char = '\u0000'
     sig map {
       case '.' if last != '>' => last = '.' ; '$'
       case ch                 => last = ch ; ch
diff --git a/src/library/scala/io/AnsiColor.scala b/src/library/scala/io/AnsiColor.scala
index 6b00eb283f..39e2e3b0ca 100644
--- a/src/library/scala/io/AnsiColor.scala
+++ b/src/library/scala/io/AnsiColor.scala
@@ -3,51 +3,51 @@ package io
 
 trait AnsiColor {
   /** Foreground color for ANSI black */
-  final val BLACK      = "\033[30m"
+  final val BLACK      = "\u001b[30m"
   /** Foreground color for ANSI red */
-  final val RED        = "\033[31m"
+  final val RED        = "\u001b[31m"
   /** Foreground color for ANSI green */
-  final val GREEN      = "\033[32m"
+  final val GREEN      = "\u001b[32m"
   /** Foreground color for ANSI yellow */
-  final val YELLOW     = "\033[33m"
+  final val YELLOW     = "\u001b[33m"
   /** Foreground color for ANSI blue */
-  final val BLUE       = "\033[34m"
+  final val BLUE       = "\u001b[34m"
   /** Foreground color for ANSI magenta */
-  final val MAGENTA    = "\033[35m"
+  final val MAGENTA    = "\u001b[35m"
   /** Foreground color for ANSI cyan */
-  final val CYAN       = "\033[36m"
+  final val CYAN       = "\u001b[36m"
   /** Foreground color for ANSI white */
-  final val WHITE      = "\033[37m"
+  final val WHITE      = "\u001b[37m"
 
   /** Background color for ANSI black */
-  final val BLACK_B    = "\033[40m"
+  final val BLACK_B    = "\u001b[40m"
   /** Background color for ANSI red */
-  final val RED_B      = "\033[41m"
+  final val RED_B      = "\u001b[41m"
   /** Background color for ANSI green */
-  final val GREEN_B    = "\033[42m"
+  final val GREEN_B    = "\u001b[42m"
   /** Background color for ANSI yellow */
-  final val YELLOW_B   = "\033[43m"
+  final val YELLOW_B   = "\u001b[43m"
   /** Background color for ANSI blue */
-  final val BLUE_B     = "\033[44m"
+  final val BLUE_B     = "\u001b[44m"
   /** Background color for ANSI magenta */
-  final val MAGENTA_B  = "\033[45m"
+  final val MAGENTA_B  = "\u001b[45m"
   /** Background color for ANSI cyan */
-  final val CYAN_B     = "\033[46m"
+  final val CYAN_B     = "\u001b[46m"
   /** Background color for ANSI white */
-  final val WHITE_B    = "\033[47m"
+  final val WHITE_B    = "\u001b[47m"
 
   /** Reset ANSI styles */
-  final val RESET      = "\033[0m"
+  final val RESET      = "\u001b[0m"
   /** ANSI bold */
-  final val BOLD       = "\033[1m"
+  final val BOLD       = "\u001b[1m"
   /** ANSI underlines */
-  final val UNDERLINED = "\033[4m"
+  final val UNDERLINED = "\u001b[4m"
   /** ANSI blink */
-  final val BLINK      = "\033[5m"
+  final val BLINK      = "\u001b[5m"
   /** ANSI reversed */
-  final val REVERSED   = "\033[7m"
+  final val REVERSED   = "\u001b[7m"
   /** ANSI invisible */
-  final val INVISIBLE  = "\033[8m"
+  final val INVISIBLE  = "\u001b[8m"
 }
 
 object AnsiColor extends AnsiColor { }
-- 
cgit v1.2.3