SI-7261 Implicit conversion of BooleanSetting to Boolean and BooleanFlag

This commit shortens expressions of the form `if (settings.debug.value)` to
`if (settings.debug)` for various settings.  Rarely, the setting is supplied
as a method argument.  The conversion is not employed in simple definitions
where the Boolean type would have to be specified.

4 files changed, 6 insertions, 6 deletions

diff --git a/src/repl/scala/tools/nsc/MainGenericRunner.scala b/src/repl/scala/tools/nsc/MainGenericRunner.scala
index 7195424cf9..9e87b6ba55 100644
--- a/src/repl/scala/tools/nsc/MainGenericRunner.scala
+++ b/src/repl/scala/tools/nsc/MainGenericRunner.scala
@@ -17,7 +17,7 @@ object JarRunner extends CommonRunner {
     val jarURLs   = ClassPath expandManifestPath jarPath
     val urls      = if (jarURLs.isEmpty) File(jarPath).toURL +: settings.classpathURLs else jarURLs
 
-    if (settings.Ylogcp.value) {
+    if (settings.Ylogcp) {
       Console.err.println("Running jar with these URLs as the classpath:")
       urls foreach println
     }
@@ -46,7 +46,7 @@ class MainGenericRunner {
     def sampleCompiler = new Global(settings)   // def so its not created unless needed
 
     if (!command.ok)                      return errorFn("\n" + command.shortUsageMsg)
-    else if (settings.version.value)      return errorFn("Scala code runner %s -- %s".format(versionString, copyrightString))
+    else if (settings.version)            return errorFn("Scala code runner %s -- %s".format(versionString, copyrightString))
     else if (command.shouldStopWithInfo)  return errorFn(command getInfoMessage sampleCompiler)
 
     def isE   = !settings.execute.isDefault
diff --git a/src/repl/scala/tools/nsc/interpreter/ILoop.scala b/src/repl/scala/tools/nsc/interpreter/ILoop.scala
index 599a061984..df28e428ce 100644
--- a/src/repl/scala/tools/nsc/interpreter/ILoop.scala
+++ b/src/repl/scala/tools/nsc/interpreter/ILoop.scala
@@ -628,10 +628,10 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
    *  with SimpleReader.
    */
   def chooseReader(settings: Settings): InteractiveReader = {
-    if (settings.Xnojline.value || Properties.isEmacsShell)
+    if (settings.Xnojline || Properties.isEmacsShell)
       SimpleReader()
     else try new JLineReader(
-      if (settings.noCompletion.value) NoCompletion
+      if (settings.noCompletion) NoCompletion
       else new JLineCompletion(intp)
     )
     catch {
diff --git a/src/repl/scala/tools/nsc/interpreter/IMain.scala b/src/repl/scala/tools/nsc/interpreter/IMain.scala
index d2b6cdd7f0..4ba81b634a 100644
--- a/src/repl/scala/tools/nsc/interpreter/IMain.scala
+++ b/src/repl/scala/tools/nsc/interpreter/IMain.scala
@@ -397,7 +397,7 @@ class IMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings: Set
   }
 
   private[nsc] def replwarn(msg: => String) {
-    if (!settings.nowarnings.value)
+    if (!settings.nowarnings)
       printMessage(msg)
   }
 
diff --git a/src/repl/scala/tools/nsc/interpreter/Power.scala b/src/repl/scala/tools/nsc/interpreter/Power.scala
index e517a16b32..da6d271a68 100644
--- a/src/repl/scala/tools/nsc/interpreter/Power.scala
+++ b/src/repl/scala/tools/nsc/interpreter/Power.scala
@@ -70,7 +70,7 @@ class Power[ReplValsImpl <: ReplVals : ru.TypeTag: ClassTag](val intp: IMain, re
       pass += 1
       val (repeats, unseen) = todo partition seen
       unseenHistory += unseen.size
-      if (settings.verbose.value) {
+      if (settings.verbose) {
         println("%3d  %s accumulated, %s discarded.  This pass: %s unseen, %s repeats".format(
           pass, keep.size, discarded, unseen.size, repeats.size))
       }