Better error recovery.

dart/frog/leg/tools/mini_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('parser');
 
 #import('../elements/elements.dart');
 #import('../scanner/scanner_implementation.dart');
 #import('../scanner/scannerlib.dart');
 #import('../tree/tree.dart');
 
 #source('../../source.dart');
 #source('../scanner/byte_array_scanner.dart');
 #source('../scanner/byte_strings.dart');
 
 int charCount = 0;
 Stopwatch stopwatch;
 
 void main() {
+  filesWithCrashes = [];
   stopwatch = new Stopwatch();
   MyOptions options = new MyOptions();
 
   void printStats() {
     int kb = (charCount / 1024).round().toInt();
     String stats =
         '$classCount classes (${kb}Kb) in ${stopwatch.elapsedInMs()}ms';
     if (errorCount != 0) {
       stats += ' with $errorCount errors';
     }
     if (options.diet) {
       print('Diet parsed $stats.');
     } else {
       print('Parsed $stats.');
     }
     if (filesWithCrashes.length !== 0) {
-      print('The following files caused a crash:');
+      print('The following ${filesWithCrashes.length} files caused a crash:');
       for (String file in filesWithCrashes) {
         print(file);
       }
     }
   }
 
   for (String argument in new Options().arguments) {
     if (argument == "--diet") {
       options.diet = true;
       continue;
@@ skipping 12 matching lines @@
     }
     if (argument == "--ast") {
       options.buildAst = true;
       continue;
     }
     if (argument == "-") {
       parseFilesFrom(stdin, options, printStats);
       return;
     }
     stopwatch.start();
-    charCount += parseFile(argument, options);
+    parseFile(argument, options);
     stopwatch.stop();
   }
 
   printStats();
 }
 
 void parseFile(String filename, MyOptions options) {
   List<int> bytes = read(filename);
   charCount += bytes.length;
   if (options.readOnly) return;
@@ skipping 39 matching lines @@
     if (message is !String) message = "unexpected character";
     Token fakeToken = new Token(QUESTION_INFO, scanner.charOffset);
     print(formatError(message, fakeToken, fakeToken, source));
     throw;
   }
 }
 
 var filesWithCrashes;
 
 void parseFilesFrom(InputStream input, MyOptions options, Function whenDone) {
-  filesWithCrashes = [];
   void readLine(String line) {
     stopwatch.start();
     try {
       parseFile(line, options);
     } catch (var ex, var trace) {
       filesWithCrashes.add(line);
       print(ex);
       print(trace);
     }
     stopwatch.stop();
@@ skipping 43 matching lines @@
 
   void beginClassDeclaration(Token token) {
     classCount++;
   }
 
   void beginInterface(Token token) {
     classCount++;
   }
 
   void error(String message, Token token) {
-    ++errorCount;
-    throw new ParserError(formatError(message, beginToken, endToken, file));
+    throw new ParserError(formatError(message, token, token, file));
   }
 }
 
 void formatError(String message, Token beginToken, Token endToken,
                  SourceFile file) {
+  ++errorCount;
   if (beginToken === null) return '${file.filename}: $message';
   String tokenString = endToken.toString();
   int begin = beginToken.charOffset;
   int end = endToken.charOffset + tokenString.length;
   return file.getLocationMessage(message, begin, end, true);
 }
 
 class MyNodeListener extends NodeListener {
   MyNodeListener(SourceFile file, MyOptions options)
     : super(new MyCanceller(file, options), null);
@@ skipping 104 matching lines @@
 String _GREEN_COLOR = '\u001b[32m';
 String _RED_COLOR = '\u001b[31m';
 String _MAGENTA_COLOR = '\u001b[35m';
 String _NO_COLOR = '\u001b[0m';
 
 class Mock {
   const Mock();
   bool get useColors() => true;
   internalError(message) { throw message.toString(); }
 }