Improve the event handling for string input stream

tools/testing/dart/status_file_parser.dart

 // Copyright (c) 2011, 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("status_expression.dart");
 
 // Possible outcomes of running a test.
@@ skipping 27 matching lines @@
 // Helper method to be able to run the test from the runtime
 // directory, or the top directory.
 String getFilename(String path) =>
     new File(path).existsSync() ? path : '../$path';
 
 String getDirname(String path) =>
     new Directory(path).existsSync() ? path : '../$path';
 
 void ReadTestExpectationsInto(TestExpectations expectations,
                               String statusFilePath,
-                              environment) {
+                              environment,
+                              onDone) {
   List<Section> sections = new List<Section>();
-  ReadConfigurationInto(statusFilePath, sections);
 
-  for (Section section in sections) {
-    if (section.isEnabled(environment)) {
-      for (var rule in section.testRules) {
-        expectations.addRule(rule, environment);
+  void sectionsRead() {
+    for (Section section in sections) {
+      if (section.isEnabled(environment)) {
+        for (var rule in section.testRules) {
+          expectations.addRule(rule, environment);
+        }
       }
     }
+    onDone();
   }
+
+  ReadConfigurationInto(statusFilePath, sections, sectionsRead);
 }
 
-void ReadConfigurationInto(path, sections) {
+void ReadConfigurationInto(path, sections, onDone) {
   File file = new File(getFilename(path));
   if (!file.existsSync()) return;  // TODO(whesse): Handle missing file.
   FileInputStream file_stream = file.openInputStream();
   StringInputStream lines = new StringInputStream(file_stream);
 
   Section current = new Section.always();
   sections.add(current);
   String prefix = "";
 
-  String line;
-  while ((line = lines.readLine()) != null) {
-    Match match = StripComment.firstMatch(line);
-    line = (match == null) ? "" : match[0];
-    line = line.trim();
-    if (line.isEmpty()) continue;
+  lines.lineHandler = () {
+    String line;
+    while ((line = lines.readLine()) != null) {
+      Match match = StripComment.firstMatch(line);
+      line = (match == null) ? "" : match[0];
+      line = line.trim();
+      if (line.isEmpty()) continue;
 
-    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);
-      continue;
+      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);
+        continue;
+      }
+
+      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();
+        current.testRules.add(new TestRule(name, expression));
+        continue;
+      }
+
+      match = PrefixPattern.firstMatch(line);
+      if (match != null) {
+        prefix = match[1];
+        continue;
+      }
+
+      print("unmatched line: $line");
     }
+  };
 
-    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();
-      current.testRules.add(new TestRule(name, expression));
-      continue;
-    }
-
-    match = PrefixPattern.firstMatch(line);
-    if (match != null) {
-      prefix = match[1];
-      continue;
-    }
-
-    print("unmatched line: $line");
-  }
-
-  file_stream.close();
+  lines.closeHandler = () {
+    file_stream.close();
+    onDone();
+  };
 }
 
 
 class TestRule {
   String name;
   SetExpression expression;
 
   TestRule(this.name, this.expression);
 }
 
@@ skipping 114 matching lines @@
         }
         regExps[i] = regExp;
       }
       _keyToRegExps[key] = regExps;
     });
 
     _regExpCache = null;
     _preprocessed = true;
   }
 }