Merged revisions 24749-24771,24773-24774,24776-...

Merged revisions 24749-24771,24773-24774,24776-24779 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r24749 | odersky | 2011-04-13 17:07:21 +0200 (Wed, 13 Apr 2011) | 1 line

  Fixes my part of #4283 by inserting another cast pre-emptively when an
IllegalAccess error is possible in an erasure-inserted cast. Review by
extempore. ........ r24750 | dragos | 2011-04-13 18:15:37 +0200 (Wed, 13
Apr 2011) | 1 line

  Warn when the jar file cannot be found when loading a plugin. no
review. ........ r24751 | dragos | 2011-04-13 18:15:43 +0200 (Wed, 13
Apr 2011) | 1 line

  Closes #4283. no review.
........
  r24752 | prokopec | 2011-04-13 18:31:42 +0200 (Wed, 13 Apr 2011) | 45 lines

  Refactoring the collections api to support differentiation between
referring to a sequential collection and a parallel collection, and to
support referring to both types of collections.

  New set of traits Gen* are now superclasses of both their * and Par* subclasses. For example, GenIterable is a superclass of both Iterable and ParIterable. Iterable and ParIterable are not in a subclassing relation. The new class hierarchy is illustrated below (simplified, not all relations and classes are shown):

  TraversableOnce --> GenTraversableOnce
    ^                    ^
    |                    |
  Traversable     --> GenTraversable
    ^                    ^
    |                    |
  Iterable        --> GenIterable        <-- ParIterable
    ^                    ^                      ^
    |                    |                      |
  Seq             --> GenSeq             <-- ParSeq

  (the *Like, *View and *ViewLike traits have a similar hierarchy)

  General views extract common view functionality from parallel and
sequential collections.

  This design also allows for more flexible extensions to the
collections framework. It also allows slowly factoring out common
functionality up into Gen* traits.

  From now on, it is possible to write this:

  import collection._

  val p = parallel.ParSeq(1, 2, 3)
  val g: GenSeq[Int] = p // meaning a General Sequence
  val s = g.seq // type of s is Seq[Int]

  for (elem <- g) {
    // do something without guarantees on sequentiality of foreach
    // this foreach may be executed in parallel
  }

  for (elem <- s) {
    // do something with a guarantee that foreach is executed in order, sequentially
  }

  for (elem <- p) {
    // do something concurrently, in parallel
  }

  This also means that some signatures had to be changed. For example,
method `flatMap` now takes `A => GenTraversableOnce[B]`, and `zip` takes
a `GenIterable[B]`.

  Also, there are mutable & immutable Gen* trait variants. They have
generic companion functionality. ........ r24753 | prokopec | 2011-04-13
18:31:58 +0200 (Wed, 13 Apr 2011) | 3 lines

  Fixes and closes #4405.

  No review.
........
  r24754 | prokopec | 2011-04-13 18:32:01 +0200 (Wed, 13 Apr 2011) | 3 lines

  Fixed some tests, renamed from Any to Gen.

  No review.
........
  r24755 | prokopec | 2011-04-13 18:32:04 +0200 (Wed, 13 Apr 2011) | 3 lines

  Further fixes #4405.

  No review.
........
  r24756 | prokopec | 2011-04-13 18:32:09 +0200 (Wed, 13 Apr 2011) | 3 lines

  Added test case for #4459.

  No review.
........
  r24757 | extempore | 2011-04-13 21:00:56 +0200 (Wed, 13 Apr 2011) | 1 line

  New starr based on r24749.  No review.
........
  r24758 | dragos | 2011-04-13 21:12:57 +0200 (Wed, 13 Apr 2011) | 1 line

  Revert "Closes #4283. no review." because of failing tests. ........
r24759 | extempore | 2011-04-14 06:15:50 +0200 (Thu, 14 Apr 2011) | 2
lines

  Tests which run have to be called "Test". Fixes failing test and
renames file to avoid ant's brainlessness, no review. ........ r24760 |
extempore | 2011-04-14 08:38:35 +0200 (Thu, 14 Apr 2011) | 9 lines

  Doing a little polishing on the parallel collections refactor (which
  overall looks like a big improvement.) I went for some simpler wording
  and moved a number of scaladoc tags around because the rug had been
  pulled out from under their feet.

  This leaves a lot undone, but since many of the docs need to be
reworded before they can move from e.g. SeqLike to GenSeqLike, and I'm
not well informed on exactly how these abstractions are being presented,
I stayed in the safe zone. Review by prokopec. ........ r24761 | phaller
| 2011-04-14 11:11:10 +0200 (Thu, 14 Apr 2011) | 1 line

  Closed #4454. Applied patch provided in ticket. No review. ........
