From ad4a6f4251d9b664029dd37cf252d85531ac694c Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Sun, 5 Mar 2017 20:51:40 +0900
Subject: Use Chars object from dotty instead of scala.reflect

---
 compiler/src/dotty/tools/dotc/parsing/CharArrayReader.scala    | 2 +-
 compiler/src/dotty/tools/dotc/parsing/JavaScanners.scala       | 2 +-
 compiler/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala | 2 +-
 compiler/src/dotty/tools/dotc/parsing/MarkupParsers.scala      | 2 +-
 compiler/src/dotty/tools/dotc/parsing/Scanners.scala           | 2 +-
 compiler/src/dotty/tools/dotc/parsing/Utility.scala            | 5 +++--
 6 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'compiler/src/dotty/tools/dotc/parsing')

diff --git a/compiler/src/dotty/tools/dotc/parsing/CharArrayReader.scala b/compiler/src/dotty/tools/dotc/parsing/CharArrayReader.scala
index b84e2eb47..e20eb392d 100644
--- a/compiler/src/dotty/tools/dotc/parsing/CharArrayReader.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/CharArrayReader.scala
@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package parsing
 
-import scala.reflect.internal.Chars._
+import util.Chars._
 
 abstract class CharArrayReader { self =>
 
diff --git a/compiler/src/dotty/tools/dotc/parsing/JavaScanners.scala b/compiler/src/dotty/tools/dotc/parsing/JavaScanners.scala
index 83e16627c..9e0da2c05 100644
--- a/compiler/src/dotty/tools/dotc/parsing/JavaScanners.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/JavaScanners.scala
@@ -7,7 +7,7 @@ import Scanners._
 import util.SourceFile
 import JavaTokens._
 import scala.annotation.{ switch, tailrec }
-import scala.reflect.internal.Chars._
+import util.Chars._
 
 object JavaScanners {
 
diff --git a/compiler/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala b/compiler/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala
index ce2c41797..492a8947c 100644
--- a/compiler/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/MarkupParserCommon.scala
@@ -9,7 +9,7 @@ package dotty.tools.dotc
 package parsing
 
 import Utility._
-import scala.reflect.internal.Chars.SU
+import util.Chars.SU
 
 
 
diff --git a/compiler/src/dotty/tools/dotc/parsing/MarkupParsers.scala b/compiler/src/dotty/tools/dotc/parsing/MarkupParsers.scala
index f648b9e2c..3b091d542 100644
--- a/compiler/src/dotty/tools/dotc/parsing/MarkupParsers.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/MarkupParsers.scala
@@ -5,7 +5,7 @@ package parsing
 import scala.collection.mutable
 import mutable.{ Buffer, ArrayBuffer, ListBuffer }
 import scala.util.control.ControlThrowable
-import scala.reflect.internal.Chars.SU
+import util.Chars.SU
 import Parsers._
 import util.Positions._
 import core._
diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
index b75169792..847f600c0 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
@@ -6,7 +6,7 @@ import core.Names._, core.Contexts._, core.Decorators._, util.Positions._
 import core.StdNames._, core.Comments._
 import util.SourceFile
 import java.lang.Character.isDigit
-import scala.reflect.internal.Chars._
+import util.Chars._
 import Tokens._
 import scala.annotation.{ switch, tailrec }
 import scala.collection.mutable
diff --git a/compiler/src/dotty/tools/dotc/parsing/Utility.scala b/compiler/src/dotty/tools/dotc/parsing/Utility.scala
index f522492f8..8af594d68 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Utility.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Utility.scala
@@ -1,4 +1,5 @@
-package dotty.tools.dotc.parsing
+package dotty.tools.dotc
+package parsing
 
 import scala.collection.mutable
 
@@ -10,7 +11,7 @@ import scala.collection.mutable
  * @author Burak Emir
  */
 object Utility {
-  import scala.reflect.internal.Chars.SU
+  import util.Chars.SU
 
   private val unescMap = Map(
     "lt"    -> '<',
-- 
cgit v1.2.3