diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-02-05 11:53:43 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-02-05 20:05:55 +0100 |
| commit | c9a0e36224b6eb2807bad0df2d5aa11bb05c8a32 (patch) | |
| tree | 1d426346ba57ce6957403c232dacf1bf09635ff7 /test/files/neg/t877.check | |
| parent | 570f4a46f663a8f55ce045bfde2d834bd4902f9c (diff) | |
| download | scala-c9a0e36224b6eb2807bad0df2d5aa11bb05c8a32.tar.gz scala-c9a0e36224b6eb2807bad0df2d5aa11bb05c8a32.tar.bz2 scala-c9a0e36224b6eb2807bad0df2d5aa11bb05c8a32.zip | |
[nomaster] Revert "refactors handling of parent types"
This reverts commit 40063b0009d55ed527bf1625d99a168a8faa4124.
Conflicts:
src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
Diffstat (limited to 'test/files/neg/t877.check')
| -rw-r--r-- | test/files/neg/t877.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/t877.check b/test/files/neg/t877.check index c3d4ab6584..5f25bd439c 100644 --- a/test/files/neg/t877.check +++ b/test/files/neg/t877.check @@ -1,7 +1,7 @@ t877.scala:3: error: Invalid literal number trait Foo extends A(22A, Bug!) {} ^ -t877.scala:3: error: ')' expected but eof found. +t877.scala:3: error: parents of traits may not have parameters trait Foo extends A(22A, Bug!) {} - ^ + ^ two errors found |