After the compiler refactor, we ended up with i...

After the compiler refactor, we ended up with identical copies of
PickleBuffer and PickleFormat in the library and compiler. Deleted the
compiler versions and updated references. No review.

6 files changed, 9 insertions, 404 deletions

diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index a6b32abef3..0590797e53 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -14,9 +14,10 @@ import io.{ SourceReader, AbstractFile, Path }
 import reporters.{ Reporter, ConsoleReporter }
 import util.{ ClassPath, SourceFile, Statistics, BatchSourceFile }
 import collection.mutable.{ HashSet, HashMap, ListBuffer }
+import reflect.generic.{ PickleBuffer }
 
 import symtab.{ Flags, SymbolTable, SymbolLoaders }
-import symtab.classfile.{PickleBuffer, Pickler}
+import symtab.classfile.Pickler
 import dependencies.DependencyAnalysis
 import plugins.Plugins
 import ast._
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/PickleBuffer.scala b/src/compiler/scala/tools/nsc/symtab/classfile/PickleBuffer.scala
deleted file mode 100644
index 3b54e00057..0000000000
--- a/src/compiler/scala/tools/nsc/symtab/classfile/PickleBuffer.scala
+++ /dev/null
@@ -1,166 +0,0 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2010 LAMP/EPFL
- * @author  Martin Odersky
- */
-// $Id$
-
-package scala.tools.nsc
-package symtab
-package classfile
-
-/** Variable length byte arrays, with methods for basic pickling and unpickling.
- *
- *  @param data The initial buffer
- *  @param from The first index where defined data are found
- *  @param to   The first index where new data can be written
- */
-class PickleBuffer(data: Array[Byte], from: Int, to: Int) {
-
-  var bytes = data
-  var readIndex = from
-  var writeIndex = to
-
-  /** Double bytes array */
-  private def dble() {
-    val bytes1 = new Array[Byte](bytes.length * 2)
-    Array.copy(bytes, 0, bytes1, 0, writeIndex)
-    bytes = bytes1
-  }
-
-  def ensureCapacity(capacity: Int) =
-    while (bytes.length < writeIndex + capacity) dble()
-
-  // -- Basic output routines --------------------------------------------
-
-  /** Write a byte of data */
-  def writeByte(b: Int) {
-    if (writeIndex == bytes.length) dble()
-    bytes(writeIndex) = b.toByte
-    writeIndex += 1
-  }
-
-  /** Write a natural number in big endian format, base 128.
-   *  All but the last digits have bit 0x80 set.
-   */
-  def writeNat(x: Int) =
-    writeLongNat(x.toLong & 0x00000000FFFFFFFFL)
-
-  /**
-   * Like writeNat, but for longs. This is not the same as
-   * writeLong, which writes in base 256. Note that the
-   * binary representation of LongNat is identical to Nat
-   * if the long value is in the range Int.MIN_VALUE to
-   * Int.MAX_VALUE.
-   */
-  def writeLongNat(x: Long) {
-    def writeNatPrefix(x: Long) {
-      val y = x >>> 7
-      if (y != 0L) writeNatPrefix(y)
-      writeByte(((x & 0x7f) | 0x80).toInt)
-    }
-    val y = x >>> 7
-    if (y != 0L) writeNatPrefix(y)
-    writeByte((x & 0x7f).toInt)
-  }
-
-  /** Write a natural number <code>x</code> at position <code>pos</code>.
-   *  If number is more than one byte, shift rest of array to make space.
-   *
-   *  @param pos ...
-   *  @param x   ...
-   */
-  def patchNat(pos: Int, x: Int) {
-    def patchNatPrefix(x: Int) {
-      writeByte(0)
-      Array.copy(bytes, pos, bytes, pos+1, writeIndex - (pos+1))
-      bytes(pos) = ((x & 0x7f) | 0x80).toByte
-      val y = x >>> 7
-      if (y != 0) patchNatPrefix(y)
-    }
-    bytes(pos) = (x & 0x7f).toByte
-    val y = x >>> 7
-    if (y != 0) patchNatPrefix(y)
-  }
-
-  /** Write a long number <code>x</code> in signed big endian format, base 256.
-   *
-   *  @param x The long number to be written.
-   */
-  def writeLong(x: Long) {
-    val y = x >> 8
-    val z = x & 0xff
-    if (-y != (z >> 7)) writeLong(y)
-    writeByte(z.toInt)
-  }
-
-  // -- Basic input routines --------------------------------------------
-
-  /** Peek at the current byte without moving the read index */
-  def peekByte(): Int = bytes(readIndex)
-
-  /** Read a byte */
-  def readByte(): Int = {
-    val x = bytes(readIndex); readIndex += 1; x
-  }
-
-  /** Read a natural number in big endian format, base 128.
-   *  All but the last digits have bit 0x80 set.*/
-  def readNat(): Int = readLongNat().toInt
-
-  def readLongNat(): Long = {
-    var b = 0L
-    var x = 0L
-    do {
-      b = readByte()
-      x = (x << 7) + (b & 0x7f)
-    } while ((b & 0x80) != 0L);
-    x
-  }
-
-  /** Read a long number in signed big endian format, base 256. */
-  def readLong(len: Int): Long = {
-    var x = 0L
-    var i = 0
-    while (i < len) {
-      x = (x << 8) + (readByte() & 0xff)
-      i += 1
-    }
-    val leading = 64 - (len << 3)
-    x << leading >> leading
-  }
-
-  /** Perform operation <code>op</code> until the condition
-   *  <code>readIndex == end</code> is satisfied.
-   *  Concatenate results into a list.
-   *
-   *  @param end ...
-   *  @param op  ...
-   *  @return    ...
-   */
-  def until[T](end: Int, op: () => T): List[T] =
-    if (readIndex == end) List() else op() :: until(end, op);
-
-  /** Perform operation <code>op</code> the number of
-   *  times specified.  Concatenate the results into a list.
-   */
-  def times[T](n: Int, op: ()=>T): List[T] =
-    if (n == 0) List() else op() :: times(n-1, op)
-
-  /** Pickle = majorVersion_Nat minorVersion_Nat nbEntries_Nat {Entry}
-   *  Entry  = type_Nat length_Nat [actual entries]
-   *
-   *  Assumes that the ..Version_Nat are already consumed.
-   *
-   *  @return an array mapping entry numbers to locations in
-   *  the byte array where the entries start.
-   */
-  def createIndex: Array[Int] = {
-    val index = new Array[Int](readNat()) // nbEntries_Nat
-    for (i <- 0 until index.length) {
-      index(i) = readIndex
-      readByte() // skip type_Nat
-      readIndex = readNat() + readIndex // read length_Nat, jump to next entry
-    }
-    index
-  }
-}
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/PickleFormat.scala b/src/compiler/scala/tools/nsc/symtab/classfile/PickleFormat.scala
deleted file mode 100644
index c45abbccd1..0000000000
--- a/src/compiler/scala/tools/nsc/symtab/classfile/PickleFormat.scala
+++ /dev/null
@@ -1,230 +0,0 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2010 LAMP/EPFL
- * @author  Martin Odersky
- */
-// $Id$
-
-package scala.tools.nsc
-package symtab
-package classfile
-
-/** This object provides constants for pickling attributes.
- *
- *  If you extend the format, be sure to increase the
- *  version minor number.
- *
- *  @author Martin Odersky
- *  @version 1.0
- */
-object PickleFormat {
-
-/***************************************************
- * Symbol table attribute format:
- *   Symtab         = nentries_Nat {Entry}
- *   Entry          = 1 TERMNAME len_Nat NameInfo
- *                  | 2 TYPENAME len_Nat NameInfo
- *                  | 3 NONEsym len_Nat
- *                  | 4 TYPEsym len_Nat SymbolInfo
- *                  | 5 ALIASsym len_Nat SymbolInfo
- *                  | 6 CLASSsym len_Nat SymbolInfo [thistype_Ref]
- *                  | 7 MODULEsym len_Nat SymbolInfo
- *                  | 8 VALsym len_Nat [defaultGetter_Ref] SymbolInfo [alias_Ref]
- *                  | 9 EXTref len_Nat name_Ref [owner_Ref]
- *                  | 10 EXTMODCLASSref len_Nat name_Ref [owner_Ref]
- *                  | 11 NOtpe len_Nat
- *                  | 12 NOPREFIXtpe len_Nat
- *                  | 13 THIStpe len_Nat sym_Ref
- *                  | 14 SINGLEtpe len_Nat type_Ref sym_Ref
- *                  | 15 CONSTANTtpe len_Nat constant_Ref
- *                  | 16 TYPEREFtpe len_Nat type_Ref sym_Ref {targ_Ref}
- *                  | 17 TYPEBOUNDStpe len_Nat tpe_Ref tpe_Ref
- *                  | 18 REFINEDtpe len_Nat classsym_Ref {tpe_Ref}
- *                  | 19 CLASSINFOtpe len_Nat classsym_Ref {tpe_Ref}
- *                  | 20 METHODtpe len_Nat tpe_Ref {sym_Ref}
- *                  | 21 POLYTtpe len_Nat tpe_Ref {sym_Ref}
- *                  | 22 IMPLICITMETHODtpe len_Nat tpe_Ref {sym_Ref}
- *                  | 52 SUPERtpe len_Nat tpe_Ref tpe_Ref
- *                  | 24 LITERALunit len_Nat
- *                  | 25 LITERALboolean len_Nat value_Long
- *                  | 26 LITERALbyte len_Nat value_Long
- *                  | 27 LITERALshort len_Nat value_Long
- *                  | 28 LITERALchar len_Nat value_Long
- *                  | 29 LITERALint len_Nat value_Long
- *                  | 30 LITERALlong len_Nat value_Long
- *                  | 31 LITERALfloat len_Nat value_Long
- *                  | 32 LITERALdouble len_Nat value_Long
- *                  | 33 LITERALstring len_Nat name_Ref
- *                  | 34 LITERALnull len_Nat
- *                  | 35 LITERALclass len_Nat tpe_Ref
- *                  | 36 LITERALenum len_Nat sym_Ref
- *                  | 40 SYMANNOT len_Nat sym_Ref AnnotInfoBody
- *                  | 41 CHILDREN len_Nat sym_Ref {sym_Ref}
- *                  | 42 ANNOTATEDtpe len_Nat [sym_Ref] tpe_Ref {annotinfo_Ref}
- *                  | 43 ANNOTINFO len_Nat AnnotInfoBody
- *                  | 44 ANNOTARGARRAY len_Nat {constAnnotArg_Ref}
- *                  | 47 DEBRUIJNINDEXtpe len_Nat level_Nat index_Nat
- *                  | 48 EXISTENTIALtpe len_Nat type_Ref {symbol_Ref}
- *                  | 49 TREE len_Nat 1 EMPTYtree
- *                  | 49 TREE len_Nat 2 PACKAGEtree type_Ref sym_Ref mods_Ref name_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 3 CLASStree type_Ref sym_Ref mods_Ref name_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 4 MODULEtree type_Ref sym_Ref mods_Ref name_Ref tree_Ref
- *                  | 49 TREE len_Nat 5 VALDEFtree type_Ref sym_Ref mods_Ref name_Ref tree_Ref tree_Ref
- *                  | 49 TREE len_Nat 6 DEFDEFtree type_Ref sym_Ref mods_Ref name_Ref numtparams_Nat {tree_Ref} numparamss_Nat {numparams_Nat {tree_Ref}} tree_Ref tree_Ref
- *                  | 49 TREE len_Nat 7 TYPEDEFtree type_Ref sym_Ref mods_Ref name_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 8 LABELtree type_Ref sym_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 9 IMPORTtree type_Ref sym_Ref tree_Ref {name_Ref name_Ref}
- *                  | 49 TREE len_Nat 11 DOCDEFtree type_Ref sym_Ref string_Ref tree_Ref
- *                  | 49 TREE len_Nat 12 TEMPLATEtree type_Ref sym_Ref numparents_Nat {tree_Ref} tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 13 BLOCKtree type_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 14 CASEtree type_Ref tree_Ref tree_Ref tree_Ref
- *                  | 49 TREE len_Nat 15 SEQUENCEtree type_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 16 ALTERNATIVEtree type_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 17 STARtree type_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 18 BINDtree type_Ref sym_Ref name_Ref tree_Ref
- *                  | 49 TREE len_Nat 19 UNAPPLYtree type_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 20 ARRAYVALUEtree type_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 21 FUNCTIONtree type_Ref sym_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 22 ASSIGNtree type_Ref tree_Ref tree_Ref
- *                  | 49 TREE len_Nat 23 IFtree type_Ref tree_Ref tree_Ref tree_Ref
- *                  | 49 TREE len_Nat 24 MATCHtree type_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 25 RETURNtree type_Ref sym_Ref tree_Ref
- *                  | 49 TREE len_Nat 26 TREtree type_Ref tree_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 27 THROWtree type_Ref tree_Ref
- *                  | 49 TREE len_Nat 28 NEWtree type_Ref tree_Ref
- *                  | 49 TREE len_Nat 29 TYPEDtree type_Ref tree_Ref tree_Ref
- *                  | 49 TREE len_Nat 30 TYPEAPPLYtree type_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 31 APPLYtree type_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 32 APPLYDYNAMICtree type_Ref sym_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 33 SUPERtree type_Ref sym_Ref tree_Ref name_Ref
- *                  | 49 TREE len_Nat 34 THIStree type_Ref sym_Ref  name_Ref
- *                  | 49 TREE len_Nat 35 SELECTtree type_Ref sym_Ref tree_Ref name_Ref
- *                  | 49 TREE len_Nat 36 IDENTtree type_Ref sym_Ref name_Ref
- *                  | 49 TREE len_Nat 37 LITERALtree type_Ref constant_Ref
- *                  | 49 TREE len_Nat 38 TYPEtree type_Ref
- *                  | 49 TREE len_Nat 39 ANNOTATEDtree type_Ref tree_Ref tree_Ref
- *                  | 49 TREE len_Nat 40 SINGLETONTYPEtree type_Ref tree_Ref
- *                  | 49 TREE len_Nat 41 SELECTFROMTYPEtree type_Ref tree_Ref name_Ref
- *                  | 49 TREE len_Nat 42 COMPOUNDTYPEtree type_Ref tree_Ref
- *                  | 49 TREE len_Nat 43 APPLIEDTYPEtree type_Ref tree_Ref {tree_Ref}
- *                  | 49 TREE len_Nat 44 TYPEBOUNDStree type_Ref tree_Ref tree_Ref
- *                  | 49 TREE len_Nat 45 EXISTENTIALTYPEtree type_Ref tree_Ref {tree_Ref}
- *                  | 50 MODIFIERS len_Nat flags_Long privateWithin_Ref
- *   SymbolInfo     = name_Ref owner_Ref flags_LongNat [privateWithin_Ref] info_Ref
- *   NameInfo       = <character sequence of length len_Nat in Utf8 format>
- *   NumInfo        = <len_Nat-byte signed number in big endian format>
- *   Ref            = Nat
- *   AnnotInfoBody  = info_Ref {annotArg_Ref} {name_Ref constAnnotArg_Ref}
- *   AnnotArg       = Tree | Constant
- *   ConstAnnotArg  = Constant | AnnotInfo | AnnotArgArray
- *
- *   len is remaining length after `len'.
- */
-  val MajorVersion = 5
-  val MinorVersion = 0
-
-  final val TERMname = 1
-  final val TYPEname = 2
-  final val NONEsym = 3
-  final val TYPEsym = 4
-  final val ALIASsym = 5
-  final val CLASSsym = 6
-  final val MODULEsym = 7
-  final val VALsym = 8
-  final val EXTref = 9
-  final val EXTMODCLASSref = 10
-  final val NOtpe = 11
-  final val NOPREFIXtpe = 12
-  final val THIStpe = 13
-  final val SINGLEtpe = 14
-  final val CONSTANTtpe = 15
-  final val TYPEREFtpe = 16
-  final val TYPEBOUNDStpe = 17
-  final val REFINEDtpe = 18
-  final val CLASSINFOtpe = 19
-  final val METHODtpe = 20
-  final val POLYtpe = 21
-  final val IMPLICITMETHODtpe = 22
-
-  final val LITERAL = 23   // base line for literals
-  final val LITERALunit = 24
-  final val LITERALboolean = 25
-  final val LITERALbyte = 26
-  final val LITERALshort = 27
-  final val LITERALchar = 28
-  final val LITERALint = 29
-  final val LITERALlong = 30
-  final val LITERALfloat = 31
-  final val LITERALdouble = 32
-  final val LITERALstring = 33
-  final val LITERALnull = 34
-  final val LITERALclass = 35
-  final val LITERALenum = 36
-  final val SYMANNOT = 40
-  final val CHILDREN = 41
-  final val ANNOTATEDtpe = 42
-  final val ANNOTINFO = 43
-  final val ANNOTARGARRAY = 44
-
-  final val SUPERtpe = 46
-  final val DEBRUIJNINDEXtpe = 47
-  final val EXISTENTIALtpe = 48
-
-  final val TREE = 49      // prefix code that means a tree is coming
-    final val EMPTYtree = 1
-    final val PACKAGEtree = 2
-    final val CLASStree = 3
-    final val MODULEtree = 4
-    final val VALDEFtree = 5
-    final val DEFDEFtree = 6
-    final val TYPEDEFtree = 7
-    final val LABELtree = 8
-    final val IMPORTtree = 9
-    final val DOCDEFtree = 11
-    final val TEMPLATEtree = 12
-    final val BLOCKtree = 13
-    final val CASEtree = 14
-    // This node type has been removed.
-    // final val SEQUENCEtree = 15
-    final val ALTERNATIVEtree = 16
-    final val STARtree = 17
-    final val BINDtree = 18
-    final val UNAPPLYtree = 19
-    final val ARRAYVALUEtree = 20
-    final val FUNCTIONtree = 21
-    final val ASSIGNtree = 22
-    final val IFtree = 23
-    final val MATCHtree = 24
-    final val RETURNtree = 25
-    final val TREtree = 26
-    final val THROWtree = 27
-    final val NEWtree = 28
-    final val TYPEDtree = 29
-    final val TYPEAPPLYtree = 30
-    final val APPLYtree = 31
-    final val APPLYDYNAMICtree = 32
-    final val SUPERtree = 33
-    final val THIStree = 34
-    final val SELECTtree = 35
-    final val IDENTtree = 36
-    final val LITERALtree = 37
-    final val TYPEtree = 38
-    final val ANNOTATEDtree = 39
-    final val SINGLETONTYPEtree = 40
-    final val SELECTFROMTYPEtree = 41
-    final val COMPOUNDTYPEtree = 42
-    final val APPLIEDTYPEtree = 43
-    final val TYPEBOUNDStree = 44
-    final val EXISTENTIALTYPEtree = 45
-
-  final val MODIFIERS = 50
-
-  final val firstSymTag = NONEsym
-  final val lastSymTag = VALsym
-  final val lastExtSymTag = EXTMODCLASSref
-
-
-  //The following two are no longer accurate, because ANNOTATEDtpe,
-  //SUPERtpe, ... are not in the same range as the other types
-  //final val firstTypeTag = NOtpe
-  //final val lastTypeTag = POLYtpe
-}
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
index a4be75c879..02f0adc8a1 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
@@ -9,11 +9,11 @@ package symtab
 package classfile
 
 import java.lang.{Float, Double}
