diff options
| -rw-r--r-- | src/compiler/scala/tools/cmd/program/Tokens.scala | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/cmd/program/Tokens.scala b/src/compiler/scala/tools/cmd/program/Tokens.scala index 30502213f6..01ca306c48 100644 --- a/src/compiler/scala/tools/cmd/program/Tokens.scala +++ b/src/compiler/scala/tools/cmd/program/Tokens.scala @@ -31,10 +31,10 @@ object Tokens { import runner._ val files = (residualArgs flatMap walk).distinct - if (parsed isSet "verbose") + if (parsed isSet "--verbose") println("Tokenizing: " + (files map (_.name) mkString " ")) - if (parsed isSet "stats") + if (parsed isSet "--stats") println("Stats not yet implemented.") files flatMap fromScalaSource foreach println @@ -42,8 +42,11 @@ object Tokens { /** Given a path, returns all .scala files underneath it. */ - private def walk(arg: String): List[File] = - Path(arg).walkFilter(x => x.isFile && x.hasExtension("scala")) map (_.toFile) toList + private def walk(arg: String): List[File] = { + def traverse = Path(arg) ifDirectory (_.deepList()) getOrElse Iterator(File(arg)) + + Path onlyFiles traverse filter (_ hasExtension "scala") toList + } /** Tokenizes a single scala file. */ |