Fresh drop of analyzer-experimental.

pkg/analyzer-experimental/lib/src/generated/parser.dart

 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine.parser;
 
 import 'dart:collection';
 import 'java_core.dart';
 import 'java_engine.dart';
 import 'error.dart';
 import 'source.dart';
@@ skipping 143 matching lines @@
   Token get staticKeyword => _staticKeyword;
   /**
    * Return the token representing the keyword 'var', or {@code null} if the keyword was not found.
    * @return the token representing the keyword 'var'
    */
   Token get varKeyword => _varKeyword;
   /**
    * Set the token representing the keyword 'abstract' to the given token.
    * @param abstractKeyword the token representing the keyword 'abstract'
    */
-  void set abstractKeyword4(Token abstractKeyword) {
-    this._abstractKeyword = abstractKeyword;
+  void set abstractKeyword(Token abstractKeyword4) {
+    this._abstractKeyword = abstractKeyword4;
   }
   /**
    * Set the token representing the keyword 'const' to the given token.
    * @param constKeyword the token representing the keyword 'const'
    */
-  void set constKeyword3(Token constKeyword) {
-    this._constKeyword = constKeyword;
+  void set constKeyword(Token constKeyword3) {
+    this._constKeyword = constKeyword3;
   }
   /**
    * Set the token representing the keyword 'external' to the given token.
    * @param externalKeyword the token representing the keyword 'external'
    */
-  void set externalKeyword5(Token externalKeyword) {
-    this._externalKeyword = externalKeyword;
+  void set externalKeyword(Token externalKeyword5) {
+    this._externalKeyword = externalKeyword5;
   }
   /**
    * Set the token representing the keyword 'factory' to the given token.
    * @param factoryKeyword the token representing the keyword 'factory'
    */
-  void set factoryKeyword3(Token factoryKeyword) {
-    this._factoryKeyword = factoryKeyword;
+  void set factoryKeyword(Token factoryKeyword3) {
+    this._factoryKeyword = factoryKeyword3;
   }
   /**
    * Set the token representing the keyword 'final' to the given token.
    * @param finalKeyword the token representing the keyword 'final'
    */
-  void set finalKeyword2(Token finalKeyword) {
-    this._finalKeyword = finalKeyword;
+  void set finalKeyword(Token finalKeyword2) {
+    this._finalKeyword = finalKeyword2;
   }
   /**
    * Set the token representing the keyword 'static' to the given token.
    * @param staticKeyword the token representing the keyword 'static'
    */
-  void set staticKeyword2(Token staticKeyword) {
-    this._staticKeyword = staticKeyword;
+  void set staticKeyword(Token staticKeyword2) {
+    this._staticKeyword = staticKeyword2;
   }
   /**
    * Set the token representing the keyword 'var' to the given token.
    * @param varKeyword the token representing the keyword 'var'
    */
-  void set varKeyword2(Token varKeyword) {
-    this._varKeyword = varKeyword;
+  void set varKeyword(Token varKeyword2) {
+    this._varKeyword = varKeyword2;
   }
   String toString() {
     StringBuffer builder = new StringBuffer();
     bool needsSpace = appendKeyword(builder, false, _abstractKeyword);
     needsSpace = appendKeyword(builder, needsSpace, _constKeyword);
     needsSpace = appendKeyword(builder, needsSpace, _externalKeyword);
     needsSpace = appendKeyword(builder, needsSpace, _factoryKeyword);
     needsSpace = appendKeyword(builder, needsSpace, _finalKeyword);
     needsSpace = appendKeyword(builder, needsSpace, _staticKeyword);
     appendKeyword(builder, needsSpace, _varKeyword);
@@ skipping 88 matching lines @@
   /**
    * Parse a sequence of statements, starting with the given token.
    * @param token the first token of the sequence of statement
    * @return the statements that were parsed, or {@code null} if the tokens do not represent a
    * recognizable sequence of statements
    */
   List<Statement> parseStatements(Token token) {
     _currentToken = token;
     return parseStatements2();
   }
-  void set currentToken(Token currentToken) {
-    this._currentToken = currentToken;
+  void set currentToken(Token currentToken2) {
+    this._currentToken = currentToken2;
   }
   /**
    * Advance to the next token in the token stream.
    */
   void advance() {
     _currentToken = _currentToken.next;
   }
   /**
    * Append the character equivalent of the given scalar value to the given builder. Use the start
    * and end indices to report an error, and don't append anything to the builder, if the scalar
    * value is invalid.
    * @param builder the builder to which the scalar value is to be appended
    * @param escapeSequence the escape sequence that was parsed to produce the scalar value
    * @param scalarValue the value to be appended
    * @param startIndex the index of the first character representing the scalar value
    * @param endIndex the index of the last character representing the scalar value
    */
   void appendScalarValue(StringBuffer builder, String escapeSequence, int scalarValue, int startIndex, int endIndex) {
     if (scalarValue < 0 || scalarValue > Character.MAX_CODE_POINT || (scalarValue >= 0xD800 && scalarValue <= 0xDFFF)) {
       reportError3(ParserErrorCode.INVALID_CODE_POINT, [escapeSequence]);
       return;
     }
     if (scalarValue < Character.MAX_VALUE) {
-      builder.addCharCode(scalarValue as int);
+      builder.addCharCode((scalarValue as int));
     } else {
       builder.add(Character.toChars(scalarValue));
     }
   }
   /**
    * Compute the content of a string with the given literal representation.
    * @param lexeme the literal representation of the string
    * @return the actual value of the string
    */
   String computeStringValue(String lexeme) {
@@ skipping 22 matching lines @@
     int index = start;
     while (index < end) {
       index = translateCharacter(builder, lexeme, index);
     }
     return builder.toString();
   }
   /**
    * Create a synthetic identifier.
    * @return the synthetic identifier that was created
    */
-  SimpleIdentifier createSyntheticIdentifier() => new SimpleIdentifier(createSyntheticToken(TokenType.IDENTIFIER));
+  SimpleIdentifier createSyntheticIdentifier() => new SimpleIdentifier.full(createSyntheticToken(TokenType.IDENTIFIER));
   /**
    * Create a synthetic string literal.
    * @return the synthetic string literal that was created
    */
-  SimpleStringLiteral createSyntheticStringLiteral() => new SimpleStringLiteral(createSyntheticToken(TokenType.STRING), "");
+  SimpleStringLiteral createSyntheticStringLiteral() => new SimpleStringLiteral.full(createSyntheticToken(TokenType.STRING), "");
   /**
    * Create a synthetic token with the given type.
    * @return the synthetic token that was created
    */
   Token createSyntheticToken(TokenType type) => new StringToken(type, "", _currentToken.offset);
   /**
    * Check that the given expression is assignable and report an error if it isn't.
    * <pre>
    * assignableExpression ::=
    * primary (arguments* assignableSelector)+
@@ skipping 26 matching lines @@
   /**
    * If the current token has the expected type, return it after advancing to the next token.
    * Otherwise report an error and return the current token without advancing.
    * @param type the type of token that is expected
    * @return the token that matched the given type
    */
   Token expect2(TokenType type) {
     if (matches5(type)) {
       return andAdvance;
     }
-    if (type == TokenType.SEMICOLON) {
+    if (identical(type, TokenType.SEMICOLON)) {
       reportError4(ParserErrorCode.EXPECTED_TOKEN, _currentToken.previous, [type.lexeme]);
     } else {
       reportError3(ParserErrorCode.EXPECTED_TOKEN, [type.lexeme]);
     }
     return _currentToken;
   }
   /**
    * Advance to the next token in the token stream, making it the new current token.
    * @return the token that was current before this method was invoked
    */
@@ skipping 83 matching lines @@
       return true;
     }
     Token token = skipTypeName(_currentToken);
     if (token == null) {
       return false;
     }
     token = skipSimpleIdentifier(token);
     if (token == null) {
       return false;
     }
-    TokenType type17 = token.type;
-    return type17 == TokenType.EQ || type17 == TokenType.COMMA || type17 == TokenType.SEMICOLON || matches3(token, Keyword.IN);
+    TokenType type15 = token.type;
+    return identical(type15, TokenType.EQ) || identical(type15, TokenType.COMMA) || identical(type15, TokenType.SEMICOLON) || matches3(token, Keyword.IN);
   }
   /**
    * Return {@code true} if the current token appears to be the beginning of a switch member.
    * @return {@code true} if the current token appears to be the beginning of a switch member
    */
   bool isSwitchMember() {
     Token token = _currentToken;
     while (matches4(token, TokenType.IDENTIFIER) && matches4(token.next, TokenType.COLON)) {
       token = token.next.next;
     }
-    if (token.type == TokenType.KEYWORD) {
-      Keyword keyword28 = (token as KeywordToken).keyword;
-      return keyword28 == Keyword.CASE || keyword28 == Keyword.DEFAULT;
+    if (identical(token.type, TokenType.KEYWORD)) {
+      Keyword keyword27 = ((token as KeywordToken)).keyword;
+      return identical(keyword27, Keyword.CASE) || identical(keyword27, Keyword.DEFAULT);
     }
     return false;
   }
   /**
    * Compare the given tokens to find the token that appears first in the source being parsed. That
    * is, return the left-most of all of the tokens. The arguments are allowed to be {@code null}.
    * Return the token with the smallest offset, or {@code null} if there are no arguments or if all
    * of the arguments are {@code null}.
    * @param tokens the tokens being compared
    * @return the token with the smallest offset
    */
   Token lexicallyFirst(List<Token> tokens) {
     Token first = null;
     int firstOffset = 2147483647;
     for (Token token in tokens) {
       if (token != null) {
-        int offset3 = token.offset;
-        if (offset3 < firstOffset) {
+        int offset4 = token.offset;
+        if (offset4 < firstOffset) {
           first = token;
         }
       }
     }
     return first;
   }
   /**
    * Return {@code true} if the current token matches the given keyword.
    * @param keyword the keyword that can optionally appear in the current location
    * @return {@code true} if the current token matches the given keyword
    */
   bool matches(Keyword keyword) => matches3(_currentToken, keyword);
   /**
    * Return {@code true} if the current token matches the given identifier.
    * @param identifier the identifier that can optionally appear in the current location
    * @return {@code true} if the current token matches the given identifier
    */
-  bool matches2(String identifier) => _currentToken.type == TokenType.IDENTIFIER && _currentToken.lexeme == identifier;
+  bool matches2(String identifier) => identical(_currentToken.type, TokenType.IDENTIFIER) && _currentToken.lexeme == identifier;
   /**
    * Return {@code true} if the given token matches the given keyword.
    * @param token the token being tested
    * @param keyword the keyword that is being tested for
    * @return {@code true} if the given token matches the given keyword
    */
-  bool matches3(Token token, Keyword keyword) => token.type == TokenType.KEYWORD && (token as KeywordToken).keyword == keyword;
+  bool matches3(Token token, Keyword keyword35) => identical(token.type, TokenType.KEYWORD) && identical(((token as KeywordToken)).keyword, keyword35);
   /**
    * Return {@code true} if the given token has the given type.
    * @param token the token being tested
    * @param type the type of token that is being tested for
    * @return {@code true} if the given token has the given type
    */
-  bool matches4(Token token, TokenType type) => token.type == type;
+  bool matches4(Token token, TokenType type24) => identical(token.type, type24);
   /**
    * Return {@code true} if the current token has the given type. Note that this method, unlike
    * other variants, will modify the token stream if possible to match a wider range of tokens. In
    * particular, if we are attempting to match a '>' and the next token is either a '>>' or '>>>',
    * the token stream will be re-written and {@code true} will be returned.
    * @param type the type of token that can optionally appear in the current location
    * @return {@code true} if the current token has the given type
    */
-  bool matches5(TokenType type) {
+  bool matches5(TokenType type25) {
     TokenType currentType = _currentToken.type;
-    if (currentType != type) {
-      if (type == TokenType.GT) {
-        if (currentType == TokenType.GT_GT) {
-          int offset4 = _currentToken.offset;
-          Token first = new Token(TokenType.GT, offset4);
-          Token second = new Token(TokenType.GT, offset4 + 1);
+    if (currentType != type25) {
+      if (identical(type25, TokenType.GT)) {
+        if (identical(currentType, TokenType.GT_GT)) {
+          int offset5 = _currentToken.offset;
+          Token first = new Token(TokenType.GT, offset5);
+          Token second = new Token(TokenType.GT, offset5 + 1);
           second.setNext(_currentToken.next);
           first.setNext(second);
           _currentToken.previous.setNext(first);
           _currentToken = first;
           return true;
-        } else if (currentType == TokenType.GT_EQ) {
-          int offset5 = _currentToken.offset;
-          Token first = new Token(TokenType.GT, offset5);
-          Token second = new Token(TokenType.EQ, offset5 + 1);
+        } else if (identical(currentType, TokenType.GT_EQ)) {
+          int offset6 = _currentToken.offset;
+          Token first = new Token(TokenType.GT, offset6);
+          Token second = new Token(TokenType.EQ, offset6 + 1);
           second.setNext(_currentToken.next);
           first.setNext(second);
           _currentToken.previous.setNext(first);
           _currentToken = first;
           return true;
-        } else if (currentType == TokenType.GT_GT_EQ) {
-          int offset6 = _currentToken.offset;
-          Token first = new Token(TokenType.GT, offset6);
-          Token second = new Token(TokenType.GT, offset6 + 1);
-          Token third = new Token(TokenType.EQ, offset6 + 2);
+        } else if (identical(currentType, TokenType.GT_GT_EQ)) {
+          int offset7 = _currentToken.offset;
+          Token first = new Token(TokenType.GT, offset7);
+          Token second = new Token(TokenType.GT, offset7 + 1);
+          Token third = new Token(TokenType.EQ, offset7 + 2);
           third.setNext(_currentToken.next);
           second.setNext(third);
           first.setNext(second);
           _currentToken.previous.setNext(first);
           _currentToken = first;
           return true;
         }
       }
       return false;
     }
     return true;
   }
   /**
    * Return {@code true} if the given token has any one of the given types.
    * @param token the token being tested
    * @param types the types of token that are being tested for
    * @return {@code true} if the given token has any of the given types
    */
   bool matchesAny(Token token, List<TokenType> types) {
     TokenType actualType = token.type;
     for (TokenType type in types) {
-      if (actualType == type) {
+      if (identical(actualType, type)) {
         return true;
       }
     }
     return false;
   }
   /**
    * Return {@code true} if the current token is a valid identifier. Valid identifiers include
    * built-in identifiers (pseudo-keywords).
    * @return {@code true} if the current token is a valid identifier
    */
   bool matchesIdentifier() => matchesIdentifier2(_currentToken);
   /**
    * Return {@code true} if the given token is a valid identifier. Valid identifiers include
    * built-in identifiers (pseudo-keywords).
    * @return {@code true} if the given token is a valid identifier
    */
-  bool matchesIdentifier2(Token token) => matches4(token, TokenType.IDENTIFIER) || (matches4(token, TokenType.KEYWORD) && (token as KeywordToken).keyword.isPseudoKeyword());
+  bool matchesIdentifier2(Token token) => matches4(token, TokenType.IDENTIFIER) || (matches4(token, TokenType.KEYWORD) && ((token as KeywordToken)).keyword.isPseudoKeyword());
   /**
    * If the current token has the given type, then advance to the next token and return {@code true}. Otherwise, return {@code false} without advancing.
    * @param type the type of token that can optionally appear in the current location
    * @return {@code true} if the current token has the given type
    */
   bool optional(TokenType type) {
     if (matches5(type)) {
       advance();
       return true;
     }
     return false;
   }
   /**
    * Parse an additive expression.
    * <pre>
    * additiveExpression ::=
    * multiplicativeExpression (additiveOperator multiplicativeExpression)
    * | 'super' (additiveOperator multiplicativeExpression)+
    * </pre>
    * @return the additive expression that was parsed
    */
   Expression parseAdditiveExpression() {
     Expression expression;
     if (matches(Keyword.SUPER) && _currentToken.next.type.isAdditiveOperator()) {
-      expression = new SuperExpression(andAdvance);
+      expression = new SuperExpression.full(andAdvance);
     } else {
       expression = parseMultiplicativeExpression();
     }
     while (_currentToken.type.isAdditiveOperator()) {
       Token operator = andAdvance;
-      expression = new BinaryExpression(expression, operator, parseMultiplicativeExpression());
+      expression = new BinaryExpression.full(expression, operator, parseMultiplicativeExpression());
     }
     return expression;
   }
   /**
    * Parse an annotation.
    * <pre>
    * annotation ::=
    * '@' qualified (‘.’ identifier)? arguments?
    * </pre>
    * @return the annotation that was parsed
    */
   Annotation parseAnnotation() {
     Token atSign = expect2(TokenType.AT);
     Identifier name = parsePrefixedIdentifier();
     Token period = null;
     SimpleIdentifier constructorName = null;
     if (matches5(TokenType.PERIOD)) {
       period = andAdvance;
       constructorName = parseSimpleIdentifier();
     }
     ArgumentList arguments = null;
     if (matches5(TokenType.OPEN_PAREN)) {
       arguments = parseArgumentList();
     }
-    return new Annotation(atSign, name, period, constructorName, arguments);
+    return new Annotation.full(atSign, name, period, constructorName, arguments);
   }
   /**
    * Parse an argument.
    * <pre>
    * argument ::=
    * namedArgument
    * | expression
    * namedArgument ::=
    * label expression
    * </pre>
    * @return the argument that was parsed
    */
   Expression parseArgument() {
     if (matchesIdentifier() && matches4(peek(), TokenType.COLON)) {
-      SimpleIdentifier label = new SimpleIdentifier(andAdvance);
-      Label name = new Label(label, andAdvance);
-      return new NamedExpression(name, parseExpression2());
+      SimpleIdentifier label = new SimpleIdentifier.full(andAdvance);
+      Label name = new Label.full(label, andAdvance);
+      return new NamedExpression.full(name, parseExpression2());
     } else {
       return parseExpression2();
     }
   }
   /**
    * Parse an argument definition test.
    * <pre>
    * argumentDefinitionTest ::=
    * '?' identifier
    * </pre>
    * @return the argument definition test that was parsed
    */
   ArgumentDefinitionTest parseArgumentDefinitionTest() {
     Token question = expect2(TokenType.QUESTION);
     SimpleIdentifier identifier = parseSimpleIdentifier();
-    return new ArgumentDefinitionTest(question, identifier);
+    return new ArgumentDefinitionTest.full(question, identifier);
   }
   /**
    * Parse a list of arguments.
    * <pre>
    * arguments ::=
    * '(' argumentList? ')'
    * argumentList ::=
    * namedArgument (',' namedArgument)
    * | expressionList (',' namedArgument)
    * </pre>
    * @return the argument list that was parsed
    */
   ArgumentList parseArgumentList() {
     Token leftParenthesis = expect2(TokenType.OPEN_PAREN);
     List<Expression> arguments = new List<Expression>();
     if (matches5(TokenType.CLOSE_PAREN)) {
-      return new ArgumentList(leftParenthesis, arguments, andAdvance);
+      return new ArgumentList.full(leftParenthesis, arguments, andAdvance);
     }
     Expression argument = parseArgument();
     arguments.add(argument);
     bool foundNamedArgument = argument is NamedExpression;
     bool generatedError = false;
     while (optional(TokenType.COMMA)) {
       argument = parseArgument();
       arguments.add(argument);
       if (foundNamedArgument) {
         if (!generatedError && argument is! NamedExpression) {
           reportError3(ParserErrorCode.POSITIONAL_AFTER_NAMED_ARGUMENT, []);
           generatedError = true;
         }
       } else if (argument is NamedExpression) {
         foundNamedArgument = true;
       }
     }
     Token rightParenthesis = expect2(TokenType.CLOSE_PAREN);
-    return new ArgumentList(leftParenthesis, arguments, rightParenthesis);
+    return new ArgumentList.full(leftParenthesis, arguments, rightParenthesis);
   }
   /**
    * Parse an assert statement.
    * <pre>
    * assertStatement ::=
    * 'assert' '(' conditionalExpression ')' ';'
    * </pre>
    * @return the assert statement
    */
   AssertStatement parseAssertStatement() {
     Token keyword = expect(Keyword.ASSERT);
     Token leftParen = expect2(TokenType.OPEN_PAREN);
     Expression expression = parseConditionalExpression();
     Token rightParen = expect2(TokenType.CLOSE_PAREN);
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new AssertStatement(keyword, leftParen, expression, rightParen, semicolon);
+    return new AssertStatement.full(keyword, leftParen, expression, rightParen, semicolon);
   }
   /**
    * Parse an assignable expression.
    * <pre>
    * assignableExpression ::=
    * primary (arguments* assignableSelector)+
    * | 'super' assignableSelector
    * | identifier
    * </pre>
    * @param primaryAllowed {@code true} if the expression is allowed to be a primary without any
    * assignable selector
    * @return the assignable expression that was parsed
    */
   Expression parseAssignableExpression(bool primaryAllowed) {
     if (matches(Keyword.SUPER)) {
-      return parseAssignableSelector(new SuperExpression(andAdvance), false);
+      return parseAssignableSelector(new SuperExpression.full(andAdvance), false);
     }
     Expression expression = parsePrimaryExpression();
     bool isOptional = primaryAllowed || expression is SimpleIdentifier;
     while (true) {
       while (matches5(TokenType.OPEN_PAREN)) {
         ArgumentList argumentList = parseArgumentList();
         if (expression is SimpleIdentifier) {
-          expression = new MethodInvocation(null, null, expression as SimpleIdentifier, argumentList);
+          expression = new MethodInvocation.full(null, null, (expression as SimpleIdentifier), argumentList);
         } else if (expression is PrefixedIdentifier) {
-          PrefixedIdentifier identifier = expression as PrefixedIdentifier;
-          expression = new MethodInvocation(identifier.prefix, identifier.period, identifier.identifier, argumentList);
+          PrefixedIdentifier identifier = (expression as PrefixedIdentifier);
+          expression = new MethodInvocation.full(identifier.prefix, identifier.period, identifier.identifier, argumentList);
         } else if (expression is PropertyAccess) {
-          PropertyAccess access = expression as PropertyAccess;
-          expression = new MethodInvocation(access.target, access.operator, access.propertyName, argumentList);
+          PropertyAccess access = (expression as PropertyAccess);
+          expression = new MethodInvocation.full(access.target, access.operator, access.propertyName, argumentList);
         } else {
-          expression = new FunctionExpressionInvocation(expression, argumentList);
+          expression = new FunctionExpressionInvocation.full(expression, argumentList);
         }
         if (!primaryAllowed) {
           isOptional = false;
         }
       }
       Expression selectorExpression = parseAssignableSelector(expression, isOptional || (expression is PrefixedIdentifier));
-      if (selectorExpression == expression) {
+      if (identical(selectorExpression, expression)) {
         if (!isOptional && (expression is PrefixedIdentifier)) {
-          PrefixedIdentifier identifier = expression as PrefixedIdentifier;
-          expression = new PropertyAccess(identifier.prefix, identifier.period, identifier.identifier);
+          PrefixedIdentifier identifier = (expression as PrefixedIdentifier);
+          expression = new PropertyAccess.full(identifier.prefix, identifier.period, identifier.identifier);
         }
         return expression;
       }
       expression = selectorExpression;
       isOptional = true;
     }
   }
   /**
    * Parse an assignable selector.
    * <pre>
    * assignableSelector ::=
    * '[' expression ']'
    * | '.' identifier
    * </pre>
    * @param prefix the expression preceding the selector
    * @param optional {@code true} if the selector is optional
    * @return the assignable selector that was parsed
    */
   Expression parseAssignableSelector(Expression prefix, bool optional) {
     if (matches5(TokenType.OPEN_SQUARE_BRACKET)) {
       Token leftBracket = andAdvance;
       Expression index = parseExpression2();
       Token rightBracket = expect2(TokenType.CLOSE_SQUARE_BRACKET);
-      return new IndexExpression.con1(prefix, leftBracket, index, rightBracket);
+      return new IndexExpression.forTarget_full(prefix, leftBracket, index, rightBracket);
     } else if (matches5(TokenType.PERIOD)) {
       Token period = andAdvance;
-      return new PropertyAccess(prefix, period, parseSimpleIdentifier());
+      return new PropertyAccess.full(prefix, period, parseSimpleIdentifier());
     } else {
       if (!optional) {
         reportError3(ParserErrorCode.MISSING_ASSIGNABLE_SELECTOR, []);
       }
       return prefix;
     }
   }
   /**
    * Parse a bitwise and expression.
    * <pre>
    * bitwiseAndExpression ::=
    * equalityExpression ('&' equalityExpression)
    * | 'super' ('&' equalityExpression)+
    * </pre>
    * @return the bitwise and expression that was parsed
    */
   Expression parseBitwiseAndExpression() {
     Expression expression;
     if (matches(Keyword.SUPER) && matches4(peek(), TokenType.AMPERSAND)) {
-      expression = new SuperExpression(andAdvance);
+      expression = new SuperExpression.full(andAdvance);
     } else {
       expression = parseEqualityExpression();
     }
     while (matches5(TokenType.AMPERSAND)) {
       Token operator = andAdvance;
-      expression = new BinaryExpression(expression, operator, parseEqualityExpression());
+      expression = new BinaryExpression.full(expression, operator, parseEqualityExpression());
     }
     return expression;
   }
   /**
    * Parse a bitwise or expression.
    * <pre>
    * bitwiseOrExpression ::=
    * bitwiseXorExpression ('|' bitwiseXorExpression)
    * | 'super' ('|' bitwiseXorExpression)+
    * </pre>
    * @return the bitwise or expression that was parsed
    */
   Expression parseBitwiseOrExpression() {
     Expression expression;
     if (matches(Keyword.SUPER) && matches4(peek(), TokenType.BAR)) {
-      expression = new SuperExpression(andAdvance);
+      expression = new SuperExpression.full(andAdvance);
     } else {
       expression = parseBitwiseXorExpression();
     }
     while (matches5(TokenType.BAR)) {
       Token operator = andAdvance;
-      expression = new BinaryExpression(expression, operator, parseBitwiseXorExpression());
+      expression = new BinaryExpression.full(expression, operator, parseBitwiseXorExpression());
     }
     return expression;
   }
   /**
    * Parse a bitwise exclusive-or expression.
    * <pre>
    * bitwiseXorExpression ::=
    * bitwiseAndExpression ('^' bitwiseAndExpression)
    * | 'super' ('^' bitwiseAndExpression)+
    * </pre>
    * @return the bitwise exclusive-or expression that was parsed
    */
   Expression parseBitwiseXorExpression() {
     Expression expression;
     if (matches(Keyword.SUPER) && matches4(peek(), TokenType.CARET)) {
-      expression = new SuperExpression(andAdvance);
+      expression = new SuperExpression.full(andAdvance);
     } else {
       expression = parseBitwiseAndExpression();
     }
     while (matches5(TokenType.CARET)) {
       Token operator = andAdvance;
-      expression = new BinaryExpression(expression, operator, parseBitwiseAndExpression());
+      expression = new BinaryExpression.full(expression, operator, parseBitwiseAndExpression());
     }
     return expression;
   }
   /**
    * Parse a block.
    * <pre>
    * block ::=
    * '{' statements '}'
    * </pre>
    * @return the block that was parsed
    */
   Block parseBlock() {
     Token leftBracket = expect2(TokenType.OPEN_CURLY_BRACKET);
     List<Statement> statements = new List<Statement>();
     Token statementStart = _currentToken;
     while (!matches5(TokenType.EOF) && !matches5(TokenType.CLOSE_CURLY_BRACKET)) {
       Statement statement = parseStatement2();
       if (statement != null) {
         statements.add(statement);
       }
-      if (_currentToken == statementStart) {
+      if (identical(_currentToken, statementStart)) {
         reportError4(ParserErrorCode.UNEXPECTED_TOKEN, _currentToken, [_currentToken.lexeme]);
         advance();
       }
       statementStart = _currentToken;
     }
     Token rightBracket = expect2(TokenType.CLOSE_CURLY_BRACKET);
-    return new Block(leftBracket, statements, rightBracket);
+    return new Block.full(leftBracket, statements, rightBracket);
   }
   /**
    * Parse a break statement.
    * <pre>
    * breakStatement ::=
    * 'break' identifier? ';'
    * </pre>
    * @return the break statement that was parsed
    */
   Statement parseBreakStatement() {
     Token breakKeyword = expect(Keyword.BREAK);
     SimpleIdentifier label = null;
     if (matchesIdentifier()) {
       label = parseSimpleIdentifier();
     }
     if (!_inLoop && !_inSwitch && label == null) {
       reportError4(ParserErrorCode.BREAK_OUTSIDE_OF_LOOP, breakKeyword, []);
     }
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new BreakStatement(breakKeyword, label, semicolon);
+    return new BreakStatement.full(breakKeyword, label, semicolon);
   }
   /**
    * Parse a cascade section.
    * <pre>
    * cascadeSection ::=
    * '..' cascadeSelector arguments* (assignableSelector arguments*)* cascadeAssignment?
    * cascadeSelector ::=
    * '[' expression ']'
    * | identifier
    * cascadeAssignment ::=
    * assignmentOperator expressionWithoutCascade
    * </pre>
    * @return the expression representing the cascaded method invocation
    */
   Expression parseCascadeSection() {
     Token period = expect2(TokenType.PERIOD_PERIOD);
     Expression expression = null;
     SimpleIdentifier functionName = null;
     if (matchesIdentifier()) {
       functionName = parseSimpleIdentifier();
-    } else if (_currentToken.type == TokenType.OPEN_SQUARE_BRACKET) {
+    } else if (identical(_currentToken.type, TokenType.OPEN_SQUARE_BRACKET)) {
       Token leftBracket = andAdvance;
       Expression index = parseExpression2();
       Token rightBracket = expect2(TokenType.CLOSE_SQUARE_BRACKET);
-      expression = new IndexExpression.con2(period, leftBracket, index, rightBracket);
+      expression = new IndexExpression.forCascade_full(period, leftBracket, index, rightBracket);
       period = null;
     } else {
       reportError4(ParserErrorCode.UNEXPECTED_TOKEN, _currentToken, [_currentToken.lexeme]);
       return expression;
     }
-    if (_currentToken.type == TokenType.OPEN_PAREN) {
-      while (_currentToken.type == TokenType.OPEN_PAREN) {
+    if (identical(_currentToken.type, TokenType.OPEN_PAREN)) {
+      while (identical(_currentToken.type, TokenType.OPEN_PAREN)) {
         if (functionName != null) {
-          expression = new MethodInvocation(expression, period, functionName, parseArgumentList());
+          expression = new MethodInvocation.full(expression, period, functionName, parseArgumentList());
           period = null;
           functionName = null;
         } else if (expression == null) {
           return null;
         } else {
-          expression = new FunctionExpressionInvocation(expression, parseArgumentList());
+          expression = new FunctionExpressionInvocation.full(expression, parseArgumentList());
         }
       }
     } else if (functionName != null) {
-      expression = new PropertyAccess(expression, period, functionName);
+      expression = new PropertyAccess.full(expression, period, functionName);
       period = null;
     }
     bool progress = true;
     while (progress) {
       progress = false;
       Expression selector = parseAssignableSelector(expression, true);
       if (selector != expression) {
         expression = selector;
         progress = true;
-        while (_currentToken.type == TokenType.OPEN_PAREN) {
-          expression = new FunctionExpressionInvocation(expression, parseArgumentList());
+        while (identical(_currentToken.type, TokenType.OPEN_PAREN)) {
+          expression = new FunctionExpressionInvocation.full(expression, parseArgumentList());
         }
       }
     }
     if (_currentToken.type.isAssignmentOperator()) {
       Token operator = andAdvance;
       ensureAssignable(expression);
-      expression = new AssignmentExpression(expression, operator, parseExpression2());
+      expression = new AssignmentExpression.full(expression, operator, parseExpression2());
     }
     return expression;
   }
   /**
    * Parse a class declaration.
    * <pre>
    * classDeclaration ::=
    * metadata 'abstract'? 'class' name typeParameterList? (extendsClause withClause?)? implementsClause? '{' classMembers '}'
    * </pre>
    * @param commentAndMetadata the metadata to be associated with the member
@@ skipping 55 matching lines @@
     Token rightBracket = null;
     if (matches5(TokenType.OPEN_CURLY_BRACKET)) {
       leftBracket = expect2(TokenType.OPEN_CURLY_BRACKET);
       members = parseClassMembers(className);
       rightBracket = expect2(TokenType.CLOSE_CURLY_BRACKET);
     } else {
       leftBracket = createSyntheticToken(TokenType.OPEN_CURLY_BRACKET);
       rightBracket = createSyntheticToken(TokenType.CLOSE_CURLY_BRACKET);
       reportError3(ParserErrorCode.MISSING_CLASS_BODY, []);
     }
-    return new ClassDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, abstractKeyword, keyword, name, typeParameters, extendsClause, withClause, implementsClause, leftBracket, members, rightBracket);
+    return new ClassDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, abstractKeyword, keyword, name, typeParameters, extendsClause, withClause, implementsClause, leftBracket, members, rightBracket);
   }
   /**
    * Parse a class member.
    * <pre>
    * classMemberDefinition ::=
    * declaration ';'
    * | methodSignature functionBody
    * </pre>
    * @param className the name of the class containing the member being parsed
    * @return the class member that was parsed
@@ skipping 80 matching lines @@
     while (!matches5(TokenType.EOF) && !matches5(TokenType.CLOSE_CURLY_BRACKET) && !matches(Keyword.CLASS) && !matches(Keyword.TYPEDEF)) {
       if (matches5(TokenType.SEMICOLON)) {
         reportError4(ParserErrorCode.UNEXPECTED_TOKEN, _currentToken, [_currentToken.lexeme]);
         advance();
       } else {
         ClassMember member = parseClassMember(className);
         if (member != null) {
           members.add(member);
         }
       }
-      if (_currentToken == memberStart) {
+      if (identical(_currentToken, memberStart)) {
         reportError4(ParserErrorCode.UNEXPECTED_TOKEN, _currentToken, [_currentToken.lexeme]);
         advance();
       }
       memberStart = _currentToken;
     }
     return members;
   }
   /**
    * Parse a class type alias.
    * <pre>
@@ skipping 17 matching lines @@
     if (matches(Keyword.ABSTRACT)) {
       abstractKeyword = andAdvance;
     }
     TypeName superclass = parseTypeName();
     WithClause withClause = parseWithClause();
     ImplementsClause implementsClause = null;
     if (matches(Keyword.IMPLEMENTS)) {
       implementsClause = parseImplementsClause();
     }
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new ClassTypeAlias(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, name, typeParameters, equals, abstractKeyword, superclass, withClause, implementsClause, semicolon);
+    return new ClassTypeAlias.full(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, name, typeParameters, equals, abstractKeyword, superclass, withClause, implementsClause, semicolon);
   }
   /**
    * Parse a list of combinators in a directive.
    * <pre>
    * combinator ::=
    * 'show' identifier (',' identifier)
    * | 'hide' identifier (',' identifier)
    * </pre>
    * @return the combinators that were parsed
    */
   List<Combinator> parseCombinators() {
     List<Combinator> combinators = new List<Combinator>();
-    while (matches2(Parser._SHOW) || matches2(Parser._HIDE)) {
+    while (matches2(_SHOW) || matches2(_HIDE)) {
       Token keyword = expect2(TokenType.IDENTIFIER);
-      if (keyword.lexeme == Parser._SHOW) {
+      if (keyword.lexeme == _SHOW) {
         List<SimpleIdentifier> shownNames = parseIdentifierList();
-        combinators.add(new ShowCombinator(keyword, shownNames));
+        combinators.add(new ShowCombinator.full(keyword, shownNames));
       } else {
         List<SimpleIdentifier> hiddenNames = parseIdentifierList();
-        combinators.add(new HideCombinator(keyword, hiddenNames));
+        combinators.add(new HideCombinator.full(keyword, hiddenNames));
       }
     }
     return combinators;
   }
   /**
    * Parse the documentation comment and metadata preceeding a declaration. This method allows any
    * number of documentation comments to occur before, after or between the metadata, but only
    * returns the last (right-most) documentation comment that is found.
    * <pre>
    * metadata ::=
@@ skipping 23 matching lines @@
    * comment
    * @param sourceOffset the offset of the first character of the reference source
    * @return the comment reference that was parsed
    */
   CommentReference parseCommentReference(String referenceSource, int sourceOffset) {
     if (referenceSource.length == 0) {
       return null;
     }
     try {
       List<bool> errorFound = [false];
-      AnalysisErrorListener listener = new AnalysisErrorListener_1(errorFound);
+      AnalysisErrorListener listener = new AnalysisErrorListener_4(errorFound);
       StringScanner scanner = new StringScanner(null, referenceSource, listener);
       scanner.setSourceStart(1, 1, sourceOffset);
       Token firstToken = scanner.tokenize();
       if (!errorFound[0]) {
         Token newKeyword = null;
         if (matches3(firstToken, Keyword.NEW)) {
           newKeyword = firstToken;
           firstToken = firstToken.next;
         }
         if (matchesIdentifier2(firstToken)) {
           Token secondToken = firstToken.next;
           Token thirdToken = secondToken.next;
           Token nextToken;
           Identifier identifier;
           if (matches4(secondToken, TokenType.PERIOD) && matchesIdentifier2(thirdToken)) {
-            identifier = new PrefixedIdentifier(new SimpleIdentifier(firstToken), secondToken, new SimpleIdentifier(thirdToken));
+            identifier = new PrefixedIdentifier.full(new SimpleIdentifier.full(firstToken), secondToken, new SimpleIdentifier.full(thirdToken));
             nextToken = thirdToken.next;
           } else {
-            identifier = new SimpleIdentifier(firstToken);
+            identifier = new SimpleIdentifier.full(firstToken);
             nextToken = firstToken.next;
           }
           if (nextToken.type != TokenType.EOF) {
           }
-          return new CommentReference(newKeyword, identifier);
+          return new CommentReference.full(newKeyword, identifier);
         } else if (matches3(firstToken, Keyword.THIS) || matches3(firstToken, Keyword.NULL) || matches3(firstToken, Keyword.TRUE) || matches3(firstToken, Keyword.FALSE)) {
           return null;
         } else if (matches4(firstToken, TokenType.STRING)) {
         } else {
         }
       }
-    } on Exception catch (exception) {
+    } on JavaException catch (exception) {
     }
     return null;
   }
   /**
    * Parse all of the comment references occurring in the given array of documentation comments.
    * <pre>
    * commentReference ::=
    * '[' 'new'? qualified ']' libraryReference?
    * libraryReference ::=
    * '(' stringLiteral ')'
    * </pre>
    * @param tokens the comment tokens representing the documentation comments to be parsed
    * @return the comment references that were parsed
    */
   List<CommentReference> parseCommentReferences(List<Token> tokens) {
     List<CommentReference> references = new List<CommentReference>();
     for (Token token in tokens) {
       String comment = token.lexeme;
       int leftIndex = comment.indexOf('[');
       while (leftIndex >= 0) {
         int rightIndex = comment.indexOf(']', leftIndex);
         if (rightIndex >= 0) {
-          int firstChar = comment.charCodeAt(leftIndex + 1);
-          if (firstChar != 0x27 && firstChar != 0x22 && firstChar != 0x3a) {
+          int firstChar = comment.codeUnitAt(leftIndex + 1);
+          if (firstChar != 0x27 && firstChar != 0x22 && firstChar != 0x3A) {
             CommentReference reference = parseCommentReference(comment.substring(leftIndex + 1, rightIndex), token.offset + leftIndex + 1);
             if (reference != null) {
               references.add(reference);
             }
           }
         } else {
           rightIndex = leftIndex + 1;
         }
         leftIndex = comment.indexOf('[', rightIndex);
       }
@@ skipping 18 matching lines @@
    * </pre>
    * @return the compilation unit that was parsed
    */
   CompilationUnit parseCompilationUnit2() {
     Token firstToken = _currentToken.precedingComments;
     if (firstToken == null) {
       firstToken = _currentToken;
     }
     ScriptTag scriptTag = null;
     if (matches5(TokenType.SCRIPT_TAG)) {
-      scriptTag = new ScriptTag(andAdvance);
+      scriptTag = new ScriptTag.full(andAdvance);
     }
     bool libraryDirectiveFound = false;
     bool partOfDirectiveFound = false;
     bool partDirectiveFound = false;
     bool directiveFoundAfterDeclaration = false;
     List<Directive> directives = new List<Directive>();
     List<CompilationUnitMember> declarations = new List<CompilationUnitMember>();
     Token memberStart = _currentToken;
     while (!matches5(TokenType.EOF)) {
       CommentAndMetadata commentAndMetadata = parseCommentAndMetadata();
@@ skipping 38 matching lines @@
         directives.add(directive);
       } else if (matches5(TokenType.SEMICOLON)) {
         reportError4(ParserErrorCode.UNEXPECTED_TOKEN, _currentToken, [_currentToken.lexeme]);
         advance();
       } else {
         CompilationUnitMember member = parseCompilationUnitMember(commentAndMetadata);
         if (member != null) {
           declarations.add(member);
         }
       }
-      if (_currentToken == memberStart) {
+      if (identical(_currentToken, memberStart)) {
         reportError4(ParserErrorCode.UNEXPECTED_TOKEN, _currentToken, [_currentToken.lexeme]);
         advance();
       }
       memberStart = _currentToken;
     }
-    return new CompilationUnit(firstToken, scriptTag, directives, declarations, _currentToken);
+    return new CompilationUnit.full(firstToken, scriptTag, directives, declarations, _currentToken);
   }
   /**
    * Parse a compilation unit member.
    * <pre>
    * compilationUnitMember ::=
    * classDefinition
    * | functionTypeAlias
    * | external functionSignature
    * | external getterSignature
    * | external setterSignature
@@ skipping 20 matching lines @@
         return parseFunctionDeclaration(commentAndMetadata, modifiers.externalKeyword, null, false);
       } else if (matches(Keyword.OPERATOR) && peek().isOperator()) {
         return null;
       } else if (matchesIdentifier() && matchesAny(peek(), [TokenType.OPEN_PAREN, TokenType.OPEN_CURLY_BRACKET, TokenType.FUNCTION])) {
         validateModifiersForTopLevelFunction(modifiers);
         return parseFunctionDeclaration(commentAndMetadata, modifiers.externalKeyword, null, false);
       } else {
         if (matchesIdentifier()) {
           if (matchesAny(peek(), [TokenType.EQ, TokenType.COMMA, TokenType.SEMICOLON])) {
             reportError(ParserErrorCode.VOID_VARIABLE, returnType, []);
-            return new TopLevelVariableDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(validateModifiersForTopLevelVariable(modifiers), null), expect2(TokenType.SEMICOLON));
+            return new TopLevelVariableDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(validateModifiersForTopLevelVariable(modifiers), null), expect2(TokenType.SEMICOLON));
           }
         }
         return null;
       }
     } else if ((matches(Keyword.GET) || matches(Keyword.SET)) && matchesIdentifier2(peek())) {
       validateModifiersForTopLevelFunction(modifiers);
       return parseFunctionDeclaration(commentAndMetadata, modifiers.externalKeyword, null, false);
     } else if (matches(Keyword.OPERATOR) && peek().isOperator()) {
       return null;
     } else if (!matchesIdentifier()) {
       return null;
     } else if (matches4(peek(), TokenType.OPEN_PAREN)) {
       validateModifiersForTopLevelFunction(modifiers);
       return parseFunctionDeclaration(commentAndMetadata, modifiers.externalKeyword, null, false);
     } else if (matchesAny(peek(), [TokenType.EQ, TokenType.COMMA, TokenType.SEMICOLON])) {
-      return new TopLevelVariableDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(validateModifiersForTopLevelVariable(modifiers), null), expect2(TokenType.SEMICOLON));
+      return new TopLevelVariableDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(validateModifiersForTopLevelVariable(modifiers), null), expect2(TokenType.SEMICOLON));
     }
     TypeName returnType = parseReturnType();
     if (matches(Keyword.GET) || matches(Keyword.SET)) {
       validateModifiersForTopLevelFunction(modifiers);
       return parseFunctionDeclaration(commentAndMetadata, modifiers.externalKeyword, returnType, false);
     } else if (!matchesIdentifier()) {
       return null;
     }
     if (matchesAny(peek(), [TokenType.OPEN_PAREN, TokenType.FUNCTION, TokenType.OPEN_CURLY_BRACKET])) {
       validateModifiersForTopLevelFunction(modifiers);
       return parseFunctionDeclaration(commentAndMetadata, modifiers.externalKeyword, returnType, false);
     }
-    return new TopLevelVariableDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(validateModifiersForTopLevelVariable(modifiers), returnType), expect2(TokenType.SEMICOLON));
+    return new TopLevelVariableDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(validateModifiersForTopLevelVariable(modifiers), returnType), expect2(TokenType.SEMICOLON));
   }
   /**
    * Parse a conditional expression.
    * <pre>
    * conditionalExpression ::=
    * logicalOrExpression ('?' expressionWithoutCascade ':' expressionWithoutCascade)?
    * </pre>
    * @return the conditional expression that was parsed
    */
   Expression parseConditionalExpression() {
     Expression condition = parseLogicalOrExpression();
     if (!matches5(TokenType.QUESTION)) {
       return condition;
     }
     Token question = andAdvance;
     Expression thenExpression = parseExpressionWithoutCascade();
     Token colon = expect2(TokenType.COLON);
     Expression elseExpression = parseExpressionWithoutCascade();
-    return new ConditionalExpression(condition, question, thenExpression, colon, elseExpression);
+    return new ConditionalExpression.full(condition, question, thenExpression, colon, elseExpression);
   }
   /**
    * Parse a const expression.
    * <pre>
    * constExpression ::=
    * instanceCreationExpression
    * | listLiteral
    * | mapLiteral
    * </pre>
    * @return the const expression that was parsed
@@ skipping 32 matching lines @@
         } else {
           initializers.add(parseConstructorFieldInitializer());
         }
       } while (optional(TokenType.COMMA));
     }
     ConstructorName redirectedConstructor = null;
     FunctionBody body;
     if (matches5(TokenType.EQ)) {
       separator = andAdvance;
       redirectedConstructor = parseConstructorName();
-      body = new EmptyFunctionBody(expect2(TokenType.SEMICOLON));
+      body = new EmptyFunctionBody.full(expect2(TokenType.SEMICOLON));
     } else {
       body = parseFunctionBody(true, false);
       if (!bodyAllowed && body is! EmptyFunctionBody) {
         reportError3(ParserErrorCode.EXTERNAL_CONSTRUCTOR_WITH_BODY, []);
       }
     }
-    return new ConstructorDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, constKeyword, factoryKeyword, returnType, period, name, parameters, separator, initializers, redirectedConstructor, body);
+    return new ConstructorDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, constKeyword, factoryKeyword, returnType, period, name, parameters, separator, initializers, redirectedConstructor, body);
   }
   /**
    * Parse a field initializer within a constructor.
    * <pre>
    * fieldInitializer:
    * ('this' '.')? identifier '=' conditionalExpression cascadeSection
    * </pre>
    * @return the field initializer that was parsed
    */
   ConstructorFieldInitializer parseConstructorFieldInitializer() {
     Token keyword = null;
     Token period = null;
     if (matches(Keyword.THIS)) {
       keyword = andAdvance;
       period = expect2(TokenType.PERIOD);
     }
     SimpleIdentifier fieldName = parseSimpleIdentifier();
     Token equals = expect2(TokenType.EQ);
     Expression expression = parseConditionalExpression();
     TokenType tokenType = _currentToken.type;
-    if (tokenType == TokenType.PERIOD_PERIOD) {
+    if (identical(tokenType, TokenType.PERIOD_PERIOD)) {
       List<Expression> cascadeSections = new List<Expression>();
-      while (tokenType == TokenType.PERIOD_PERIOD) {
+      while (identical(tokenType, TokenType.PERIOD_PERIOD)) {
         Expression section = parseCascadeSection();
         if (section != null) {
           cascadeSections.add(section);
         }
         tokenType = _currentToken.type;
       }
-      expression = new CascadeExpression(expression, cascadeSections);
+      expression = new CascadeExpression.full(expression, cascadeSections);
     }
-    return new ConstructorFieldInitializer(keyword, period, fieldName, equals, expression);
+    return new ConstructorFieldInitializer.full(keyword, period, fieldName, equals, expression);
   }
   /**
    * Parse the name of a constructor.
    * <pre>
    * constructorName:
    * type ('.' identifier)?
    * </pre>
    * @return the constructor name that was parsed
    */
   ConstructorName parseConstructorName() {
     TypeName type = parseTypeName();
     Token period = null;
     SimpleIdentifier name = null;
     if (matches5(TokenType.PERIOD)) {
       period = andAdvance;
       name = parseSimpleIdentifier();
     }
-    return new ConstructorName(type, period, name);
+    return new ConstructorName.full(type, period, name);
   }
   /**
    * Parse a continue statement.
    * <pre>
    * continueStatement ::=
    * 'continue' identifier? ';'
    * </pre>
    * @return the continue statement that was parsed
    */
   Statement parseContinueStatement() {
     Token continueKeyword = expect(Keyword.CONTINUE);
     if (!_inLoop && !_inSwitch) {
       reportError4(ParserErrorCode.CONTINUE_OUTSIDE_OF_LOOP, continueKeyword, []);
     }
     SimpleIdentifier label = null;
     if (matchesIdentifier()) {
       label = parseSimpleIdentifier();
     }
     if (_inSwitch && !_inLoop && label == null) {
       reportError4(ParserErrorCode.CONTINUE_WITHOUT_LABEL_IN_CASE, continueKeyword, []);
     }
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new ContinueStatement(continueKeyword, label, semicolon);
+    return new ContinueStatement.full(continueKeyword, label, semicolon);
   }
   /**
    * Parse a directive.
    * <pre>
    * directive ::=
    * exportDirective
    * | libraryDirective
    * | importDirective
    * | partDirective
    * </pre>
@@ skipping 19 matching lines @@
    * documentationComment ::=
    * multiLineComment?
    * | singleLineComment
    * </pre>
    * @return the documentation comment that was parsed, or {@code null} if there was no comment
    */
   Comment parseDocumentationComment() {
     List<Token> commentTokens = new List<Token>();
     Token commentToken = _currentToken.precedingComments;
     while (commentToken != null) {
-      if (commentToken.type == TokenType.SINGLE_LINE_COMMENT) {
+      if (identical(commentToken.type, TokenType.SINGLE_LINE_COMMENT)) {
         if (commentToken.lexeme.startsWith("///")) {
           if (commentTokens.length == 1 && commentTokens[0].lexeme.startsWith("/**")) {
             commentTokens.clear();
           }
           commentTokens.add(commentToken);
         }
       } else {
         if (commentToken.lexeme.startsWith("/**")) {
           commentTokens.clear();
           commentTokens.add(commentToken);
@@ skipping 20 matching lines @@
     bool wasInLoop = _inLoop;
     _inLoop = true;
     try {
       Token doKeyword = expect(Keyword.DO);
       Statement body = parseStatement2();
       Token whileKeyword = expect(Keyword.WHILE);
       Token leftParenthesis = expect2(TokenType.OPEN_PAREN);
       Expression condition = parseExpression2();
       Token rightParenthesis = expect2(TokenType.CLOSE_PAREN);
       Token semicolon = expect2(TokenType.SEMICOLON);
-      return new DoStatement(doKeyword, body, whileKeyword, leftParenthesis, condition, rightParenthesis, semicolon);
+      return new DoStatement.full(doKeyword, body, whileKeyword, leftParenthesis, condition, rightParenthesis, semicolon);
     } finally {
       _inLoop = wasInLoop;
     }
   }
   /**
    * Parse an empty statement.
    * <pre>
    * emptyStatement ::=
    * ';'
    * </pre>
    * @return the empty statement that was parsed
    */
-  Statement parseEmptyStatement() => new EmptyStatement(andAdvance);
+  Statement parseEmptyStatement() => new EmptyStatement.full(andAdvance);
   /**
    * Parse an equality expression.
    * <pre>
    * equalityExpression ::=
    * relationalExpression (equalityOperator relationalExpression)?
    * | 'super' equalityOperator relationalExpression
    * </pre>
    * @return the equality expression that was parsed
    */
   Expression parseEqualityExpression() {
     Expression expression;
     if (matches(Keyword.SUPER) && _currentToken.next.type.isEqualityOperator()) {
-      expression = new SuperExpression(andAdvance);
+      expression = new SuperExpression.full(andAdvance);
     } else {
       expression = parseRelationalExpression();
     }
     while (_currentToken.type.isEqualityOperator()) {
       Token operator = andAdvance;
-      expression = new BinaryExpression(expression, operator, parseRelationalExpression());
+      expression = new BinaryExpression.full(expression, operator, parseRelationalExpression());
     }
     return expression;
   }
   /**
    * Parse an export directive.
    * <pre>
    * exportDirective ::=
    * metadata 'export' stringLiteral combinator*';'
    * </pre>
    * @param commentAndMetadata the metadata to be associated with the directive
    * @return the export directive that was parsed
    */
   ExportDirective parseExportDirective(CommentAndMetadata commentAndMetadata) {
     Token exportKeyword = expect(Keyword.EXPORT);
     StringLiteral libraryUri = parseStringLiteral();
     List<Combinator> combinators = parseCombinators();
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new ExportDirective(commentAndMetadata.comment, commentAndMetadata.metadata, exportKeyword, libraryUri, combinators, semicolon);
+    return new ExportDirective.full(commentAndMetadata.comment, commentAndMetadata.metadata, exportKeyword, libraryUri, combinators, semicolon);
   }
   /**
    * Parse an expression that does not contain any cascades.
    * <pre>
    * expression ::=
    * assignableExpression assignmentOperator expression
    * | conditionalExpression cascadeSection
    * | throwExpression
    * </pre>
    * @return the expression that was parsed
    */
   Expression parseExpression2() {
     if (matches(Keyword.THROW)) {
       return parseThrowExpression();
     }
     Expression expression = parseConditionalExpression();
     TokenType tokenType = _currentToken.type;
-    if (tokenType == TokenType.PERIOD_PERIOD) {
+    if (identical(tokenType, TokenType.PERIOD_PERIOD)) {
       List<Expression> cascadeSections = new List<Expression>();
-      while (tokenType == TokenType.PERIOD_PERIOD) {
+      while (identical(tokenType, TokenType.PERIOD_PERIOD)) {
         Expression section = parseCascadeSection();
         if (section != null) {
           cascadeSections.add(section);
         }
         tokenType = _currentToken.type;
       }
-      return new CascadeExpression(expression, cascadeSections);
+      return new CascadeExpression.full(expression, cascadeSections);
     } else if (tokenType.isAssignmentOperator()) {
       Token operator = andAdvance;
       ensureAssignable(expression);
-      return new AssignmentExpression(expression, operator, parseExpression2());
+      return new AssignmentExpression.full(expression, operator, parseExpression2());
     }
     return expression;
   }
   /**
    * Parse a list of expressions.
    * <pre>
    * expressionList ::=
    * expression (',' expression)
    * </pre>
    * @return the expression that was parsed
@@ skipping 17 matching lines @@
    * @return the expression that was parsed
    */
   Expression parseExpressionWithoutCascade() {
     if (matches(Keyword.THROW)) {
       return parseThrowExpressionWithoutCascade();
     }
     Expression expression = parseConditionalExpression();
     if (_currentToken.type.isAssignmentOperator()) {
       Token operator = andAdvance;
       ensureAssignable(expression);
-      expression = new AssignmentExpression(expression, operator, parseExpressionWithoutCascade());
+      expression = new AssignmentExpression.full(expression, operator, parseExpressionWithoutCascade());
     }
     return expression;
   }
   /**
    * Parse a class extends clause.
    * <pre>
    * classExtendsClause ::=
    * 'extends' type
    * </pre>
    * @return the class extends clause that was parsed
    */
   ExtendsClause parseExtendsClause() {
     Token keyword = expect(Keyword.EXTENDS);
     TypeName superclass = parseTypeName();
-    return new ExtendsClause(keyword, superclass);
+    return new ExtendsClause.full(keyword, superclass);
   }
   /**
    * Parse the 'final', 'const', 'var' or type preceding a variable declaration.
    * <pre>
    * finalConstVarOrType ::=
    * | 'final' type?
    * | 'const' type?
    * | 'var'
    * | type
    * </pre>
@@ skipping 29 matching lines @@
    * </pre>
    * @param kind the kind of parameter being expected based on the presence or absence of group
    * delimiters
    * @return the formal parameter that was parsed
    */
   FormalParameter parseFormalParameter(ParameterKind kind) {
     NormalFormalParameter parameter = parseNormalFormalParameter();
     if (matches5(TokenType.EQ)) {
       Token seperator = andAdvance;
       Expression defaultValue = parseExpression2();
-      if (kind == ParameterKind.NAMED) {
+      if (identical(kind, ParameterKind.NAMED)) {
         reportError4(ParserErrorCode.WRONG_SEPARATOR_FOR_NAMED_PARAMETER, seperator, []);
-      } else if (kind == ParameterKind.REQUIRED) {
+      } else if (identical(kind, ParameterKind.REQUIRED)) {
         reportError(ParserErrorCode.POSITIONAL_PARAMETER_OUTSIDE_GROUP, parameter, []);
       }
-      return new DefaultFormalParameter(parameter, kind, seperator, defaultValue);
+      return new DefaultFormalParameter.full(parameter, kind, seperator, defaultValue);
     } else if (matches5(TokenType.COLON)) {
       Token seperator = andAdvance;
       Expression defaultValue = parseExpression2();
-      if (kind == ParameterKind.POSITIONAL) {
+      if (identical(kind, ParameterKind.POSITIONAL)) {
         reportError4(ParserErrorCode.WRONG_SEPARATOR_FOR_POSITIONAL_PARAMETER, seperator, []);
-      } else if (kind == ParameterKind.REQUIRED) {
+      } else if (identical(kind, ParameterKind.REQUIRED)) {
         reportError(ParserErrorCode.NAMED_PARAMETER_OUTSIDE_GROUP, parameter, []);
       }
-      return new DefaultFormalParameter(parameter, kind, seperator, defaultValue);
+      return new DefaultFormalParameter.full(parameter, kind, seperator, defaultValue);
     } else if (kind != ParameterKind.REQUIRED) {
-      return new DefaultFormalParameter(parameter, kind, null, null);
+      return new DefaultFormalParameter.full(parameter, kind, null, null);
     }
     return parameter;
   }
   /**
    * Parse a list of formal parameters.
    * <pre>
    * formalParameterList ::=
    * '(' ')'
    * | '(' normalFormalParameters (',' optionalFormalParameters)? ')'
    * | '(' optionalFormalParameters ')'
    * normalFormalParameters ::=
    * normalFormalParameter (',' normalFormalParameter)
    * optionalFormalParameters ::=
    * optionalPositionalFormalParameters
    * | namedFormalParameters
    * optionalPositionalFormalParameters ::=
    * '[' defaultFormalParameter (',' defaultFormalParameter)* ']'
    * namedFormalParameters ::=
    * '{' defaultNamedParameter (',' defaultNamedParameter)* '}'
    * </pre>
    * @return the formal parameters that were parsed
    */
   FormalParameterList parseFormalParameterList() {
     Token leftParenthesis = expect2(TokenType.OPEN_PAREN);
     if (matches5(TokenType.CLOSE_PAREN)) {
-      return new FormalParameterList(leftParenthesis, null, null, null, andAdvance);
+      return new FormalParameterList.full(leftParenthesis, null, null, null, andAdvance);
     }
     List<FormalParameter> parameters = new List<FormalParameter>();
     List<FormalParameter> normalParameters = new List<FormalParameter>();
     List<FormalParameter> positionalParameters = new List<FormalParameter>();
     List<FormalParameter> namedParameters = new List<FormalParameter>();
     List<FormalParameter> currentParameters = normalParameters;
     Token leftSquareBracket = null;
     Token rightSquareBracket = null;
     Token leftCurlyBracket = null;
     Token rightCurlyBracket = null;
     ParameterKind kind = ParameterKind.REQUIRED;
     bool firstParameter = true;
     bool reportedMuliplePositionalGroups = false;
     bool reportedMulipleNamedGroups = false;
     bool reportedMixedGroups = false;
     Token initialToken = null;
     do {
       if (firstParameter) {
         firstParameter = false;
       } else if (!optional(TokenType.COMMA)) {
-        if ((leftParenthesis as BeginToken).endToken != null) {
+        if (((leftParenthesis as BeginToken)).endToken != null) {
           reportError3(ParserErrorCode.EXPECTED_TOKEN, [TokenType.COMMA.lexeme]);
         } else {
           break;
         }
       }
       initialToken = _currentToken;
       if (matches5(TokenType.OPEN_SQUARE_BRACKET)) {
         if (leftSquareBracket != null && !reportedMuliplePositionalGroups) {
           reportError3(ParserErrorCode.MULTIPLE_POSITIONAL_PARAMETER_GROUPS, []);
           reportedMuliplePositionalGroups = true;
@@ skipping 39 matching lines @@
     if (leftSquareBracket != null && rightSquareBracket == null) {
     }
     if (leftCurlyBracket != null && rightCurlyBracket == null) {
     }
     if (leftSquareBracket == null) {
       leftSquareBracket = leftCurlyBracket;
     }
     if (rightSquareBracket == null) {
       rightSquareBracket = rightCurlyBracket;
     }
-    return new FormalParameterList(leftParenthesis, parameters, leftSquareBracket, rightSquareBracket, rightParenthesis);
+    return new FormalParameterList.full(leftParenthesis, parameters, leftSquareBracket, rightSquareBracket, rightParenthesis);
   }
   /**
    * Parse a for statement.
    * <pre>
    * forStatement ::=
    * 'for' '(' forLoopParts ')' statement
    * forLoopParts ::=
    * forInitializerStatement expression? ';' expressionList?
    * | declaredIdentifier 'in' expression
    * | identifier 'in' expression
    * forInitializerStatement ::=
    * variableDeclarationList ';'
    * | expression? ';'
    * </pre>
    * @return the for statement that was parsed
    */
   Statement parseForStatement() {
     bool wasInLoop = _inLoop;
     _inLoop = true;
     try {
       Token forKeyword = expect(Keyword.FOR);
       Token leftParenthesis = expect2(TokenType.OPEN_PAREN);
       VariableDeclarationList variableList = null;
       Expression initialization = null;
       if (!matches5(TokenType.SEMICOLON)) {
         if (matchesIdentifier() && matches3(peek(), Keyword.IN)) {
           List<VariableDeclaration> variables = new List<VariableDeclaration>();
           SimpleIdentifier variableName = parseSimpleIdentifier();
-          variables.add(new VariableDeclaration(null, null, variableName, null, null));
-          variableList = new VariableDeclarationList(null, null, variables);
+          variables.add(new VariableDeclaration.full(null, null, variableName, null, null));
+          variableList = new VariableDeclarationList.full(null, null, variables);
         } else if (isInitializedVariableDeclaration()) {
           variableList = parseVariableDeclarationList();
         } else {
           initialization = parseExpression2();
         }
         if (matches(Keyword.IN)) {
           SimpleFormalParameter loopParameter = null;
           if (variableList == null) {
             reportError3(ParserErrorCode.MISSING_VARIABLE_IN_FOR_EACH, []);
           } else {
-            NodeList<VariableDeclaration> variables5 = variableList.variables;
-            if (variables5.length > 1) {
-              reportError3(ParserErrorCode.MULTIPLE_VARIABLES_IN_FOR_EACH, [variables5.length.toString()]);
+            NodeList<VariableDeclaration> variables3 = variableList.variables;
+            if (variables3.length > 1) {
+              reportError3(ParserErrorCode.MULTIPLE_VARIABLES_IN_FOR_EACH, [variables3.length.toString()]);
             }
-            VariableDeclaration variable = variables5[0];
+            VariableDeclaration variable = variables3[0];
             if (variable.initializer != null) {
               reportError3(ParserErrorCode.INITIALIZED_VARIABLE_IN_FOR_EACH, []);
             }
-            loopParameter = new SimpleFormalParameter(null, null, variableList.keyword, variableList.type, variable.name);
+            loopParameter = new SimpleFormalParameter.full(null, null, variableList.keyword, variableList.type, variable.name);
           }
           Token inKeyword = expect(Keyword.IN);
           Expression iterator = parseExpression2();
           Token rightParenthesis = expect2(TokenType.CLOSE_PAREN);
           Statement body = parseStatement2();
-          return new ForEachStatement(forKeyword, leftParenthesis, loopParameter, inKeyword, iterator, rightParenthesis, body);
+          return new ForEachStatement.full(forKeyword, leftParenthesis, loopParameter, inKeyword, iterator, rightParenthesis, body);
         }
       }
       Token leftSeparator = expect2(TokenType.SEMICOLON);
       Expression condition = null;
       if (!matches5(TokenType.SEMICOLON)) {
         condition = parseExpression2();
       }
       Token rightSeparator = expect2(TokenType.SEMICOLON);
       List<Expression> updaters = null;
       if (!matches5(TokenType.CLOSE_PAREN)) {
         updaters = parseExpressionList();
       }
       Token rightParenthesis = expect2(TokenType.CLOSE_PAREN);
       Statement body = parseStatement2();
-      return new ForStatement(forKeyword, leftParenthesis, variableList, initialization, leftSeparator, condition, rightSeparator, updaters, rightParenthesis, body);
+      return new ForStatement.full(forKeyword, leftParenthesis, variableList, initialization, leftSeparator, condition, rightSeparator, updaters, rightParenthesis, body);
     } finally {
       _inLoop = wasInLoop;
     }
   }
   /**
    * Parse a function body.
    * <pre>
    * functionBody ::=
    * '=>' expression ';'
    * | block
    * functionExpressionBody ::=
    * '=>' expression
    * | block
    * </pre>
    * @param mayBeEmpty {@code true} if the function body is allowed to be empty
    * @param inExpression {@code true} if the function body is being parsed as part of an expression
    * and therefore does not have a terminating semicolon
    * @return the function body that was parsed
    */
   FunctionBody parseFunctionBody(bool mayBeEmpty, bool inExpression) {
     bool wasInLoop = _inLoop;
     bool wasInSwitch = _inSwitch;
     _inLoop = false;
     _inSwitch = false;
     try {
       if (matches5(TokenType.SEMICOLON)) {
         if (!mayBeEmpty) {
           reportError3(ParserErrorCode.MISSING_FUNCTION_BODY, []);
         }
-        return new EmptyFunctionBody(andAdvance);
+        return new EmptyFunctionBody.full(andAdvance);
       } else if (matches5(TokenType.FUNCTION)) {
         Token functionDefinition = andAdvance;
         Expression expression = parseExpression2();
         Token semicolon = null;
         if (!inExpression) {
           semicolon = expect2(TokenType.SEMICOLON);
         }
-        return new ExpressionFunctionBody(functionDefinition, expression, semicolon);
+        return new ExpressionFunctionBody.full(functionDefinition, expression, semicolon);
       } else if (matches5(TokenType.OPEN_CURLY_BRACKET)) {
-        return new BlockFunctionBody(parseBlock());
+        return new BlockFunctionBody.full(parseBlock());
       } else if (matches2("native")) {
         advance();
         parseStringLiteral();
-        return new EmptyFunctionBody(andAdvance);
+        return new EmptyFunctionBody.full(andAdvance);
       } else {
         reportError3(ParserErrorCode.MISSING_FUNCTION_BODY, []);
-        return new EmptyFunctionBody(createSyntheticToken(TokenType.SEMICOLON));
+        return new EmptyFunctionBody.full(createSyntheticToken(TokenType.SEMICOLON));
       }
     } finally {
       _inLoop = wasInLoop;
       _inSwitch = wasInSwitch;
     }
   }
   /**
    * Parse a function declaration.
    * <pre>
    * functionDeclaration ::=
@@ skipping 30 matching lines @@
       parseFormalParameterList();
     }
     FunctionBody body = null;
     if (externalKeyword == null) {
       body = parseFunctionBody(false, false);
     }
     if (!isStatement && matches5(TokenType.SEMICOLON)) {
       reportError3(ParserErrorCode.UNEXPECTED_TOKEN, [_currentToken.lexeme]);
       advance();
     }
-    return new FunctionDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, returnType, keyword, name, new FunctionExpression(parameters, body));
+    return new FunctionDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, returnType, keyword, name, new FunctionExpression.full(parameters, body));
   }
   /**
    * Parse a function declaration statement.
    * <pre>
    * functionDeclarationStatement ::=
    * functionSignature functionBody
    * </pre>
    * @return the function declaration statement that was parsed
    */
   Statement parseFunctionDeclarationStatement() => parseFunctionDeclarationStatement2(parseCommentAndMetadata(), parseOptionalReturnType());
   /**
    * Parse a function declaration statement.
    * <pre>
    * functionDeclarationStatement ::=
    * functionSignature functionBody
    * </pre>
    * @param commentAndMetadata the documentation comment and metadata to be associated with the
    * declaration
    * @param returnType the return type, or {@code null} if there is no return type
    * @return the function declaration statement that was parsed
    */
-  Statement parseFunctionDeclarationStatement2(CommentAndMetadata commentAndMetadata, TypeName returnType) => new FunctionDeclarationStatement(parseFunctionDeclaration(commentAndMetadata, null, returnType, true));
+  Statement parseFunctionDeclarationStatement2(CommentAndMetadata commentAndMetadata, TypeName returnType) => new FunctionDeclarationStatement.full(parseFunctionDeclaration(commentAndMetadata, null, returnType, true));
   /**
    * Parse a function expression.
    * <pre>
    * functionExpression ::=
    * (returnType? identifier)? formalParameterList functionExpressionBody
    * </pre>
    * @return the function expression that was parsed
    */
   FunctionExpression parseFunctionExpression() {
     FormalParameterList parameters = parseFormalParameterList();
     validateFormalParameterList(parameters);
     FunctionBody body = parseFunctionBody(false, true);
-    return new FunctionExpression(parameters, body);
+    return new FunctionExpression.full(parameters, body);
   }
   /**
    * Parse a function type alias.
    * <pre>
    * functionTypeAlias ::=
    * functionPrefix typeParameterList? formalParameterList ';'
    * functionPrefix ::=
    * returnType? name
    * </pre>
    * @param commentAndMetadata the metadata to be associated with the member
    * @param keyword the token representing the 'typedef' keyword
    * @return the function type alias that was parsed
    */
   FunctionTypeAlias parseFunctionTypeAlias(CommentAndMetadata commentAndMetadata, Token keyword) {
     TypeName returnType = null;
     if (hasReturnTypeInTypeAlias()) {
       returnType = parseReturnType();
     }
     SimpleIdentifier name = parseSimpleIdentifier2(ParserErrorCode.BUILT_IN_IDENTIFIER_AS_TYPEDEF_NAME);
     TypeParameterList typeParameters = null;
     if (matches5(TokenType.LT)) {
       typeParameters = parseTypeParameterList();
     }
     if (matches5(TokenType.SEMICOLON)) {
       reportError3(ParserErrorCode.MISSING_TYPEDEF_PARAMETERS, []);
-      FormalParameterList parameters = new FormalParameterList(createSyntheticToken(TokenType.OPEN_PAREN), null, null, null, createSyntheticToken(TokenType.CLOSE_PAREN));
+      FormalParameterList parameters = new FormalParameterList.full(createSyntheticToken(TokenType.OPEN_PAREN), null, null, null, createSyntheticToken(TokenType.CLOSE_PAREN));
       Token semicolon = expect2(TokenType.SEMICOLON);
-      return new FunctionTypeAlias(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, returnType, name, typeParameters, parameters, semicolon);
+      return new FunctionTypeAlias.full(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, returnType, name, typeParameters, parameters, semicolon);
     } else if (!matches5(TokenType.OPEN_PAREN)) {
       return null;
     }
     FormalParameterList parameters = parseFormalParameterList();
     validateFormalParameterList(parameters);
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new FunctionTypeAlias(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, returnType, name, typeParameters, parameters, semicolon);
+    return new FunctionTypeAlias.full(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, returnType, name, typeParameters, parameters, semicolon);
   }
   /**
    * Parse a getter.
    * <pre>
    * getter ::=
    * getterSignature functionBody?
    * getterSignature ::=
    * 'external'? 'static'? returnType? 'get' identifier
    * </pre>
    * @param commentAndMetadata the documentation comment and metadata to be associated with the
    * declaration
    * @param externalKeyword the 'external' token
    * @param staticKeyword the static keyword, or {@code null} if the getter is not static
    * @param the return type that has already been parsed, or {@code null} if there was no return
    * type
    * @return the getter that was parsed
    */
   MethodDeclaration parseGetter(CommentAndMetadata commentAndMetadata, Token externalKeyword, Token staticKeyword, TypeName returnType) {
     Token propertyKeyword = expect(Keyword.GET);
     SimpleIdentifier name = parseSimpleIdentifier();
     if (matches5(TokenType.OPEN_PAREN) && matches4(peek(), TokenType.CLOSE_PAREN)) {
       reportError3(ParserErrorCode.GETTER_WITH_PARAMETERS, []);
       advance();
       advance();
     }
     FunctionBody body = parseFunctionBody(true, false);
     if (externalKeyword != null && body is! EmptyFunctionBody) {
       reportError3(ParserErrorCode.EXTERNAL_GETTER_WITH_BODY, []);
     }
-    return new MethodDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, staticKeyword, returnType, propertyKeyword, null, name, null, body);
+    return new MethodDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, staticKeyword, returnType, propertyKeyword, null, name, null, body);
   }
   /**
    * Parse a list of identifiers.
    * <pre>
    * identifierList ::=
    * identifier (',' identifier)
    * </pre>
    * @return the list of identifiers that were parsed
    */
   List<SimpleIdentifier> parseIdentifierList() {
@@ skipping 18 matching lines @@
     Token leftParenthesis = expect2(TokenType.OPEN_PAREN);
     Expression condition = parseExpression2();
     Token rightParenthesis = expect2(TokenType.CLOSE_PAREN);
     Statement thenStatement = parseStatement2();
     Token elseKeyword = null;
     Statement elseStatement = null;
     if (matches(Keyword.ELSE)) {
       elseKeyword = andAdvance;
       elseStatement = parseStatement2();
     }
-    return new IfStatement(ifKeyword, leftParenthesis, condition, rightParenthesis, thenStatement, elseKeyword, elseStatement);
+    return new IfStatement.full(ifKeyword, leftParenthesis, condition, rightParenthesis, thenStatement, elseKeyword, elseStatement);
   }
   /**
    * Parse an implements clause.
    * <pre>
    * implementsClause ::=
    * 'implements' type (',' type)
    * </pre>
    * @return the implements clause that was parsed
    */
   ImplementsClause parseImplementsClause() {
     Token keyword = expect(Keyword.IMPLEMENTS);
     List<TypeName> interfaces = new List<TypeName>();
     interfaces.add(parseTypeName());
     while (optional(TokenType.COMMA)) {
       interfaces.add(parseTypeName());
     }
-    return new ImplementsClause(keyword, interfaces);
+    return new ImplementsClause.full(keyword, interfaces);
   }
   /**
    * Parse an import directive.
    * <pre>
    * importDirective ::=
    * metadata 'import' stringLiteral ('as' identifier)? combinator*';'
    * </pre>
    * @param commentAndMetadata the metadata to be associated with the directive
    * @return the import directive that was parsed
    */
   ImportDirective parseImportDirective(CommentAndMetadata commentAndMetadata) {
     Token importKeyword = expect(Keyword.IMPORT);
     StringLiteral libraryUri = parseStringLiteral();
     Token asToken = null;
     SimpleIdentifier prefix = null;
     if (matches(Keyword.AS)) {
       asToken = andAdvance;
       prefix = parseSimpleIdentifier();
     }
     List<Combinator> combinators = parseCombinators();
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new ImportDirective(commentAndMetadata.comment, commentAndMetadata.metadata, importKeyword, libraryUri, asToken, prefix, combinators, semicolon);
+    return new ImportDirective.full(commentAndMetadata.comment, commentAndMetadata.metadata, importKeyword, libraryUri, asToken, prefix, combinators, semicolon);
   }
   /**
    * Parse a list of initialized identifiers.
    * <pre>
    * ?? ::=
    * 'static'? ('var' | type) initializedIdentifierList ';'
    * | 'final' type? initializedIdentifierList ';'
    * initializedIdentifierList ::=
    * initializedIdentifier (',' initializedIdentifier)
    * initializedIdentifier ::=
    * identifier ('=' expression)?
    * </pre>
    * @param commentAndMetadata the documentation comment and metadata to be associated with the
    * declaration
    * @param staticKeyword the static keyword, or {@code null} if the getter is not static
    * @param keyword the token representing the 'final', 'const' or 'var' keyword, or {@code null} if
    * there is no keyword
    * @param type the type that has already been parsed, or {@code null} if 'var' was provided
    * @return the getter that was parsed
    */
   FieldDeclaration parseInitializedIdentifierList(CommentAndMetadata commentAndMetadata, Token staticKeyword, Token keyword, TypeName type) {
     VariableDeclarationList fieldList = parseVariableDeclarationList2(keyword, type);
-    return new FieldDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, staticKeyword, fieldList, expect2(TokenType.SEMICOLON));
+    return new FieldDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, staticKeyword, fieldList, expect2(TokenType.SEMICOLON));
   }
   /**
    * Parse an instance creation expression.
    * <pre>
    * instanceCreationExpression ::=
    * ('new' | 'const') type ('.' identifier)? argumentList
    * </pre>
    * @param keyword the 'new' or 'const' keyword that introduces the expression
    * @return the instance creation expression that was parsed
    */
   InstanceCreationExpression parseInstanceCreationExpression(Token keyword) {
     ConstructorName constructorName = parseConstructorName();
     ArgumentList argumentList = parseArgumentList();
-    return new InstanceCreationExpression(keyword, constructorName, argumentList);
+    return new InstanceCreationExpression.full(keyword, constructorName, argumentList);
   }
   /**
    * Parse a library directive.
    * <pre>
    * libraryDirective ::=
    * metadata 'library' identifier ';'
    * </pre>
    * @param commentAndMetadata the metadata to be associated with the directive
    * @return the library directive that was parsed
    */
   LibraryDirective parseLibraryDirective(CommentAndMetadata commentAndMetadata) {
     Token keyword = expect(Keyword.LIBRARY);
     LibraryIdentifier libraryName = parseLibraryName(ParserErrorCode.MISSING_NAME_IN_LIBRARY_DIRECTIVE, keyword);
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new LibraryDirective(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, libraryName, semicolon);
+    return new LibraryDirective.full(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, libraryName, semicolon);
   }
   /**
    * Parse a library identifier.
    * <pre>
    * libraryIdentifier ::=
    * identifier ('.' identifier)
    * </pre>
    * @return the library identifier that was parsed
    */
   LibraryIdentifier parseLibraryIdentifier() {
     List<SimpleIdentifier> components = new List<SimpleIdentifier>();
     components.add(parseSimpleIdentifier());
     while (matches5(TokenType.PERIOD)) {
       advance();
       components.add(parseSimpleIdentifier());
     }
-    return new LibraryIdentifier(components);
+    return new LibraryIdentifier.full(components);
   }
   /**
    * Parse a library name.
    * <pre>
    * libraryName ::=
    * libraryIdentifier
    * </pre>
    * @param missingNameError the error code to be used if the library name is missing
    * @param missingNameToken the token associated with the error produced if the library name is
    * missing
    * @return the library name that was parsed
    */
   LibraryIdentifier parseLibraryName(ParserErrorCode missingNameError, Token missingNameToken) {
     if (matchesIdentifier()) {
       return parseLibraryIdentifier();
     } else if (matches5(TokenType.STRING)) {
       StringLiteral string = parseStringLiteral();
       reportError(ParserErrorCode.NON_IDENTIFIER_LIBRARY_NAME, string, []);
     } else {
       reportError4(missingNameError, missingNameToken, []);
     }
     List<SimpleIdentifier> components = new List<SimpleIdentifier>();
     components.add(createSyntheticIdentifier());
-    return new LibraryIdentifier(components);
+    return new LibraryIdentifier.full(components);
   }
   /**
    * Parse a list literal.
    * <pre>
    * listLiteral ::=
    * 'const'? typeArguments? '[' (expressionList ','?)? ']'
    * </pre>
    * @param modifier the 'const' modifier appearing before the literal, or {@code null} if there is
    * no modifier
    * @param typeArguments the type arguments appearing before the literal, or {@code null} if there
    * are no type arguments
    * @return the list literal that was parsed
    */
   ListLiteral parseListLiteral(Token modifier, TypeArgumentList typeArguments) {
     if (matches5(TokenType.INDEX)) {
       BeginToken leftBracket = new BeginToken(TokenType.OPEN_SQUARE_BRACKET, _currentToken.offset);
       Token rightBracket = new Token(TokenType.CLOSE_SQUARE_BRACKET, _currentToken.offset + 1);
-      leftBracket.endToken2 = rightBracket;
+      leftBracket.endToken = rightBracket;
       rightBracket.setNext(_currentToken.next);
       leftBracket.setNext(rightBracket);
       _currentToken.previous.setNext(leftBracket);
       _currentToken = _currentToken.next;
-      return new ListLiteral(modifier, typeArguments, leftBracket, null, rightBracket);
+      return new ListLiteral.full(modifier, typeArguments, leftBracket, null, rightBracket);
     }
     Token leftBracket = expect2(TokenType.OPEN_SQUARE_BRACKET);
     if (matches5(TokenType.CLOSE_SQUARE_BRACKET)) {
-      return new ListLiteral(modifier, typeArguments, leftBracket, null, andAdvance);
+      return new ListLiteral.full(modifier, typeArguments, leftBracket, null, andAdvance);
     }
     List<Expression> elements = new List<Expression>();
     elements.add(parseExpression2());
     while (optional(TokenType.COMMA)) {
       if (matches5(TokenType.CLOSE_SQUARE_BRACKET)) {
-        return new ListLiteral(modifier, typeArguments, leftBracket, elements, andAdvance);
+        return new ListLiteral.full(modifier, typeArguments, leftBracket, elements, andAdvance);
       }
       elements.add(parseExpression2());
     }
     Token rightBracket = expect2(TokenType.CLOSE_SQUARE_BRACKET);
-    return new ListLiteral(modifier, typeArguments, leftBracket, elements, rightBracket);
+    return new ListLiteral.full(modifier, typeArguments, leftBracket, elements, rightBracket);
   }
   /**
    * Parse a list or map literal.
    * <pre>
    * listOrMapLiteral ::=
    * listLiteral
    * | mapLiteral
    * </pre>
    * @param modifier the 'const' modifier appearing before the literal, or {@code null} if there is
    * no modifier
    * @return the list or map literal that was parsed
    */
   TypedLiteral parseListOrMapLiteral(Token modifier) {
     TypeArgumentList typeArguments = null;
     if (matches5(TokenType.LT)) {
       typeArguments = parseTypeArgumentList();
     }
     if (matches5(TokenType.OPEN_CURLY_BRACKET)) {
       return parseMapLiteral(modifier, typeArguments);
     } else if (matches5(TokenType.OPEN_SQUARE_BRACKET) || matches5(TokenType.INDEX)) {
       return parseListLiteral(modifier, typeArguments);
     }
     reportError3(ParserErrorCode.EXPECTED_LIST_OR_MAP_LITERAL, []);
-    return new ListLiteral(modifier, typeArguments, createSyntheticToken(TokenType.OPEN_SQUARE_BRACKET), null, createSyntheticToken(TokenType.CLOSE_SQUARE_BRACKET));
+    return new ListLiteral.full(modifier, typeArguments, createSyntheticToken(TokenType.OPEN_SQUARE_BRACKET), null, createSyntheticToken(TokenType.CLOSE_SQUARE_BRACKET));
   }
   /**
    * Parse a logical and expression.
    * <pre>
    * logicalAndExpression ::=
    * bitwiseOrExpression ('&&' bitwiseOrExpression)
    * </pre>
    * @return the logical and expression that was parsed
    */
   Expression parseLogicalAndExpression() {
     Expression expression = parseBitwiseOrExpression();
     while (matches5(TokenType.AMPERSAND_AMPERSAND)) {
       Token operator = andAdvance;
-      expression = new BinaryExpression(expression, operator, parseBitwiseOrExpression());
+      expression = new BinaryExpression.full(expression, operator, parseBitwiseOrExpression());
     }
     return expression;
   }
   /**
    * Parse a logical or expression.
    * <pre>
    * logicalOrExpression ::=
    * logicalAndExpression ('||' logicalAndExpression)
    * </pre>
    * @return the logical or expression that was parsed
    */
   Expression parseLogicalOrExpression() {
     Expression expression = parseLogicalAndExpression();
     while (matches5(TokenType.BAR_BAR)) {
       Token operator = andAdvance;
-      expression = new BinaryExpression(expression, operator, parseLogicalAndExpression());
+      expression = new BinaryExpression.full(expression, operator, parseLogicalAndExpression());
     }
     return expression;
   }
   /**
    * Parse a map literal.
    * <pre>
    * mapLiteral ::=
    * 'const'? typeArguments? '{' (mapLiteralEntry (',' mapLiteralEntry)* ','?)? '}'
    * </pre>
    * @param modifier the 'const' modifier appearing before the literal, or {@code null} if there is
    * no modifier
    * @param typeArguments the type arguments that were declared, or {@code null} if there are no
    * type arguments
    * @return the map literal that was parsed
    */
   MapLiteral parseMapLiteral(Token modifier, TypeArgumentList typeArguments) {
     Token leftBracket = expect2(TokenType.OPEN_CURLY_BRACKET);
     List<MapLiteralEntry> entries = new List<MapLiteralEntry>();
     if (matches5(TokenType.CLOSE_CURLY_BRACKET)) {
-      return new MapLiteral(modifier, typeArguments, leftBracket, entries, andAdvance);
+      return new MapLiteral.full(modifier, typeArguments, leftBracket, entries, andAdvance);
     }
     entries.add(parseMapLiteralEntry());
     while (optional(TokenType.COMMA)) {
       if (matches5(TokenType.CLOSE_CURLY_BRACKET)) {
-        return new MapLiteral(modifier, typeArguments, leftBracket, entries, andAdvance);
+        return new MapLiteral.full(modifier, typeArguments, leftBracket, entries, andAdvance);
       }
       entries.add(parseMapLiteralEntry());
     }
     Token rightBracket = expect2(TokenType.CLOSE_CURLY_BRACKET);
-    return new MapLiteral(modifier, typeArguments, leftBracket, entries, rightBracket);
+    return new MapLiteral.full(modifier, typeArguments, leftBracket, entries, rightBracket);
   }
   /**
    * Parse a map literal entry.
    * <pre>
    * mapLiteralEntry ::=
    * stringLiteral ':' expression
    * </pre>
    * @return the map literal entry that was parsed
    */
   MapLiteralEntry parseMapLiteralEntry() {
     StringLiteral key = parseStringLiteral();
     Token separator = expect2(TokenType.COLON);
     Expression value = parseExpression2();
-    return new MapLiteralEntry(key, separator, value);
+    return new MapLiteralEntry.full(key, separator, value);
   }
   /**
    * Parse a method declaration.
    * <pre>
    * functionDeclaration ::=
    * 'external'? 'static'? functionSignature functionBody
    * | 'external'? functionSignature ';'
    * </pre>
    * @param commentAndMetadata the documentation comment and metadata to be associated with the
    * declaration
@@ skipping 28 matching lines @@
     FunctionBody body = parseFunctionBody(externalKeyword != null || staticKeyword == null, false);
     if (externalKeyword != null) {
       if (body is! EmptyFunctionBody) {
         reportError(ParserErrorCode.EXTERNAL_METHOD_WITH_BODY, body, []);
       }
     } else if (staticKeyword != null) {
       if (body is EmptyFunctionBody) {
         reportError(ParserErrorCode.ABSTRACT_STATIC_METHOD, body, []);
       }
     }
-    return new MethodDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, staticKeyword, returnType, null, null, name, parameters, body);
+    return new MethodDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, staticKeyword, returnType, null, null, name, parameters, body);
   }
   /**
    * Parse the modifiers preceding a declaration. This method allows the modifiers to appear in any
    * order but does generate errors for duplicated modifiers. Checks for other problems, such as
    * having the modifiers appear in the wrong order or specifying both 'const' and 'final', are
    * reported in one of the methods whose name is prefixed with {@code validateModifiersFor}.
    * <pre>
    * modifiers ::=
    * ('abstract' | 'const' | 'external' | 'factory' | 'final' | 'static' | 'var')
    * </pre>
    * @return the modifiers that were parsed
    */
   Modifiers parseModifiers() {
     Modifiers modifiers = new Modifiers();
     bool progress = true;
     while (progress) {
       if (matches(Keyword.ABSTRACT)) {
         if (modifiers.abstractKeyword != null) {
           reportError3(ParserErrorCode.DUPLICATED_MODIFIER, [_currentToken.lexeme]);
           advance();
         } else {
-          modifiers.abstractKeyword4 = andAdvance;
+          modifiers.abstractKeyword = andAdvance;
         }
       } else if (matches(Keyword.CONST)) {
         if (modifiers.constKeyword != null) {
           reportError3(ParserErrorCode.DUPLICATED_MODIFIER, [_currentToken.lexeme]);
           advance();
         } else {
-          modifiers.constKeyword3 = andAdvance;
+          modifiers.constKeyword = andAdvance;
         }
       } else if (matches(Keyword.EXTERNAL)) {
         if (modifiers.externalKeyword != null) {
           reportError3(ParserErrorCode.DUPLICATED_MODIFIER, [_currentToken.lexeme]);
           advance();
         } else {
-          modifiers.externalKeyword5 = andAdvance;
+          modifiers.externalKeyword = andAdvance;
         }
       } else if (matches(Keyword.FACTORY)) {
         if (modifiers.factoryKeyword != null) {
           reportError3(ParserErrorCode.DUPLICATED_MODIFIER, [_currentToken.lexeme]);
           advance();
         } else {
-          modifiers.factoryKeyword3 = andAdvance;
+          modifiers.factoryKeyword = andAdvance;
         }
       } else if (matches(Keyword.FINAL)) {
         if (modifiers.finalKeyword != null) {
           reportError3(ParserErrorCode.DUPLICATED_MODIFIER, [_currentToken.lexeme]);
           advance();
         } else {
-          modifiers.finalKeyword2 = andAdvance;
+          modifiers.finalKeyword = andAdvance;
         }
       } else if (matches(Keyword.STATIC)) {
         if (modifiers.staticKeyword != null) {
           reportError3(ParserErrorCode.DUPLICATED_MODIFIER, [_currentToken.lexeme]);
           advance();
         } else {
-          modifiers.staticKeyword2 = andAdvance;
+          modifiers.staticKeyword = andAdvance;
         }
       } else if (matches(Keyword.VAR)) {
         if (modifiers.varKeyword != null) {
           reportError3(ParserErrorCode.DUPLICATED_MODIFIER, [_currentToken.lexeme]);
           advance();
         } else {
-          modifiers.varKeyword2 = andAdvance;
+          modifiers.varKeyword = andAdvance;
         }
       } else {
         progress = false;
       }
     }
     return modifiers;
   }
   /**
    * Parse a multiplicative expression.
    * <pre>
    * multiplicativeExpression ::=
    * unaryExpression (multiplicativeOperator unaryExpression)
    * | 'super' (multiplicativeOperator unaryExpression)+
    * </pre>
    * @return the multiplicative expression that was parsed
    */
   Expression parseMultiplicativeExpression() {
     Expression expression;
     if (matches(Keyword.SUPER) && _currentToken.next.type.isMultiplicativeOperator()) {
-      expression = new SuperExpression(andAdvance);
+      expression = new SuperExpression.full(andAdvance);
     } else {
       expression = parseUnaryExpression();
     }
     while (_currentToken.type.isMultiplicativeOperator()) {
       Token operator = andAdvance;
-      expression = new BinaryExpression(expression, operator, parseUnaryExpression());
+      expression = new BinaryExpression.full(expression, operator, parseUnaryExpression());
     }
     return expression;
   }
   /**
    * Parse a new expression.
    * <pre>
    * newExpression ::=
    * instanceCreationExpression
    * </pre>
    * @return the new expression that was parsed
@@ skipping 18 matching lines @@
    * | expressionStatement
    * | functionSignature functionBody
    * </pre>
    * @return the non-labeled statement that was parsed
    */
   Statement parseNonLabeledStatement() {
     CommentAndMetadata commentAndMetadata = parseCommentAndMetadata();
     if (matches5(TokenType.OPEN_CURLY_BRACKET)) {
       if (matches4(peek(), TokenType.STRING)) {
         Token afterString = skipStringLiteral(_currentToken.next);
-        if (afterString != null && afterString.type == TokenType.COLON) {
-          return new ExpressionStatement(parseExpression2(), expect2(TokenType.SEMICOLON));
+        if (afterString != null && identical(afterString.type, TokenType.COLON)) {
+          return new ExpressionStatement.full(parseExpression2(), expect2(TokenType.SEMICOLON));
         }
       }
       return parseBlock();
-    } else if (matches5(TokenType.KEYWORD) && !(_currentToken as KeywordToken).keyword.isPseudoKeyword()) {
-      Keyword keyword29 = (_currentToken as KeywordToken).keyword;
-      if (keyword29 == Keyword.ASSERT) {
+    } else if (matches5(TokenType.KEYWORD) && !((_currentToken as KeywordToken)).keyword.isPseudoKeyword()) {
+      Keyword keyword28 = ((_currentToken as KeywordToken)).keyword;
+      if (identical(keyword28, Keyword.ASSERT)) {
         return parseAssertStatement();
-      } else if (keyword29 == Keyword.BREAK) {
+      } else if (identical(keyword28, Keyword.BREAK)) {
         return parseBreakStatement();
-      } else if (keyword29 == Keyword.CONTINUE) {
+      } else if (identical(keyword28, Keyword.CONTINUE)) {
         return parseContinueStatement();
-      } else if (keyword29 == Keyword.DO) {
+      } else if (identical(keyword28, Keyword.DO)) {
         return parseDoStatement();
-      } else if (keyword29 == Keyword.FOR) {
+      } else if (identical(keyword28, Keyword.FOR)) {
         return parseForStatement();
-      } else if (keyword29 == Keyword.IF) {
+      } else if (identical(keyword28, Keyword.IF)) {
         return parseIfStatement();
-      } else if (keyword29 == Keyword.RETURN) {
+      } else if (identical(keyword28, Keyword.RETURN)) {
         return parseReturnStatement();
-      } else if (keyword29 == Keyword.SWITCH) {
+      } else if (identical(keyword28, Keyword.SWITCH)) {
         return parseSwitchStatement();
-      } else if (keyword29 == Keyword.THROW) {
-        return new ExpressionStatement(parseThrowExpression(), expect2(TokenType.SEMICOLON));
-      } else if (keyword29 == Keyword.TRY) {
+      } else if (identical(keyword28, Keyword.THROW)) {
+        return new ExpressionStatement.full(parseThrowExpression(), expect2(TokenType.SEMICOLON));
+      } else if (identical(keyword28, Keyword.TRY)) {
         return parseTryStatement();
-      } else if (keyword29 == Keyword.WHILE) {
+      } else if (identical(keyword28, Keyword.WHILE)) {
         return parseWhileStatement();
-      } else if (keyword29 == Keyword.VAR || keyword29 == Keyword.FINAL) {
+      } else if (identical(keyword28, Keyword.VAR) || identical(keyword28, Keyword.FINAL)) {
         return parseVariableDeclarationStatement();
-      } else if (keyword29 == Keyword.VOID) {
+      } else if (identical(keyword28, Keyword.VOID)) {
         TypeName returnType = parseReturnType();
         if (matchesIdentifier() && matchesAny(peek(), [TokenType.OPEN_PAREN, TokenType.OPEN_CURLY_BRACKET, TokenType.FUNCTION])) {
           return parseFunctionDeclarationStatement2(commentAndMetadata, returnType);
         } else {
           if (matchesIdentifier()) {
             if (matchesAny(peek(), [TokenType.EQ, TokenType.COMMA, TokenType.SEMICOLON])) {
               reportError(ParserErrorCode.VOID_VARIABLE, returnType, []);
               return parseVariableDeclarationStatement();
             }
           }
           return null;
         }
-      } else if (keyword29 == Keyword.CONST) {
+      } else if (identical(keyword28, Keyword.CONST)) {
         if (matchesAny(peek(), [TokenType.LT, TokenType.OPEN_CURLY_BRACKET, TokenType.OPEN_SQUARE_BRACKET, TokenType.INDEX])) {
-          return new ExpressionStatement(parseExpression2(), expect2(TokenType.SEMICOLON));
+          return new ExpressionStatement.full(parseExpression2(), expect2(TokenType.SEMICOLON));
         } else if (matches4(peek(), TokenType.IDENTIFIER)) {
           Token afterType = skipTypeName(peek());
           if (afterType != null) {
             if (matches4(afterType, TokenType.OPEN_PAREN) || (matches4(afterType, TokenType.PERIOD) && matches4(afterType.next, TokenType.IDENTIFIER) && matches4(afterType.next.next, TokenType.OPEN_PAREN))) {
-              return new ExpressionStatement(parseExpression2(), expect2(TokenType.SEMICOLON));
+              return new ExpressionStatement.full(parseExpression2(), expect2(TokenType.SEMICOLON));
             }
           }
         }
         return parseVariableDeclarationStatement();
-      } else if (keyword29 == Keyword.NEW || keyword29 == Keyword.TRUE || keyword29 == Keyword.FALSE || keyword29 == Keyword.NULL || keyword29 == Keyword.SUPER || keyword29 == Keyword.THIS) {
-        return new ExpressionStatement(parseExpression2(), expect2(TokenType.SEMICOLON));
+      } else if (identical(keyword28, Keyword.NEW) || identical(keyword28, Keyword.TRUE) || identical(keyword28, Keyword.FALSE) || identical(keyword28, Keyword.NULL) || identical(keyword28, Keyword.SUPER) || identical(keyword28, Keyword.THIS)) {
+        return new ExpressionStatement.full(parseExpression2(), expect2(TokenType.SEMICOLON));
       } else {
         return null;
       }
     } else if (matches5(TokenType.SEMICOLON)) {
       return parseEmptyStatement();
     } else if (isInitializedVariableDeclaration()) {
       return parseVariableDeclarationStatement();
     } else if (isFunctionDeclaration()) {
       return parseFunctionDeclarationStatement();
     } else {
-      return new ExpressionStatement(parseExpression2(), expect2(TokenType.SEMICOLON));
+      return new ExpressionStatement.full(parseExpression2(), expect2(TokenType.SEMICOLON));
     }
   }
   /**
    * Parse a normal formal parameter.
    * <pre>
    * normalFormalParameter ::=
    * functionSignature
    * | fieldFormalParameter
    * | simpleFormalParameter
    * functionSignature:
@@ skipping 13 matching lines @@
     Token period = null;
     if (matches(Keyword.THIS)) {
       thisKeyword = andAdvance;
       period = expect2(TokenType.PERIOD);
     }
     SimpleIdentifier identifier = parseSimpleIdentifier();
     if (matches5(TokenType.OPEN_PAREN)) {
       if (thisKeyword != null) {
       }
       FormalParameterList parameters = parseFormalParameterList();
-      return new FunctionTypedFormalParameter(commentAndMetadata.comment, commentAndMetadata.metadata, holder.type, identifier, parameters);
+      return new FunctionTypedFormalParameter.full(commentAndMetadata.comment, commentAndMetadata.metadata, holder.type, identifier, parameters);
     }
-    TypeName type18 = holder.type;
-    if (type18 != null && matches3(type18.name.beginToken, Keyword.VOID)) {
-      reportError4(ParserErrorCode.VOID_PARAMETER, type18.name.beginToken, []);
+    TypeName type16 = holder.type;
+    if (type16 != null && matches3(type16.name.beginToken, Keyword.VOID)) {
+      reportError4(ParserErrorCode.VOID_PARAMETER, type16.name.beginToken, []);
     }
     if (thisKeyword != null) {
-      return new FieldFormalParameter(commentAndMetadata.comment, commentAndMetadata.metadata, holder.keyword, holder.type, thisKeyword, period, identifier);
+      return new FieldFormalParameter.full(commentAndMetadata.comment, commentAndMetadata.metadata, holder.keyword, holder.type, thisKeyword, period, identifier);
     }
-    return new SimpleFormalParameter(commentAndMetadata.comment, commentAndMetadata.metadata, holder.keyword, holder.type, identifier);
+    return new SimpleFormalParameter.full(commentAndMetadata.comment, commentAndMetadata.metadata, holder.keyword, holder.type, identifier);
   }
   /**
    * Parse an operator declaration.
    * <pre>
    * operatorDeclaration ::=
    * operatorSignature (';' | functionBody)
    * operatorSignature ::=
    * 'external'? returnType? 'operator' operator formalParameterList
    * </pre>
    * @param commentAndMetadata the documentation comment and metadata to be associated with the
    * declaration
    * @param externalKeyword the 'external' token
    * @param the return type that has already been parsed, or {@code null} if there was no return
    * type
    * @return the operator declaration that was parsed
    */
   MethodDeclaration parseOperator(CommentAndMetadata commentAndMetadata, Token externalKeyword, TypeName returnType) {
     Token operatorKeyword = expect(Keyword.OPERATOR);
     if (!_currentToken.isUserDefinableOperator()) {
       reportError3(ParserErrorCode.NON_USER_DEFINABLE_OPERATOR, [_currentToken.lexeme]);
     }
-    SimpleIdentifier name = new SimpleIdentifier(andAdvance);
+    SimpleIdentifier name = new SimpleIdentifier.full(andAdvance);
     FormalParameterList parameters = parseFormalParameterList();
     validateFormalParameterList(parameters);
     FunctionBody body = parseFunctionBody(true, false);
     if (externalKeyword != null && body is! EmptyFunctionBody) {
       reportError3(ParserErrorCode.EXTERNAL_OPERATOR_WITH_BODY, []);
     }
-    return new MethodDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, null, returnType, null, operatorKeyword, name, parameters, body);
+    return new MethodDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, null, returnType, null, operatorKeyword, name, parameters, body);
   }
   /**
    * Parse a return type if one is given, otherwise return {@code null} without advancing.
    * @return the return type that was parsed
    */
   TypeName parseOptionalReturnType() {
     if (matches(Keyword.VOID)) {
       return parseReturnType();
     } else if (matchesIdentifier() && !matches(Keyword.GET) && !matches(Keyword.SET) && !matches(Keyword.OPERATOR) && (matchesIdentifier2(peek()) || matches4(peek(), TokenType.LT))) {
       return parseReturnType();
     } else if (matchesIdentifier() && matches4(peek(), TokenType.PERIOD) && matchesIdentifier2(peek2(2)) && (matchesIdentifier2(peek2(3)) || matches4(peek2(3), TokenType.LT))) {
       return parseReturnType();
     }
     return null;
   }
   /**
    * Parse a part or part-of directive.
    * <pre>
    * partDirective ::=
    * metadata 'part' stringLiteral ';'
    * partOfDirective ::=
    * metadata 'part' 'of' identifier ';'
    * </pre>
    * @param commentAndMetadata the metadata to be associated with the directive
    * @return the part or part-of directive that was parsed
    */
   Directive parsePartDirective(CommentAndMetadata commentAndMetadata) {
     Token partKeyword = expect(Keyword.PART);
-    if (matches2(Parser._OF)) {
+    if (matches2(_OF)) {
       Token ofKeyword = andAdvance;
       LibraryIdentifier libraryName = parseLibraryName(ParserErrorCode.MISSING_NAME_IN_PART_OF_DIRECTIVE, ofKeyword);
       Token semicolon = expect2(TokenType.SEMICOLON);
-      return new PartOfDirective(commentAndMetadata.comment, commentAndMetadata.metadata, partKeyword, ofKeyword, libraryName, semicolon);
+      return new PartOfDirective.full(commentAndMetadata.comment, commentAndMetadata.metadata, partKeyword, ofKeyword, libraryName, semicolon);
     }
     StringLiteral partUri = parseStringLiteral();
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new PartDirective(commentAndMetadata.comment, commentAndMetadata.metadata, partKeyword, partUri, semicolon);
+    return new PartDirective.full(commentAndMetadata.comment, commentAndMetadata.metadata, partKeyword, partUri, semicolon);
   }
   /**
    * Parse a postfix expression.
    * <pre>
    * postfixExpression ::=
    * assignableExpression postfixOperator
    * | primary selector
    * selector ::=
    * assignableSelector
    * | argumentList
    * </pre>
    * @return the postfix expression that was parsed
    */
   Expression parsePostfixExpression() {
     Expression operand = parseAssignableExpression(true);
     if (matches5(TokenType.OPEN_SQUARE_BRACKET) || matches5(TokenType.PERIOD) || matches5(TokenType.OPEN_PAREN)) {
       do {
         if (matches5(TokenType.OPEN_PAREN)) {
           ArgumentList argumentList = parseArgumentList();
           if (operand is PropertyAccess) {
-            PropertyAccess access = operand as PropertyAccess;
-            operand = new MethodInvocation(access.target, access.operator, access.propertyName, argumentList);
+            PropertyAccess access = (operand as PropertyAccess);
+            operand = new MethodInvocation.full(access.target, access.operator, access.propertyName, argumentList);
           } else {
-            operand = new FunctionExpressionInvocation(operand, argumentList);
+            operand = new FunctionExpressionInvocation.full(operand, argumentList);
           }
         } else {
           operand = parseAssignableSelector(operand, true);
         }
       } while (matches5(TokenType.OPEN_SQUARE_BRACKET) || matches5(TokenType.PERIOD) || matches5(TokenType.OPEN_PAREN));
       return operand;
     }
     if (!_currentToken.type.isIncrementOperator()) {
       return operand;
     }
     if (operand is FunctionExpressionInvocation) {
       reportError3(ParserErrorCode.MISSING_ASSIGNABLE_SELECTOR, []);
     }
     Token operator = andAdvance;
-    return new PostfixExpression(operand, operator);
+    return new PostfixExpression.full(operand, operator);
   }
   /**
    * Parse a prefixed identifier.
    * <pre>
    * prefixedIdentifier ::=
    * identifier ('.' identifier)?
    * </pre>
    * @return the prefixed identifier that was parsed
    */
   Identifier parsePrefixedIdentifier() {
     SimpleIdentifier qualifier = parseSimpleIdentifier();
     if (!matches5(TokenType.PERIOD)) {
       return qualifier;
     }
     Token period = andAdvance;
     SimpleIdentifier qualified = parseSimpleIdentifier();
-    return new PrefixedIdentifier(qualifier, period, qualified);
+    return new PrefixedIdentifier.full(qualifier, period, qualified);
   }
   /**
    * Parse a primary expression.
    * <pre>
    * primary ::=
    * thisExpression
    * | 'super' assignableSelector
    * | functionExpression
    * | literal
    * | identifier
    * | newExpression
    * | constObjectExpression
    * | '(' expression ')'
    * | argumentDefinitionTest
    * literal ::=
    * nullLiteral
    * | booleanLiteral
    * | numericLiteral
    * | stringLiteral
    * | mapLiteral
    * | listLiteral
    * </pre>
    * @return the primary expression that was parsed
    */
   Expression parsePrimaryExpression() {
     if (matches(Keyword.THIS)) {
-      return new ThisExpression(andAdvance);
+      return new ThisExpression.full(andAdvance);
     } else if (matches(Keyword.SUPER)) {
-      return parseAssignableSelector(new SuperExpression(andAdvance), false);
+      return parseAssignableSelector(new SuperExpression.full(andAdvance), false);
     } else if (matches(Keyword.NULL)) {
-      return new NullLiteral(andAdvance);
+      return new NullLiteral.full(andAdvance);
     } else if (matches(Keyword.FALSE)) {
-      return new BooleanLiteral(andAdvance, false);
+      return new BooleanLiteral.full(andAdvance, false);
     } else if (matches(Keyword.TRUE)) {
-      return new BooleanLiteral(andAdvance, true);
+      return new BooleanLiteral.full(andAdvance, true);
     } else if (matches5(TokenType.DOUBLE)) {
       Token token = andAdvance;
       double value = 0.0;
       try {
         value = double.parse(token.lexeme);
       } on NumberFormatException catch (exception) {
       }
-      return new DoubleLiteral(token, value);
+      return new DoubleLiteral.full(token, value);
     } else if (matches5(TokenType.HEXADECIMAL)) {
       Token token = andAdvance;
       int value = null;
       try {
         value = int.parse(token.lexeme.substring(2), radix: 16);
       } on NumberFormatException catch (exception) {
       }
-      return new IntegerLiteral.con1(token, value);
+      return new IntegerLiteral.full(token, value);
     } else if (matches5(TokenType.INT)) {
       Token token = andAdvance;
       int value = null;
       try {
         value = int.parse(token.lexeme);
       } on NumberFormatException catch (exception) {
       }
-      return new IntegerLiteral.con1(token, value);
+      return new IntegerLiteral.full(token, value);
     } else if (matches5(TokenType.STRING)) {
       return parseStringLiteral();
     } else if (matches5(TokenType.OPEN_CURLY_BRACKET)) {
       return parseMapLiteral(null, null);
     } else if (matches5(TokenType.OPEN_SQUARE_BRACKET) || matches5(TokenType.INDEX)) {
       return parseListLiteral(null, null);
     } else if (matchesIdentifier()) {
       return parsePrefixedIdentifier();
     } else if (matches(Keyword.NEW)) {
       return parseNewExpression();
     } else if (matches(Keyword.CONST)) {
       return parseConstExpression();
     } else if (matches5(TokenType.OPEN_PAREN)) {
       if (isFunctionExpression(_currentToken)) {
         return parseFunctionExpression();
       }
       Token leftParenthesis = andAdvance;
       Expression expression = parseExpression2();
       Token rightParenthesis = expect2(TokenType.CLOSE_PAREN);
-      return new ParenthesizedExpression(leftParenthesis, expression, rightParenthesis);
+      return new ParenthesizedExpression.full(leftParenthesis, expression, rightParenthesis);
     } else if (matches5(TokenType.LT)) {
       return parseListOrMapLiteral(null);
     } else if (matches5(TokenType.QUESTION)) {
       return parseArgumentDefinitionTest();
     } else if (matches(Keyword.VOID)) {
       reportError3(ParserErrorCode.UNEXPECTED_TOKEN, [_currentToken.lexeme]);
       advance();
       return parsePrimaryExpression();
     } else {
       return createSyntheticIdentifier();
     }
   }
   /**
    * Parse a redirecting constructor invocation.
    * <pre>
    * redirectingConstructorInvocation ::=
    * 'this' ('.' identifier)? arguments
    * </pre>
    * @return the redirecting constructor invocation that was parsed
    */
   RedirectingConstructorInvocation parseRedirectingConstructorInvocation() {
     Token keyword = expect(Keyword.THIS);
     Token period = null;
     SimpleIdentifier constructorName = null;
     if (matches5(TokenType.PERIOD)) {
       period = andAdvance;
       constructorName = parseSimpleIdentifier();
     }
     ArgumentList argumentList = parseArgumentList();
-    return new RedirectingConstructorInvocation(keyword, period, constructorName, argumentList);
+    return new RedirectingConstructorInvocation.full(keyword, period, constructorName, argumentList);
   }
   /**
    * Parse a relational expression.
    * <pre>
    * relationalExpression ::=
    * shiftExpression ('is' type | 'as' type | relationalOperator shiftExpression)?
    * | 'super' relationalOperator shiftExpression
    * </pre>
    * @return the relational expression that was parsed
    */
   Expression parseRelationalExpression() {
     if (matches(Keyword.SUPER) && _currentToken.next.type.isRelationalOperator()) {
-      Expression expression = new SuperExpression(andAdvance);
+      Expression expression = new SuperExpression.full(andAdvance);
       Token operator = andAdvance;
-      expression = new BinaryExpression(expression, operator, parseShiftExpression());
+      expression = new BinaryExpression.full(expression, operator, parseShiftExpression());
       return expression;
     }
     Expression expression = parseShiftExpression();
     if (matches(Keyword.AS)) {
       Token isOperator = andAdvance;
-      expression = new AsExpression(expression, isOperator, parseTypeName());
+      expression = new AsExpression.full(expression, isOperator, parseTypeName());
     } else if (matches(Keyword.IS)) {
       Token isOperator = andAdvance;
       Token notOperator = null;
       if (matches5(TokenType.BANG)) {
         notOperator = andAdvance;
       }
-      expression = new IsExpression(expression, isOperator, notOperator, parseTypeName());
+      expression = new IsExpression.full(expression, isOperator, notOperator, parseTypeName());
     } else if (_currentToken.type.isRelationalOperator()) {
       Token operator = andAdvance;
-      expression = new BinaryExpression(expression, operator, parseShiftExpression());
+      expression = new BinaryExpression.full(expression, operator, parseShiftExpression());
     }
     return expression;
   }
   /**
    * Parse a return statement.
    * <pre>
    * returnStatement ::=
    * 'return' expression? ';'
    * </pre>
    * @return the return statement that was parsed
    */
   Statement parseReturnStatement() {
     Token returnKeyword = expect(Keyword.RETURN);
     if (matches5(TokenType.SEMICOLON)) {
-      return new ReturnStatement(returnKeyword, null, andAdvance);
+      return new ReturnStatement.full(returnKeyword, null, andAdvance);
     }
     Expression expression = parseExpression2();
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new ReturnStatement(returnKeyword, expression, semicolon);
+    return new ReturnStatement.full(returnKeyword, expression, semicolon);
   }
   /**
    * Parse a return type.
    * <pre>
    * returnType ::=
    * 'void'
    * | type
    * </pre>
    * @return the return type that was parsed
    */
   TypeName parseReturnType() {
     if (matches(Keyword.VOID)) {
-      return new TypeName(new SimpleIdentifier(andAdvance), null);
+      return new TypeName.full(new SimpleIdentifier.full(andAdvance), null);
     } else {
       return parseTypeName();
     }
   }
   /**
    * Parse a setter.
    * <pre>
    * setter ::=
    * setterSignature functionBody?
    * setterSignature ::=
    * 'external'? 'static'? returnType? 'set' identifier formalParameterList
    * </pre>
    * @param commentAndMetadata the documentation comment and metadata to be associated with the
    * declaration
    * @param externalKeyword the 'external' token
    * @param staticKeyword the static keyword, or {@code null} if the setter is not static
    * @param the return type that has already been parsed, or {@code null} if there was no return
    * type
    * @return the setter that was parsed
    */
   MethodDeclaration parseSetter(CommentAndMetadata commentAndMetadata, Token externalKeyword, Token staticKeyword, TypeName returnType) {
     Token propertyKeyword = expect(Keyword.SET);
     SimpleIdentifier name = parseSimpleIdentifier();
     FormalParameterList parameters = parseFormalParameterList();
     validateFormalParameterList(parameters);
     FunctionBody body = parseFunctionBody(true, false);
     if (externalKeyword != null && body is! EmptyFunctionBody) {
       reportError3(ParserErrorCode.EXTERNAL_SETTER_WITH_BODY, []);
     }
-    return new MethodDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, staticKeyword, returnType, propertyKeyword, null, name, parameters, body);
+    return new MethodDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, staticKeyword, returnType, propertyKeyword, null, name, parameters, body);
   }
   /**
    * Parse a shift expression.
    * <pre>
    * shiftExpression ::=
    * additiveExpression (shiftOperator additiveExpression)
    * | 'super' (shiftOperator additiveExpression)+
    * </pre>
    * @return the shift expression that was parsed
    */
   Expression parseShiftExpression() {
     Expression expression;
     if (matches(Keyword.SUPER) && _currentToken.next.type.isShiftOperator()) {
-      expression = new SuperExpression(andAdvance);
+      expression = new SuperExpression.full(andAdvance);
     } else {
       expression = parseAdditiveExpression();
     }
     while (_currentToken.type.isShiftOperator()) {
       Token operator = andAdvance;
-      expression = new BinaryExpression(expression, operator, parseAdditiveExpression());
+      expression = new BinaryExpression.full(expression, operator, parseAdditiveExpression());
     }
     return expression;
   }
   /**
    * Parse a simple identifier.
    * <pre>
    * identifier ::=
    * IDENTIFIER
    * </pre>
    * @return the simple identifier that was parsed
    */
   SimpleIdentifier parseSimpleIdentifier() {
     if (matchesIdentifier()) {
-      return new SimpleIdentifier(andAdvance);
+      return new SimpleIdentifier.full(andAdvance);
     }
     reportError3(ParserErrorCode.MISSING_IDENTIFIER, []);
     return createSyntheticIdentifier();
   }
   /**
    * Parse a simple identifier and validate that it is not a built-in identifier.
    * <pre>
    * identifier ::=
    * IDENTIFIER
    * </pre>
    * @param errorCode the error code to be used to report a built-in identifier if one is found
    * @return the simple identifier that was parsed
    */
   SimpleIdentifier parseSimpleIdentifier2(ParserErrorCode errorCode) {
     if (matchesIdentifier()) {
       Token token = andAdvance;
-      if (token.type == TokenType.KEYWORD) {
+      if (identical(token.type, TokenType.KEYWORD)) {
         reportError4(errorCode, token, [token.lexeme]);
       }
-      return new SimpleIdentifier(token);
+      return new SimpleIdentifier.full(token);
     }
     reportError3(ParserErrorCode.MISSING_IDENTIFIER, []);
     return createSyntheticIdentifier();
   }
   /**
    * Parse a statement.
    * <pre>
    * statement ::=
    * label* nonLabeledStatement
    * </pre>
    * @return the statement that was parsed
    */
   Statement parseStatement2() {
     List<Label> labels = new List<Label>();
     while (matchesIdentifier() && matches4(peek(), TokenType.COLON)) {
       SimpleIdentifier label = parseSimpleIdentifier();
       Token colon = expect2(TokenType.COLON);
-      labels.add(new Label(label, colon));
+      labels.add(new Label.full(label, colon));
     }
     Statement statement = parseNonLabeledStatement();
     if (labels.isEmpty) {
       return statement;
     }
-    return new LabeledStatement(labels, statement);
+    return new LabeledStatement.full(labels, statement);
   }
   /**
    * Parse a list of statements within a switch statement.
    * <pre>
    * statements ::=
    * statement
    * </pre>
    * @return the statements that were parsed
    */
   List<Statement> parseStatements2() {
     List<Statement> statements = new List<Statement>();
     Token statementStart = _currentToken;
     while (!matches5(TokenType.EOF) && !matches5(TokenType.CLOSE_CURLY_BRACKET) && !isSwitchMember()) {
       statements.add(parseStatement2());
-      if (_currentToken == statementStart) {
+      if (identical(_currentToken, statementStart)) {
         reportError4(ParserErrorCode.UNEXPECTED_TOKEN, _currentToken, [_currentToken.lexeme]);
         advance();
       }
       statementStart = _currentToken;
     }
     return statements;
   }
   /**
    * Parse a string literal that contains interpolations.
    * @return the string literal that was parsed
    */
   StringInterpolation parseStringInterpolation(Token string) {
     List<InterpolationElement> elements = new List<InterpolationElement>();
-    elements.add(new InterpolationString(string, computeStringValue(string.lexeme)));
+    elements.add(new InterpolationString.full(string, computeStringValue(string.lexeme)));
     while (matches5(TokenType.STRING_INTERPOLATION_EXPRESSION) || matches5(TokenType.STRING_INTERPOLATION_IDENTIFIER)) {
       if (matches5(TokenType.STRING_INTERPOLATION_EXPRESSION)) {
         Token openToken = andAdvance;
         Expression expression = parseExpression2();
         Token rightBracket = expect2(TokenType.CLOSE_CURLY_BRACKET);
-        elements.add(new InterpolationExpression(openToken, expression, rightBracket));
+        elements.add(new InterpolationExpression.full(openToken, expression, rightBracket));
       } else {
         Token openToken = andAdvance;
         Expression expression = null;
         if (matches(Keyword.THIS)) {
-          expression = new ThisExpression(andAdvance);
+          expression = new ThisExpression.full(andAdvance);
         } else {
           expression = parseSimpleIdentifier();
         }
-        elements.add(new InterpolationExpression(openToken, expression, null));
+        elements.add(new InterpolationExpression.full(openToken, expression, null));
       }
       if (matches5(TokenType.STRING)) {
         string = andAdvance;
-        elements.add(new InterpolationString(string, computeStringValue(string.lexeme)));
+        elements.add(new InterpolationString.full(string, computeStringValue(string.lexeme)));
       }
     }
-    return new StringInterpolation(elements);
+    return new StringInterpolation.full(elements);
   }
   /**
    * Parse a string literal.
    * <pre>
    * stringLiteral ::=
    * MULTI_LINE_STRING+
    * | SINGLE_LINE_STRING+
    * </pre>
    * @return the string literal that was parsed
    */
   StringLiteral parseStringLiteral() {
     List<StringLiteral> strings = new List<StringLiteral>();
     while (matches5(TokenType.STRING)) {
       Token string = andAdvance;
       if (matches5(TokenType.STRING_INTERPOLATION_EXPRESSION) || matches5(TokenType.STRING_INTERPOLATION_IDENTIFIER)) {
         strings.add(parseStringInterpolation(string));
       } else {
-        strings.add(new SimpleStringLiteral(string, computeStringValue(string.lexeme)));
+        strings.add(new SimpleStringLiteral.full(string, computeStringValue(string.lexeme)));
       }
     }
     if (strings.length < 1) {
       reportError3(ParserErrorCode.EXPECTED_STRING_LITERAL, []);
       return createSyntheticStringLiteral();
     } else if (strings.length == 1) {
       return strings[0];
     } else {
-      return new AdjacentStrings(strings);
+      return new AdjacentStrings.full(strings);
     }
   }
   /**
    * Parse a super constructor invocation.
    * <pre>
    * superConstructorInvocation ::=
    * 'super' ('.' identifier)? arguments
    * </pre>
    * @return the super constructor invocation that was parsed
    */
   SuperConstructorInvocation parseSuperConstructorInvocation() {
     Token keyword = expect(Keyword.SUPER);
     Token period = null;
     SimpleIdentifier constructorName = null;
     if (matches5(TokenType.PERIOD)) {
       period = andAdvance;
       constructorName = parseSimpleIdentifier();
     }
     ArgumentList argumentList = parseArgumentList();
-    return new SuperConstructorInvocation(keyword, period, constructorName, argumentList);
+    return new SuperConstructorInvocation.full(keyword, period, constructorName, argumentList);
   }
   /**
    * Parse a switch statement.
    * <pre>
    * switchStatement ::=
    * 'switch' '(' expression ')' '{' switchCase* defaultCase? '}'
    * switchCase ::=
    * label* ('case' expression ':') statements
    * defaultCase ::=
    * label* 'default' ':' statements
@@ skipping 15 matching lines @@
         List<Label> labels = new List<Label>();
         while (matchesIdentifier() && matches4(peek(), TokenType.COLON)) {
           SimpleIdentifier identifier = parseSimpleIdentifier();
           String label = identifier.token.lexeme;
           if (definedLabels.contains(label)) {
             reportError4(ParserErrorCode.DUPLICATE_LABEL_IN_SWITCH_STATEMENT, identifier.token, [label]);
           } else {
             javaSetAdd(definedLabels, label);
           }
           Token colon = expect2(TokenType.COLON);
-          labels.add(new Label(identifier, colon));
+          labels.add(new Label.full(identifier, colon));
         }
         if (matches(Keyword.CASE)) {
           Token caseKeyword = andAdvance;
           Expression caseExpression = parseExpression2();
           Token colon = expect2(TokenType.COLON);
-          members.add(new SwitchCase(labels, caseKeyword, caseExpression, colon, parseStatements2()));
+          members.add(new SwitchCase.full(labels, caseKeyword, caseExpression, colon, parseStatements2()));
         } else if (matches(Keyword.DEFAULT)) {
           Token defaultKeyword = andAdvance;
           Token colon = expect2(TokenType.COLON);
-          members.add(new SwitchDefault(labels, defaultKeyword, colon, parseStatements2()));
+          members.add(new SwitchDefault.full(labels, defaultKeyword, colon, parseStatements2()));
         } else {
           reportError3(ParserErrorCode.EXPECTED_CASE_OR_DEFAULT, []);
           while (!matches5(TokenType.EOF) && !matches5(TokenType.CLOSE_CURLY_BRACKET) && !matches(Keyword.CASE) && !matches(Keyword.DEFAULT)) {
             advance();
           }
         }
       }
       Token rightBracket = expect2(TokenType.CLOSE_CURLY_BRACKET);
-      return new SwitchStatement(keyword, leftParenthesis, expression, rightParenthesis, leftBracket, members, rightBracket);
+      return new SwitchStatement.full(keyword, leftParenthesis, expression, rightParenthesis, leftBracket, members, rightBracket);
     } finally {
       _inSwitch = wasInSwitch;
     }
   }
   /**
    * Parse a throw expression.
    * <pre>
    * throwExpression ::=
    * 'throw' expression? ';'
    * </pre>
    * @return the throw expression that was parsed
    */
   Expression parseThrowExpression() {
     Token keyword = expect(Keyword.THROW);
     if (matches5(TokenType.SEMICOLON) || matches5(TokenType.CLOSE_PAREN)) {
-      return new ThrowExpression(keyword, null);
+      return new ThrowExpression.full(keyword, null);
     }
     Expression expression = parseExpression2();
-    return new ThrowExpression(keyword, expression);
+    return new ThrowExpression.full(keyword, expression);
   }
   /**
    * Parse a throw expression.
    * <pre>
    * throwExpressionWithoutCascade ::=
    * 'throw' expressionWithoutCascade? ';'
    * </pre>
    * @return the throw expression that was parsed
    */
   Expression parseThrowExpressionWithoutCascade() {
     Token keyword = expect(Keyword.THROW);
     if (matches5(TokenType.SEMICOLON) || matches5(TokenType.CLOSE_PAREN)) {
-      return new ThrowExpression(keyword, null);
+      return new ThrowExpression.full(keyword, null);
     }
     Expression expression = parseExpressionWithoutCascade();
-    return new ThrowExpression(keyword, expression);
+    return new ThrowExpression.full(keyword, expression);
   }
   /**
    * Parse a try statement.
    * <pre>
    * tryStatement ::=
    * 'try' block (onPart+ finallyPart? | finallyPart)
    * onPart ::=
    * catchPart block
    * | 'on' qualified catchPart? block
    * catchPart ::=
    * 'catch' '(' identifier (',' identifier)? ')'
    * finallyPart ::=
    * 'finally' block
    * </pre>
    * @return the try statement that was parsed
    */
   Statement parseTryStatement() {
     Token tryKeyword = expect(Keyword.TRY);
     Block body = parseBlock();
     List<CatchClause> catchClauses = new List<CatchClause>();
     Block finallyClause = null;
-    while (matches2(Parser._ON) || matches(Keyword.CATCH)) {
+    while (matches2(_ON) || matches(Keyword.CATCH)) {
       Token onKeyword = null;
       TypeName exceptionType = null;
-      if (matches2(Parser._ON)) {
+      if (matches2(_ON)) {
         onKeyword = andAdvance;
-        exceptionType = new TypeName(parsePrefixedIdentifier(), null);
+        exceptionType = new TypeName.full(parsePrefixedIdentifier(), null);
       }
       Token catchKeyword = null;
       Token leftParenthesis = null;
       SimpleIdentifier exceptionParameter = null;
       Token comma = null;
       SimpleIdentifier stackTraceParameter = null;
       Token rightParenthesis = null;
       if (matches(Keyword.CATCH)) {
         catchKeyword = andAdvance;
         leftParenthesis = expect2(TokenType.OPEN_PAREN);
         exceptionParameter = parseSimpleIdentifier();
         if (matches5(TokenType.COMMA)) {
           comma = andAdvance;
           stackTraceParameter = parseSimpleIdentifier();
         }
         rightParenthesis = expect2(TokenType.CLOSE_PAREN);
       }
       Block catchBody = parseBlock();
-      catchClauses.add(new CatchClause(onKeyword, exceptionType, catchKeyword, leftParenthesis, exceptionParameter, comma, stackTraceParameter, rightParenthesis, catchBody));
+      catchClauses.add(new CatchClause.full(onKeyword, exceptionType, catchKeyword, leftParenthesis, exceptionParameter, comma, stackTraceParameter, rightParenthesis, catchBody));
     }
     Token finallyKeyword = null;
     if (matches(Keyword.FINALLY)) {
       finallyKeyword = andAdvance;
       finallyClause = parseBlock();
     } else {
       if (catchClauses.isEmpty) {
         reportError3(ParserErrorCode.MISSING_CATCH_OR_FINALLY, []);
       }
     }
-    return new TryStatement(tryKeyword, body, catchClauses, finallyKeyword, finallyClause);
+    return new TryStatement.full(tryKeyword, body, catchClauses, finallyKeyword, finallyClause);
   }
   /**
    * Parse a type alias.
    * <pre>
    * typeAlias ::=
    * 'typedef' typeAliasBody
    * typeAliasBody ::=
    * classTypeAlias
    * | functionTypeAlias
    * classTypeAlias ::=
@@ skipping 34 matching lines @@
    * @return the type argument list that was parsed
    */
   TypeArgumentList parseTypeArgumentList() {
     Token leftBracket = expect2(TokenType.LT);
     List<TypeName> arguments = new List<TypeName>();
     arguments.add(parseTypeName());
     while (optional(TokenType.COMMA)) {
       arguments.add(parseTypeName());
     }
     Token rightBracket = expect2(TokenType.GT);
-    return new TypeArgumentList(leftBracket, arguments, rightBracket);
+    return new TypeArgumentList.full(leftBracket, arguments, rightBracket);
   }
   /**
    * Parse a type name.
    * <pre>
    * type ::=
    * qualified typeArguments?
    * </pre>
    * @return the type name that was parsed
    */
   TypeName parseTypeName() {
     Identifier typeName = parsePrefixedIdentifier();
     TypeArgumentList typeArguments = null;
     if (matches5(TokenType.LT)) {
       typeArguments = parseTypeArgumentList();
     }
-    return new TypeName(typeName, typeArguments);
+    return new TypeName.full(typeName, typeArguments);
   }
   /**
    * Parse a type parameter.
    * <pre>
    * typeParameter ::=
    * metadata name ('extends' bound)?
    * </pre>
    * @return the type parameter that was parsed
    */
   TypeParameter parseTypeParameter() {
     CommentAndMetadata commentAndMetadata = parseCommentAndMetadata();
     SimpleIdentifier name = parseSimpleIdentifier2(ParserErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE_VARIABLE_NAME);
     if (matches(Keyword.EXTENDS)) {
       Token keyword = andAdvance;
       TypeName bound = parseTypeName();
-      return new TypeParameter(commentAndMetadata.comment, commentAndMetadata.metadata, name, keyword, bound);
+      return new TypeParameter.full(commentAndMetadata.comment, commentAndMetadata.metadata, name, keyword, bound);
     }
-    return new TypeParameter(commentAndMetadata.comment, commentAndMetadata.metadata, name, null, null);
+    return new TypeParameter.full(commentAndMetadata.comment, commentAndMetadata.metadata, name, null, null);
   }
   /**
    * Parse a list of type parameters.
    * <pre>
    * typeParameterList ::=
    * '<' typeParameter (',' typeParameter)* '>'
    * </pre>
    * @return the list of type parameters that were parsed
    */
   TypeParameterList parseTypeParameterList() {
     Token leftBracket = expect2(TokenType.LT);
     List<TypeParameter> typeParameters = new List<TypeParameter>();
     typeParameters.add(parseTypeParameter());
     while (optional(TokenType.COMMA)) {
       typeParameters.add(parseTypeParameter());
     }
     Token rightBracket = expect2(TokenType.GT);
-    return new TypeParameterList(leftBracket, typeParameters, rightBracket);
+    return new TypeParameterList.full(leftBracket, typeParameters, rightBracket);
   }
   /**
    * Parse a unary expression.
    * <pre>
    * unaryExpression ::=
    * prefixOperator unaryExpression
    * | postfixExpression
    * | unaryOperator 'super'
    * | '-' 'super'
    * | incrementOperator assignableExpression
    * </pre>
    * @return the unary expression that was parsed
    */
   Expression parseUnaryExpression() {
     if (matches5(TokenType.MINUS) || matches5(TokenType.BANG) || matches5(TokenType.TILDE)) {
       Token operator = andAdvance;
       if (matches(Keyword.SUPER)) {
         if (matches4(peek(), TokenType.OPEN_SQUARE_BRACKET) || matches4(peek(), TokenType.PERIOD)) {
-          return new PrefixExpression(operator, parseUnaryExpression());
+          return new PrefixExpression.full(operator, parseUnaryExpression());
         }
-        return new PrefixExpression(operator, new SuperExpression(andAdvance));
+        return new PrefixExpression.full(operator, new SuperExpression.full(andAdvance));
       }
-      return new PrefixExpression(operator, parseUnaryExpression());
+      return new PrefixExpression.full(operator, parseUnaryExpression());
     } else if (_currentToken.type.isIncrementOperator()) {
       Token operator = andAdvance;
       if (matches(Keyword.SUPER)) {
-        if (operator.type == TokenType.MINUS_MINUS) {
-          int offset7 = operator.offset;
-          Token firstOperator = new Token(TokenType.MINUS, offset7);
-          Token secondOperator = new Token(TokenType.MINUS, offset7 + 1);
+        if (identical(operator.type, TokenType.MINUS_MINUS)) {
+          int offset8 = operator.offset;
+          Token firstOperator = new Token(TokenType.MINUS, offset8);
+          Token secondOperator = new Token(TokenType.MINUS, offset8 + 1);
           secondOperator.setNext(_currentToken);
           firstOperator.setNext(secondOperator);
           operator.previous.setNext(firstOperator);
-          return new PrefixExpression(firstOperator, new PrefixExpression(secondOperator, new SuperExpression(andAdvance)));
+          return new PrefixExpression.full(firstOperator, new PrefixExpression.full(secondOperator, new SuperExpression.full(andAdvance)));
         } else {
           reportError3(ParserErrorCode.INVALID_OPERATOR_FOR_SUPER, [operator.lexeme]);
-          return new PrefixExpression(operator, new SuperExpression(andAdvance));
+          return new PrefixExpression.full(operator, new SuperExpression.full(andAdvance));
         }
       }
-      return new PrefixExpression(operator, parseAssignableExpression(false));
+      return new PrefixExpression.full(operator, parseAssignableExpression(false));
     } else if (matches5(TokenType.PLUS)) {
       reportError3(ParserErrorCode.USE_OF_UNARY_PLUS_OPERATOR, []);
     }
     return parsePostfixExpression();
   }
   /**
    * Parse a variable declaration.
    * <pre>
    * variableDeclaration ::=
    * identifier ('=' expression)?
    * </pre>
    * @return the variable declaration that was parsed
    */
   VariableDeclaration parseVariableDeclaration() {
     CommentAndMetadata commentAndMetadata = parseCommentAndMetadata();
     SimpleIdentifier name = parseSimpleIdentifier();
     Token equals = null;
     Expression initializer = null;
     if (matches5(TokenType.EQ)) {
       equals = andAdvance;
       initializer = parseExpression2();
     }
-    return new VariableDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, name, equals, initializer);
+    return new VariableDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, name, equals, initializer);
   }
   /**
    * Parse a variable declaration list.
    * <pre>
    * variableDeclarationList ::=
    * finalConstVarOrType variableDeclaration (',' variableDeclaration)
    * </pre>
    * @return the variable declaration list that was parsed
    */
   VariableDeclarationList parseVariableDeclarationList() {
@@ skipping 11 matching lines @@
    * @param type the type of the variables in the list
    * @return the variable declaration list that was parsed
    */
   VariableDeclarationList parseVariableDeclarationList2(Token keyword, TypeName type) {
     List<VariableDeclaration> variables = new List<VariableDeclaration>();
     variables.add(parseVariableDeclaration());
     while (matches5(TokenType.COMMA)) {
       advance();
       variables.add(parseVariableDeclaration());
     }
-    return new VariableDeclarationList(keyword, type, variables);
+    return new VariableDeclarationList.full(keyword, type, variables);
   }
   /**
    * Parse a variable declaration statement.
    * <pre>
    * variableDeclarationStatement ::=
    * variableDeclarationList ';'
    * </pre>
    * @return the variable declaration statement that was parsed
    */
   VariableDeclarationStatement parseVariableDeclarationStatement() {
     VariableDeclarationList variableList = parseVariableDeclarationList();
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new VariableDeclarationStatement(variableList, semicolon);
+    return new VariableDeclarationStatement.full(variableList, semicolon);
   }
   /**
    * Parse a while statement.
    * <pre>
    * whileStatement ::=
    * 'while' '(' expression ')' statement
    * </pre>
    * @return the while statement that was parsed
    */
   Statement parseWhileStatement() {
     bool wasInLoop = _inLoop;
     _inLoop = true;
     try {
       Token keyword = expect(Keyword.WHILE);
       Token leftParenthesis = expect2(TokenType.OPEN_PAREN);
       Expression condition = parseExpression2();
       Token rightParenthesis = expect2(TokenType.CLOSE_PAREN);
       Statement body = parseStatement2();
-      return new WhileStatement(keyword, leftParenthesis, condition, rightParenthesis, body);
+      return new WhileStatement.full(keyword, leftParenthesis, condition, rightParenthesis, body);
     } finally {
       _inLoop = wasInLoop;
     }
   }
   /**
    * Parse a with clause.
    * <pre>
    * withClause ::=
    * 'with' typeName (',' typeName)
    * </pre>
    * @return the with clause that was parsed
    */
   WithClause parseWithClause() {
     Token with6 = expect(Keyword.WITH);
     List<TypeName> types = new List<TypeName>();
     types.add(parseTypeName());
     while (optional(TokenType.COMMA)) {
       types.add(parseTypeName());
     }
-    return new WithClause(with6, types);
+    return new WithClause.full(with6, types);
   }
   /**
    * Return the token that is immediately after the current token. This is equivalent to{@link #peek(int) peek(1)}.
    * @return the token that is immediately after the current token
    */
   Token peek() => _currentToken.next;
   /**
    * Return the token that is the given distance after the current token.
    * @param distance the number of tokens to look ahead, where {@code 0} is the current token,{@code 1} is the next token, etc.
    * @return the token that is the given distance after the current token
@@ skipping 41 matching lines @@
    * | 'final' type?
    * | 'const' type?
    * | 'var'
    * | type
    * </pre>
    * @param startToken the token at which parsing is to begin
    * @return the token following the type that was parsed
    */
   Token skipFinalConstVarOrType(Token startToken) {
     if (matches3(startToken, Keyword.FINAL) || matches3(startToken, Keyword.CONST)) {
-      Token next2 = startToken.next;
-      if (matchesIdentifier2(next2.next) || matches4(next2.next, TokenType.LT) || matches3(next2.next, Keyword.THIS)) {
-        return skipTypeName(next2);
+      Token next3 = startToken.next;
+      if (matchesIdentifier2(next3.next) || matches4(next3.next, TokenType.LT) || matches3(next3.next, Keyword.THIS)) {
+        return skipTypeName(next3);
       }
     } else if (matches3(startToken, Keyword.VAR)) {
       return startToken.next;
     } else if (matchesIdentifier2(startToken)) {
-      Token next3 = startToken.next;
-      if (matchesIdentifier2(next3) || matches4(next3, TokenType.LT) || matches3(next3, Keyword.THIS) || (matches4(next3, TokenType.PERIOD) && matchesIdentifier2(next3.next) && (matchesIdentifier2(next3.next.next) || matches4(next3.next.next, TokenType.LT) || matches3(next3.next.next, Keyword.THIS)))) {
+      Token next4 = startToken.next;
+      if (matchesIdentifier2(next4) || matches4(next4, TokenType.LT) || matches3(next4, Keyword.THIS) || (matches4(next4, TokenType.PERIOD) && matchesIdentifier2(next4.next) && (matchesIdentifier2(next4.next.next) || matches4(next4.next.next, TokenType.LT) || matches3(next4.next.next, Keyword.THIS)))) {
         return skipReturnType(startToken);
       }
     }
     return null;
   }
   /**
    * Parse a list of formal parameters, starting at the given token, without actually creating a
    * formal parameter list or changing the current token. Return the token following the formal
    * parameter list that was parsed, or {@code null} if the given token is not the first token in a
    * valid list of formal parameter.
@@ skipping 20 matching lines @@
    * namedFormalParameters ::=
    * '{' defaultNamedParameter (',' defaultNamedParameter)* '}'
    * </pre>
    * @param startToken the token at which parsing is to begin
    * @return the token following the formal parameter list that was parsed
    */
   Token skipFormalParameterList(Token startToken) {
     if (!matches4(startToken, TokenType.OPEN_PAREN)) {
       return null;
     }
-    Token next4 = startToken.next;
-    if (matches4(next4, TokenType.CLOSE_PAREN)) {
-      return next4.next;
+    Token next5 = startToken.next;
+    if (matches4(next5, TokenType.CLOSE_PAREN)) {
+      return next5.next;
     }
-    if (matchesAny(next4, [TokenType.AT, TokenType.OPEN_SQUARE_BRACKET, TokenType.OPEN_CURLY_BRACKET]) || matches3(next4, Keyword.VOID) || (matchesIdentifier2(next4) && (matchesAny(next4.next, [TokenType.COMMA, TokenType.CLOSE_PAREN])))) {
+    if (matchesAny(next5, [TokenType.AT, TokenType.OPEN_SQUARE_BRACKET, TokenType.OPEN_CURLY_BRACKET]) || matches3(next5, Keyword.VOID) || (matchesIdentifier2(next5) && (matchesAny(next5.next, [TokenType.COMMA, TokenType.CLOSE_PAREN])))) {
       return skipPastMatchingToken(startToken);
     }
-    if (matchesIdentifier2(next4) && matches4(next4.next, TokenType.OPEN_PAREN)) {
-      Token afterParameters = skipFormalParameterList(next4.next);
+    if (matchesIdentifier2(next5) && matches4(next5.next, TokenType.OPEN_PAREN)) {
+      Token afterParameters = skipFormalParameterList(next5.next);
       if (afterParameters != null && (matchesAny(afterParameters, [TokenType.COMMA, TokenType.CLOSE_PAREN]))) {
         return skipPastMatchingToken(startToken);
       }
     }
-    Token afterType = skipFinalConstVarOrType(next4);
+    Token afterType = skipFinalConstVarOrType(next5);
     if (afterType == null) {
       return null;
     }
     if (skipSimpleIdentifier(afterType) == null) {
       return null;
     }
     return skipPastMatchingToken(startToken);
   }
   /**
    * If the given token is a begin token with an associated end token, then return the token
    * following the end token. Otherwise, return {@code null}.
    * @param startToken the token that is assumed to be a being token
    * @return the token following the matching end token
    */
   Token skipPastMatchingToken(Token startToken) {
     if (startToken is! BeginToken) {
       return null;
     }
-    Token closeParen = (startToken as BeginToken).endToken;
+    Token closeParen = ((startToken as BeginToken)).endToken;
     if (closeParen == null) {
       return null;
     }
     return closeParen.next;
   }
   /**
    * Parse a prefixed identifier, starting at the given token, without actually creating a prefixed
    * identifier or changing the current token. Return the token following the prefixed identifier
    * that was parsed, or {@code null} if the given token is not the first token in a valid prefixed
    * identifier.
@@ skipping 43 matching lines @@
    * <p>
    * This method must be kept in sync with {@link #parseSimpleIdentifier()}.
    * <pre>
    * identifier ::=
    * IDENTIFIER
    * </pre>
    * @param startToken the token at which parsing is to begin
    * @return the token following the simple identifier that was parsed
    */
   Token skipSimpleIdentifier(Token startToken) {
-    if (matches4(startToken, TokenType.IDENTIFIER) || (matches4(startToken, TokenType.KEYWORD) && (startToken as KeywordToken).keyword.isPseudoKeyword())) {
+    if (matches4(startToken, TokenType.IDENTIFIER) || (matches4(startToken, TokenType.KEYWORD) && ((startToken as KeywordToken)).keyword.isPseudoKeyword())) {
       return startToken.next;
     }
     return null;
   }
   /**
    * Parse a string literal that contains interpolations, starting at the given token, without
    * actually creating a string literal or changing the current token. Return the token following
    * the string literal that was parsed, or {@code null} if the given token is not the first token
    * in a valid string literal.
    * <p>
    * This method must be kept in sync with {@link #parseStringInterpolation(Token)}.
    * @param startToken the token at which parsing is to begin
    * @return the string literal that was parsed
    */
   Token skipStringInterpolation(Token startToken) {
     Token token = startToken;
-    TokenType type19 = token.type;
-    while (type19 == TokenType.STRING_INTERPOLATION_EXPRESSION || type19 == TokenType.STRING_INTERPOLATION_IDENTIFIER) {
-      if (type19 == TokenType.STRING_INTERPOLATION_EXPRESSION) {
+    TokenType type17 = token.type;
+    while (identical(type17, TokenType.STRING_INTERPOLATION_EXPRESSION) || identical(type17, TokenType.STRING_INTERPOLATION_IDENTIFIER)) {
+      if (identical(type17, TokenType.STRING_INTERPOLATION_EXPRESSION)) {
         token = token.next;
-        type19 = token.type;
+        type17 = token.type;
         int bracketNestingLevel = 1;
         while (bracketNestingLevel > 0) {
-          if (type19 == TokenType.EOF) {
+          if (identical(type17, TokenType.EOF)) {
             return null;
-          } else if (type19 == TokenType.OPEN_CURLY_BRACKET) {
+          } else if (identical(type17, TokenType.OPEN_CURLY_BRACKET)) {
             bracketNestingLevel++;
-          } else if (type19 == TokenType.CLOSE_CURLY_BRACKET) {
+          } else if (identical(type17, TokenType.CLOSE_CURLY_BRACKET)) {
             bracketNestingLevel--;
-          } else if (type19 == TokenType.STRING) {
+          } else if (identical(type17, TokenType.STRING)) {
             token = skipStringLiteral(token);
             if (token == null) {
               return null;
             }
           } else {
             token = token.next;
           }
-          type19 = token.type;
+          type17 = token.type;
         }
         token = token.next;
-        type19 = token.type;
+        type17 = token.type;
       } else {
         token = token.next;
         if (token.type != TokenType.IDENTIFIER) {
           return null;
         }
         token = token.next;
       }
-      type19 = token.type;
-      if (type19 == TokenType.STRING) {
+      type17 = token.type;
+      if (identical(type17, TokenType.STRING)) {
         token = token.next;
-        type19 = token.type;
+        type17 = token.type;
       }
     }
     return token;
   }
   /**
    * Parse a string literal, starting at the given token, without actually creating a string literal
    * or changing the current token. Return the token following the string literal that was parsed,
    * or {@code null} if the given token is not the first token in a valid string literal.
    * <p>
    * This method must be kept in sync with {@link #parseStringLiteral()}.
    * <pre>
    * stringLiteral ::=
    * MULTI_LINE_STRING+
    * | SINGLE_LINE_STRING+
    * </pre>
    * @param startToken the token at which parsing is to begin
    * @return the token following the string literal that was parsed
    */
   Token skipStringLiteral(Token startToken) {
     Token token = startToken;
     while (token != null && matches4(token, TokenType.STRING)) {
       token = token.next;
-      TokenType type20 = token.type;
-      if (type20 == TokenType.STRING_INTERPOLATION_EXPRESSION || type20 == TokenType.STRING_INTERPOLATION_IDENTIFIER) {
+      TokenType type18 = token.type;
+      if (identical(type18, TokenType.STRING_INTERPOLATION_EXPRESSION) || identical(type18, TokenType.STRING_INTERPOLATION_IDENTIFIER)) {
         token = skipStringInterpolation(token);
       }
     }
-    if (token == startToken) {
+    if (identical(token, startToken)) {
       return null;
     }
     return token;
   }
   /**
    * Parse a list of type arguments, starting at the given token, without actually creating a type argument list
    * or changing the current token. Return the token following the type argument list that was parsed,
    * or {@code null} if the given token is not the first token in a valid type argument list.
    * <p>
    * This method must be kept in sync with {@link #parseTypeArgumentList()}.
@@ skipping 14 matching lines @@
     token = skipTypeName(token.next);
     if (token == null) {
       return null;
     }
     while (matches4(token, TokenType.COMMA)) {
       token = skipTypeName(token.next);
       if (token == null) {
         return null;
       }
     }
-    if (token.type == TokenType.GT) {
+    if (identical(token.type, TokenType.GT)) {
       return token.next;
-    } else if (token.type == TokenType.GT_GT) {
+    } else if (identical(token.type, TokenType.GT_GT)) {
       Token second = new Token(TokenType.GT, token.offset + 1);
       second.setNextWithoutSettingPrevious(token.next);
       return second;
     }
     return null;
   }
   /**
    * Parse a type name, starting at the given token, without actually creating a type name or
    * changing the current token. Return the token following the type name that was parsed, or{@code null} if the given token is not the first token in a valid type name.
    * <p>
@@ skipping 27 matching lines @@
    * '<' typeParameter (',' typeParameter)* '>'
    * </pre>
    * @param startToken the token at which parsing is to begin
    * @return the token following the type parameter list that was parsed
    */
   Token skipTypeParameterList(Token startToken) {
     if (!matches4(startToken, TokenType.LT)) {
       return null;
     }
     int depth = 1;
-    Token next5 = startToken.next;
+    Token next6 = startToken.next;
     while (depth > 0) {
-      if (matches4(next5, TokenType.EOF)) {
+      if (matches4(next6, TokenType.EOF)) {
         return null;
-      } else if (matches4(next5, TokenType.LT)) {
+      } else if (matches4(next6, TokenType.LT)) {
         depth++;
-      } else if (matches4(next5, TokenType.GT)) {
+      } else if (matches4(next6, TokenType.GT)) {
         depth--;
-      } else if (matches4(next5, TokenType.GT_EQ)) {
+      } else if (matches4(next6, TokenType.GT_EQ)) {
         if (depth == 1) {
-          Token fakeEquals = new Token(TokenType.EQ, next5.offset + 2);
-          fakeEquals.setNextWithoutSettingPrevious(next5.next);
+          Token fakeEquals = new Token(TokenType.EQ, next6.offset + 2);
+          fakeEquals.setNextWithoutSettingPrevious(next6.next);
           return fakeEquals;
         }
         depth--;
-      } else if (matches4(next5, TokenType.GT_GT)) {
+      } else if (matches4(next6, TokenType.GT_GT)) {
         depth -= 2;
-      } else if (matches4(next5, TokenType.GT_GT_EQ)) {
+      } else if (matches4(next6, TokenType.GT_GT_EQ)) {
         if (depth < 2) {
           return null;
         } else if (depth == 2) {
-          Token fakeEquals = new Token(TokenType.EQ, next5.offset + 2);
-          fakeEquals.setNextWithoutSettingPrevious(next5.next);
+          Token fakeEquals = new Token(TokenType.EQ, next6.offset + 2);
+          fakeEquals.setNextWithoutSettingPrevious(next6.next);
           return fakeEquals;
         }
         depth -= 2;
       }
-      next5 = next5.next;
+      next6 = next6.next;
     }
-    return next5;
+    return next6;
   }
   /**
    * Translate the characters at the given index in the given string, appending the translated
    * character to the given builder. The index is assumed to be valid.
    * @param builder the builder to which the translated character is to be appended
    * @param lexeme the string containing the character(s) to be translated
    * @param index the index of the character to be translated
    * @return the index of the next character to be translated
    */
   int translateCharacter(StringBuffer builder, String lexeme, int index) {
-    int currentChar = lexeme.charCodeAt(index);
-    if (currentChar != 0x5c) {
+    int currentChar = lexeme.codeUnitAt(index);
+    if (currentChar != 0x5C) {
       builder.addCharCode(currentChar);
       return index + 1;
     }
     int length8 = lexeme.length;
     int currentIndex = index + 1;
     if (currentIndex >= length8) {
       return length8;
     }
-    currentChar = lexeme.charCodeAt(currentIndex);
-    if (currentChar == 0x6e) {
-      builder.addCharCode(0xa);
+    currentChar = lexeme.codeUnitAt(currentIndex);
+    if (currentChar == 0x6E) {
+      builder.addCharCode(0xA);
     } else if (currentChar == 0x72) {
-      builder.addCharCode(0xd);
+      builder.addCharCode(0xD);
     } else if (currentChar == 0x66) {
-      builder.addCharCode(0xc);
+      builder.addCharCode(0xC);
     } else if (currentChar == 0x62) {
       builder.addCharCode(0x8);
     } else if (currentChar == 0x74) {
       builder.addCharCode(0x9);
     } else if (currentChar == 0x76) {
-      builder.addCharCode(0xb);
+      builder.addCharCode(0xB);
     } else if (currentChar == 0x78) {
       if (currentIndex + 2 >= length8) {
         reportError3(ParserErrorCode.INVALID_HEX_ESCAPE, []);
         return length8;
       }
-      int firstDigit = lexeme.charCodeAt(currentIndex + 1);
-      int secondDigit = lexeme.charCodeAt(currentIndex + 2);
+      int firstDigit = lexeme.codeUnitAt(currentIndex + 1);
+      int secondDigit = lexeme.codeUnitAt(currentIndex + 2);
       if (!isHexDigit(firstDigit) || !isHexDigit(secondDigit)) {
         reportError3(ParserErrorCode.INVALID_HEX_ESCAPE, []);
       } else {
-        builder.addCharCode(((Character.digit(firstDigit, 16) << 4) + Character.digit(secondDigit, 16)) as int);
+        builder.addCharCode((((Character.digit(firstDigit, 16) << 4) + Character.digit(secondDigit, 16)) as int));
       }
       return currentIndex + 3;
     } else if (currentChar == 0x75) {
       currentIndex++;
       if (currentIndex >= length8) {
         reportError3(ParserErrorCode.INVALID_UNICODE_ESCAPE, []);
         return length8;
       }
-      currentChar = lexeme.charCodeAt(currentIndex);
-      if (currentChar == 0x7b) {
+      currentChar = lexeme.codeUnitAt(currentIndex);
+      if (currentChar == 0x7B) {
         currentIndex++;
         if (currentIndex >= length8) {
           reportError3(ParserErrorCode.INVALID_UNICODE_ESCAPE, []);
           return length8;
         }
-        currentChar = lexeme.charCodeAt(currentIndex);
+        currentChar = lexeme.codeUnitAt(currentIndex);
         int digitCount = 0;
         int value = 0;
-        while (currentChar != 0x7d) {
+        while (currentChar != 0x7D) {
           if (!isHexDigit(currentChar)) {
             reportError3(ParserErrorCode.INVALID_UNICODE_ESCAPE, []);
             currentIndex++;
-            while (currentIndex < length8 && lexeme.charCodeAt(currentIndex) != 0x7d) {
+            while (currentIndex < length8 && lexeme.codeUnitAt(currentIndex) != 0x7D) {
               currentIndex++;
             }
             return currentIndex + 1;
           }
           digitCount++;
           value = (value << 4) + Character.digit(currentChar, 16);
           currentIndex++;
           if (currentIndex >= length8) {
             reportError3(ParserErrorCode.INVALID_UNICODE_ESCAPE, []);
             return length8;
           }
-          currentChar = lexeme.charCodeAt(currentIndex);
+          currentChar = lexeme.codeUnitAt(currentIndex);
         }
         if (digitCount < 1 || digitCount > 6) {
           reportError3(ParserErrorCode.INVALID_UNICODE_ESCAPE, []);
         }
         appendScalarValue(builder, lexeme.substring(index, currentIndex + 1), value, index, currentIndex);
         return currentIndex + 1;
       } else {
         if (currentIndex + 3 >= length8) {
           reportError3(ParserErrorCode.INVALID_UNICODE_ESCAPE, []);
           return length8;
         }
         int firstDigit = currentChar;
-        int secondDigit = lexeme.charCodeAt(currentIndex + 1);
-        int thirdDigit = lexeme.charCodeAt(currentIndex + 2);
-        int fourthDigit = lexeme.charCodeAt(currentIndex + 3);
+        int secondDigit = lexeme.codeUnitAt(currentIndex + 1);
+        int thirdDigit = lexeme.codeUnitAt(currentIndex + 2);
+        int fourthDigit = lexeme.codeUnitAt(currentIndex + 3);
         if (!isHexDigit(firstDigit) || !isHexDigit(secondDigit) || !isHexDigit(thirdDigit) || !isHexDigit(fourthDigit)) {
           reportError3(ParserErrorCode.INVALID_UNICODE_ESCAPE, []);
         } else {
           appendScalarValue(builder, lexeme.substring(index, currentIndex + 1), ((((((Character.digit(firstDigit, 16) << 4) + Character.digit(secondDigit, 16)) << 4) + Character.digit(thirdDigit, 16)) << 4) + Character.digit(fourthDigit, 16)), index, currentIndex + 3);
         }
         return currentIndex + 4;
       }
     } else {
       builder.addCharCode(currentChar);
     }
     return currentIndex + 1;
   }
   /**
    * Validate that the given parameter list does not contain any field initializers.
    * @param parameterList the parameter list to be validated
    */
   void validateFormalParameterList(FormalParameterList parameterList) {
     for (FormalParameter parameter in parameterList.parameters) {
       if (parameter is FieldFormalParameter) {
-        reportError(ParserErrorCode.FIELD_INITIALIZER_OUTSIDE_CONSTRUCTOR, (parameter as FieldFormalParameter).identifier, []);
+        reportError(ParserErrorCode.FIELD_INITIALIZER_OUTSIDE_CONSTRUCTOR, ((parameter as FieldFormalParameter)).identifier, []);
       }
     }
   }
   /**
    * Validate that the given set of modifiers is appropriate for a class and return the 'abstract'
    * keyword if there is one.
    * @param modifiers the modifiers being validated
    */
   Token validateModifiersForClass(Modifiers modifiers) {
     validateModifiersForTopLevelDeclaration(modifiers);
@@ skipping 212 matching lines @@
       reportError4(ParserErrorCode.EXTERNAL_TYPEDEF, modifiers.externalKeyword, []);
     }
     if (modifiers.finalKeyword != null) {
       reportError4(ParserErrorCode.FINAL_TYPEDEF, modifiers.finalKeyword, []);
     }
     if (modifiers.varKeyword != null) {
       reportError4(ParserErrorCode.VAR_TYPEDEF, modifiers.varKeyword, []);
     }
   }
 }
-class AnalysisErrorListener_1 implements AnalysisErrorListener {
+class AnalysisErrorListener_4 implements AnalysisErrorListener {
   List<bool> errorFound;
-  AnalysisErrorListener_1(this.errorFound);
+  AnalysisErrorListener_4(this.errorFound);
   void onError(AnalysisError error) {
     errorFound[0] = true;
   }
 }
 /**
  * The enumeration {@code ParserErrorCode} defines the error codes used for errors detected by the
  * parser. The convention for this class is for the name of the error code to indicate the problem
  * that caused the error to be generated and for the error message to explain what is wrong and,
  * when appropriate, how the problem can be corrected.
  */
@@ skipping 106 matching lines @@
   ErrorSeverity _severity;
   /**
    * The message template used to create the message to be displayed for this error.
    */
   String _message;
   /**
    * Initialize a newly created error code to have the given severity and message.
    * @param severity the severity of the error
    * @param message the message template used to create the message to be displayed for the error
    */
-  ParserErrorCode.con1(String ___name, int ___ordinal, ErrorSeverity severity, String message) {
-    _jtd_constructor_208_impl(___name, ___ordinal, severity, message);
+  ParserErrorCode.con1(String ___name, int ___ordinal, ErrorSeverity severity2, String message2) {
+    _jtd_constructor_217_impl(___name, ___ordinal, severity2, message2);
   }
-  _jtd_constructor_208_impl(String ___name, int ___ordinal, ErrorSeverity severity, String message) {
+  _jtd_constructor_217_impl(String ___name, int ___ordinal, ErrorSeverity severity2, String message2) {
     __name = ___name;
     __ordinal = ___ordinal;
-    this._severity = severity;
-    this._message = message;
+    this._severity = severity2;
+    this._message = message2;
   }
   /**
    * Initialize a newly created error code to have the given message and a severity of ERROR.
    * @param message the message template used to create the message to be displayed for the error
    */
   ParserErrorCode.con2(String ___name, int ___ordinal, String message) {
-    _jtd_constructor_209_impl(___name, ___ordinal, message);
+    _jtd_constructor_218_impl(___name, ___ordinal, message);
   }
-  _jtd_constructor_209_impl(String ___name, int ___ordinal, String message) {
-    _jtd_constructor_208_impl(___name, ___ordinal, ErrorSeverity.ERROR, message);
+  _jtd_constructor_218_impl(String ___name, int ___ordinal, String message) {
+    _jtd_constructor_217_impl(___name, ___ordinal, ErrorSeverity.ERROR, message);
   }
   ErrorSeverity get errorSeverity => _severity;
   String get message => _message;
   ErrorType get type => ErrorType.SYNTACTIC_ERROR;
   bool needsRecompilation() => true;
   String toString() => __name;
 }
 /**
  * Instances of the class {link ToFormattedSourceVisitor} write a source representation of a visited
  * AST node (and all of it's children) to a writer.
@@ skipping 149 matching lines @@
       for (String line in StringUtils.split(token.lexeme, "\n")) {
         if (firstLine) {
           firstLine = false;
         } else {
           line = " ${line.trim()}";
           line = StringUtils.replace(line, "/*", "/ *");
         }
         _writer.print(line);
         nl2();
       }
-      if (token == node.endToken) {
+      if (identical(token, node.endToken)) {
         break;
       }
     }
     return null;
   }
   Object visitCommentReference(CommentReference node) => null;
   Object visitCompilationUnit(CompilationUnit node) {
-    ScriptTag scriptTag5 = node.scriptTag;
+    ScriptTag scriptTag7 = node.scriptTag;
     NodeList<Directive> directives4 = node.directives;
-    visit(scriptTag5);
-    String prefix = scriptTag5 == null ? "" : " ";
+    visit(scriptTag7);
+    String prefix = scriptTag7 == null ? "" : " ";
     visitList7(prefix, directives4, "\n");
-    prefix = scriptTag5 == null && directives4.isEmpty ? "" : "\n\n";
+    prefix = scriptTag7 == null && directives4.isEmpty ? "" : "\n\n";
     visitList7(prefix, node.declarations, "\n");
     return null;
   }
   Object visitConditionalExpression(ConditionalExpression node) {
     visit(node.condition);
     _writer.print(" ? ");
     visit(node.thenExpression);
     _writer.print(" : ");
     visit(node.elseExpression);
     return null;
@@ skipping 56 matching lines @@
   Object visitEmptyFunctionBody(EmptyFunctionBody node) {
     _writer.print(';');
     return null;
   }
   Object visitEmptyStatement(EmptyStatement node) {
     _writer.print(';');
     return null;
   }
   Object visitExportDirective(ExportDirective node) {
     _writer.print("export ");
-    visit(node.libraryUri);
+    visit(node.uri);
     visitList7(" ", node.combinators, " ");
     _writer.print(';');
     return null;
   }
   Object visitExpressionFunctionBody(ExpressionFunctionBody node) {
     _writer.print("=> ");
     visit(node.expression);
     if (node.semicolon != null) {
       _writer.print(';');
     }
@@ skipping 29 matching lines @@
     _writer.print(" in ");
     visit(node.iterator);
     _writer.print(") ");
     visit(node.body);
     return null;
   }
   Object visitFormalParameterList(FormalParameterList node) {
     String groupEnd = null;
     _writer.print('(');
     NodeList<FormalParameter> parameters11 = node.parameters;
-    int size6 = parameters11.length;
-    for (int i = 0; i < size6; i++) {
+    int size7 = parameters11.length;
+    for (int i = 0; i < size7; i++) {
       FormalParameter parameter = parameters11[i];
       if (i > 0) {
         _writer.print(", ");
       }
       if (groupEnd == null && parameter is DefaultFormalParameter) {
-        if (parameter.kind == ParameterKind.NAMED) {
+        if (identical(parameter.kind, ParameterKind.NAMED)) {
           groupEnd = "}";
           _writer.print('{');
         } else {
           groupEnd = "]";
           _writer.print('[');
         }
       }
       parameter.accept(this);
     }
     if (groupEnd != null) {
@@ skipping 69 matching lines @@
     visit7(" else ", node.elseStatement);
     return null;
   }
   Object visitImplementsClause(ImplementsClause node) {
     _writer.print("implements ");
     visitList5(node.interfaces, ", ");
     return null;
   }
   Object visitImportDirective(ImportDirective node) {
     _writer.print("import ");
-    visit(node.libraryUri);
+    visit(node.uri);
     visit7(" as ", node.prefix);
     visitList7(" ", node.combinators, " ");
     _writer.print(';');
     return null;
   }
   Object visitIndexExpression(IndexExpression node) {
     if (node.isCascaded()) {
       _writer.print("..");
     } else {
       visit(node.array);
@@ skipping 124 matching lines @@
     return null;
   }
   Object visitParenthesizedExpression(ParenthesizedExpression node) {
     _writer.print('(');
     visit(node.expression);
     _writer.print(')');
     return null;
   }
   Object visitPartDirective(PartDirective node) {
     _writer.print("part ");
-    visit(node.partUri);
+    visit(node.uri);
     _writer.print(';');
     return null;
   }
   Object visitPartOfDirective(PartOfDirective node) {
     _writer.print("part of ");
     visit(node.libraryName);
     _writer.print(';');
     return null;
   }
   Object visitPostfixExpression(PostfixExpression node) {
@@ skipping 21 matching lines @@
     visit(node.propertyName);
     return null;
   }
   Object visitRedirectingConstructorInvocation(RedirectingConstructorInvocation node) {
     _writer.print("this");
     visit7(".", node.constructorName);
     visit(node.argumentList);
     return null;
   }
   Object visitReturnStatement(ReturnStatement node) {
-    Expression expression15 = node.expression;
-    if (expression15 == null) {
+    Expression expression16 = node.expression;
+    if (expression16 == null) {
       _writer.print("return;");
     } else {
       _writer.print("return ");
-      expression15.accept(this);
+      expression16.accept(this);
       _writer.print(";");
     }
     return null;
   }
   Object visitScriptTag(ScriptTag node) {
     _writer.print(node.scriptTag.lexeme);
     return null;
   }
   Object visitShowCombinator(ShowCombinator node) {
     _writer.print("show ");
@@ skipping 202 matching lines @@
   void visitList(NodeList<ASTNode> nodes) {
     visitList5(nodes, "");
   }
   /**
    * Print a list of nodes, separated by the given separator.
    * @param nodes the nodes to be printed
    * @param separator the separator to be printed between adjacent nodes
    */
   void visitList5(NodeList<ASTNode> nodes, String separator) {
     if (nodes != null) {
-      int size7 = nodes.length;
-      for (int i = 0; i < size7; i++) {
+      int size8 = nodes.length;
+      for (int i = 0; i < size8; i++) {
         if ("\n" == separator) {
           _writer.print("\n");
           indent();
         } else if (i > 0) {
           _writer.print(separator);
         }
         nodes[i].accept(this);
       }
     }
   }
   /**
    * Print a list of nodes, separated by the given separator.
    * @param nodes the nodes to be printed
    * @param separator the separator to be printed between adjacent nodes
    * @param suffix the suffix to be printed if the list is not empty
    */
   void visitList6(NodeList<ASTNode> nodes, String separator, String suffix) {
     if (nodes != null) {
-      int size8 = nodes.length;
-      if (size8 > 0) {
-        for (int i = 0; i < size8; i++) {
+      int size9 = nodes.length;
+      if (size9 > 0) {
+        for (int i = 0; i < size9; i++) {
           if (i > 0) {
             _writer.print(separator);
           }
           nodes[i].accept(this);
         }
         _writer.print(suffix);
       }
     }
   }
   /**
    * Print a list of nodes, separated by the given separator.
    * @param prefix the prefix to be printed if the list is not empty
    * @param nodes the nodes to be printed
    * @param separator the separator to be printed between adjacent nodes
    */
   void visitList7(String prefix, NodeList<ASTNode> nodes, String separator) {
     if (nodes != null) {
-      int size9 = nodes.length;
-      if (size9 > 0) {
+      int size10 = nodes.length;
+      if (size10 > 0) {
         _writer.print(prefix);
-        for (int i = 0; i < size9; i++) {
+        for (int i = 0; i < size10; i++) {
           if (i > 0) {
             _writer.print(separator);
           }
           nodes[i].accept(this);
         }
       }
     }
   }
 }