Added tools/status_clean.dart script

dart/tools/testing/dart/status_file_parser.dart

 // Copyright (c) 2012, 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 status_file_parser;
 
 import "dart:async";
 import "dart:convert" show LineSplitter, UTF8;
 import "dart:io";
+
 import "status_expression.dart";
+import "utils.dart" show Path;
 
 class Expectation {
   // Possible outcomes of running a test.
   static Expectation PASS = byName('Pass');
   static Expectation CRASH = byName('Crash');
   static Expectation TIMEOUT = byName('Timeout');
   static Expectation FAIL = byName('Fail');
 
   // Special 'FAIL' cases
   static Expectation RUNTIME_ERROR = byName('RuntimeError');
@@ skipping 82 matching lines @@
   String toString() => prettyName;
 }
 
 
 final RegExp SplitComment = new RegExp("^([^#]*)(#.*)?\$");
 final RegExp HeaderPattern = new RegExp(r"^\[([^\]]+)\]");
 final RegExp RulePattern = new RegExp(r"\s*([^: ]*)\s*:(.*)");
 final RegExp IssueNumberPattern =
     new RegExp("Issue ([0-9]+)|dartbug.com/([0-9]+)", caseSensitive: false);
 
+class StatusFile {
+  final Path location;
+
+  StatusFile(this.location);
+}
+
 // TODO(whesse): Implement configuration_info library that contains data
 // structures for test configuration, including Section.
 class Section {
-  BooleanExpression condition;
-  List<TestRule> testRules;
+  final StatusFile statusFile;
 
-  Section.always() : condition = null, testRules = new List<TestRule>();
-  Section(this.condition) : testRules = new List<TestRule>();
+  final BooleanExpression condition;
+  final List<TestRule> testRules;
+  final int lineNr;

[ricow1, 2014/02/11 14:33:52]

lineNr -> lineNumber

[kustermann, 2014/02/14 11:52:07]

Done.

+
+  Section.always(this.statusFile, this.lineNr)
+      : condition = null, testRules = new List<TestRule>();
+  Section(this.statusFile, this.condition, this.lineNr)
+      : testRules = new List<TestRule>();
 
   bool isEnabled(environment) =>
       condition == null || condition.evaluate(environment);
 
   String toString() {
     return "Section: $condition";
   }
 }
 
 Future<TestExpectations> ReadTestExpectations(List<String> statusFilePaths,
@@ skipping 15 matching lines @@
     for (Section section in sections) {
       if (section.isEnabled(environment)) {
         for (var rule in section.testRules) {
           expectations.addRule(rule, environment);
         }
       }
     }
     completer.complete();
   }
 
-  ReadConfigurationInto(statusFilePath, sections, sectionsRead);
+  ReadConfigurationInto(new Path(statusFilePath), sections, sectionsRead);

[Bill Hesse, 2014/02/13 17:05:08]

As we've said before, it would be nice to replace Path with Uri or
package:path/path.dart, but until then, I guess it is OK to use it.

[kustermann, 2014/02/14 11:52:07]

There are *many* places we need to change, yes.

   return completer.future;
 }
 
-void ReadConfigurationInto(path, sections, onDone) {
-  File file = new File(path);
+void ReadConfigurationInto(Path path, sections, onDone) {
+  StatusFile statusFile = new StatusFile(path);
+  File file = new File(path.toNativePath());
   if (!file.existsSync()) {
     throw new Exception('Cannot find test status file $path');
   }
+  int lineNr = 0;

[Bill Hesse, 2014/02/13 17:05:08]

Should we start this at -1, so we get zero-based line numbers in the output? 
This would be better where the data is used.

[kustermann, 2014/02/14 11:52:07]

The reason why I chose 1-based line numbering is that it's the natural way of
looking at it. Every editor displays line numbers from one (and when printing
out error messages with line numbers, it makes sense to start also at 1).

Short: I think it causes less confusion.

   Stream<String> lines =
       file.openRead()
           .transform(UTF8.decoder)
           .transform(new LineSplitter());
 
-  Section current = new Section.always();
-  sections.add(current);
+  Section currentSection = new Section.always(statusFile, -1);
+  sections.add(currentSection);
+
 
   lines.listen((String line) {
+    lineNr++;
     Match match = SplitComment.firstMatch(line);
     line = (match == null) ? "" : match[1];
     line = line.trim();
     if (line.isEmpty) return;
 
     // Extract the comment to get the issue number if needed.
     String comment = (match == null || match[2] == null) ? "" : match[2];
 
     match = HeaderPattern.firstMatch(line);
     if (match != null) {
       String condition_string = match[1].trim();
       List<String> tokens = new Tokenizer(condition_string).tokenize();
       ExpressionParser parser = new ExpressionParser(new Scanner(tokens));
-      current = new Section(parser.parseBooleanExpression());
-      sections.add(current);
+      currentSection =
+          new Section(statusFile, parser.parseBooleanExpression(), lineNr);
+      sections.add(currentSection);
       return;
     }
 
     match = RulePattern.firstMatch(line);
     if (match != null) {
       String name = match[1].trim();
       // TODO(whesse): Handle test names ending in a wildcard (*).
       String expression_string = match[2].trim();
       List<String> tokens = new Tokenizer(expression_string).tokenize();
       SetExpression expression =
           new ExpressionParser(new Scanner(tokens)).parseSetExpression();
 
       // Look for issue number in comment.
       String issueString = null;
       match = IssueNumberPattern.firstMatch(comment);
       if (match != null) {
         issueString = match[1];
         if (issueString == null) issueString = match[2];
       }
       int issue = issueString != null ? int.parse(issueString) : null;
-      current.testRules.add(new TestRule(name, expression, issue));
+      currentSection.testRules.add(
+          new TestRule(currentSection, name, expression, issue, lineNr));
       return;
     }
 
     print("unmatched line: $line");
   },
   onDone: onDone);
 }
 
 
 class TestRule {
+  final Section section;

[Bill Hesse, 2014/02/13 17:05:08]

I don't see this property being used in any of the changed files.

[kustermann, 2014/02/14 11:52:07]

Good point - removed. I think I used it in an earlier version of it.

+
   String name;
   SetExpression expression;
   int issue;
+  int lineNr;
 
-  TestRule(this.name, this.expression, this.issue);
+  TestRule(this.section, this.name, this.expression, this.issue, this.lineNr);
 
   bool get hasIssue => issue != null;
 
   String toString() => 'TestRule($name, $expression, $issue)';
 }
 
 
 class TestExpectations {
   Map _map;
   bool _preprocessed = false;
@@ skipping 80 matching lines @@
         }
         regExps[i] = regExp;
       }
       _keyToRegExps[key] = regExps;
     });
 
     _regExpCache = null;
     _preprocessed = true;
   }
 }