Moved scala.reflect.Chars to scala.reflect.inte...

Moved scala.reflect.Chars to scala.reflect.internal.Chars, un-splitting
the scala.reflect package. This is necessary for running in an OSGi
container, such as Eclipse. A package may not be contributed by two
different bundles (in this case the library and the compiler). It may
be moved back when 'scala.reflect' exists only in one place. review by
extempore.

15 files changed, 15 insertions, 15 deletions

diff --git a/src/compiler/scala/reflect/Chars.scala b/src/compiler/scala/reflect/internal/Chars.scala
index 739c0ca22b..7bd37618ed 100644
--- a/src/compiler/scala/reflect/Chars.scala
+++ b/src/compiler/scala/reflect/internal/Chars.scala
@@ -2,7 +2,7 @@
  * Copyright 2006-2011 LAMP/EPFL
  * @author  Martin Odersky
  */
-package scala.reflect
+package scala.reflect.internal
 
 import annotation.{ tailrec, switch }
 import java.lang.{ Character => JCharacter }
diff --git a/src/compiler/scala/tools/cmd/program/Tokens.scala b/src/compiler/scala/tools/cmd/program/Tokens.scala
index c62f17cc35..be494bba3a 100644
--- a/src/compiler/scala/tools/cmd/program/Tokens.scala
+++ b/src/compiler/scala/tools/cmd/program/Tokens.scala
@@ -8,7 +8,7 @@ package cmd
 package program
 
 import nsc._
-import scala.reflect.Chars.char2uescape
+import scala.reflect.internal.Chars.char2uescape
 import io._
 import ast.parser.Tokens._
 
diff --git a/src/compiler/scala/tools/nsc/ast/DocComments.scala b/src/compiler/scala/tools/nsc/ast/DocComments.scala
index 91d8f9fb87..3b31730827 100755
--- a/src/compiler/scala/tools/nsc/ast/DocComments.scala
+++ b/src/compiler/scala/tools/nsc/ast/DocComments.scala
@@ -10,7 +10,7 @@ import symtab._
 import reporters.Reporter
 import util.{Position, NoPosition}
 import util.DocStrings._
