Modify fasta scanner testing logic to use ErrorToken.errorCode.

pkg/front_end/test/scanner_test.dart

 // Copyright (c) 2016, 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 'package:front_end/src/base/errors.dart';
 import 'package:front_end/src/base/jenkins_smi_hash.dart';
 import 'package:front_end/src/fasta/scanner/error_token.dart' as fasta;
 import 'package:front_end/src/fasta/scanner/keyword.dart' as fasta;
 import 'package:front_end/src/fasta/scanner/string_scanner.dart' as fasta;
 import 'package:front_end/src/fasta/scanner/token.dart' as fasta;
@@ skipping 103 matching lines @@
         // keyword.substring(0, keyword.length() - 1)
         expect(state, isNotNull);
       }
     }
   }
 }
 
 @reflectiveTest
 class ScannerTest extends ScannerTestBase {
   @override
+  @failingTest
+  void test_incomplete_string_interpolation() {
+    super.test_incomplete_string_interpolation();
+  }
+
+  @override
   Token _scanWithListener(String source, _ErrorListener listener,
       {bool genericMethodComments: false,
       bool lazyAssignmentOperators: false}) {
     Scanner scanner =
         new _TestScanner(new CharSequenceReader(source), listener);
     scanner.scanGenericMethodComments = genericMethodComments;
     scanner.scanLazyAssignmentOperators = lazyAssignmentOperators;
     return scanner.tokenize();
   }
 }
@@ skipping 76 matching lines @@
 
   @override
   @failingTest
   void test_comment_generic_method_type_list() {
     // TODO(paulberry,ahe): Fasta doesn't support generic method comment syntax.
     super.test_comment_generic_method_type_list();
   }
 
   @override
   @failingTest
-  void test_comment_multi_unterminated() {
-    // TODO(paulberry,ahe): see UnimplementedError("distinguish unterminated
-    // errors")
-    super.test_comment_multi_unterminated();
-  }
-
-  @override
-  @failingTest
   void test_comment_single() {
     // TODO(paulberry,ahe): See TODO comment below in _translateTokenInfoKind().
     super.test_comment_single();
   }
 
   @override
   @failingTest
