diff options
Diffstat (limited to 'src/compiler/scala')
5 files changed, 15 insertions, 12 deletions
diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala index b6e9ab33d5..34b515cf21 100644 --- a/src/compiler/scala/tools/nsc/CompileServer.scala +++ b/src/compiler/scala/tools/nsc/CompileServer.scala @@ -180,6 +180,6 @@ object CompileServer extends StandardCompileServer { run() compileSocket.deletePort(port) - exit(0) + sys.exit(0) } } diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala index 001b93d28f..ad7cde1e30 100644 --- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala +++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala @@ -73,8 +73,7 @@ object MainGenericRunner { else command.thingToRun match { case None => // We start the repl when no arguments are given. - new ILoop main settings - true // not actually reached in general + new ILoop process settings case Some(thingToRun) => val isObjectName = diff --git a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala index 481cfac6f6..19372d9e7c 100644 --- a/src/compiler/scala/tools/nsc/doc/html/page/Template.scala +++ b/src/compiler/scala/tools/nsc/doc/html/page/Template.scala @@ -63,13 +63,13 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage { <div id="mbrsel"> <div id='textfilter'><span class='pre'/><span class='input'><input type='text' accesskey='/'/></span><span class='post'/></div> - { if (tpl.linearization.isEmpty) NodeSeq.Empty else + { if (tpl.linearizationTemplates.isEmpty) NodeSeq.Empty else <div id="order"> <span class="filtertype">Ordering</span> <ol><li class="alpha in">Alphabetic</li><li class="inherit out">By inheritance</li></ol> </div> } - { if (tpl.linearization.isEmpty) NodeSeq.Empty else + { if (tpl.linearizationTemplates.isEmpty) NodeSeq.Empty else <div id="ancestors"> <span class="filtertype">Inherited</span> <ol><li class="hideall">Hide All</li><li class="showall">Show all</li></ol> @@ -112,7 +112,7 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage { } { - NodeSeq fromSeq (for ((superTpl, superType) <- tpl.linearization) yield + NodeSeq fromSeq (for ((superTpl, superType) <- (tpl.linearizationTemplates zip tpl.linearizationTypes)) yield <div class="parent" name={ superTpl.qualifiedName }> <h3>Inherited from { if (tpl.universe.settings.useStupidTypes.value) @@ -292,7 +292,7 @@ class Template(tpl: DocTemplateEntity) extends HtmlPage { } } ++ { mbr match { - case dtpl: DocTemplateEntity if (isSelf && !dtpl.linearization.isEmpty && !isReduced) => + case dtpl: DocTemplateEntity if (isSelf && !dtpl.linearizationTemplates.isEmpty && !isReduced) => <div class="block"> linear super types: { typesToHtml(dtpl.linearizationTypes, hasLinks = true, sep = xml.Text(", ")) } </div> diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala index 3153323858..53a3448c20 100644 --- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala @@ -734,10 +734,9 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter) // if they asked for no help and command is valid, we call the real main neededHelp() match { - case "" => if (command.ok) main(command.settings) // else nothing - case help => plush(help) + case "" => command.ok && process(command.settings) + case help => plush(help) ; true } - true } @deprecated("Use `process` instead") @@ -763,7 +762,7 @@ object ILoop { val settings = new Settings settings.classpath.value = sys.props("java.class.path") - repl main settings + repl process settings } } } diff --git a/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala b/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala index dae58d3656..37b81a8fc1 100644 --- a/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala @@ -92,7 +92,12 @@ abstract class TypeParser { val flags = Flags.JAVA | Flags.STATIC | Flags.IMPLICIT; // todo: static? shouldn't be final instead? val viewMethodType = (msym: Symbol) => JavaMethodType(msym.newSyntheticValueParams(List(fromTpe)), toTpe) val vmsym = createMethod(nme.view_ + viewSuffix, flags, viewMethodType, null, true); - if (addToboxMethodMap) definitions.boxMethod(clazz) = vmsym + // !!! this used to mutate a mutable map in definitions, but that map became + // immutable and this kept "working" with a no-op. So now it's commented out + // since I retired the deprecated code which allowed for that bug. + // + // if (addToboxMethodMap) definitions.boxMethod(clazz) = vmsym + if (isAddressOf) clrTypes.addressOfViews += vmsym vmsym } |