diff options
| author | Paul Phillips <paulp@improving.org> | 2010-04-21 19:44:45 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-04-21 19:44:45 +0000 |
| commit | c8266ce2b587e495179d8ce50207e27f3352821d (patch) | |
| tree | 33e0a65520c28dad03217cefa96e5ac7592dd726 /src/compiler | |
| parent | db0d40b73c92be4a0eb0ef03f6bfb166c8cfb4c0 (diff) | |
| download | scala-c8266ce2b587e495179d8ce50207e27f3352821d.tar.gz scala-c8266ce2b587e495179d8ce50207e27f3352821d.tar.bz2 scala-c8266ce2b587e495179d8ce50207e27f3352821d.zip | |
Fixed a couple bugs in tools/tokens which were ...
Fixed a couple bugs in tools/tokens which were mysteriously more visible
once it was checked in. No review.
Diffstat (limited to 'src/compiler')
| -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. */ |