From ebafcc4e7cb4734736d6a063d49226f944d74637 Mon Sep 17 00:00:00 2001 From: Iulian Dragos Date: Wed, 26 Jan 2011 12:07:07 +0000 Subject: One last attempt at getting the presentation co... One last attempt at getting the presentation compiler pass some tests. no review. --- test/files/presentation/simple-tests.check | 6 +++--- test/files/presentation/simple-tests/SimpleInteractiveTest.scala | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'test/files') diff --git a/test/files/presentation/simple-tests.check b/test/files/presentation/simple-tests.check index 26ddc0836c..ed972ddcda 100644 --- a/test/files/presentation/simple-tests.check +++ b/test/files/presentation/simple-tests.check @@ -1,7 +1,5 @@ reload: Tester.scala askTypeCompletion at Tester.scala(12,39) -askTypeCompletion at Tester.scala(23,24) -askTypeCompletion at Tester.scala(105,29) ================================================================================ [response] aksTypeCompletion at (12,39) @@ -71,6 +69,7 @@ TypeMember(method withSource,[A](src: scala.tools.nsc.util.SourceFile)(op: => A) TypeMember(method withoutTruncating,[T](body: => T)T,true,true,) TypeMember(value x,=> scala.tools.nsc.reporters.StoreReporter,true,false,method any2ArrowAssoc) TypeMember(value x,scala.tools.nsc.reporters.StoreReporter,false,false,method any2ArrowAssoc) +askTypeCompletion at Tester.scala(23,24) ================================================================================ [response] aksTypeCompletion at (23,24) @@ -125,6 +124,7 @@ TypeMember(method wait,(x$1: Long,x$2: Int)Unit,true,true,) TypeMember(method wait,(x$1: Long)Unit,true,true,) TypeMember(value x,=> scala.tools.nsc.interactive.Response[U],true,false,method any2ArrowAssoc) TypeMember(value x,scala.tools.nsc.interactive.Response[U],false,false,method any2ArrowAssoc) +askTypeCompletion at Tester.scala(105,29) ================================================================================ [response] aksTypeCompletion at (105,29) @@ -181,8 +181,8 @@ TypeMember(method wait,(x$1: Long)Unit,true,true,) TypeMember(value x,=> scala.tools.nsc.util.SourceFile,true,false,method any2ArrowAssoc) TypeMember(value x,scala.tools.nsc.util.SourceFile,false,false,method any2ArrowAssoc) askTypeAt at Tester.scala(12,14) -askTypeAt at Tester.scala(13,14) [response] askTypeAt at (12,14) private[this] val reporter: scala.tools.nsc.reporters.StoreReporter = new reporters.StoreReporter() +askTypeAt at Tester.scala(13,14) [response] askTypeAt at (13,14) private[this] val compiler: scala.tools.nsc.interactive.Global = new Global(Tester.this.settings, Tester.this.reporter) diff --git a/test/files/presentation/simple-tests/SimpleInteractiveTest.scala b/test/files/presentation/simple-tests/SimpleInteractiveTest.scala index 0456f9f5e7..cfadc561ae 100644 --- a/test/files/presentation/simple-tests/SimpleInteractiveTest.scala +++ b/test/files/presentation/simple-tests/SimpleInteractiveTest.scala @@ -6,4 +6,5 @@ import scala.tools.nsc.interactive.tests._ */ object Test extends InteractiveTest { override val runRandomTests = false +// override val synchronousRequests = false } -- cgit v1.2.3