Move allowTrailingOptions into ArgParser.

pkg/args/lib/src/parser.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 args.src.parser;
 
 import '../args.dart';
 
 final _SOLO_OPT = new RegExp(r'^-([a-zA-Z0-9])$');
 final _ABBR_OPT = new RegExp(r'^-([a-zA-Z0-9]+)(.*)$');
@@ skipping 10 matching lines @@
    * command. For top-level results, this returns `null`.
    */
   final String commandName;
 
   /**
    * The parser for the supercommand of this command parser, or `null` if this
    * is the top-level parser.
    */
   final Parser parent;
 
-  /** If `true`, parsing will continue after a non-option argument. */
-  final bool allowTrailingOptions;
-
   /** The grammar being parsed. */
   final ArgParser grammar;
 
   /** The arguments being parsed. */
   final List<String> args;
 
   /** The remaining non-option, non-command arguments. */
   final rest = <String>[];
 
   /** The accumulated parsed options. */
   final Map<String, dynamic> results = <String, dynamic>{};
 
-  Parser(this.commandName, this.grammar, this.args, this.parent, rest,
-      {this.allowTrailingOptions: false}) {
+  Parser(this.commandName, this.grammar, this.args, this.parent, rest) {
     if (rest != null) this.rest.addAll(rest);
   }
 
 
   /** The current argument being parsed. */
   String get current => args[0];
 
   /** Parses the arguments. This can only be called once. */
   ArgResults parse() {
     var commandResults = null;
@@ skipping 14 matching lines @@
         args.removeAt(0);
         break;
       }
 
       // Try to parse the current argument as a command. This happens before
       // options so that commands can have option-like names.
       var command = grammar.commands[current];
       if (command != null) {
         validate(rest.isEmpty, 'Cannot specify arguments before a command.');
         var commandName = args.removeAt(0);
-        var commandParser = new Parser(commandName, command, args, this, rest,
-            allowTrailingOptions: allowTrailingOptions);
+        var commandParser = new Parser(commandName, command, args, this, rest);
         commandResults = commandParser.parse();
 
         // All remaining arguments were passed to command so clear them here.
         rest.clear();
         break;
       }
 
       // Try to parse the current argument as an option. Note that the order
       // here matters.
       if (parseSoloOption()) continue;
       if (parseAbbreviation(this)) continue;
       if (parseLongOption()) continue;
 
       // This argument is neither option nor command, so stop parsing unless
       // the [allowTrailingOptions] option is set.
-      if (!allowTrailingOptions) break;
+      if (!grammar.allowTrailingOptions) break;
       rest.add(args.removeAt(0));
     }
 
     // Set unspecified multivalued arguments to their default value,
     // if any, and invoke the callbacks.
     grammar.options.forEach((name, option) {
       if (option.allowMultiple &&
           results[name].length == 0 &&
           option.defaultValue != null) {
         results[name].add(option.defaultValue);
@@ skipping 179 matching lines @@
           '"$value" is not an allowed value for option "${option.name}".');
     }
 
     if (option.allowMultiple) {
       results[option.name].add(value);
     } else {
       results[option.name] = value;
     }
   }
 }