Move allowTrailingOptions into ArgParser.

pkg/args/lib/args.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.
 
 /**
  * Parser support for transforming raw command-line arguments into a set
  * of options and values.
  *
  * This library supports [GNU][] and [POSIX][] style options, and it works
  * in both server-side and client-side apps.
@@ skipping 268 matching lines @@
   /**
    * The options that have been defined for this parser.
    */
   final Map<String, Option> options;
 
   /**
    * The commands that have been defined for this parser.
    */
   final Map<String, ArgParser> commands;
 
-  /** Creates a new ArgParser. */
-  factory ArgParser() =>
-      new ArgParser._(<String, Option>{}, <String, ArgParser>{});
+  /**
+   * Whether or not this parser parses options that appear after non-option
+   * arguments.
+   */
+  final bool allowTrailingOptions;
 
-  ArgParser._(Map<String, Option> options, Map<String, ArgParser> commands) :
+  /**
+   * Creates a new ArgParser.
+   *
+   * If [allowTrailingOptions] is set, the parser will continue parsing even
+   * after it finds an argument that is neither an option nor a command.
+   * This allows options to be specified after regular arguments. Defaults to
+   * `false`.
+   */
+  factory ArgParser({bool allowTrailingOptions}) =>
+      new ArgParser._(<String, Option>{}, <String, ArgParser>{},
+          allowTrailingOptions: allowTrailingOptions);
+
+  ArgParser._(Map<String, Option> options, Map<String, ArgParser> commands,
+      {bool allowTrailingOptions}) :
     this._options = options,
     this.options = new UnmodifiableMapView(options),
     this._commands = commands,
-    this.commands = new UnmodifiableMapView(commands);
+    this.commands = new UnmodifiableMapView(commands),
+    this.allowTrailingOptions = allowTrailingOptions != null ?
+        allowTrailingOptions : false;
 
   /**
    * Defines a command.
    *
    * A command is a named argument which may in turn define its own options and
    * subcommands using the given parser. If [parser] is omitted, implicitly
    * creates a new one. Returns the parser for the command.
    */
   ArgParser addCommand(String name, [ArgParser parser]) {
     // Make sure the name isn't in use.
@@ skipping 51 matching lines @@
     }
 
     _options[name] = new Option(name, abbr, help, allowed, allowedHelp,
         defaultsTo, callback, isFlag: isFlag, negatable: negatable,
         allowMultiple: allowMultiple, hide: hide);
   }
 
   /**
    * Parses [args], a list of command-line arguments, matches them against the
    * flags and options defined by this parser, and returns the result.
-   *
-   * If [allowTrailingOptions] is set, the parser will continue parsing even
-   * after it finds an argument that is neither an option nor a command.
-   * This allows options to be specified after regular arguments.
-   *
-   * [allowTrailingOptions] is false by default, so when a non-option,
-   * non-command argument is encountered, it and all remaining arguments,
-   * even those that look like options are passed to the innermost command.
    */
-  ArgResults parse(List<String> args, {bool allowTrailingOptions}) {
-    if (allowTrailingOptions == null) allowTrailingOptions = false;
-    return new Parser(null, this, args.toList(), null, null,
-        allowTrailingOptions: allowTrailingOptions).parse();
-  }
+  ArgResults parse(List<String> args) =>
+      new Parser(null, this, args.toList(), null, null).parse();
 
   /**
    * Generates a string displaying usage information for the defined options.
    * This is basically the help text shown on the command line.
    */
   String getUsage() => new Usage(this).generate();
 
   /**
    * Get the default value for an option. Useful after parsing to test
    * if the user specified something other than the default.
@@ skipping 53 matching lines @@
           'Could not find an option named "$name".');
     }
 
     return _options[name];
   }
 
   /** Get the names of the options as an [Iterable]. */
   Iterable<String> get options => _options.keys;
 }