From 77eeea07087a29740aef7a649bb2c586bad0e7d5 Mon Sep 17 00:00:00 2001 From: buraq Date: Thu, 22 Jan 2004 15:16:59 +0000 Subject: little bug in command args filtering, fixed --- sources/scala/tools/scala4ant/AntAdaptor.scala | 10 ++++++---- 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]]; -- cgit v1.2.3