diff options
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/NameManglers.scala | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Names.scala | 6 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala | 2 |
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 } |