-  void test_double_missingDigitInExponent() {
-    // TODO(paulberry,ahe): see UnimplementedError("distinguish unterminated
-    // errors")
-    super.test_double_missingDigitInExponent();
-  }
-
-  @override
-  @failingTest
-  void test_hexidecimal_missingDigit() {
-    // TODO(paulberry,ahe): see UnimplementedError("distinguish unterminated
-    // errors")
-    super.test_hexidecimal_missingDigit();
-  }
-
-  @override
-  @failingTest
   void test_index() {
     // TODO(paulberry,ahe): "[]" should be parsed as a single token.
     super.test_index();
   }
 
   @override
   @failingTest
   void test_index_eq() {
     // TODO(paulberry,ahe): "[]=" should be parsed as a single token.
     super.test_index_eq();
@@ skipping 57 matching lines @@
 
   @override
   @failingTest
   void test_string_raw_simple_unterminated_eol() {
     // TODO(paulberry,ahe): bad error recovery.
     super.test_string_raw_simple_unterminated_eol();
   }
 
   @override
   @failingTest
-  void test_string_simple_interpolation_missingIdentifier() {
-    // TODO(paulberry,ahe): bad error recovery.
-    super.test_string_simple_interpolation_missingIdentifier();
-  }
-
-  @override
-  @failingTest
-  void test_string_simple_interpolation_nonIdentifier() {
-    // TODO(paulberry,ahe): bad error recovery.
-    super.test_string_simple_interpolation_nonIdentifier();
-  }
-
-  @override
-  @failingTest
   void test_string_simple_unterminated_eof() {
     // TODO(paulberry,ahe): bad error recovery.
     super.test_string_simple_unterminated_eof();
   }
 
   @override
   @failingTest
   void test_string_simple_unterminated_eol() {
     // TODO(paulberry,ahe): bad error recovery.
     super.test_string_simple_unterminated_eol();
@@ skipping 32 matching lines @@
     var analyzerTokenHead = new Token(null, 0);
     analyzerTokenHead.previous = analyzerTokenHead;
     var analyzerTokenTail = analyzerTokenHead;
     // TODO(paulberry,ahe): Fasta includes comments directly in the token
     // stream, rather than pointing to them via a "precedingComment" pointer, as
     // analyzer does.  This seems like it will complicate parsing and other
     // operations.
     CommentToken currentCommentHead;
     CommentToken currentCommentTail;
     while (true) {
-      if (token is fasta.ErrorToken) {
+      if (scanner.hasErrors && token is fasta.ErrorToken) {
         var error = _translateErrorToken(token, source.length);
         if (error != null) {
           listener.errors.add(error);
         }
       } else if (token is fasta.StringToken &&
           token.info.kind == fasta.COMMENT_TOKEN) {
         var translatedToken = _translateToken(token, null) as CommentToken;
         if (currentCommentHead == null) {
           currentCommentHead = currentCommentTail = translatedToken;
         } else {
@@ skipping 31 matching lines @@
       if (errorLength == 0) {
         // Analyzer never generates an error message of length zero,
         // since such an error would not be visible in an editor.
         // TODO(paulberry,ahe): would it make sense to replicate this behavior
         // in fasta, or move it elsewhere in analyzer?
         errorLength = 1;
       }
       return new _TestError(charOffset, errorLength, errorCode, arguments);
     }
 
-    if (token is fasta.UnterminatedToken) {
-      // TODO(paulberry,ahe): How to tell what kind of error to
-      // report?  It could be ScannerErrorCode.UNTERMINATED_STRING_LITERAL,
-      // ScannerErrorCode.MISSING_HEX_DIGIT, or
-      // ScannerErrorCode.UNTERMINATED_MULTI_LINE_COMMENT
-      return _makeError(
-          throw new UnimplementedError("distinguish unterminated errors"),
-          null);
-    } else if (token is fasta.UnmatchedToken) {
-      return null;
-    } else if (token is fasta.NonAsciiIdentifierToken) {
-      return _makeError(ScannerErrorCode.ILLEGAL_CHARACTER, [token.character]);
-    } else if (token is fasta.NonAsciiWhitespaceToken) {
-      return _makeError(ScannerErrorCode.ILLEGAL_CHARACTER, [token.character]);
+    var errorCode = token.errorCode;

[ahe, 2017/02/07 09:37:49]

Nice. I don't have a direct test of this property.

+    switch (errorCode) {
+      case fasta.ErrorKind.UnterminatedString:
+        // TODO(paulberry,ahe): Fasta reports the error location as the entire
+        // string; analyzer expects the end of the string.
+        charOffset = endOffset;
+        return _makeError(ScannerErrorCode.UNTERMINATED_STRING_LITERAL, null);
+      case fasta.ErrorKind.UnmatchedToken:
+        return null;
+      case fasta.ErrorKind.UnterminatedComment:
+        // TODO(paulberry,ahe): Fasta reports the error location as the entire
+        // comment; analyzer expects the end of the comment.
+        charOffset = endOffset;
+        return _makeError(
+            ScannerErrorCode.UNTERMINATED_MULTI_LINE_COMMENT, null);
+      case fasta.ErrorKind.MissingExponent:
+        // TODO(paulberry,ahe): Fasta reports the error location as the entire
+        // number; analyzer expects the end of the number.
+        charOffset = endOffset;
+        return _makeError(ScannerErrorCode.MISSING_DIGIT, null);
+      case fasta.ErrorKind.ExpectedHexDigit:
+        // TODO(paulberry,ahe): Fasta reports the error location as the entire
+        // number; analyzer expects the end of the number.
+        charOffset = endOffset;
+        return _makeError(ScannerErrorCode.MISSING_HEX_DIGIT, null);
+      case fasta.ErrorKind.NonAsciiIdentifier:
+      case fasta.ErrorKind.NonAsciiWhitespace:
+        return _makeError(
+            ScannerErrorCode.ILLEGAL_CHARACTER, [token.character]);
+      case fasta.ErrorKind.UnexpectedDollarInString:
+        return null;
+      default:
+        throw new UnimplementedError('$errorCode');
     }
-    throw new UnimplementedError('${token.runtimeType}');
   }
 
   Keyword _translateKeyword(String syntax) =>
       _keywordMap[syntax] ?? (throw new UnimplementedError('$syntax'));
 
   Token _translateToken(fasta.Token token, CommentToken comment) {
     var type = _translateTokenInfoKind(token.info.kind);
     int offset = token.charOffset;
     Token makeStringToken(String value) {
       if (comment == null) {
@@ skipping 193 matching lines @@
         return TokenType.QUESTION_QUESTION;
       case fasta.QUESTION_QUESTION_EQ_TOKEN:
         return TokenType.QUESTION_QUESTION_EQ;
       default:
         throw new UnimplementedError('$kind');
     }
   }
 }
 
 abstract class ScannerTestBase {
-  void fail_incomplete_string_interpolation() {
-    // https://code.google.com/p/dart/issues/detail?id=18073
-    _assertErrorAndTokens(
-        ScannerErrorCode.UNTERMINATED_STRING_LITERAL, 9, "\"foo \${bar", [
-      new StringToken(TokenType.STRING, "\"foo ", 0),
-      new StringToken(TokenType.STRING_INTERPOLATION_EXPRESSION, "\${", 5),
-      new StringToken(TokenType.IDENTIFIER, "bar", 7)
-    ]);
-  }
-
   void test_ampersand() {
     _assertToken(TokenType.AMPERSAND, "&");
   }
 
   void test_ampersand_ampersand() {
     _assertToken(TokenType.AMPERSAND_AMPERSAND, "&&");
   }
 
   void test_ampersand_ampersand_eq() {
     _assertToken(TokenType.AMPERSAND_AMPERSAND_EQ, "&&=",
@@ skipping 239 matching lines @@
   }
 
   void test_illegalChar_nbsp() {
     _assertError(ScannerErrorCode.ILLEGAL_CHARACTER, 0, "\u00A0", [0xa0]);
   }
 
   void test_illegalChar_notLetter() {
     _assertError(ScannerErrorCode.ILLEGAL_CHARACTER, 0, "\u0312", [0x312]);
   }
 
+  void test_incomplete_string_interpolation() {
+    // https://code.google.com/p/dart/issues/detail?id=18073
+    _assertErrorAndTokens(
+        ScannerErrorCode.UNTERMINATED_STRING_LITERAL, 9, "\"foo \${bar", [
+      new StringToken(TokenType.STRING, "\"foo ", 0),
+      new StringToken(TokenType.STRING_INTERPOLATION_EXPRESSION, "\${", 5),
+      new StringToken(TokenType.IDENTIFIER, "bar", 7)
+    ]);
+  }
+
   void test_index() {
     _assertToken(TokenType.INDEX, "[]");
   }
 
   void test_index_eq() {
     _assertToken(TokenType.INDEX_EQ, "[]=");
   }
 
   void test_int() {
     _assertToken(TokenType.INT, "123");
@@ skipping 916 matching lines @@
   _TestScanner(CharacterReader reader, [this.listener]) : super(reader);
 
   @override
   void reportError(
       ScannerErrorCode errorCode, int offset, List<Object> arguments) {
     if (listener != null) {
       listener.errors.add(new _TestError(offset, 1, errorCode, arguments));
     }
   }
 }