Update dart2js unit tests to dart_parser and dart_scanner.

pkg/compiler/lib/src/parser/element_listener.dart

Index: pkg/compiler/lib/src/parser/element_listener.dart
diff --git a/pkg/compiler/lib/src/parser/element_listener.dart b/pkg/compiler/lib/src/parser/element_listener.dart
index c7300abe4b9514f675697be7fd1940639f10b6c1..d3f55ce19835486b762760bda384e961f917342b 100644
--- a/pkg/compiler/lib/src/parser/element_listener.dart
+++ b/pkg/compiler/lib/src/parser/element_listener.dart
@@ -30,7 +30,7 @@ import 'package:dart_scanner/src/precedence.dart' as Precedence show
 import '../tree/tree.dart';
 import '../util/util.dart' show Link, LinkBuilder;
 import 'package:dart_parser/dart_parser.dart'
-    show ErrorKind, Listener, ParserError, closeBraceFor, optional;
+    show ErrorKind, Listener, ParserError, optional;
 import 'partial_elements.dart'
     show
         PartialClassElement,
@@ -85,6 +85,10 @@ class ElementListener extends Listener {
 
   bool suppressParseErrors = false;
 
+  /// Set to true each time we parse a native function body. It is reset in
+  /// [handleInvalidFunctionBody] which is called immediately after.
+  bool lastErrorWasNativeFunctionBody = false;
+
   ElementListener(this.scannerOptions, DiagnosticReporter reporter,
       this.compilationUnitElement, this.idGenerator)
       : this.reporter = reporter,
@@ -454,7 +458,9 @@ class ElementListener extends Listener {
   @override
   Token handleUnrecoverableError(Token token, ErrorKind kind, Map arguments) {
     Token next = handleError(token, kind, arguments);
-    if (next == null) {
+    if (next == null &&
+        kind != ErrorKind.UnterminatedComment &&
+        kind != ErrorKind.UnterminatedString) {
       throw new ParserError.fromTokens(token, token, kind, arguments);
     } else {
       return next;
@@ -466,6 +472,21 @@ class ElementListener extends Listener {
     handleError(token, kind, arguments);
   }
 
+  @override
+  void handleInvalidExpression(Token token) {
+    pushNode(new ErrorExpression(token));
+  }
+
+  @override
+  void handleInvalidFunctionBody(Token token) {
+    lastErrorWasNativeFunctionBody = false;
+  }
+
+  @override
+  void handleInvalidTypeReference(Token token) {
+    pushNode(null);
+  }
+
   Token handleError(Token token, ErrorKind kind, Map arguments) {
     MessageKind errorCode;
 
@@ -510,27 +531,14 @@ class ElementListener extends Listener {
         return token;
 
       case ErrorKind.ExpectedType:
-        pushNode(null);
-        if (token is ErrorToken) {
-          // TODO(ahe): This is dead code.
-          return synthesizeIdentifier(token);
-        } else {
-          reportFatalError(reporter.spanFromToken(token),
-              "Expected a type, but got '${token.value}'.");
-        }
+        reportFatalError(reporter.spanFromToken(token),
+            "Expected a type, but got '${token.value}'.");
         return null;
 
       case ErrorKind.ExpectedExpression:
-        if (token is ErrorToken) {
-          // TODO(ahe): This dead code.
-          pushNode(new ErrorExpression(token));
-          return token.next;
-        } else {
-          pushNode(null);
-          reportFatalError(
-              reporter.spanFromToken(token),
-              "Expected an expression, but got '${token.value}'.");
-        }
+        reportFatalError(
+            reporter.spanFromToken(token),
+            "Expected an expression, but got '${token.value}'.");
         return null;
 
       case ErrorKind.UnexpectedToken:
@@ -550,6 +558,7 @@ class ElementListener extends Listener {
 
       case ErrorKind.ExpectedFunctionBody:
         if (optional("native", token)) {
+          lastErrorWasNativeFunctionBody = true;
           return native.handleNativeFunctionBody(this, token);
         } else {
           reportFatalError(
@@ -570,10 +579,7 @@ class ElementListener extends Listener {
             "Expected a declaration, but got '${token.value}'.");
 
       case ErrorKind.UnmatchedToken:
-        String begin = token.value;
-        String end = closeBraceFor(begin);
-        reportErrorFromToken(
-            token, MessageKind.UNMATCHED_TOKEN, {'begin': begin, 'end': end});
+        reportErrorFromToken(token, MessageKind.UNMATCHED_TOKEN, arguments);
         Token next = token.next;
         while (next is ErrorToken) {
           next = next.next;