Some accumulated work and polish on classpath a...

Some accumulated work and polish on classpath and jars. No review.

1 files changed, 9 insertions, 7 deletions

diff --git a/src/library/scala/sys/SystemProperties.scala b/src/library/scala/sys/SystemProperties.scala
index 228ca6315e..296db9e469 100644
--- a/src/library/scala/sys/SystemProperties.scala
+++ b/src/library/scala/sys/SystemProperties.scala
@@ -55,14 +55,15 @@ object SystemProperties {
 
   implicit def systemPropertiesToCompanion(p: SystemProperties): SystemProperties.type = this
   private lazy val propertyHelp = mutable.Map[String, String]()
-  private def bool(key: String, helpText: String): BooleanProp = {
-    val prop = (
-      if (key startsWith "java.") BooleanProp.valueIsTrue(key)
-      else BooleanProp.keyExists(key)
-    )
-    propertyHelp(key) = helpText
-    prop
+  private def addHelp[P <: Prop[_]](p: P, helpText: String): P = {
+    propertyHelp(p.key) = helpText
+    p
   }
+  private def str(key: String, helpText: String) = addHelp(Prop[String](key), helpText)
+  private def bool(key: String, helpText: String): BooleanProp = addHelp[BooleanProp](
+    if (key startsWith "java.") BooleanProp.valueIsTrue(key) else BooleanProp.keyExists(key),
+    helpText
+  )
   def help(key: String) = propertyHelp.getOrElse(key, "")
 
   // Todo: bring some sanity to the intersection of system properties aka "mutable
@@ -72,5 +73,6 @@ object SystemProperties {
   lazy val preferIPv4Stack     = bool("java.net.preferIPv4Stack", "system should prefer IPv4 sockets")
   lazy val preferIPv6Addresses = bool("java.net.preferIPv6Addresses", "system should prefer IPv6 addresses")
   lazy val noTraceSupression   = bool("scala.control.noTraceSuppression", "scala should not suppress any stack trace creation")
+  lazy val traceSourcePath     = str("scala.control.sourcepath", "sourcepath for looking up stack trace elements")
 }