r24762 | dragos | 2011-04-14 15:48:00 +0200 (Thu, 14 Apr 2011) | 1 line

  This time, fixed #4283. no review.
........
  r24763 | extempore | 2011-04-14 16:25:46 +0200 (Thu, 14 Apr 2011) | 4 lines

  Of late the test which fires up the window server, which has already
been the source of undue quantities of inconvenience, has taken to
hanging indefinitely when I run the test suite on a remote machine. Rope
at end, goodbye test, no review. ........ r24764 | prokopec | 2011-04-14
18:09:33 +0200 (Thu, 14 Apr 2011) | 4 lines

  Adding some docs refactorings.
  Also, added some docs variables to Gen* traits that were missing.

  No review.
........
  r24765 | extempore | 2011-04-14 21:33:39 +0200 (Thu, 14 Apr 2011) | 2 lines

  Some patches to jline, and new jar. Thanks to Kenji Matsuoka for
improving the keybindings. No review. ........ r24766 | extempore |
2011-04-14 23:05:12 +0200 (Thu, 14 Apr 2011) | 3 lines

  Adds "since" field to @deprecated. Thanks to Simon Ochsenreither
for the patch, as it's a change I've always wanted. Moving up in the
glamorous world of scala commits! No review. ........ r24767 | extempore
| 2011-04-14 23:06:14 +0200 (Thu, 14 Apr 2011) | 3 lines

  Various addenda to soc's patch: regenerating Product/Tuple/Function
classes and AnyVal sources, making versioning consistent, etc. Closes
#4477, no review. ........ r24768 | extempore | 2011-04-15 04:39:32
+0200 (Fri, 15 Apr 2011) | 3 lines

  Some mopping up having to do with deprecated gaining an argument,
which may or may not cure scaladoc of its current assertion failure. No
review. ........ r24769 | extempore | 2011-04-15 07:05:53 +0200 (Fri, 15
Apr 2011) | 1 line

  Fixing a couple more tests, no review.
........
  r24770 | extempore | 2011-04-15 08:55:32 +0200 (Fri, 15 Apr 2011) | 6 lines

  Having been tortured by remorse ever since tiark told me that r23934
had made the hashmap slower, I crushed my previous efforts under the
heel of my boot, threw all the types out the window, poured acid on
them, and turned all the dials to the far other extreme. Pity the man
who will sell his soul for a few CPU cycles. (I am that man.) Review by
rompf. ........ r24771 | prokopec | 2011-04-15 09:54:54 +0200 (Fri, 15
Apr 2011) | 3 lines

  Couple of fixes to the usecases in docs.

  No review.
........
  r24773 | kzys | 2011-04-15 18:12:22 +0200 (Fri, 15 Apr 2011) | 2 lines

  [scaladoc] Strike-through for deprecated symbols on the reference
index. Closes #4471. Review by dubochet. ........ r24774 | extempore |
2011-04-15 23:03:44 +0200 (Fri, 15 Apr 2011) | 3 lines

  Added a script in tools for deploying maven artifacts locally, since
it always takes me an eternity to figure out slash remember how to do
it. No review. ........ r24776 | extempore | 2011-04-17 21:58:15 +0200
(Sun, 17 Apr 2011) | 2 lines

  Added releaseVersion and developmentVersion to Properties so people
don't all have to parse the versionString. No review. ........ r24777 |
extempore | 2011-04-17 23:28:03 +0200 (Sun, 17 Apr 2011) | 1 line

  Revised that last botched commit.  No review.
........
  r24778 | odersky | 2011-04-19 11:52:59 +0200 (Tue, 19 Apr 2011) | 1 line

  Trying to get build times down by refining implicit searches. Implicit
infos associated with toplevel classes are cached now. Review by rompf.
........ r24779 | odersky | 2011-04-19 12:56:58 +0200 (Tue, 19 Apr 2011)
| 1 line

  Further optimizations of implicits. Now, improves checks between
static members are cached as well. Review by rompf. ........

3 files changed, 409 insertions, 0 deletions

