diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-02-05 11:51:24 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-02-05 20:05:42 +0100 |
| commit | 570f4a46f663a8f55ce045bfde2d834bd4902f9c (patch) | |
| tree | 12b710878bff3d01f53a88a46d95dd10edb92d8e /test/files/neg | |
| parent | c7205317e1fa59430d2372c27c4d0858b05ffdfc (diff) | |
| download | scala-570f4a46f663a8f55ce045bfde2d834bd4902f9c.tar.gz scala-570f4a46f663a8f55ce045bfde2d834bd4902f9c.tar.bz2 scala-570f4a46f663a8f55ce045bfde2d834bd4902f9c.zip | |
[nomaster] Revert "introduces global.pendingSuperCall"
This reverts commit 0ebf72b9498108e67c2133c6522c436af50a18e8.
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/reflect/scala/reflect/internal/Trees.scala
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/anyval-anyref-parent.check | 2 | ||||
| -rw-r--r-- | test/files/neg/names-defaults-neg.check | 2 | ||||
| -rw-r--r-- | test/files/neg/t5529.check | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/test/files/neg/anyval-anyref-parent.check b/test/files/neg/anyval-anyref-parent.check index 8c2aa36583..fe20e5de81 100644 --- a/test/files/neg/anyval-anyref-parent.check +++ b/test/files/neg/anyval-anyref-parent.check @@ -3,7 +3,7 @@ trait Foo2 extends AnyVal // fail ^ anyval-anyref-parent.scala:5: error: Any does not have a constructor class Bar1 extends Any // fail - ^ + ^ anyval-anyref-parent.scala:6: error: value class needs to have exactly one public val parameter class Bar2(x: Int) extends AnyVal // fail ^ diff --git a/test/files/neg/names-defaults-neg.check b/test/files/neg/names-defaults-neg.check index f6bd703e1f..ea7c323b74 100644 --- a/test/files/neg/names-defaults-neg.check +++ b/test/files/neg/names-defaults-neg.check @@ -100,7 +100,7 @@ Error occurred in an application involving default arguments. ^ names-defaults-neg.scala:86: error: module extending its companion class cannot use default constructor arguments object C extends C() - ^ + ^ names-defaults-neg.scala:90: error: deprecated parameter name x has to be distinct from any other parameter name (deprecated or not). def deprNam1(x: Int, @deprecatedName('x) y: String) = 0 ^ diff --git a/test/files/neg/t5529.check b/test/files/neg/t5529.check index da3f84e1ec..5d2175fa79 100644 --- a/test/files/neg/t5529.check +++ b/test/files/neg/t5529.check @@ -4,4 +4,7 @@ t5529.scala:12: error: File is already defined as class File t5529.scala:10: error: class type required but test.Test.File found sealed class Dir extends File { } ^ -two errors found +t5529.scala:10: error: test.Test.File does not have a constructor + sealed class Dir extends File { } + ^ +three errors found |