From 1754813beb02cea6733ecdbcfd34d2f0341fb945 Mon Sep 17 00:00:00 2001 From: Hubert Plociniczak Date: Mon, 31 Oct 2011 23:41:32 +0000 Subject: Fixed failing pc tests. no review --- test/files/presentation/callcc-interpreter.check | 5 +++-- test/files/presentation/ide-bug-1000475.check | 15 +++++++++------ test/files/presentation/ide-bug-1000531.check | 5 +++-- test/files/presentation/implicit-member.check | 4 +++- test/files/presentation/ping-pong.check | 12 +++++++----- test/files/presentation/properties.check | 15 +++++++++------ test/files/presentation/timeofday.check | 10 ++++++---- 7 files changed, 40 insertions(+), 26 deletions(-) diff --git a/test/files/presentation/callcc-interpreter.check b/test/files/presentation/callcc-interpreter.check index 0a63f24a93..95ce693875 100644 --- a/test/files/presentation/callcc-interpreter.check +++ b/test/files/presentation/callcc-interpreter.check @@ -3,7 +3,7 @@ reload: CallccInterpreter.scala askTypeCompletion at CallccInterpreter.scala(51,38) ================================================================================ [response] aksTypeCompletion at (51,38) -retrieved 62 members +retrieved 63 members `class AddcallccInterpreter.Add` `class AppcallccInterpreter.App` `class CcccallccInterpreter.Ccc` @@ -57,11 +57,12 @@ retrieved 62 members `type AnswercallccInterpreter.Answer` `type EnvironmentcallccInterpreter.Environment` `type NamecallccInterpreter.Name` +`value __leftOfArrowcallccInterpreter.type` +`value __resultOfEnsuringcallccInterpreter.type` `value selfAny` `value term0callccInterpreter.App` `value term1callccInterpreter.App` `value term2callccInterpreter.Add` -`value xcallccInterpreter.type` ================================================================================ askType at CallccInterpreter.scala(14,21) diff --git a/test/files/presentation/ide-bug-1000475.check b/test/files/presentation/ide-bug-1000475.check index 739d25c7c7..6ccd44a5b3 100644 --- a/test/files/presentation/ide-bug-1000475.check +++ b/test/files/presentation/ide-bug-1000475.check @@ -3,7 +3,7 @@ reload: Foo.scala askTypeCompletion at Foo.scala(3,7) ================================================================================ [response] aksTypeCompletion at (3,7) -retrieved 34 members +retrieved 35 members `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` `method ##()Int` @@ -32,14 +32,15 @@ retrieved 34 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(Object, B)` +`value __leftOfArrowObject` +`value __resultOfEnsuringObject` `value selfAny` -`value xObject` ================================================================================ askTypeCompletion at Foo.scala(6,10) ================================================================================ [response] aksTypeCompletion at (6,10) -retrieved 34 members +retrieved 35 members `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` `method ##()Int` @@ -68,14 +69,15 @@ retrieved 34 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(Object, B)` +`value __leftOfArrowObject` +`value __resultOfEnsuringObject` `value selfAny` -`value xObject` ================================================================================ askTypeCompletion at Foo.scala(7,7) ================================================================================ [response] aksTypeCompletion at (7,7) -retrieved 34 members +retrieved 35 members `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` `method ##()Int` @@ -104,6 +106,7 @@ retrieved 34 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(Object, B)` +`value __leftOfArrowObject` +`value __resultOfEnsuringObject` `value selfAny` -`value xObject` ================================================================================ diff --git a/test/files/presentation/ide-bug-1000531.check b/test/files/presentation/ide-bug-1000531.check index 67311cdf35..4cd932e602 100644 --- a/test/files/presentation/ide-bug-1000531.check +++ b/test/files/presentation/ide-bug-1000531.check @@ -3,7 +3,7 @@ reload: CrashOnLoad.scala askTypeCompletion at CrashOnLoad.scala(6,12) ================================================================================ [response] aksTypeCompletion at (6,12) -retrieved 121 members +retrieved 122 members `class GroupedIteratorIterator[B]#GroupedIterator` `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` @@ -119,6 +119,7 @@ retrieved 121 members `method zipWithIndex=> Object with Iterator[(B, Int)]{def idx: Int; def idx_=(x$1: Int): Unit}` `method zip[B](that: Iterator[B])Object with Iterator[(B, B)]` `method →[B](y: B)(java.util.Iterator[B], B)` +`value __leftOfArrowjava.util.Iterator[B]` +`value __resultOfEnsuringjava.util.Iterator[B]` `value selfAny` -`value xjava.util.Iterator[B]` ================================================================================ diff --git a/test/files/presentation/implicit-member.check b/test/files/presentation/implicit-member.check index 2f4e6bd828..a856c9f986 100644 --- a/test/files/presentation/implicit-member.check +++ b/test/files/presentation/implicit-member.check @@ -3,7 +3,7 @@ reload: ImplicitMember.scala askTypeCompletion at ImplicitMember.scala(7,7) ================================================================================ [response] aksTypeCompletion at (7,7) -retrieved 36 members +retrieved 38 members `class AppliedImplicitImplicit.AppliedImplicit` `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` @@ -34,6 +34,8 @@ retrieved 36 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(Implicit.type, B)` +`value __leftOfArrowImplicit.type` +`value __resultOfEnsuringImplicit.type` `value selfAny` `value xImplicit.type` ================================================================================ diff --git a/test/files/presentation/ping-pong.check b/test/files/presentation/ping-pong.check index 44e1a04732..bc1b57eb6d 100644 --- a/test/files/presentation/ping-pong.check +++ b/test/files/presentation/ping-pong.check @@ -3,7 +3,7 @@ reload: PingPong.scala askTypeCompletion at PingPong.scala(10,23) ================================================================================ [response] aksTypeCompletion at (10,23) -retrieved 38 members +retrieved 39 members `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` `method ##()Int` @@ -33,16 +33,17 @@ retrieved 38 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(Pong, B)` +`value __leftOfArrowPong` +`value __resultOfEnsuringPong` `value nameString` `value pingPing` `value selfAny` -`value xPong` ================================================================================ askTypeCompletion at PingPong.scala(19,20) ================================================================================ [response] aksTypeCompletion at (19,20) -retrieved 38 members +retrieved 39 members `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` `method ##()Int` @@ -74,15 +75,16 @@ retrieved 38 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(Ping, B)` +`value __leftOfArrowPing` +`value __resultOfEnsuringPing` `value pongPong` `value selfAny` -`value xPing` ================================================================================ askType at PingPong.scala(8,10) ================================================================================ [response] askTypeAt at (8,10) -def loop: Unit = poke() +def loop: Unit = Ping.this.poke() ================================================================================ askType at PingPong.scala(10,10) diff --git a/test/files/presentation/properties.check b/test/files/presentation/properties.check index 268811c036..39bcbd1733 100644 --- a/test/files/presentation/properties.check +++ b/test/files/presentation/properties.check @@ -3,7 +3,7 @@ reload: properties.scala askTypeCompletion at properties.scala(29,33) ================================================================================ [response] aksTypeCompletion at (29,33) -retrieved 49 members +retrieved 50 members `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` `method ##()Int` @@ -42,9 +42,10 @@ retrieved 49 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(properties.Property[String], B)` +`value __leftOfArrowproperties.Property[String]` +`value __resultOfEnsuringproperties.Property[String]` `value initString` `value selfAny` -`value xproperties.Property[String]` `variable getterString => String` `variable setterString => String` `variable valueString` @@ -53,7 +54,7 @@ retrieved 49 members askTypeCompletion at properties.scala(29,67) ================================================================================ [response] aksTypeCompletion at (29,67) -retrieved 49 members +retrieved 50 members `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` `method ##()Int` @@ -92,9 +93,10 @@ retrieved 49 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(properties.Property[String], B)` +`value __leftOfArrowproperties.Property[String]` +`value __resultOfEnsuringproperties.Property[String]` `value initString` `value selfAny` -`value xproperties.Property[String]` `variable getterString => String` `variable setterString => String` `variable valueString` @@ -103,7 +105,7 @@ retrieved 49 members askTypeCompletion at properties.scala(45,10) ================================================================================ [response] aksTypeCompletion at (45,10) -retrieved 36 members +retrieved 37 members `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` `method ##()Int` @@ -132,10 +134,11 @@ retrieved 36 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(properties.User, B)` +`value __leftOfArrowproperties.User` +`value __resultOfEnsuringproperties.User` `value firstnameproperties.Property[String]` `value lastnameproperties.Property[String]` `value selfAny` -`value xproperties.User` ================================================================================ askType at properties.scala(18,28) diff --git a/test/files/presentation/timeofday.check b/test/files/presentation/timeofday.check index 1067e0a8fa..47f93796b4 100644 --- a/test/files/presentation/timeofday.check +++ b/test/files/presentation/timeofday.check @@ -3,7 +3,7 @@ reload: timeofday.scala askTypeCompletion at timeofday.scala(26,33) ================================================================================ [response] aksTypeCompletion at (26,33) -retrieved 43 members +retrieved 44 members `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` `method ##()Int` @@ -38,8 +38,9 @@ retrieved 43 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(timeofday.TimeOfDayVar, B)` +`value __leftOfArrowtimeofday.TimeOfDayVar` +`value __resultOfEnsuringtimeofday.TimeOfDayVar` `value selfAny` -`value xtimeofday.TimeOfDayVar` `variable hInt` `variable mInt` `variable sInt` @@ -48,7 +49,7 @@ retrieved 43 members askTypeCompletion at timeofday.scala(32,19) ================================================================================ [response] aksTypeCompletion at (32,19) -retrieved 43 members +retrieved 44 members `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` `method ##()Int` @@ -83,8 +84,9 @@ retrieved 43 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(timeofday.TimeOfDayVar, B)` +`value __leftOfArrowtimeofday.TimeOfDayVar` +`value __resultOfEnsuringtimeofday.TimeOfDayVar` `value selfAny` -`value xtimeofday.TimeOfDayVar` `variable hInt` `variable mInt` `variable sInt` -- cgit v1.2.3