Allow a space after -o in dart2js option parsing.

sdk/lib/_internal/compiler/implementation/dart2js.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.cmdline;
 
 import 'dart:async';
 import 'dart:collection' show Queue, LinkedHashMap;
 import 'dart:io';
 import 'dart:utf';
@@ skipping 11 matching lines @@
 /**
  * A string to identify the revision or build.
  *
  * This ID is displayed if the compiler crashes and in verbose mode, and is
  * an aid in reproducing bug reports.
  *
  * The actual string is rewritten by a wrapper script when included in the sdk.
  */
 String BUILD_ID = null;
 
-typedef void HandleOption(String option);
+typedef void HandleOption(var argument, [Iterator<String> rest]);
 
 class OptionHandler {
-  String pattern;
-  HandleOption handle;
+  final String pattern;
+  final HandleOption handle;
+  final bool multipleArguments;
 
-  OptionHandler(this.pattern, this.handle);
+  OptionHandler(this.pattern, this.handle, {this.multipleArguments: false});
 }
 
 /**
  * Extract the parameter of an option.
  *
  * For example, in ['--out=fisk.js'] and ['-ohest.js'], the parameters
  * are ['fisk.js'] and ['hest.js'], respectively.
  */
 String extractParameter(String argument) {
   // m[0] is the entire match (which will be equal to argument). m[1]
   // is something like "-o" or "--out=", and m[2] is the parameter.
   Match m = new RegExp('^(-[a-z]|--.+=)(.*)').firstMatch(argument);
   if (m == null) helpAndFail('Error: Unknown option "$argument".');
   return m[2];
 }
 
 String extractPath(String argument) {
   String path = nativeToUriPath(extractParameter(argument));
   return path.endsWith("/") ? path : "$path/";
 }
 
 void parseCommandLine(List<OptionHandler> handlers, List<String> argv) {
   // TODO(ahe): Use ../../args/args.dart for parsing options instead.
   var patterns = <String>[];
   for (OptionHandler handler in handlers) {
     patterns.add(handler.pattern);
   }
   var pattern = new RegExp('^(${patterns.join(")\$|(")})\$');
-  OUTER: for (String argument in argv) {
+
+  Iterator<String> arguments = argv.iterator;
+  OUTER: while (arguments.moveNext()) {
+    String argument = arguments.current;
     Match match = pattern.firstMatch(argument);
     assert(match.groupCount == handlers.length);
     for (int i = 0; i < handlers.length; i++) {
       if (match[i + 1] != null) {
-        handlers[i].handle(argument);
+        OptionHandler handler = handlers[i];
+        if (handler.multipleArguments) {
+          handler.handle(argument, arguments);
+        } else {
+          handler.handle(argument);
+        }
         continue OUTER;
       }
     }
     throw 'Internal error: "$argument" did not match';
   }
 }
 
 void compile(List<String> argv) {
   bool isWindows = (Platform.operatingSystem == 'windows');
   Uri libraryRoot = currentDirectory;
@@ skipping 18 matching lines @@
   }
 
   setLibraryRoot(String argument) {
     libraryRoot = currentDirectory.resolve(extractPath(argument));
   }
 
   setPackageRoot(String argument) {
     packageRoot = currentDirectory.resolve(extractPath(argument));
   }
 
-  setOutput(String argument) {
+  setOutput(String argument, Iterator<String> rest) {
+    String path;
+    if (argument == '-o') {
+      if (!rest.moveNext()) {
+        helpAndFail('Error: Missing file after -o option.');
+      }
+      path = rest.current;
+    } else {
+      path = extractParameter(argument);
+    }
     explicitOut = true;
-    out = currentDirectory.resolve(nativeToUriPath(extractParameter(argument)));
+    out = currentDirectory.resolve(nativeToUriPath(path));
     sourceMapOut = Uri.parse('$out.map');
   }
 
   setOutputType(String argument) {
     if (argument == '--output-type=dart') {
       outputLanguage = OUTPUT_LANGUAGE_DART;
       if (!explicitOut) {
         out = currentDirectory.resolve('out.dart');
         sourceMapOut = currentDirectory.resolve('out.dart.map');
       }
@@ skipping 60 matching lines @@
           passThrough('--enable-checked-mode');
           break;
         default:
           throw 'Internal error: "$shortOption" did not match';
       }
     }
   }
 
   List<String> arguments = <String>[];
   List<OptionHandler> handlers = <OptionHandler>[
     new OptionHandler('-[chv?]+', handleShortOptions),

[ahe, 2013/05/30 10:02:49]

I would expect a type error here in checked mode.

     new OptionHandler('--throw-on-error',
                       (_) => diagnosticHandler.throwOnError = true),
     new OptionHandler('--suppress-warnings',
                       (_) => diagnosticHandler.showWarnings = false),
     new OptionHandler('--output-type=dart|--output-type=js', setOutputType),
     new OptionHandler('--verbose', setVerbose),
     new OptionHandler('--version', (_) => wantVersion = true),
     new OptionHandler('--library-root=.+', setLibraryRoot),
-    new OptionHandler('--out=.+|-o.+', setOutput),
+    new OptionHandler('--out=.+|-o.*', setOutput, multipleArguments: true),
     new OptionHandler('--allow-mock-compilation', passThrough),
     new OptionHandler('--minify', passThrough),
     new OptionHandler('--force-strip=.*', setStrip),
     // TODO(ahe): Remove the --no-colors option.
     new OptionHandler('--disable-diagnostic-colors',
                       (_) => diagnosticHandler.enableColors = false),
     new OptionHandler('--enable-diagnostic-colors',
                       (_) => diagnosticHandler.enableColors = true),
     new OptionHandler('--enable[_-]checked[_-]mode|--checked',
                       (_) => passThrough('--enable-checked-mode')),
@@ skipping 172 matching lines @@
   // This message should be no longer than 20 lines. The default
   // terminal size normally 80x24. Two lines are used for the prompts
   // before and after running the compiler. Another two lines may be
   // used to print an error message.
   print('''
 Usage: dart2js [options] dartfile
 
 Compiles Dart to JavaScript.
 
 Common options:
-  -o<file> Generate the output into <file>.
-  -c       Insert runtime type checks and enable assertions (checked mode).
-  -h       Display this message (add -v for information about all options).''');
+  -o <file> Generate the output into <file>.
+  -c        Insert runtime type checks and enable assertions (checked mode).
+  -h        Display this message (add -v for information about all options).''');
 }
 
 void verboseHelp() {
   print('''
 Usage: dart2js [options] dartfile
 
 Compiles Dart to JavaScript.
 
 Supported options:
-  -o<file>, --out=<file>
+  -o <file>, --out=<file>
     Generate the output into <file>.
 
   -c, --enable-checked-mode, --checked
     Insert runtime type checks and enable assertions (checked mode).
 
   -h, /h, /?, --help
     Display this message (add -v for information about all options).
 
   -v, --verbose
     Display verbose information.
@@ skipping 111 matching lines @@
       print(trace);
     } finally {
       exit(253); // 253 is recognized as a crash by our test scripts.
     }
   }
 }
 
 void main() {
   mainWithErrorHandler(new Options());
 }