Rename io.Code.toUTF8 and io.Code.fromUTF8 so t...

Rename io.Code.toUTF8 and io.Code.fromUTF8 so that the names match
what the methods do, with an added migration warning. Closes #4203. No
review.

3 files changed, 5 insertions, 5 deletions

diff --git a/src/scalap/scala/tools/scalap/ByteArrayReader.scala b/src/scalap/scala/tools/scalap/ByteArrayReader.scala
index c4d06a468c..73220d1048 100644
--- a/src/scalap/scala/tools/scalap/ByteArrayReader.scala
+++ b/src/scalap/scala/tools/scalap/ByteArrayReader.scala
@@ -72,7 +72,7 @@ class ByteArrayReader(content: Array[Byte]) {
   /** read an UTF8 encoded string
    */
   def nextUTF8(len: Int): String = {
-    val cs = scala.io.Codec.toUTF8(buf.slice(bp, bp + len))
+    val cs = scala.io.Codec.fromUTF8(buf.slice(bp, bp + len))
     bp += len
     new String(cs)
   }
diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala
index 01652a50b9..d53d8e1fc1 100644
--- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala
+++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ClassFileParser.scala
@@ -64,9 +64,9 @@ class ByteCode(val bytes : Array[Byte], val pos : Int, val length : Int) {
    * Transforms array subsequence of the current buffer into the UTF8 String and
    * stores and array of bytes for the decompiler
    */
-  def toUTF8StringAndBytes = {
+  def fromUTF8StringAndBytes = {
     val chunk: Array[Byte] = bytes drop pos take length
-    StringBytesPair(io.Codec.toUTF8(chunk).mkString, chunk)
+    StringBytesPair(io.Codec.fromUTF8(chunk).mkString, chunk)
   }
 
   def byte(i : Int) = bytes(pos) & 0xFF
@@ -102,7 +102,7 @@ object ClassFileParser extends ByteCodeReader {
 
   // NOTE currently most constants just evaluate to a string description
   // TODO evaluate to useful values
-  val utf8String = (u2 >> bytes) ^^ add1 { raw => pool => raw.toUTF8StringAndBytes }
+  val utf8String = (u2 >> bytes) ^^ add1 { raw => pool => raw.fromUTF8StringAndBytes }
   val intConstant = u4 ^^ add1 { x => pool => x }
   val floatConstant = bytes(4) ^^ add1 { raw => pool => "Float: TODO" }
   val longConstant = bytes(8) ^^ add2 { raw => pool => raw.toLong }
diff --git a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala
index cb4f336d9c..170a9a15a3 100644
--- a/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala
+++ b/src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala
@@ -72,7 +72,7 @@ object ScalaSigAttributeParsers extends ByteCodeReader  {
   val symtab = nat >> entry.times
   val scalaSig = nat ~ nat ~ symtab ^~~^ ScalaSig
 
-  val utf8 = read(x => x.toUTF8StringAndBytes.string)
+  val utf8 = read(x => x.fromUTF8StringAndBytes.string)
   val longValue = read(_ toLong)
 }