aboutsummaryrefslogtreecommitdiff
path: root/src/dotty
diff options
context:
space:
mode:
authorodersky <odersky@gmail.com>2015-03-13 16:56:10 +0100
committerodersky <odersky@gmail.com>2015-03-13 16:56:10 +0100
commit0ee93122b9e367c08ed1d81c9cfc5919fc3a32af (patch)
tree25d449340c809c823b37d87a2c1a1389ddce8f71 /src/dotty
parent42b34056959878b9ec1a2acc9f7ec7a707adc623 (diff)
parent30b56ed7e7c51a73ebfee8fdcfc13c9579eddcbf (diff)
downloaddotty-0ee93122b9e367c08ed1d81c9cfc5919fc3a32af.tar.gz
dotty-0ee93122b9e367c08ed1d81c9cfc5919fc3a32af.tar.bz2
dotty-0ee93122b9e367c08ed1d81c9cfc5919fc3a32af.zip
Merge pull request #390 from smarter/fix/isDerivedValueClass
`AnyVal` is not a derived value class
Diffstat (limited to 'src/dotty')
-rw-r--r--src/dotty/tools/dotc/transform/ValueClasses.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/transform/ValueClasses.scala b/src/dotty/tools/dotc/transform/ValueClasses.scala
index c5cf44552..2d44ed826 100644
--- a/src/dotty/tools/dotc/transform/ValueClasses.scala
+++ b/src/dotty/tools/dotc/transform/ValueClasses.scala
@@ -12,7 +12,10 @@ import Flags._
object ValueClasses {
def isDerivedValueClass(d: SymDenotation)(implicit ctx: Context) =
- d.isClass && d.derivesFrom(defn.AnyValClass) && !d.isPrimitiveValueClass
+ d.isClass &&
+ (d.symbol ne defn.AnyValClass) &&
+ d.derivesFrom(defn.AnyValClass) &&
+ !d.isPrimitiveValueClass
def isMethodWithExtension(d: SymDenotation)(implicit ctx: Context) =
d.isSourceMethod &&