-import scala.reflect.Chars._
+import scala.reflect.internal.Chars._
 import scala.collection.mutable.{HashMap, ListBuffer, StringBuilder}
 
 /*
diff --git a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
index fa81c3f033..6c025e8443 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
@@ -12,7 +12,7 @@ import scala.util.control.ControlThrowable
 import scala.tools.nsc.util.{SourceFile,CharArrayReader}
 import scala.xml.{ Text, TextBuffer }
 import scala.xml.Utility.{ isNameStart, isNameChar, isSpace }
-import scala.reflect.Chars.{ SU, LF }
+import scala.reflect.internal.Chars.{ SU, LF }
 
 // XXX/Note: many/most of the functions in here are almost direct cut and pastes
 // from another file - scala.xml.parsing.MarkupParser, it looks like.
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index bb4c1d33f0..c7134ce91a 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -13,7 +13,7 @@ import scala.collection.mutable.ListBuffer
 import util.{ SourceFile, OffsetPosition, FreshNameCreator }
 import scala.reflect.internal.{ ModifierFlags => Flags }
 import Tokens._
-import scala.reflect.Chars.{ isScalaLetter }
+import scala.reflect.internal.Chars.{ isScalaLetter }
 
 /** Historical note: JavaParsers started life as a direct copy of Parsers
  *  but at a time when that Parsers had been replaced by a different one.
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
index 78bfa1f5ff..d304a11b06 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
@@ -6,7 +6,7 @@ package scala.tools.nsc
 package ast.parser
 
 import scala.tools.nsc.util._
-import scala.reflect.Chars._
+import scala.reflect.internal.Chars._
 import Tokens._
 import scala.annotation.switch
 import scala.collection.mutable.{ ListBuffer, ArrayBuffer }
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Tokens.scala b/src/compiler/scala/tools/nsc/ast/parser/Tokens.scala
index 533690fe2e..7524f7d5eb 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Tokens.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Tokens.scala
@@ -13,7 +13,7 @@ import annotation.switch
  *  identical token sets.
  */
 abstract class Tokens {
-  import scala.reflect.Chars._
+  import scala.reflect.internal.Chars._
 
   /** special tokens */
   final val EMPTY = -3
diff --git a/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala b/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala
index 385e181404..99112d9151 100644
--- a/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala
@@ -9,7 +9,7 @@ package interpreter
 import scala.collection.{ mutable, immutable }
 import scala.PartialFunction.cond
 import scala.reflect.NameTransformer
-import scala.reflect.Chars
+import scala.reflect.internal.Chars
 
 trait MemberHandlers {
   val intp: IMain
diff --git a/src/compiler/scala/tools/nsc/interpreter/ReplStrings.scala b/src/compiler/scala/tools/nsc/interpreter/ReplStrings.scala
index d14f4cefae..c17672850d 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ReplStrings.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ReplStrings.scala
@@ -9,7 +9,7 @@ package interpreter
 import scala.collection.{ mutable, immutable }
 import scala.PartialFunction.cond
 import scala.reflect.NameTransformer
-import scala.reflect.Chars
+import scala.reflect.internal.Chars
 
 trait ReplStrings {
   // Longest common prefix
diff --git a/src/compiler/scala/tools/nsc/javac/JavaScanners.scala b/src/compiler/scala/tools/nsc/javac/JavaScanners.scala
index 841b28c56f..95e1ff1482 100644
--- a/src/compiler/scala/tools/nsc/javac/JavaScanners.scala
+++ b/src/compiler/scala/tools/nsc/javac/JavaScanners.scala
@@ -7,7 +7,7 @@ package scala.tools.nsc
 package javac
 
 import scala.tools.nsc.util._
-import scala.reflect.Chars._
+import scala.reflect.internal.Chars._
 import JavaTokens._
 import scala.annotation.switch
 
diff --git a/src/compiler/scala/tools/nsc/util/CharArrayReader.scala b/src/compiler/scala/tools/nsc/util/CharArrayReader.scala
index e38f99b42c..c79ac91f49 100644
--- a/src/compiler/scala/tools/nsc/util/CharArrayReader.scala
+++ b/src/compiler/scala/tools/nsc/util/CharArrayReader.scala
@@ -6,7 +6,7 @@
 package scala.tools.nsc
 package util
 
-import scala.reflect.Chars._
+import scala.reflect.internal.Chars._
 
 abstract class CharArrayReader { self =>
 
diff --git a/src/compiler/scala/tools/nsc/util/DocStrings.scala b/src/compiler/scala/tools/nsc/util/DocStrings.scala
index 014c90365c..5a0a864d11 100755
--- a/src/compiler/scala/tools/nsc/util/DocStrings.scala
+++ b/src/compiler/scala/tools/nsc/util/DocStrings.scala
@@ -7,7 +7,7 @@
 package scala.tools.nsc
 package util
 
-import scala.reflect.Chars._
+import scala.reflect.internal.Chars._
 import scala.collection.mutable.{HashMap, ListBuffer, StringBuilder}
 
 /** Utilitity methods for doc comment strings
diff --git a/src/compiler/scala/tools/nsc/util/JavaCharArrayReader.scala b/src/compiler/scala/tools/nsc/util/JavaCharArrayReader.scala
index 98ec4dc29b..7d9433f4d3 100644
--- a/src/compiler/scala/tools/nsc/util/JavaCharArrayReader.scala
+++ b/src/compiler/scala/tools/nsc/util/JavaCharArrayReader.scala
@@ -6,7 +6,7 @@
 package scala.tools.nsc
 package util
 
-import scala.reflect.Chars._
+import scala.reflect.internal.Chars._
 
 class JavaCharArrayReader(buf: IndexedSeq[Char], start: Int, /* startline: int, startcol: int, */
                       decodeUni: Boolean, error: String => Unit) extends Iterator[Char] with Cloneable {
diff --git a/src/compiler/scala/tools/nsc/util/SourceFile.scala b/src/compiler/scala/tools/nsc/util/SourceFile.scala
index 5ab4a5cee3..f875ff549f 100644
--- a/src/compiler/scala/tools/nsc/util/SourceFile.scala
+++ b/src/compiler/scala/tools/nsc/util/SourceFile.scala
@@ -12,7 +12,7 @@ import scala.collection.mutable.ArrayBuffer
 import annotation.tailrec
 import java.util.regex.Pattern
 import java.io.IOException
-import scala.reflect.Chars._
+import scala.reflect.internal.Chars._
 
 /** abstract base class of a source file used in the compiler */
 abstract class SourceFile {
diff --git a/src/compiler/scala/tools/nsc/util/package.scala b/src/compiler/scala/tools/nsc/util/package.scala
index fe11238ca4..a62dfc4c0f 100644
--- a/src/compiler/scala/tools/nsc/util/package.scala
+++ b/src/compiler/scala/tools/nsc/util/package.scala
@@ -10,7 +10,7 @@ import java.io.{ OutputStream, PrintStream, ByteArrayOutputStream, PrintWriter,
 package object util {
 
   // forwarder for old code that builds against 2.9 and 2.10
-  val Chars = scala.reflect.Chars
+  val Chars = scala.reflect.internal.Chars
 
   type Set[T <: AnyRef] = scala.reflect.internal.util.Set[T]
   type HashSet[T >: Null <: AnyRef] = scala.reflect.internal.util.HashSet[T]