diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-31 12:52:54 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-01 08:27:09 -0700 |
| commit | f7535f72903f083b2444fb1d0b73363efa5482e9 (patch) | |
| tree | 8f8872c0d1f4f9810530baf574b9d1aa8e049033 /test | |
| parent | 17356bf8a3eddb5b6652884ee5b96970d3ddb6cf (diff) | |
| download | scala-f7535f72903f083b2444fb1d0b73363efa5482e9.tar.gz scala-f7535f72903f083b2444fb1d0b73363efa5482e9.tar.bz2 scala-f7535f72903f083b2444fb1d0b73363efa5482e9.zip | |
Pushed Symbol/Type creation partitioning further.
Yet more funnelling of immutable creation-time known information
into the identities of symbols and types.
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/override-object-flag.check | 2 | ||||
| -rw-r--r-- | test/files/neg/override-object-no.check | 2 | ||||
| -rw-r--r-- | test/files/neg/t961.check | 2 | ||||
| -rw-r--r-- | test/files/presentation/callcc-interpreter.check | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/files/neg/override-object-flag.check b/test/files/neg/override-object-flag.check index 152d31ff8a..344165138d 100644 --- a/test/files/neg/override-object-flag.check +++ b/test/files/neg/override-object-flag.check @@ -1,4 +1,4 @@ -override-object-flag.scala:3: error: overriding object Foo in trait A of type object B.this.Foo; +override-object-flag.scala:3: error: overriding object Foo in trait A; object Foo cannot override final member trait B extends A { override object Foo } ^ diff --git a/test/files/neg/override-object-no.check b/test/files/neg/override-object-no.check index f9fb37381b..52bad2b937 100644 --- a/test/files/neg/override-object-no.check +++ b/test/files/neg/override-object-no.check @@ -10,7 +10,7 @@ an overriding object must conform to the overridden object's class bound; required: Object{def g: Int} trait Quux2 extends Quux1 { override object Bar { def g = "abc" } } // err ^ -override-object-no.scala:25: error: overriding object Bar in trait Quux3 of type object Quux4.this.Bar; +override-object-no.scala:25: error: overriding object Bar in trait Quux3; object Bar cannot override final member trait Quux4 extends Quux3 { override object Bar } // err ^ diff --git a/test/files/neg/t961.check b/test/files/neg/t961.check index 48273f764d..14d39b0f42 100644 --- a/test/files/neg/t961.check +++ b/test/files/neg/t961.check @@ -1,4 +1,4 @@ -t961.scala:11: error: object Temp.B does not take parameters +t961.scala:11: error: Temp.B.type does not take parameters B() match { ^ one error found diff --git a/test/files/presentation/callcc-interpreter.check b/test/files/presentation/callcc-interpreter.check index 3385ef12b7..c50e171b4e 100644 --- a/test/files/presentation/callcc-interpreter.check +++ b/test/files/presentation/callcc-interpreter.check @@ -52,7 +52,7 @@ retrieved 64 members `method wait(x$1: Long, x$2: Int)Unit` `method x=> callccInterpreter.type` `method →[B](y: B)(callccInterpreter.type, B)` -`object Wrongobject callccInterpreter.Wrong` +`object WrongcallccInterpreter.Wrong.type` `trait TermcallccInterpreter.Term` `trait ValuecallccInterpreter.Value` `type AnswercallccInterpreter.Answer` |