-import scala.tools.nsc.util.{Position, NoPosition, ShowPickled}
-import scala.collection.mutable.Set
-import Flags._
+import util.{ Position, NoPosition, ShowPickled }
+import collection.mutable.Set
+import reflect.generic.{ PickleBuffer, PickleFormat }
 import PickleFormat._
-
+import Flags._
 
 /**
  * Serialize a top-level module and/or class.
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala
index 0538d108c4..4022258746 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala
@@ -12,7 +12,7 @@ import java.io.IOException
 import java.lang.{Float, Double}
 
 import Flags._
-import PickleFormat._
+import scala.reflect.generic.PickleFormat._
 import collection.mutable.{HashMap, ListBuffer}
 import annotation.switch
 
diff --git a/src/compiler/scala/tools/nsc/util/ShowPickled.scala b/src/compiler/scala/tools/nsc/util/ShowPickled.scala
index 20ae9c7eeb..18df575d93 100644
--- a/src/compiler/scala/tools/nsc/util/ShowPickled.scala
+++ b/src/compiler/scala/tools/nsc/util/ShowPickled.scala
@@ -12,8 +12,8 @@ import java.lang.Long.toHexString
 import java.lang.Float.intBitsToFloat
 import java.lang.Double.longBitsToDouble
 
-import symtab.{Flags, Names}
-import symtab.classfile.{PickleBuffer, PickleFormat}
+import symtab.{ Flags, Names }
+import scala.reflect.generic.{ PickleBuffer, PickleFormat }
 import interpreter.ByteCode.scalaSigBytesForPath
 
 object ShowPickled extends Names {