DDC/AnalyzerCLI common cmdline option processing

pkg/dev_compiler/lib/src/compiler/command.dart

 // Copyright (c) 2016, 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.
 
 import 'dart:io';
 import 'package:analyzer/src/command_line/arguments.dart'
     show
-        defineDDCAnalysisArguments,
-        extractDefinedVariables,
+        defineAnalysisArguments,
         filterUnknownArguments,
         ignoreUnrecognizedFlagsFlag;
 import 'package:analyzer/src/generated/source.dart' show Source;
 import 'package:analyzer/src/summary/package_bundle_reader.dart'
     show InSummarySource;
 import 'package:args/args.dart' show ArgParser, ArgResults;
 import 'package:args/command_runner.dart' show UsageException;
 import 'package:path/path.dart' as path;
 
 import '../analyzer/context.dart' show AnalyzerOptions;
 import 'compiler.dart' show BuildUnit, CompilerOptions, ModuleCompiler;
 import 'module_builder.dart';
 
 bool _verbose = false;
 
 /// Runs a single compile for dartdevc.
 ///
 /// This handles argument parsing, usage, error handling.
 /// See bin/dartdevc.dart for the actual entry point, which includes Bazel
 /// worker support.
 int compile(List<String> args, {void printFn(Object obj)}) {
   printFn ??= print;
+
   ArgResults argResults;
-  var declaredVars = <String, String>{};
+  AnalyzerOptions analyzerOptions;
   try {
-    args = extractDefinedVariables(args, declaredVars);
     var parser = _argParser();
     if (args.contains('--$ignoreUnrecognizedFlagsFlag')) {
       args = filterUnknownArguments(args, parser);
     }
     argResults = parser.parse(args);
-    _verbose = argResults['verbose'];
+    analyzerOptions = new AnalyzerOptions.fromArguments(argResults);
   } on FormatException catch (error) {
     printFn('$error\n\n$_usageMessage');
     return 64;
   }
+
+  _verbose = argResults['verbose'];
+  if (argResults['help']) {
+    printFn(_usageMessage);
+    return 0;
+  }
+
   try {
-    _compile(argResults, declaredVars, printFn);
+    _compile(argResults, analyzerOptions, printFn);
     return 0;
   } on UsageException catch (error) {
     // Incorrect usage, input file not found, etc.
     printFn(error);
     return 64;
   } on CompileErrorException catch (error) {
     // Code has error(s) and failed to compile.
     printFn(error);
     return 1;
   } catch (error, stackTrace) {
@@ skipping 32 matching lines @@
         defaultsTo: false,
         negatable: false)
     ..addOption('out',
         abbr: 'o', allowMultiple: true, help: 'Output file (required).')
     ..addOption('module-root',
         help: 'Root module directory.\n'
             'Generated module paths are relative to this root.')
     ..addOption('library-root',
         help: 'Root of source files.\n'
             'Generated library names are relative to this root.');
-  defineDDCAnalysisArguments(argParser, hide: hide);
+  defineAnalysisArguments(argParser, hide: hide, ddc: true);
   addModuleFormatOptions(argParser, allowMultiple: true, hide: hide);
   AnalyzerOptions.addArguments(argParser, hide: hide);
   CompilerOptions.addArguments(argParser, hide: hide);
   return argParser;
 }
 
 bool _changed(List<int> list1, List<int> list2) {
   var length = list1.length;
   if (length != list2.length) return true;
   for (var i = 0; i < length; ++i) {
     if (list1[i] != list2[i]) return true;
   }
   return false;
 }
 
-void _compile(ArgResults argResults, Map<String, String> declaredVars,
+void _compile(ArgResults argResults, AnalyzerOptions analyzerOptions,
     void printFn(Object obj)) {
-  if (argResults['help']) {
-    printFn(_usageMessage);
-    return;
-  }
-  var compiler = new ModuleCompiler(
-      new AnalyzerOptions.fromArguments(argResults, declaredVars));
+  var compiler = new ModuleCompiler(analyzerOptions);
   var compilerOpts = new CompilerOptions.fromArguments(argResults);
   var outPaths = argResults['out'] as List<String>;
   var moduleFormats = parseModuleFormatOption(argResults);
   bool singleOutFile = argResults['single-out-file'];
   if (singleOutFile) {
     for (var format in moduleFormats) {
       if (format != ModuleFormat.amd && format != ModuleFormat.legacy) {
         _usageException('Format $format cannot be combined with '
             'single-out-file. Only amd and legacy modes are supported.');
       }
@@ skipping 93 matching lines @@
     '\n\n${_argParser(hide: !_verbose).usage}';
 
 void _usageException(String message) {
   throw new UsageException(message, _usageMessage);
 }
 
 /// Thrown when the input source code has errors.
 class CompileErrorException implements Exception {
   toString() => '\nPlease fix all errors before compiling (warnings are okay).';
 }