Revert "Replace the configuration map with a typed object."

tools/testing/dart/status_file.dart

 // Copyright (c) 2017, 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 'environment.dart';
 import 'expectation.dart';
-import 'path.dart';
 import 'status_expression.dart';
 
 /// Splits out a trailing line comment
 final _commentPattern = new RegExp("^([^#]*)(#.*)?\$");
 
 /// Matches the header that begins a new section, like:
 ///
 ///     [ $compiler == dart2js && $minified ]
 final _sectionPattern = new RegExp(r"^\[([^\]]+)\]");
 
@@ skipping 18 matching lines @@
 /// an environment. If it evaluates to true, then the entries after the header
 /// take effect.
 ///
 /// Each entry is a glob-like file path followed by a colon and then a
 /// comma-separated list of [Expectation]s. The path may point to an individual
 /// file, or a directory, in which case it applies to all files under that path.
 ///
 /// Entries may also appear before any section header, in which case they
 /// always apply.
 class StatusFile {
-  final String _path;
   final List<StatusSection> sections = [];
 
-  /// Parses the status file at [_path].
-  StatusFile.read(this._path) {
-    var lines = new File(_path).readAsLinesSync();
+  /// Parses the status file at [path].
+  StatusFile.read(String path) {
+    var lines = new File(path).readAsLinesSync();
 
     // The current section whose rules are being parsed.
     StatusSection section;
 
     var lineNumber = 0;
-
     for (var line in lines) {
       lineNumber++;
 
-      fail(String message, [List<String> errors]) {
-        print('$message in "$_shortPath" line $lineNumber:\n$line');
-
-        if (errors != null) {
-          for (var error in errors) {
-            print("- ${error.replaceAll('\n', '\n  ')}");
-          }
-        }
-        exit(1);
-      }
-
       // Strip off the comment and whitespace.
       var match = _commentPattern.firstMatch(line);
       var source = "";
       var comment = "";
       if (match != null) {
         source = match[1].trim();
         comment = match[2] ?? "";
       }
 
       // Ignore empty (or comment-only) lines.
       if (source.isEmpty) continue;
 
       // See if we are starting a new section.
       match = _sectionPattern.firstMatch(source);
       if (match != null) {
-        try {
-          var condition = Expression.parse(match[1].trim());
-
-          var errors = <String>[];
-          condition.validate(errors);
-
-          if (errors.isNotEmpty) {
-            var s = errors.length > 1 ? "s" : "";
-            fail('Validation error$s', errors);
-          }
-
-          section = new StatusSection(condition);
-          sections.add(section);
-        } on FormatException {
-          fail("Status expression syntax error");
-        }
+        var condition = Expression.parse(match[1].trim());
+        section = new StatusSection(condition);
+        sections.add(section);
         continue;
       }
 
       // Otherwise, it should be a new entry under the current section.
       match = _entryPattern.firstMatch(source);
       if (match != null) {
         var path = match[1].trim();
         // TODO(whesse): Handle test names ending in a wildcard (*).
-        var expectations = <Expectation>[];
-        for (var name in match[2].split(",")) {
-          name = name.trim();
-          try {
-            expectations.add(Expectation.find(name));
-          } on ArgumentError {
-            fail('Unrecognized test expectation "$name"');
-          }
-        }
-
+        var expectations = _parseExpectations(match[2]);
         var issue = _issueNumber(comment);
 
         // If we haven't found a section header yet, create an implicit section
         // that matches everything.
         if (section == null) {
           section = new StatusSection(null);
           sections.add(section);
         }
 
         section.entries.add(new StatusEntry(path, expectations, issue));
         continue;
       }
 
-      fail("Unrecognized input");
+      throw new FormatException(
+          "Could not parse line $lineNumber of status file '$path':\n$line");
     }
   }
 
-  /// Gets the path to this status file relative to the Dart repo root.
-  String get _shortPath {
-    var repoRoot = new Path(Platform.script
-            .toFilePath(windows: Platform.operatingSystem == "windows"))
-        .join(new Path("../../../../"));
-    return new Path(_path).relativeTo(repoRoot).toString();
+  /// Parses a comma-separated list of expectation names from [text].
+  List<Expectation> _parseExpectations(String text) {
+    return text
+        .split(",")
+        .map((name) => Expectation.find(name.trim()))
+        .toList();
   }
 
   /// Returns the issue number embedded in [comment] or `null` if there is none.
   int _issueNumber(String comment) {
     var match = _issuePattern.firstMatch(comment);
     if (match == null) return null;
 
     return int.parse(match[1], onError: (_) => null);
   }
 
@@ skipping 21 matching lines @@
 /// the entries within the section.
 class StatusSection {
   /// The expression that determines when this section is applied.
   ///
   /// May be `null` for paths that appear before any section header in the file.
   /// In that case, the section always applies.
   final Expression _condition;
   final List<StatusEntry> entries = [];
 
   /// Returns true if this section should apply in the given [environment].
-  bool isEnabled(Environment environment) =>
+  bool isEnabled(Map<String, dynamic> environment) =>
       _condition == null || _condition.evaluate(environment);
 
   StatusSection(this._condition);
 }
 
 /// Describes the test status of the file or files at a given path.
 class StatusEntry {
   final String path;
   final List<Expectation> expectations;
   final int issue;
 
   StatusEntry(this.path, this.expectations, this.issue);
 }