diff options
| author | michelou <michelou@epfl.ch> | 2007-02-28 14:14:18 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2007-02-28 14:14:18 +0000 |
| commit | 08373d4e920f441594c4cda9e1abe22d3c9d6c66 (patch) | |
| tree | c42e12e7e9ed81366a90766955e677e87f434b8b /src | |
| parent | 28f747a2c133e2dea1ab699715517ad250f65fef (diff) | |
| download | scala-08373d4e920f441594c4cda9e1abe22d3c9d6c66.tar.gz scala-08373d4e920f441594c4cda9e1abe22d3c9d6c66.tar.bz2 scala-08373d4e920f441594c4cda9e1abe22d3c9d6c66.zip | |
removed '-Xunapply' option
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Settings.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocGenerator.scala | 10 | ||||
| -rw-r--r-- | src/manual/scala/man1/scalac.scala | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala index 8bb895745b..ade73ab2bc 100644 --- a/src/compiler/scala/tools/nsc/Settings.scala +++ b/src/compiler/scala/tools/nsc/Settings.scala @@ -131,8 +131,6 @@ class Settings(error: String => unit) { val Xprintpos = BooleanSetting("-Xprintpos", "Print tree positions (as offsets)") val Xscript = new BooleanSetting("-Xscript", "compile script file") { override def hiddenToIDE = true } val Xexperimental = BooleanSetting("-Xexperimental", "enable experimental extensions") - val Xunapply = BooleanSetting("-Xunapply", "enable unapply pattern matching") - Xunapply.value = true val Xplugtypes = BooleanSetting("-Xplugtypes", "parse but ignore annotations in more locations") //Xplugtypes.value = true // just while experimenting val Xkilloption = BooleanSetting("-Xkilloption", "optimizes option types") diff --git a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala index 13a110601c..bca2419ec7 100644 --- a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala +++ b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala @@ -127,11 +127,15 @@ abstract class DocGenerator extends Models { .++ (Text("]"))) } else tpe match { case RefinedType(parents, _) => - assert(parents.length > 1) - aref(urlFor(parents(1).symbol), target, parents(1).toString()) + //Console.println("***** parents= " + parents)//debug + val parents1 = + if ((parents.length > 1) && + (parents.head.symbol eq definitions.ObjectClass)) parents.tail + else parents + aref(urlFor(parents1.head.symbol), target, parents1.head.toString()) .++ { val sep = Text(" with ") - for (val t <- parents.tail.tail) + for (val t <- parents1.tail) yield Group(sep ++ urlFor(t, target)) } case _ => diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala index fd76ab5f20..09333e9255 100644 --- a/src/manual/scala/man1/scalac.scala +++ b/src/manual/scala/man1/scalac.scala @@ -190,11 +190,6 @@ object scalac extends Command { Definition( CmdOption("Xexperimental"), "enable experimental extensions"), - /* - Definition( - CmdOption("Xunapply"), - "Enable unapply pattern matching"), - */ Definition( CmdOption("Xplugtypes"), "Parse but ignore annotations in more locations"), |