From 40f8fa94026d482f8318481bb64ae0245a39acbc Mon Sep 17 00:00:00 2001 From: michelou Date: Tue, 10 Mar 2009 11:39:04 +0000 Subject: removed deprecated warning, updated svn props, ... removed deprecated warning, updated svn props, cleaned up code --- src/compiler/scala/tools/nsc/CompilerCommand.scala | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/compiler/scala/tools/nsc/CompilerCommand.scala') diff --git a/src/compiler/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala index c5c7f84434..7896f4e270 100644 --- a/src/compiler/scala/tools/nsc/CompilerCommand.scala +++ b/src/compiler/scala/tools/nsc/CompilerCommand.scala @@ -77,33 +77,33 @@ class CompilerCommand( // start; an informative message of some sort // should be printed instead. // (note: do not add "files.isEmpty" do this list) - val stopSettings=List[(()=>Boolean, - (Global)=>String)]( - (()=> settings.help.value, compiler => - usageMsg + compiler.pluginOptionsHelp + val stopSettings = List[(() => Boolean, (Global) => String)]( + (() => settings.help.value, + compiler => usageMsg + compiler.pluginOptionsHelp ), - (()=> settings.Xhelp.value, compiler => - xusageMsg + (() => settings.Xhelp.value, + compiler => xusageMsg ), - (()=> settings.Yhelp.value, compiler => - yusageMsg + (() => settings.Yhelp.value, + compiler => yusageMsg ), - (()=> settings.showPlugins.value, compiler => - compiler.pluginDescriptions + (() => settings.showPlugins.value, + compiler => compiler.pluginDescriptions ), - (()=> settings.showPhases.value, compiler => - compiler.phaseDescriptions + (() => settings.showPhases.value, + compiler => compiler.phaseDescriptions ) ) - def shouldStopWithInfo = stopSettings.exists({pair => (pair._1)()}) - def getInfoMessage(compiler:Global) = - stopSettings.find({pair => (pair._1)()}) match { - case Some((test,getMessage)) => getMessage(compiler) + def shouldStopWithInfo: Boolean = + stopSettings.exists(pair => (pair._1)()) + + def getInfoMessage(compiler: Global): String = + stopSettings.find(pair => (pair._1)()) match { + case Some((test, getMessage)) => getMessage(compiler) case None => "" } - /** Whether the command was processed okay */ var ok = true -- cgit v1.2.3