diff options
| author | buraq <buraq@epfl.ch> | 2004-01-22 15:16:59 +0000 |
|---|---|---|
| committer | buraq <buraq@epfl.ch> | 2004-01-22 15:16:59 +0000 |
| commit | 77eeea07087a29740aef7a649bb2c586bad0e7d5 (patch) | |
| tree | d4d944fd308efa24100316e50a3fe0f334cbf910 | |
| parent | ccaf17119600c25091a28e4fdc87e0d5452a4030 (diff) | |
| download | scala-77eeea07087a29740aef7a649bb2c586bad0e7d5.tar.gz scala-77eeea07087a29740aef7a649bb2c586bad0e7d5.tar.bz2 scala-77eeea07087a29740aef7a649bb2c586bad0e7d5.zip | |
little bug in command args filtering, fixed
| -rw-r--r-- | sources/scala/tools/scala4ant/AntAdaptor.scala | 10 | ||||
| -rw-r--r-- | sources/scala/tools/scala4ant/AntTask.scala | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sources/scala/tools/scala4ant/AntAdaptor.scala b/sources/scala/tools/scala4ant/AntAdaptor.scala index affe233fb0..c167333986 100644 --- a/sources/scala/tools/scala4ant/AntAdaptor.scala +++ b/sources/scala/tools/scala4ant/AntAdaptor.scala @@ -31,11 +31,13 @@ package scala.tools.scala4ant { def runCompiler(args:Array[String]) = { var result = true; - // dirty work, to get rid of debugging (-g) option, set in setupJavac... - val nargs = new Array[ String ]( args.length - 2 ); + // dirty work to get rid of debugging (-g) option, set in setupJavac... + + val nargs = new Array[ String ]( args.length - 1 ); var j = 0; - for( val i <- List.range( 0, args.length-1 ) ) { + for( val i <- List.range( 0, args.length ) ) { + Console.println( "args[ "+i+" ] = "+args(i)); if( !args( i ).startsWith("-g") ) { //System.err.print( args[ i ] +" ") nargs( j ) = args( i ); @@ -46,7 +48,7 @@ package scala.tools.scala4ant { // compile val reporter = new Reporter(); val command = new CompilerCommand(PRODUCT, VERSION, reporter, new CompilerPhases()); - if (command.parse(nargs) && command.files.list.size() > 0) { + if( command.parse(nargs) && command.files.list.size() > 0 ) { val global = new Global(command); try { global.compile(command.files.toArray(), false); diff --git a/sources/scala/tools/scala4ant/AntTask.scala b/sources/scala/tools/scala4ant/AntTask.scala index 603dc21149..45808a0eef 100644 --- a/sources/scala/tools/scala4ant/AntTask.scala +++ b/sources/scala/tools/scala4ant/AntTask.scala @@ -87,7 +87,7 @@ class AntTask extends Javac { protected def parseSuffixes():Array[String] = { val st = new StringTokenizer(suffixes, " ,"); val al = new ArrayList(); - while (st.hasMoreTokens()) { + while( st.hasMoreTokens() ) { al.add("." + st.nextToken()); } al.toArray((new Array[String]( al.size() )).asInstanceOf[Array[java.lang.Object]]).asInstanceOf[Array[String]]; |