Refactor the code to avoid duplication and separate concerns

jedesah · jedesah · commit 514b82b13e35 · 2013-07-06T12:34:54.000-07:00
diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
@@ -591,32 +591,31 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
     }
   }
 
-  def withFile(filename: String)(action: File => Unit) {
-    val f = File(filename)
+  def smartPath(path: String) = if (File(path).exists) path else path.trim
+
+  def withPath(path: String)(action: File => Unit) {
+    val f = File(path)
 
     if (f.exists) action(f)
-    else echo("\"" + filename + "\" does not appear to exist")
+    else echo("The path '" + f + "' doesn't seem to exist.")
   }
 
   def loadCommand(arg: String) = {
-    val smartArg = if (File(arg).exists) arg else arg.trim
     var shouldReplay: Option[String] = None
-    withFile(smartArg)(f => {
+    withPath(smartPath(arg))(f => {
       interpretAllFrom(f)
       shouldReplay = Some(":load " + arg)
     })
     Result(true, shouldReplay)
   }
 
   def addClasspath(arg: String): Unit = {
-    val f = File(arg).normalize
-    if (f.exists) {
+    withPath(File(arg).normalize.path)(f => {
       addedClasspath = ClassPath.join(addedClasspath, f.path)
       val totalClasspath = ClassPath.join(settings.classpath.value, addedClasspath)
       echo("Added '%s'.  Your new classpath is:\n\"%s\"".format(f.path, totalClasspath))
       replay()
-    }
-    else echo("The path '" + f + "' doesn't seem to exist.")
+    })
   }
 
   def powerCmd(): Result = {
