summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/cmd/FromString.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-11-13 00:14:40 -0800
committerPaul Phillips <paulp@improving.org>2012-11-19 11:55:06 -0800
commitd5e3f85946af966111f88af90a666a709df0ba6f (patch)
treeedb2d3cfae76679bc0311f3c22d01779a2f32ef3 /src/compiler/scala/tools/cmd/FromString.scala
parent645c2676dd6699ac24a57dfe750386bbdb827ee8 (diff)
downloadscala-d5e3f85946af966111f88af90a666a709df0ba6f.tar.gz
scala-d5e3f85946af966111f88af90a666a709df0ba6f.tar.bz2
scala-d5e3f85946af966111f88af90a666a709df0ba6f.zip
Revert "Commenting out unused members."
This reverts commit 951fc3a486.
Diffstat (limited to 'src/compiler/scala/tools/cmd/FromString.scala')
-rw-r--r--src/compiler/scala/tools/cmd/FromString.scala14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/cmd/FromString.scala b/src/compiler/scala/tools/cmd/FromString.scala
index c9df9f9145..2a624875ee 100644
--- a/src/compiler/scala/tools/cmd/FromString.scala
+++ b/src/compiler/scala/tools/cmd/FromString.scala
@@ -25,17 +25,17 @@ abstract class FromString[+T](implicit t: ru.TypeTag[T]) extends PartialFunction
object FromString {
// We need these because we clash with the String => Path implicits.
- // private def toFile(s: String) = new File(new java.io.File(s))
+ private def toFile(s: String) = new File(new java.io.File(s))
private def toDir(s: String) = new Directory(new java.io.File(s))
/** Path related stringifiers.
*/
- // val ExistingFile: FromString[File] = new FromString[File]()(tagOfFile) {
- // override def isDefinedAt(s: String) = toFile(s).isFile
- // def apply(s: String): File =
- // if (isDefinedAt(s)) toFile(s)
- // else cmd.runAndExit(println("'%s' is not an existing file." format s))
- // }
+ val ExistingFile: FromString[File] = new FromString[File]()(tagOfFile) {
+ override def isDefinedAt(s: String) = toFile(s).isFile
+ def apply(s: String): File =
+ if (isDefinedAt(s)) toFile(s)
+ else cmd.runAndExit(println("'%s' is not an existing file." format s))
+ }
val ExistingDir: FromString[Directory] = new FromString[Directory]()(tagOfDirectory) {
override def isDefinedAt(s: String) = toDir(s).isDirectory
def apply(s: String): Directory =