summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorDonna Malayeri <lindydonna@gmail.com>2011-03-07 18:08:32 +0000
committerDonna Malayeri <lindydonna@gmail.com>2011-03-07 18:08:32 +0000
commit3689a29fca753e51d72c6c81abf78dfc6ba51b92 (patch)
tree4eb40573c7c96a17b72a6b9d4a83e78f270fc93b /src/compiler
parentcb0d585411b0c7336591b4d129b99be2946ba203 (diff)
downloadscala-3689a29fca753e51d72c6c81abf78dfc6ba51b92.tar.gz
scala-3689a29fca753e51d72c6c81abf78dfc6ba51b92.tar.bz2
scala-3689a29fca753e51d72c6c81abf78dfc6ba51b92.zip
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.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/symtab/NameManglers.scala2
-rw-r--r--src/compiler/scala/tools/nsc/symtab/Names.scala6
-rw-r--r--src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/NameManglers.scala b/src/compiler/scala/tools/nsc/symtab/NameManglers.scala
index 9fe8f9e37f..b24a064139 100644
--- a/src/compiler/scala/tools/nsc/symtab/NameManglers.scala
+++ b/src/compiler/scala/tools/nsc/symtab/NameManglers.scala
@@ -33,7 +33,7 @@ trait NameManglers {
val marker = "$$$$"
val cs = s.toArray
- val bytes = Codec fromUTF8 cs
+ val bytes = Codec toUTF8 cs
md5 update bytes
val md5chars = md5.digest() map (b => (b & 0xFF).toHexString) mkString
diff --git a/src/compiler/scala/tools/nsc/symtab/Names.scala b/src/compiler/scala/tools/nsc/symtab/Names.scala
index 4ca4880d35..9e0348c2e3 100644
--- a/src/compiler/scala/tools/nsc/symtab/Names.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Names.scala
@@ -87,7 +87,7 @@ trait Names extends reflect.generic.Names {
val marker = "$$$$"
val cs = s.toArray
- val bytes = Codec fromUTF8 cs
+ val bytes = Codec toUTF8 cs
md5 update bytes
val md5chars = md5.digest() map (b => (b & 0xFF).toHexString) mkString
@@ -120,7 +120,7 @@ trait Names extends reflect.generic.Names {
/** Create a term name from the UTF8 encoded bytes in bs[offset..offset+len-1].
*/
def newTermName(bs: Array[Byte], offset: Int, len: Int): TermName =
- newTermName(Codec toUTF8 bs.slice(offset, offset + len) mkString)
+ newTermName(Codec fromUTF8 bs.slice(offset, offset + len) mkString)
/** Create a type name from the characters in cs[offset..offset+len-1].
*/
@@ -193,7 +193,7 @@ trait Names extends reflect.generic.Names {
* (i.e. maximally 3*length bytes).
*/
final def copyUTF8(bs: Array[Byte], offset: Int): Int = {
- val bytes = Codec fromUTF8 chrs.slice(index, index + len)
+ val bytes = Codec toUTF8 chrs.slice(index, index + len)
compat.Platform.arraycopy(bytes, 0, bs, offset, bytes.length)
offset + bytes.length
}
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
index da261bb6bf..8f560b772f 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
@@ -499,7 +499,7 @@ abstract class Pickler extends SubComponent {
/** Write a name in UTF8 format. */
private def writeName(name: Name) {
ensureCapacity(name.length * 3)
- val utfBytes = Codec fromUTF8 name.toString
+ val utfBytes = Codec toUTF8 name.toString
compat.Platform.arraycopy(utfBytes, 0, bytes, writeIndex, utfBytes.length)
writeIndex += utfBytes.length
}