diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/Properties.scala | 11 | ||||
| -rw-r--r-- | src/library/scala/util/Properties.scala | 32 | ||||
| -rw-r--r-- | src/scalap/scala/tools/scalap/Properties.scala | 2 |
3 files changed, 22 insertions, 23 deletions
diff --git a/src/compiler/scala/tools/nsc/Properties.scala b/src/compiler/scala/tools/nsc/Properties.scala index a4d11c2e8a..8b30929092 100644 --- a/src/compiler/scala/tools/nsc/Properties.scala +++ b/src/compiler/scala/tools/nsc/Properties.scala @@ -13,12 +13,11 @@ object Properties extends scala.util.PropertiesTrait { protected def pickJarBasedOn = classOf[Global] // settings based on jar properties - val fileEndingString = prop("file.ending", ".scala|.java") - val residentPromptString = prop("resident.prompt", "\nnsc> ") - val shellPromptString = prop("shell.prompt", "\nscala> ") + def fileEndingString = prop("file.ending", ".scala|.java") + def residentPromptString = prop("resident.prompt", "\nnsc> ") + def shellPromptString = prop("shell.prompt", "\nscala> ") // derived values - val cmdName = if (isWin) "scala.bat" else "scala" - val fileEndings = fileEndingString.split("""\|""").toList - + def cmdName = if (isWin) "scala.bat" else "scala" + def fileEndings = fileEndingString.split("""\|""").toList } diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala index f0d899ea98..450738b21d 100644 --- a/src/library/scala/util/Properties.scala +++ b/src/library/scala/util/Properties.scala @@ -56,26 +56,26 @@ private[scala] trait PropertiesTrait /** This is the encoding to use reading in source files, overridden with -encoding * Note that it uses "prop" i.e. looks in the scala jar, not the system properties. */ - val sourceEncoding = prop("file.encoding", "UTF-8") + def sourceEncoding = prop("file.encoding", "UTF-8") /** This is the default text encoding, overridden (unreliably) with * JAVA_OPTS="-Dfile.encoding=Foo" */ - val encodingString = sysprop("file.encoding", "UTF-8") - - val isWin = sysprop("os.name") startsWith "Windows" - val isMac = sysprop("java.vendor") startsWith "Apple" - val javaClassPath = sysprop("java.class.path") - val javaHome = sysprop("java.home") - val javaVmName = sysprop("java.vm.name") - val javaVmVersion = sysprop("java.vm.version") - val javaVmInfo = sysprop("java.vm.info") - val javaVersion = sysprop("java.version") - val tmpDir = sysprop("java.io.tmpdir") - val homeDir = sysprop("user.home") - val currentDir = sysprop("user.dir") - val userName = sysprop("user.name") - val scalaHome = sysprop("scala.home", null) // XXX places do null checks... + def encodingString = sysprop("file.encoding", "UTF-8") + + def isWin = sysprop("os.name") startsWith "Windows" + def isMac = sysprop("java.vendor") startsWith "Apple" + def javaClassPath = sysprop("java.class.path") + def javaHome = sysprop("java.home") + def javaVmName = sysprop("java.vm.name") + def javaVmVersion = sysprop("java.vm.version") + def javaVmInfo = sysprop("java.vm.info") + def javaVersion = sysprop("java.version") + def tmpDir = sysprop("java.io.tmpdir") + def homeDir = sysprop("user.home") + def currentDir = sysprop("user.dir") + def userName = sysprop("user.name") + def scalaHome = sysprop("scala.home", null) // XXX places do null checks... // provide a main method so version info can be obtained by running this private val writer = new java.io.PrintWriter(Console.err, true) diff --git a/src/scalap/scala/tools/scalap/Properties.scala b/src/scalap/scala/tools/scalap/Properties.scala index f433737896..72a4513b8b 100644 --- a/src/scalap/scala/tools/scalap/Properties.scala +++ b/src/scalap/scala/tools/scalap/Properties.scala @@ -14,5 +14,5 @@ object Properties extends scala.util.PropertiesTrait { protected def propCategory = "decoder" protected def pickJarBasedOn = classOf[Classfile] - val cmdName = scala.tools.nsc.Properties.cmdName + def cmdName = scala.tools.nsc.Properties.cmdName } |