diff options
| author | Martin Odersky <odersky@gmail.com> | 2012-02-07 18:56:16 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2012-02-07 18:56:16 +0100 |
| commit | 5f02cf9f4035a90225e77a978354ee7c0504e601 (patch) | |
| tree | 2187b9c49f8207d2549b3c4ac61fd67d02c5be27 /src/compiler/scala/tools/nsc/transform/Mixin.scala | |
| parent | aa7ca3599c51702c3c03b27384d25d54ec76afab (diff) | |
| download | scala-5f02cf9f4035a90225e77a978354ee7c0504e601.tar.gz scala-5f02cf9f4035a90225e77a978354ee7c0504e601.tar.bz2 scala-5f02cf9f4035a90225e77a978354ee7c0504e601.zip | |
Rename isValueClass -> isPrimitiveValueClass
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/Mixin.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index b3b7596f9a..5bf4c016ae 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -445,7 +445,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { if ((sym.hasAccessorFlag || (sym.isTerm && !sym.isMethod)) && sym.isPrivate && !(currentOwner.isGetter && currentOwner.accessed == sym) // getter - && !definitions.isValueClass(sym.tpe.resultType.typeSymbol) + && !definitions.isPrimitiveValueClass(sym.tpe.resultType.typeSymbol) && sym.owner == templ.symbol.owner && !sym.isLazy && !tree.isDef) { @@ -517,7 +517,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { localTyper = erasure.newTyper(rootContext.make(tree, currentOwner)) atPhase(phase.next)(currentOwner.owner.info)//todo: needed? - if (!currentOwner.isTrait && !isValueClass(currentOwner)) + if (!currentOwner.isTrait && !isPrimitiveValueClass(currentOwner)) addMixedinMembers(currentOwner, unit) else if (currentOwner hasFlag lateINTERFACE) addLateInterfaceMembers(currentOwner) |