diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-08-29 04:15:47 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-08-29 04:15:47 -0700 |
| commit | 5391e245710f12cbd9983c82e350fb05613dcd7d (patch) | |
| tree | 203b9f0069e0682828f7664c888c7509aba671a6 | |
| parent | a7fbaa126b68078dfe6eb5658211a77b1bfa2339 (diff) | |
| parent | 3cff2587d78eb6023ab1a584eba1bba8fd3660a0 (diff) | |
| download | scala-5391e245710f12cbd9983c82e350fb05613dcd7d.tar.gz scala-5391e245710f12cbd9983c82e350fb05613dcd7d.tar.bz2 scala-5391e245710f12cbd9983c82e350fb05613dcd7d.zip | |
Merge pull request #1206 from paulp/issue/6283
Fix for SI-6283, no abstract value classes.
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/RefChecks.scala | 2 | ||||
| -rw-r--r-- | test/files/neg/t6283.check | 4 | ||||
| -rw-r--r-- | test/files/neg/t6283.scala | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala index 9201981635..166bb2d18c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala +++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala @@ -1618,6 +1618,8 @@ abstract class RefChecks extends InfoTransform with reflect.internal.transform.R if ((clazz isSubClass AnyValClass) && !isPrimitiveValueClass(clazz)) { if (clazz.isTrait) unit.error(clazz.pos, "Only classes (not traits) are allowed to extend AnyVal") + else if ((clazz != AnyValClass) && clazz.hasFlag(ABSTRACT)) + unit.error(clazz.pos, "`abstract' modifier cannot be used with value classes") } } diff --git a/test/files/neg/t6283.check b/test/files/neg/t6283.check new file mode 100644 index 0000000000..69e417ee93 --- /dev/null +++ b/test/files/neg/t6283.check @@ -0,0 +1,4 @@ +t6283.scala:1: error: `abstract' modifier cannot be used with value classes +abstract class Funky(val i: Int) extends AnyVal + ^ +one error found diff --git a/test/files/neg/t6283.scala b/test/files/neg/t6283.scala new file mode 100644 index 0000000000..d41eb18a74 --- /dev/null +++ b/test/files/neg/t6283.scala @@ -0,0 +1 @@ +abstract class Funky(val i: Int) extends AnyVal |