diff --git a/test/disabled/presentation/simple-tests.check b/test/disabled/presentation/simple-tests.check
new file mode 100644
index 0000000000..b90dfce77c
--- /dev/null
+++ b/test/disabled/presentation/simple-tests.check
@@ -0,0 +1,390 @@
+reload: Tester.scala
+askTypeCompletion at Tester.scala(16,25)
+
+================================================================================
+[response] aksTypeCompletion at (16,25)
+retreived 75 members
+TypeMember(method !=,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method !=,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method >,(that: Tester.this.settings.Setting)Boolean,true,true,<none>)
+TypeMember(method >=,(that: Tester.this.settings.Setting)Boolean,true,true,<none>)
+TypeMember(method ##,()Int,true,true,<none>)
+TypeMember(method <,(that: Tester.this.settings.Setting)Boolean,true,true,<none>)
+TypeMember(method <=,(that: Tester.this.settings.Setting)Boolean,true,true,<none>)
+TypeMember(method ->,[B](y: B)(Tester.this.settings.BooleanSetting, B),true,false,method any2ArrowAssoc)
+TypeMember(method +,(other: String)java.lang.String,true,false,method any2stringadd)
+TypeMember(method →,[B](y: B)(Tester.this.settings.BooleanSetting, B),true,false,method any2ArrowAssoc)
+TypeMember(constructor BooleanSetting,(name: String,descr: String)Tester.this.settings.BooleanSetting,true,false,<none>)
+TypeMember(constructor Object,()java.lang.Object,true,true,<none>)
+TypeMember(constructor StringAdd,(self: Any)scala.runtime.StringAdd,true,false,method any2stringadd)
+TypeMember(constructor ArrowAssoc,(x: Tester.this.settings.BooleanSetting)ArrowAssoc[Tester.this.settings.BooleanSetting],true,false,method any2ArrowAssoc)
+TypeMember(type T,Tester.this.settings.verbose.T,true,false,<none>)
+TypeMember(variable _abbreviations,List[String],false,true,<none>)
+TypeMember(variable _helpSyntax,String,false,true,<none>)
+TypeMember(variable _postSetHook,(Tester.this.settings.verbose.type) => Unit,false,true,<none>)
+TypeMember(method abbreviations,=> List[String],true,true,<none>)
+TypeMember(method asInstanceOf,[T0]=> T0,true,true,<none>)
+TypeMember(method choices,=> List[String],true,true,<none>)
+TypeMember(method clone,()java.lang.Object,false,true,<none>)
+TypeMember(method compare,(that: Tester.this.settings.Setting)Int,true,true,<none>)
+TypeMember(method compareTo,(that: Tester.this.settings.Setting)Int,true,true,<none>)
+TypeMember(method dependencies,=> List[(Tester.this.settings.Setting, String)],true,true,<none>)
+TypeMember(variable dependency,Option[(Tester.this.settings.Setting, String)],false,true,<none>)
+TypeMember(method dependsOn,(s: Tester.this.settings.Setting,value: String)Tester.this.settings.verbose.type,true,true,<none>)
+TypeMember(value descr,String,false,false,<none>)
+TypeMember(method ensuring,(cond: (Tester.this.settings.BooleanSetting) => Boolean,msg: => Any)Tester.this.settings.BooleanSetting,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: (Tester.this.settings.BooleanSetting) => Boolean)Tester.this.settings.BooleanSetting,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean,msg: => Any)Tester.this.settings.BooleanSetting,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean)Tester.this.settings.BooleanSetting,true,false,method any2Ensuring)
+TypeMember(method eq,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method equals,(that: Any)Boolean,true,true,<none>)
+TypeMember(method errorAndValue,[T](msg: String,x: T)T,true,true,<none>)
+TypeMember(method finalize,()Unit,false,true,<none>)
+TypeMember(method formatted,(fmtstr: String)String,true,false,method any2stringadd)
+TypeMember(method hashCode,()Int,true,true,<none>)
+TypeMember(value helpDescription,String,false,true,<none>)
+TypeMember(method helpSyntax,=> String,true,true,<none>)
+TypeMember(method isAdvanced,=> Boolean,true,true,<none>)
+TypeMember(method isDefault,=> Boolean,true,true,<none>)
+TypeMember(method isForDebug,=> Boolean,true,true,<none>)
+TypeMember(method isInstanceOf,[T0]=> Boolean,true,true,<none>)
+TypeMember(method isInternalOnly,=> Boolean,true,true,<none>)
+TypeMember(method isPrivate,=> Boolean,true,true,<none>)
+TypeMember(method isStandard,=> Boolean,true,true,<none>)
+TypeMember(value name,String,false,false,<none>)
+TypeMember(method ne,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method notify,()Unit,true,true,<none>)
+TypeMember(method notifyAll,()Unit,true,true,<none>)
+TypeMember(method postSetHook,()Unit,true,true,<none>)
+TypeMember(method respondsTo,(label: String)Boolean,true,true,<none>)
+TypeMember(value self,Any,false,false,method any2stringadd)
+TypeMember(variable setByUser,Boolean,false,true,<none>)
+TypeMember(method synchronized,[T0](x$1: T0)T0,true,true,<none>)
+TypeMember(method toString,()String,true,true,<none>)
+TypeMember(method tryToSet,(args: List[String])Some[List[String]],true,false,<none>)
+TypeMember(method tryToSetColon,(args: List[String])Option[Tester.this.settings.ResultOfTryToSet],true,true,<none>)
+TypeMember(method tryToSetFromPropertyValue,(s: String)Unit,true,false,<none>)
+TypeMember(method tryToSetProperty,(args: List[String])Option[Tester.this.settings.ResultOfTryToSet],true,true,<none>)
+TypeMember(method unparse,=> List[String],true,false,<none>)
+TypeMember(variable v,Boolean,false,false,<none>)
+TypeMember(method value,=> Tester.this.settings.verbose.T,true,true,<none>)
+TypeMember(method value_=,(arg: Tester.this.settings.verbose.T)Unit,true,true,<none>)
+TypeMember(method wait,()Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long,x$2: Int)Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long)Unit,true,true,<none>)
+TypeMember(method withAbbreviation,(s: String)Tester.this.settings.verbose.type,true,true,<none>)
+TypeMember(method withHelpSyntax,(s: String)Tester.this.settings.verbose.type,true,true,<none>)
+TypeMember(method withPostSetHook,(f: (Tester.this.settings.verbose.type) => Unit)Tester.this.settings.verbose.type,true,true,<none>)
+TypeMember(value x,Tester.this.settings.BooleanSetting,false,false,method any2ArrowAssoc)
+askTypeCompletion at Tester.scala(23,24)
+
+================================================================================
+[response] aksTypeCompletion at (23,24)
+retreived 46 members
+TypeMember(method !=,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method !=,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ##,()Int,true,true,<none>)
+TypeMember(method ->,[B](y: B)(scala.tools.nsc.interactive.Response[U], B),true,false,method any2ArrowAssoc)
+TypeMember(method +,(other: String)java.lang.String,true,false,method any2stringadd)
+TypeMember(method →,[B](y: B)(scala.tools.nsc.interactive.Response[U], B),true,false,method any2ArrowAssoc)
+TypeMember(constructor Response,()scala.tools.nsc.interactive.Response[U],true,false,<none>)
+TypeMember(constructor StringAdd,(self: Any)scala.runtime.StringAdd,true,false,method any2stringadd)
+TypeMember(constructor ArrowAssoc,(x: scala.tools.nsc.interactive.Response[U])ArrowAssoc[scala.tools.nsc.interactive.Response[U]],true,false,method any2ArrowAssoc)
+TypeMember(method asInstanceOf,[T0]=> T0,true,true,<none>)
+TypeMember(method cancel,()Unit,true,false,<none>)
+TypeMember(variable cancelled,Boolean,false,false,<none>)
+TypeMember(method clear,()Unit,true,false,<none>)
+TypeMember(method clone,()java.lang.Object,false,true,<none>)
+TypeMember(variable complete,Boolean,false,false,<none>)
+TypeMember(variable data,Option[Either[U,Throwable]],false,false,<none>)
+TypeMember(method ensuring,(cond: (scala.tools.nsc.interactive.Response[U]) => Boolean,msg: => Any)scala.tools.nsc.interactive.Response[U],true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: (scala.tools.nsc.interactive.Response[U]) => Boolean)scala.tools.nsc.interactive.Response[U],true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean,msg: => Any)scala.tools.nsc.interactive.Response[U],true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean)scala.tools.nsc.interactive.Response[U],true,false,method any2Ensuring)
+TypeMember(method eq,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method equals,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method finalize,()Unit,false,true,<none>)
+TypeMember(method formatted,(fmtstr: String)String,true,false,method any2stringadd)
+TypeMember(method get,(timeout: Long)Option[Either[U,Throwable]],true,false,<none>)
+TypeMember(method get,=> Either[U,Throwable],true,false,<none>)
+TypeMember(method hashCode,()Int,true,true,<none>)
+TypeMember(method isCancelled,=> Boolean,true,false,<none>)
+TypeMember(method isComplete,=> Boolean,true,false,<none>)
+TypeMember(method isInstanceOf,[T0]=> Boolean,true,true,<none>)
+TypeMember(method ne,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method notify,()Unit,true,true,<none>)
+TypeMember(method notifyAll,()Unit,true,true,<none>)
+TypeMember(method raise,(exc: Throwable)Unit,true,false,<none>)
+TypeMember(value self,Any,false,false,method any2stringadd)
+TypeMember(method set,(x: U)Unit,true,false,<none>)
+TypeMember(method setProvisionally,(x: U)Unit,true,false,<none>)
+TypeMember(method synchronized,[T0](x$1: T0)T0,true,true,<none>)
+TypeMember(method toString,()java.lang.String,true,true,<none>)
+TypeMember(method wait,()Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long,x$2: Int)Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long)Unit,true,true,<none>)
+TypeMember(value x,scala.tools.nsc.interactive.Response[U],false,false,method any2ArrowAssoc)
+askTypeCompletion at Tester.scala(27,23)
+
+================================================================================
+[response] aksTypeCompletion at (27,23)
+retreived 196 members
+TypeMember(method !=,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method !=,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ##,()Int,true,true,<none>)
+TypeMember(method ->,[B](y: B)(scala.tools.nsc.Settings, B),true,false,method any2ArrowAssoc)
+TypeMember(method +,(other: String)java.lang.String,true,false,method any2stringadd)
+TypeMember(method →,[B](y: B)(scala.tools.nsc.Settings, B),true,false,method any2ArrowAssoc)
+TypeMember(constructor Settings,()scala.tools.nsc.Settings,true,false,<none>)
+TypeMember(constructor Settings,(errorFn: (String) => Unit)scala.tools.nsc.Settings,true,false,<none>)
+TypeMember(constructor StringAdd,(self: Any)scala.runtime.StringAdd,true,false,method any2stringadd)
+TypeMember(constructor ArrowAssoc,(x: scala.tools.nsc.Settings)ArrowAssoc[scala.tools.nsc.Settings],true,false,method any2ArrowAssoc)
+TypeMember(trait AbsSetting,Tester.this.settings.AbsSetting,true,true,<none>)
+TypeMember(trait AbsSettingValue,Tester.this.settings.AbsSettingValue,true,true,<none>)
+TypeMember(class BooleanSetting,Tester.this.settings.BooleanSetting,true,true,<none>)
+TypeMember(method BooleanSetting,(name: String,descr: String)Tester.this.settings.BooleanSetting,true,true,<none>)
+TypeMember(class ChoiceSetting,Tester.this.settings.ChoiceSetting,true,true,<none>)
+TypeMember(method ChoiceSetting,(name: String,helpArg: String,descr: String,choices: List[String],default: String)Tester.this.settings.ChoiceSetting,true,true,<none>)
+TypeMember(class IntSetting,Tester.this.settings.IntSetting,true,true,<none>)
+TypeMember(method IntSetting,(name: String,descr: String,default: Int,range: Option[(Int, Int)],parser: (String) => Option[Int])Tester.this.settings.IntSetting,true,true,<none>)
+TypeMember(trait InternalSetting,Tester.this.settings.InternalSetting,true,true,<none>)
+TypeMember(class MultiStringSetting,Tester.this.settings.MultiStringSetting,true,true,<none>)
+TypeMember(method MultiStringSetting,(name: String,arg: String,descr: String)Tester.this.settings.MultiStringSetting,true,true,<none>)
+TypeMember(class OutputDirs,Tester.this.settings.OutputDirs,true,true,<none>)
+TypeMember(class OutputSetting,Tester.this.settings.OutputSetting,true,true,<none>)
+TypeMember(method OutputSetting,(outputDirs: Tester.this.settings.OutputDirs,default: String)Tester.this.settings.OutputSetting,true,true,<none>)
+TypeMember(class PathSetting,Tester.this.settings.PathSetting,true,true,<none>)
+TypeMember(method PathSetting,(name: String,descr: String,default: String)Tester.this.settings.PathSetting,true,true,<none>)
+TypeMember(class PhasesSetting,Tester.this.settings.PhasesSetting,true,true,<none>)
+TypeMember(method PhasesSetting,(name: String,descr: String)Tester.this.settings.PhasesSetting,true,true,<none>)
+TypeMember(type ResultOfTryToSet,Tester.this.settings.ResultOfTryToSet,true,true,<none>)
+TypeMember(class Setting,Tester.this.settings.Setting,true,true,<none>)
+TypeMember(class SettingGroup,Tester.this.settings.SettingGroup,true,true,<none>)
+TypeMember(lazy value SettingOrdering,Ordering[Tester.this.settings.Setting],false,true,<none>)
+TypeMember(trait SettingValue,Tester.this.settings.SettingValue,true,true,<none>)
+TypeMember(method StringSetting,(name: String,arg: String,descr: String,default: String)Tester.this.settings.StringSetting,true,true,<none>)
+TypeMember(class StringSetting,Tester.this.settings.StringSetting,true,true,<none>)
+TypeMember(method XO,=> Tester.this.settings.BooleanSetting,true,true,<none>)
+TypeMember(value Xchecknull,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xcloselim,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xdce,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xexperimental,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xhelp,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xlinearizer,Tester.this.settings.ChoiceSetting,false,true,<none>)
+TypeMember(value XlogImplicits,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xmigration28,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xnojline,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xprint,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(value Xprintpos,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xshowcls,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value Xshowobj,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value Xshowtrees,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xwarnfatal,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Xwarninit,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ybuilderdebug,Tester.this.settings.ChoiceSetting,false,true,<none>)
+TypeMember(value Ybuildmanagerdebug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ycompacttrees,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ycompletion,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value YdepMethTpes,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yhelp,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yidedebug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ylogcp,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value YmethodInfer,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ymurmur,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ynogenericsig,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ynosqueeze,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ynotnull,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ypmatdebug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ypmatnaive,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value YpresentationDebug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value YpresentationLog,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value YpresentationReplay,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value YpresentationVerbose,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yprofile,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(value YprofileClass,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value YprofileMem,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yrangepos,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yrecursion,Tester.this.settings.IntSetting,false,true,<none>)
+TypeMember(value Yrepldebug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value YrichExes,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yshow,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(value Ystatistics,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Ytyperdebug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value Yverifysigs,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value YvirtClasses,Boolean,false,true,<none>)
+TypeMember(value Ywarndeadcode,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method add,[T <: Tester.this.settings.Setting](s: T)T,false,true,<none>)
+TypeMember(lazy value allSettings,scala.collection.mutable.HashSet[Tester.this.settings.Setting],false,true,<none>)
+TypeMember(value argfiles,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method asInstanceOf,[T0]=> T0,true,true,<none>)
+TypeMember(value assemextdirs,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value assemname,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value assemrefs,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value bootclasspath,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(value browse,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(value check,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(method checkDependencies,=> Boolean,true,true,<none>)
+TypeMember(value checkInit,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value classpath,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(method clone,()java.lang.Object,false,true,<none>)
+TypeMember(method copy,()scala.tools.nsc.Settings,true,true,<none>)
+TypeMember(value d,Tester.this.settings.OutputSetting,false,true,<none>)
+TypeMember(value debug,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method debuginfo,=> Tester.this.settings.ChoiceSetting,true,true,<none>)
+TypeMember(method dependenciesFile,=> Tester.this.settings.StringSetting,true,true,<none>)
+TypeMember(value dependencyfile,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value deprecation,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method disable,(s: Tester.this.settings.Setting)scala.collection.mutable.HashSet[Tester.this.settings.Setting],true,true,<none>)
+TypeMember(value disable,Tester.this.settings.MultiStringSetting,false,true,<none>)
+TypeMember(value elidebelow,Tester.this.settings.IntSetting,false,true,<none>)
+TypeMember(method embeddedDefaults,(loader: java.lang.ClassLoader)Unit,true,true,<none>)
+TypeMember(method embeddedDefaults,[T](implicit evidence$1: Manifest[T])Unit,true,true,<none>)
+TypeMember(value encoding,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(method ensuring,(cond: (scala.tools.nsc.Settings) => Boolean,msg: => Any)scala.tools.nsc.Settings,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: (scala.tools.nsc.Settings) => Boolean)scala.tools.nsc.Settings,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean,msg: => Any)scala.tools.nsc.Settings,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean)scala.tools.nsc.Settings,true,false,method any2Ensuring)
+TypeMember(method eq,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method equals,(that: Any)Boolean,true,true,<none>)
+TypeMember(value errorFn,(String) => Unit,false,false,<none>)
+TypeMember(value explaintypes,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(variable explicitParentLoader,Option[java.lang.ClassLoader],false,true,<none>)
+TypeMember(value extdirs,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(method finalize,()Unit,false,true,<none>)
+TypeMember(method formatted,(fmtstr: String)String,true,false,method any2stringadd)
+TypeMember(value fscShutdown,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value future,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value g,Tester.this.settings.ChoiceSetting,false,true,<none>)
+TypeMember(value genPhaseGraph,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(method getClasspath,(id: String,loader: java.lang.ClassLoader)Option[String],false,true,<none>)
+TypeMember(method hashCode,()Int,true,true,<none>)
+TypeMember(value help,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value inline,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method isInstanceOf,[T0]=> Boolean,true,true,<none>)
+TypeMember(value javabootclasspath,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(value javaextdirs,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(value log,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(method lookupSetting,(cmd: String)Option[Tester.this.settings.Setting],true,true,<none>)
+TypeMember(value make,Tester.this.settings.ChoiceSetting,false,true,<none>)
+TypeMember(method ne,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(value noCompletion,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value noForwarders,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value noSelfCheck,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value noassertions,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value noimports,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value nospecialization,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method notify,()Unit,true,true,<none>)
+TypeMember(method notifyAll,()Unit,true,true,<none>)
+TypeMember(value nouescape,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value nowarn,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method nowarnings,=> Tester.this.settings.BooleanSetting,true,true,<none>)
+TypeMember(value optimise,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method outdir,=> Tester.this.settings.OutputSetting,true,true,<none>)
+TypeMember(lazy value outputDirs,Tester.this.settings.OutputDirs,false,true,<none>)
+TypeMember(method parseParams,(args: List[String])List[String],false,true,<none>)
+TypeMember(value plugin,Tester.this.settings.MultiStringSetting,false,true,<none>)
+TypeMember(value pluginOptions,Tester.this.settings.MultiStringSetting,false,true,<none>)
+TypeMember(value pluginsDir,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value print,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method printLate,=> Tester.this.settings.BooleanSetting,true,true,<none>)
+TypeMember(value printtypes,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method processArgumentString,(params: String)(Boolean, List[String]),true,true,<none>)
+TypeMember(method processArguments,(arguments: List[String],processAll: Boolean)(Boolean, List[String]),true,true,<none>)
+TypeMember(value prompt,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method recreateArgs,=> List[String],true,true,<none>)
+TypeMember(value refinementMethodDispatch,Tester.this.settings.ChoiceSetting,false,true,<none>)
+TypeMember(value require,Tester.this.settings.MultiStringSetting,false,true,<none>)
+TypeMember(value resident,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value script,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value self,Any,false,false,method any2stringadd)
+TypeMember(value selfInAnnots,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value showPhases,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value showPlugins,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value skip,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(value sourceReader,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value sourcedir,Tester.this.settings.StringSetting,false,true,<none>)
+TypeMember(value sourcepath,Tester.this.settings.PathSetting,false,true,<none>)
+TypeMember(method splitParams,(line: String)List[String],true,true,<none>)
+TypeMember(value stop,Tester.this.settings.PhasesSetting,false,true,<none>)
+TypeMember(method synchronized,[T0](x$1: T0)T0,true,true,<none>)
+TypeMember(value target,Tester.this.settings.ChoiceSetting,false,true,<none>)
+TypeMember(method toConciseString,=> String,true,true,<none>)
+TypeMember(method toString,()String,true,true,<none>)
+TypeMember(value unchecked,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value uniqid,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value usejavacp,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method userSetSettings,=> scala.collection.Set[Tester.this.settings.Setting],true,true,<none>)
+TypeMember(value verbose,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value version,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(method visibleSettings,=> scala.collection.Set[Tester.this.settings.Setting],true,true,<none>)
+TypeMember(method wait,()Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long,x$2: Int)Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long)Unit,true,true,<none>)
+TypeMember(value writeICode,Tester.this.settings.BooleanSetting,false,true,<none>)
+TypeMember(value x,scala.tools.nsc.Settings,false,false,method any2ArrowAssoc)
+askTypeCompletion at Tester.scala(105,29)
+
+================================================================================
+[response] aksTypeCompletion at (105,29)
+retreived 50 members
+TypeMember(method !=,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method !=,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method ==,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method ##,()Int,true,true,<none>)
+TypeMember(method ->,[B](y: B)(scala.tools.nsc.util.SourceFile, B),true,false,method any2ArrowAssoc)
+TypeMember(method +,(other: String)java.lang.String,true,false,method any2stringadd)
+TypeMember(method →,[B](y: B)(scala.tools.nsc.util.SourceFile, B),true,false,method any2ArrowAssoc)
+TypeMember(constructor SourceFile,()scala.tools.nsc.util.SourceFile,true,false,<none>)
+TypeMember(constructor StringAdd,(self: Any)scala.runtime.StringAdd,true,false,method any2stringadd)
+TypeMember(constructor ArrowAssoc,(x: scala.tools.nsc.util.SourceFile)ArrowAssoc[scala.tools.nsc.util.SourceFile],true,false,method any2ArrowAssoc)
+TypeMember(method asInstanceOf,[T0]=> T0,true,true,<none>)
+TypeMember(method beginsWith,(offset: Int,text: String)Boolean,true,false,<none>)
+TypeMember(method clone,()java.lang.Object,false,true,<none>)
+TypeMember(method content,=> Array[Char],true,false,<none>)
+TypeMember(method dbg,(offset: Int)java.lang.String,true,false,<none>)
+TypeMember(method ensuring,(cond: (scala.tools.nsc.util.SourceFile) => Boolean,msg: => Any)scala.tools.nsc.util.SourceFile,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: (scala.tools.nsc.util.SourceFile) => Boolean)scala.tools.nsc.util.SourceFile,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean,msg: => Any)scala.tools.nsc.util.SourceFile,true,false,method any2Ensuring)
+TypeMember(method ensuring,(cond: Boolean)scala.tools.nsc.util.SourceFile,true,false,method any2Ensuring)
+TypeMember(method eq,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method equals,(x$1: Any)Boolean,true,true,<none>)
+TypeMember(method file,=> scala.tools.nsc.io.AbstractFile,true,false,<none>)
+TypeMember(method finalize,()Unit,false,true,<none>)
+TypeMember(method formatted,(fmtstr: String)String,true,false,method any2stringadd)
+TypeMember(method hashCode,()Int,true,true,<none>)
+TypeMember(method identifier,(pos: scala.tools.nsc.util.Position,compiler: scala.tools.nsc.Global)Option[String],true,false,<none>)
+TypeMember(method isInstanceOf,[T0]=> Boolean,true,true,<none>)
+TypeMember(method isLineBreak,(idx: Int)Boolean,true,false,<none>)
+TypeMember(method isSelfContained,=> Boolean,true,false,<none>)
+TypeMember(method length,=> Int,true,false,<none>)
+TypeMember(method lineToOffset,(index: Int)Int,true,false,<none>)
+TypeMember(method lineToString,(index: Int)String,true,false,<none>)
+TypeMember(method ne,(x$1: AnyRef)Boolean,true,true,<none>)
+TypeMember(method notify,()Unit,true,true,<none>)
+TypeMember(method notifyAll,()Unit,true,true,<none>)
+TypeMember(method offsetToLine,(offset: Int)Int,true,false,<none>)
+TypeMember(method path,=> String,true,false,<none>)
+TypeMember(method position,(line: Int,column: Int)scala.tools.nsc.util.Position,true,false,<none>)
+TypeMember(method position,(offset: Int)scala.tools.nsc.util.Position,true,false,<none>)
+TypeMember(method positionInUltimateSource,(position: scala.tools.nsc.util.Position)scala.tools.nsc.util.Position,true,false,<none>)
+TypeMember(value self,Any,false,false,method any2stringadd)
+TypeMember(method skipWhitespace,(offset: Int)Int,true,false,<none>)
+TypeMember(method synchronized,[T0](x$1: T0)T0,true,true,<none>)
+TypeMember(method toString,()String,true,false,<none>)
+TypeMember(method wait,()Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long,x$2: Int)Unit,true,true,<none>)
+TypeMember(method wait,(x$1: Long)Unit,true,true,<none>)
+TypeMember(value x,scala.tools.nsc.util.SourceFile,false,false,method any2ArrowAssoc)
+askTypeAt at Tester.scala(18,13)
+[response] askTypeAt at (18,13)
+val limit: Long = java.this.lang.System.currentTimeMillis().+(Tester.this.randomDelayMillis)
+askTypeAt at Tester.scala(19,11)
+[response] askTypeAt at (19,11)
+val res: scala.tools.nsc.interactive.Response[U] = new scala.tools.nsc.interactive.Response[U]()
diff --git a/test/disabled/presentation/simple-tests.javaopts b/test/disabled/presentation/simple-tests.javaopts
new file mode 100644
index 0000000000..4af888f9c2
--- /dev/null
+++ b/test/disabled/presentation/simple-tests.javaopts
@@ -0,0 +1 @@
+-Dfile.encoding=UTF-8
\ No newline at end of file
diff --git a/test/disabled/presentation/simple-tests.opts b/test/disabled/presentation/simple-tests.opts
new file mode 100644
index 0000000000..8529bbf1a0
--- /dev/null
+++ b/test/disabled/presentation/simple-tests.opts
@@ -0,0 +1,18 @@
+# This file contains command line options that are passed to the presentation compiler
+# Lines starting with # are stripped, and you can split arguments on several lines.
+
+# The -bootclasspath option is treated specially by the test framework: if it's not specified
+# in this file, the presentation compiler will pick up the scala-library/compiler that's on the
+# java classpath used to run this test (usually build/pack)
+
+# Any option can be passed this way, like presentation debug
+# -Ypresentation-debug 
+
+# the classpath is relative to the current working directory. That means it depends where you're
+# running partest from. Run it from the root scala checkout for these files to resolve correctly
+# (by default when running 'ant test', or 'test/partest'). Paths use Unix separators, the test
+# framework translates them to the platform dependent representation.
+-bootclasspath lib/scala-compiler.jar:lib/scala-library.jar:lib/fjbg.jar
+
+# the following line would test using the quick compiler
+# -bootclasspath build/quick/classes/compiler:build/quick/classes/library:lib/fjbg.jar