New analyzer snapshot.

pkg/analyzer/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 'instrumentation.dart';
 import 'error.dart';
 import 'source.dart';
 import 'scanner.dart';
 import 'ast.dart';
 import 'utilities_dart.dart';
 import 'engine.dart' show AnalysisEngine;
 import 'utilities_collection.dart' show TokenMap;
 
 /**
  * Instances of the class `CommentAndMetadata` implement a simple data-holder for a method
  * that needs to return multiple values.
  *
  * @coverage dart.engine.parser
  */
 class CommentAndMetadata {
   /**
    * The documentation comment that was parsed, or `null` if none was given.
    */
-  Comment comment;
+  final Comment comment;
 
   /**
    * The metadata that was parsed.
    */
-  List<Annotation> metadata;
+  final List<Annotation> metadata;
 
   /**
    * Initialize a newly created holder with the given data.
    *
    * @param comment the documentation comment that was parsed
    * @param metadata the metadata that was parsed
    */
-  CommentAndMetadata(Comment comment, List<Annotation> metadata) {
-    this.comment = comment;
-    this.metadata = metadata;
-  }
+  CommentAndMetadata(this.comment, this.metadata);
 }
 
 /**
  * Instances of the class `FinalConstVarOrType` implement a simple data-holder for a method
  * that needs to return multiple values.
  *
  * @coverage dart.engine.parser
  */
 class FinalConstVarOrType {
   /**
    * The 'final', 'const' or 'var' keyword, or `null` if none was given.
    */
-  Token keyword;
+  final Token keyword;
 
   /**
    * The type, of `null` if no type was specified.
    */
-  TypeName type;
+  final TypeName type;
 
   /**
    * Initialize a newly created holder with the given data.
    *
    * @param keyword the 'final', 'const' or 'var' keyword
    * @param type the type
    */
-  FinalConstVarOrType(Token keyword, TypeName type) {
-    this.keyword = keyword;
-    this.type = type;
-  }
+  FinalConstVarOrType(this.keyword, this.type);
 }
 
 /**
  * Instances of the class `Modifiers` implement a simple data-holder for a method that needs
  * to return multiple values.
  *
  * @coverage dart.engine.parser
  */
 class Modifiers {
   /**
@@ skipping 1058 matching lines @@
    * A map from old tokens to new tokens used during the cloning process.
    */
   TokenMap _tokenMap;
 
   /**
    * The error listener that will be informed of any errors that are found during the parse.
    */
   AnalysisErrorListener _errorListener;
 
   /**
+   * The node in the AST structure that contains the revised content.
+   */
+  ASTNode _updatedNode;
+
+  /**
    * Initialize a newly created incremental parser to parse a portion of the content of the given
    * source.
    *
    * @param source the source being parsed
    * @param tokenMap a map from old tokens to new tokens used during the cloning process
    * @param errorListener the error listener that will be informed of any errors that are found
    *          during the parse
    */
   IncrementalParser(Source source, TokenMap tokenMap, AnalysisErrorListener errorListener) {
     this._source = source;
     this._tokenMap = tokenMap;
     this._errorListener = errorListener;
   }
 
   /**
+   * Return the node in the AST structure that contains the revised content.
+   *
+   * @return the updated node
+   */
+  ASTNode get updatedNode => _updatedNode;
+
+  /**
    * Given a range of tokens that were re-scanned, re-parse the minimum number of tokens to produce
    * a consistent AST structure. The range is represented by the first and last tokens in the range.
    * The tokens are assumed to be contained in the same token stream.
    *
    * @param leftToken the token in the new token stream immediately to the left of the range of
    *          tokens that were inserted
    * @param rightToken the token in the new token stream immediately to the right of the range of
    *          tokens that were inserted
    * @param originalStart the offset in the original source of the first character that was modified
    * @param originalEnd the offset in the original source of the last character that was modified
@@ skipping 38 matching lines @@
         return null;
       }
       if (advanceToParent) {
         newNode = null;
         oldNode = parent;
         originalOffset = oldNode.offset;
         parseToken = findTokenAt(parseToken, originalOffset);
         parser.currentToken = parseToken;
       }
     }
+    _updatedNode = newNode;
     if (identical(oldNode, originalStructure)) {
       ResolutionCopier.copyResolutionData(oldNode, newNode);
       return newNode as ASTNode;
     }
     ResolutionCopier.copyResolutionData(oldNode, newNode);
     IncrementalASTCloner cloner = new IncrementalASTCloner(oldNode, newNode, _tokenMap);
     return originalStructure.accept(cloner) as ASTNode;
   }
 
   /**
@@ skipping 14 matching lines @@
    * no such token.
    *
    * @param firstToken the token from which the search is to begin
    * @param offset the offset of the token to be returned
    * @return the token with the given offset
    */
   Token findTokenAt(Token firstToken, int offset) {
     while (firstToken.offset > offset && firstToken.type != TokenType.EOF) {
       firstToken = firstToken.previous;
     }
-    if (firstToken.offset == offset) {
-      return firstToken;
-    }
-    return null;
+    return firstToken;
   }
 }
 
 /**
  * Instances of the class `InsufficientContextException` represent a situation in which an AST
  * node cannot be re-parsed because there is not enough context to know how to re-parse the node.
  * Clients can attempt to re-parse the parent of the node.
  */
 class InsufficientContextException extends IncrementalParseException {
   /**
@@ skipping 171 matching lines @@
     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.full(atSign, name, period, constructorName, arguments);
+    return new Annotation(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)) {
-      return new NamedExpression.full(parseLabel(), parseExpression2());
+      return new NamedExpression(parseLabel(), parseExpression2());
     } else {
       return parseExpression2();
     }
   }
 
   /**
    * 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.full(leftParenthesis, arguments, andAdvance);
+      return new ArgumentList(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) {
           reportError10(ParserErrorCode.POSITIONAL_AFTER_NAMED_ARGUMENT, []);
           generatedError = true;
         }
       } else if (argument is NamedExpression) {
         foundNamedArgument = true;
       }
     }
     Token rightParenthesis = expect2(TokenType.CLOSE_PAREN);
-    return new ArgumentList.full(leftParenthesis, arguments, rightParenthesis);
+    return new ArgumentList(leftParenthesis, arguments, rightParenthesis);
   }
 
   /**
    * 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.full(andAdvance);
+      expression = new SuperExpression(andAdvance);
     } else {
       expression = parseBitwiseXorExpression();
     }
     while (matches5(TokenType.BAR)) {
       Token operator = andAdvance;
-      expression = new BinaryExpression.full(expression, operator, parseBitwiseXorExpression());
+      expression = new BinaryExpression(expression, operator, parseBitwiseXorExpression());
     }
     return expression;
   }
 
   /**
    * Parse a block.
    *
    * <pre>
    * block ::=
    *     '{' statements '}'
@@ skipping 10 matching lines @@
       if (statement != null) {
         statements.add(statement);
       }
       if (identical(_currentToken, statementStart)) {
         reportError11(ParserErrorCode.UNEXPECTED_TOKEN, _currentToken, [_currentToken.lexeme]);
         advance();
       }
       statementStart = _currentToken;
     }
     Token rightBracket = expect2(TokenType.CLOSE_CURLY_BRACKET);
-    return new Block.full(leftBracket, statements, rightBracket);
+    return new Block(leftBracket, statements, rightBracket);
   }
 
   /**
    * Parse a class member.
    *
    * <pre>
    * classMemberDefinition ::=
    *     declaration ';'
    *   | methodSignature functionBody
    * </pre>
@@ skipping 127 matching lines @@
    *     directive
    *   | topLevelDeclaration
    * </pre>
    *
    * @return the compilation unit that was parsed
    */
   CompilationUnit parseCompilationUnit2() {
     Token firstToken = _currentToken;
     ScriptTag scriptTag = null;
     if (matches5(TokenType.SCRIPT_TAG)) {
-      scriptTag = new ScriptTag.full(andAdvance);
+      scriptTag = new ScriptTag(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 48 matching lines @@
       }
       if (identical(_currentToken, memberStart)) {
         reportError11(ParserErrorCode.UNEXPECTED_TOKEN, _currentToken, [_currentToken.lexeme]);
         advance();
         while (!matches5(TokenType.EOF) && !couldBeStartOfCompilationUnitMember()) {
           advance();
         }
       }
       memberStart = _currentToken;
     }
-    return new CompilationUnit.full(firstToken, scriptTag, directives, declarations, _currentToken);
+    return new CompilationUnit(firstToken, scriptTag, directives, declarations, _currentToken);
   }
 
   /**
    * 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.full(condition, question, thenExpression, colon, elseExpression);
+    return new ConditionalExpression(condition, question, thenExpression, colon, elseExpression);
   }
 
   /**
    * 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.full(type, period, name);
+    return new ConstructorName(type, period, name);
   }
 
   /**
    * Parse an expression that does not contain any cascades.
    *
    * <pre>
    * expression ::=
    *     assignableExpression assignmentOperator expression
    *   | conditionalExpression cascadeSection*
    *   | throwExpression
@@ skipping 11 matching lines @@
     TokenType tokenType = _currentToken.type;
     if (identical(tokenType, TokenType.PERIOD_PERIOD)) {
       List<Expression> cascadeSections = new List<Expression>();
       while (identical(tokenType, TokenType.PERIOD_PERIOD)) {
         Expression section = parseCascadeSection();
         if (section != null) {
           cascadeSections.add(section);
         }
         tokenType = _currentToken.type;
       }
-      return new CascadeExpression.full(expression, cascadeSections);
+      return new CascadeExpression(expression, cascadeSections);
     } else if (tokenType.isAssignmentOperator) {
       Token operator = andAdvance;
       ensureAssignable(expression);
-      return new AssignmentExpression.full(expression, operator, parseExpression2());
+      return new AssignmentExpression(expression, operator, parseExpression2());
     }
     return expression;
   }
 
   /**
    * Parse an expression that does not contain any cascades.
    *
    * <pre>
    * expressionWithoutCascade ::=
    *     assignableExpression assignmentOperator expressionWithoutCascade
    *   | conditionalExpression
    *   | throwExpressionWithoutCascade
    * </pre>
    *
    * @return the expression that was parsed
    */
   Expression parseExpressionWithoutCascade() {
     if (matches(Keyword.THROW)) {
       return parseThrowExpressionWithoutCascade();
     } else if (matches(Keyword.RETHROW)) {
       return parseRethrowExpression();
     }
     Expression expression = parseConditionalExpression();
     if (_currentToken.type.isAssignmentOperator) {
       Token operator = andAdvance;
       ensureAssignable(expression);
-      expression = new AssignmentExpression.full(expression, operator, parseExpressionWithoutCascade());
+      expression = new AssignmentExpression(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.full(keyword, superclass);
+    return new ExtendsClause(keyword, superclass);
   }
 
   /**
    * Parse a list of formal parameters.
    *
    * <pre>
    * formalParameterList ::=
    *     '(' ')'
    *   | '(' normalFormalParameters (',' optionalFormalParameters)? ')'
    *   | '(' optionalFormalParameters ')'
@@ skipping 10 matching lines @@
    *
    * 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.full(leftParenthesis, null, null, null, andAdvance);
+      return new FormalParameterList(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;
@@ skipping 83 matching lines @@
     }
     if (leftCurlyBracket != null && rightCurlyBracket == null) {
       reportError10(ParserErrorCode.MISSING_TERMINATOR_FOR_PARAMETER_GROUP, ["}"]);
     }
     if (leftSquareBracket == null) {
       leftSquareBracket = leftCurlyBracket;
     }
     if (rightSquareBracket == null) {
       rightSquareBracket = rightCurlyBracket;
     }
-    return new FormalParameterList.full(leftParenthesis, parameters, leftSquareBracket, rightSquareBracket, rightParenthesis);
+    return new FormalParameterList(leftParenthesis, parameters, leftSquareBracket, rightSquareBracket, rightParenthesis);
   }
 
   /**
    * Parse a function expression.
    *
    * <pre>
    * functionExpression ::=
    *     formalParameterList functionExpressionBody
    * </pre>
    *
    * @return the function expression that was parsed
    */
   FunctionExpression parseFunctionExpression() {
     FormalParameterList parameters = parseFormalParameterList();
     validateFormalParameterList(parameters);
     FunctionBody body = parseFunctionBody(false, ParserErrorCode.MISSING_FUNCTION_BODY, true);
-    return new FunctionExpression.full(parameters, body);
+    return new FunctionExpression(parameters, body);
   }
 
   /**
    * 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.full(keyword, interfaces);
+    return new ImplementsClause(keyword, interfaces);
   }
 
   /**
    * Parse a label.
    *
    * <pre>
    * label ::=
    *     identifier ':'
    * </pre>
    *
    * @return the label that was parsed
    */
   Label parseLabel() {
     SimpleIdentifier label = parseSimpleIdentifier();
     Token colon = expect2(TokenType.COLON);
-    return new Label.full(label, colon);
+    return new Label(label, colon);
   }
 
   /**
    * 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.full(components);
+    return new LibraryIdentifier(components);
   }
 
   /**
    * 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.full(expression, operator, parseLogicalAndExpression());
+      expression = new BinaryExpression(expression, operator, parseLogicalAndExpression());
     }
     return expression;
   }
 
   /**
    * Parse a map literal entry.
    *
    * <pre>
    * mapLiteralEntry ::=
    *     expression ':' expression
    * </pre>
    *
    * @return the map literal entry that was parsed
    */
   MapLiteralEntry parseMapLiteralEntry() {
     Expression key = parseExpression2();
     Token separator = expect2(TokenType.COLON);
     Expression value = parseExpression2();
-    return new MapLiteralEntry.full(key, separator, value);
+    return new MapLiteralEntry(key, separator, value);
   }
 
   /**
    * Parse a normal formal parameter.
    *
    * <pre>
    * normalFormalParameter ::=
    *     functionSignature
    *   | fieldFormalParameter
    *   | simpleFormalParameter
@@ skipping 20 matching lines @@
       thisKeyword = andAdvance;
       period = expect2(TokenType.PERIOD);
     }
     SimpleIdentifier identifier = parseSimpleIdentifier();
     if (matches5(TokenType.OPEN_PAREN)) {
       FormalParameterList parameters = parseFormalParameterList();
       if (thisKeyword == null) {
         if (holder.keyword != null) {
           reportError11(ParserErrorCode.FUNCTION_TYPED_PARAMETER_VAR, holder.keyword, []);
         }
-        return new FunctionTypedFormalParameter.full(commentAndMetadata.comment, commentAndMetadata.metadata, holder.type, identifier, parameters);
+        return new FunctionTypedFormalParameter(commentAndMetadata.comment, commentAndMetadata.metadata, holder.type, identifier, parameters);
       } else {
-        return new FieldFormalParameter.full(commentAndMetadata.comment, commentAndMetadata.metadata, holder.keyword, holder.type, thisKeyword, period, identifier, parameters);
+        return new FieldFormalParameter(commentAndMetadata.comment, commentAndMetadata.metadata, holder.keyword, holder.type, thisKeyword, period, identifier, parameters);
       }
     }
     TypeName type = holder.type;
     if (type != null) {
       if (matches3(type.name.beginToken, Keyword.VOID)) {
         reportError11(ParserErrorCode.VOID_PARAMETER, type.name.beginToken, []);
       } else if (holder.keyword != null && matches3(holder.keyword, Keyword.VAR)) {
         reportError11(ParserErrorCode.VAR_AND_TYPE, holder.keyword, []);
       }
     }
     if (thisKeyword != null) {
-      return new FieldFormalParameter.full(commentAndMetadata.comment, commentAndMetadata.metadata, holder.keyword, holder.type, thisKeyword, period, identifier, null);
+      return new FieldFormalParameter(commentAndMetadata.comment, commentAndMetadata.metadata, holder.keyword, holder.type, thisKeyword, period, identifier, null);
     }
-    return new SimpleFormalParameter.full(commentAndMetadata.comment, commentAndMetadata.metadata, holder.keyword, holder.type, identifier);
+    return new SimpleFormalParameter(commentAndMetadata.comment, commentAndMetadata.metadata, holder.keyword, holder.type, identifier);
   }
 
   /**
    * 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.full(qualifier, period, qualified);
+    return new PrefixedIdentifier(qualifier, period, qualified);
   }
 
   /**
    * 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.full(new SimpleIdentifier.full(andAdvance), null);
+      return new TypeName(new SimpleIdentifier(andAdvance), null);
     } else {
       return parseTypeName();
     }
   }
 
   /**
    * Parse a simple identifier.
    *
    * <pre>
    * identifier ::=
    *     IDENTIFIER
    * </pre>
    *
    * @return the simple identifier that was parsed
    */
   SimpleIdentifier parseSimpleIdentifier() {
     if (matchesIdentifier()) {
-      return new SimpleIdentifier.full(andAdvance);
+      return new SimpleIdentifier(andAdvance);
     }
     reportError10(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)) {
       labels.add(parseLabel());
     }
     Statement statement = parseNonLabeledStatement();
     if (labels.isEmpty) {
       return statement;
     }
-    return new LabeledStatement.full(labels, statement);
+    return new LabeledStatement(labels, statement);
   }
 
   /**
    * 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.full(string, computeStringValue(string.lexeme, true, true)));
+        strings.add(new SimpleStringLiteral(string, computeStringValue(string.lexeme, true, true)));
       }
     }
     if (strings.length < 1) {
       reportError10(ParserErrorCode.EXPECTED_STRING_LITERAL, []);
       return createSyntheticStringLiteral();
     } else if (strings.length == 1) {
       return strings[0];
     } else {
-      return new AdjacentStrings.full(strings);
+      return new AdjacentStrings(strings);
     }
   }
 
   /**
    * Parse a list of type arguments.
    *
    * <pre>
    * typeArguments ::=
    *     '<' typeList '>'
    *
    * typeList ::=
    *     type (',' type)*
    * </pre>
    *
    * @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.full(leftBracket, arguments, rightBracket);
+    return new TypeArgumentList(leftBracket, arguments, rightBracket);
   }
 
   /**
    * Parse a type name.
    *
    * <pre>
    * type ::=
    *     qualified typeArguments?
    * </pre>
    *
    * @return the type name that was parsed
    */
   TypeName parseTypeName() {
     Identifier typeName;
     if (matches(Keyword.VAR)) {
       reportError10(ParserErrorCode.VAR_AS_TYPE_NAME, []);
-      typeName = new SimpleIdentifier.full(andAdvance);
+      typeName = new SimpleIdentifier(andAdvance);
     } else if (matchesIdentifier()) {
       typeName = parsePrefixedIdentifier();
     } else {
       typeName = createSyntheticIdentifier();
       reportError10(ParserErrorCode.EXPECTED_TYPE_NAME, []);
     }
     TypeArgumentList typeArguments = null;
     if (matches5(TokenType.LT)) {
       typeArguments = parseTypeArgumentList();
     }
-    return new TypeName.full(typeName, typeArguments);
+    return new TypeName(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 = parseSimpleIdentifier();
     if (matches(Keyword.EXTENDS)) {
       Token keyword = andAdvance;
       TypeName bound = parseTypeName();
-      return new TypeParameter.full(commentAndMetadata.comment, commentAndMetadata.metadata, name, keyword, bound);
+      return new TypeParameter(commentAndMetadata.comment, commentAndMetadata.metadata, name, keyword, bound);
     }
-    return new TypeParameter.full(commentAndMetadata.comment, commentAndMetadata.metadata, name, null, null);
+    return new TypeParameter(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.full(leftBracket, typeParameters, rightBracket);
+    return new TypeParameterList(leftBracket, typeParameters, rightBracket);
   }
 
   /**
    * Parse a with clause.
    *
    * <pre>
    * withClause ::=
    *     'with' typeName (',' typeName)*
    * </pre>
    *
    * @return the with clause that was parsed
    */
   WithClause parseWithClause() {
     Token with2 = expect(Keyword.WITH);
     List<TypeName> types = new List<TypeName>();
     types.add(parseTypeName());
     while (optional(TokenType.COMMA)) {
       types.add(parseTypeName());
     }
-    return new WithClause.full(with2, types);
+    return new WithClause(with2, types);
   }
 
   void set currentToken(Token currentToken) {
     this._currentToken = currentToken;
   }
 
   /**
    * Advance to the next token in the token stream.
    */
   void advance() {
@@ skipping 70 matching lines @@
     return builder.toString();
   }
 
   /**
    * Convert the given method declaration into the nearest valid top-level function declaration.
    *
    * @param method the method to be converted
    * @return the function declaration that most closely captures the components of the given method
    *         declaration
    */
-  FunctionDeclaration convertToFunctionDeclaration(MethodDeclaration method) => new FunctionDeclaration.full(method.documentationComment, method.metadata, method.externalKeyword, method.returnType, method.propertyKeyword, method.name, new FunctionExpression.full(method.parameters, method.body));
+  FunctionDeclaration convertToFunctionDeclaration(MethodDeclaration method) => new FunctionDeclaration(method.documentationComment, method.metadata, method.externalKeyword, method.returnType, method.propertyKeyword, method.name, new FunctionExpression(method.parameters, method.body));
 
   /**
    * Return `true` if the current token could be the start of a compilation unit member. This
    * method is used for recovery purposes to decide when to stop skipping tokens after finding an
    * error while parsing a compilation unit member.
    *
    * @return `true` if the current token could be the start of a compilation unit member
    */
   bool couldBeStartOfCompilationUnitMember() {
     if ((matches(Keyword.IMPORT) || matches(Keyword.EXPORT) || matches(Keyword.LIBRARY) || matches(Keyword.PART)) && !matches4(peek(), TokenType.PERIOD) && !matches4(peek(), TokenType.LT)) {
@@ skipping 24 matching lines @@
    *
    * @return the synthetic identifier that was created
    */
   SimpleIdentifier createSyntheticIdentifier() {
     Token syntheticToken;
     if (identical(_currentToken.type, TokenType.KEYWORD)) {
       syntheticToken = injectToken(new SyntheticStringToken(TokenType.IDENTIFIER, _currentToken.lexeme, _currentToken.offset));
     } else {
       syntheticToken = createSyntheticToken2(TokenType.IDENTIFIER);
     }
-    return new SimpleIdentifier.full(syntheticToken);
+    return new SimpleIdentifier(syntheticToken);
   }
 
   /**
    * Create a synthetic string literal.
    *
    * @return the synthetic string literal that was created
    */
-  SimpleStringLiteral createSyntheticStringLiteral() => new SimpleStringLiteral.full(createSyntheticToken2(TokenType.STRING), "");
+  SimpleStringLiteral createSyntheticStringLiteral() => new SimpleStringLiteral(createSyntheticToken2(TokenType.STRING), "");
 
   /**
    * Create a synthetic token representing the given keyword.
    *
    * @return the synthetic token that was created
    */
   Token createSyntheticToken(Keyword keyword) => injectToken(new Parser_SyntheticKeywordToken(keyword, _currentToken.offset));
 
   /**
    * Create a synthetic token with the given type.
@@ skipping 541 matching lines @@
    * 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.full(andAdvance);
+      expression = new SuperExpression(andAdvance);
     } else {
       expression = parseMultiplicativeExpression();
     }
     while (_currentToken.type.isAdditiveOperator) {
       Token operator = andAdvance;
-      expression = new BinaryExpression.full(expression, operator, parseMultiplicativeExpression());
+      expression = new BinaryExpression(expression, operator, parseMultiplicativeExpression());
     }
     return expression;
   }
 
   /**
    * 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();
     reportError11(ParserErrorCode.DEPRECATED_ARGUMENT_DEFINITION_TEST, question, []);
-    return new ArgumentDefinitionTest.full(question, identifier);
+    return new ArgumentDefinitionTest(question, identifier);
   }
 
   /**
    * 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 = parseExpression2();
     if (expression is AssignmentExpression) {
       reportError9(ParserErrorCode.ASSERT_DOES_NOT_TAKE_ASSIGNMENT, expression, []);
     } else if (expression is CascadeExpression) {
       reportError9(ParserErrorCode.ASSERT_DOES_NOT_TAKE_CASCADE, expression, []);
     } else if (expression is ThrowExpression) {
       reportError9(ParserErrorCode.ASSERT_DOES_NOT_TAKE_THROW, expression, []);
     } else if (expression is RethrowExpression) {
       reportError9(ParserErrorCode.ASSERT_DOES_NOT_TAKE_RETHROW, expression, []);
     }
     Token rightParen = expect2(TokenType.CLOSE_PAREN);
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new AssertStatement.full(keyword, leftParen, expression, rightParen, semicolon);
+    return new AssertStatement(keyword, leftParen, expression, rightParen, semicolon);
   }
 
   /**
    * Parse an assignable expression.
    *
    * <pre>
    * assignableExpression ::=
    *     primary (arguments* assignableSelector)+
    *   | 'super' assignableSelector
    *   | identifier
    * </pre>
    *
    * @param primaryAllowed `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.full(andAdvance), false);
+      return parseAssignableSelector(new SuperExpression(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.full(null, null, expression as SimpleIdentifier, argumentList);
+          expression = new MethodInvocation(null, null, expression as SimpleIdentifier, argumentList);
         } else if (expression is PrefixedIdentifier) {
           PrefixedIdentifier identifier = expression as PrefixedIdentifier;
-          expression = new MethodInvocation.full(identifier.prefix, identifier.period, identifier.identifier, argumentList);
+          expression = new MethodInvocation(identifier.prefix, identifier.period, identifier.identifier, argumentList);
         } else if (expression is PropertyAccess) {
           PropertyAccess access = expression as PropertyAccess;
-          expression = new MethodInvocation.full(access.target, access.operator, access.propertyName, argumentList);
+          expression = new MethodInvocation(access.target, access.operator, access.propertyName, argumentList);
         } else {
-          expression = new FunctionExpressionInvocation.full(expression, argumentList);
+          expression = new FunctionExpressionInvocation(expression, argumentList);
         }
         if (!primaryAllowed) {
           isOptional = false;
         }
       }
       Expression selectorExpression = parseAssignableSelector(expression, isOptional || (expression is PrefixedIdentifier));
       if (identical(selectorExpression, expression)) {
         if (!isOptional && (expression is PrefixedIdentifier)) {
           PrefixedIdentifier identifier = expression as PrefixedIdentifier;
-          expression = new PropertyAccess.full(identifier.prefix, identifier.period, identifier.identifier);
+          expression = new PropertyAccess(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 `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.forTarget_full(prefix, leftBracket, index, rightBracket);
+      return new IndexExpression.forTarget(prefix, leftBracket, index, rightBracket);
     } else if (matches5(TokenType.PERIOD)) {
       Token period = andAdvance;
-      return new PropertyAccess.full(prefix, period, parseSimpleIdentifier());
+      return new PropertyAccess(prefix, period, parseSimpleIdentifier());
     } else {
       if (!optional) {
         reportError10(ParserErrorCode.MISSING_ASSIGNABLE_SELECTOR, []);
       }
       return prefix;
     }
   }
 
   /**
    * Parse a bitwise and expression.
    *
    * <pre>
    * bitwiseAndExpression ::=
    *     shiftExpression ('&' shiftExpression)*
    *   | 'super' ('&' shiftExpression)+
    * </pre>
    *
    * @return the bitwise and expression that was parsed
    */
   Expression parseBitwiseAndExpression() {
     Expression expression;
     if (matches(Keyword.SUPER) && matches4(peek(), TokenType.AMPERSAND)) {
-      expression = new SuperExpression.full(andAdvance);
+      expression = new SuperExpression(andAdvance);
     } else {
       expression = parseShiftExpression();
     }
     while (matches5(TokenType.AMPERSAND)) {
       Token operator = andAdvance;
-      expression = new BinaryExpression.full(expression, operator, parseShiftExpression());
+      expression = new BinaryExpression(expression, operator, parseShiftExpression());
     }
     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.full(andAdvance);
+      expression = new SuperExpression(andAdvance);
     } else {
       expression = parseBitwiseAndExpression();
     }
     while (matches5(TokenType.CARET)) {
       Token operator = andAdvance;
-      expression = new BinaryExpression.full(expression, operator, parseBitwiseAndExpression());
+      expression = new BinaryExpression(expression, operator, parseBitwiseAndExpression());
     }
     return expression;
   }
 
   /**
    * 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) {
       reportError11(ParserErrorCode.BREAK_OUTSIDE_OF_LOOP, breakKeyword, []);
     }
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new BreakStatement.full(breakKeyword, label, semicolon);
+    return new BreakStatement(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 (identical(_currentToken.type, TokenType.OPEN_SQUARE_BRACKET)) {
       Token leftBracket = andAdvance;
       Expression index = parseExpression2();
       Token rightBracket = expect2(TokenType.CLOSE_SQUARE_BRACKET);
-      expression = new IndexExpression.forCascade_full(period, leftBracket, index, rightBracket);
+      expression = new IndexExpression.forCascade(period, leftBracket, index, rightBracket);
       period = null;
     } else {
       reportError11(ParserErrorCode.MISSING_IDENTIFIER, _currentToken, [_currentToken.lexeme]);
       functionName = createSyntheticIdentifier();
     }
     if (identical(_currentToken.type, TokenType.OPEN_PAREN)) {
       while (identical(_currentToken.type, TokenType.OPEN_PAREN)) {
         if (functionName != null) {
-          expression = new MethodInvocation.full(expression, period, functionName, parseArgumentList());
+          expression = new MethodInvocation(expression, period, functionName, parseArgumentList());
           period = null;
           functionName = null;
         } else if (expression == null) {
-          expression = new MethodInvocation.full(expression, period, createSyntheticIdentifier(), parseArgumentList());
+          expression = new MethodInvocation(expression, period, createSyntheticIdentifier(), parseArgumentList());
         } else {
-          expression = new FunctionExpressionInvocation.full(expression, parseArgumentList());
+          expression = new FunctionExpressionInvocation(expression, parseArgumentList());
         }
       }
     } else if (functionName != null) {
-      expression = new PropertyAccess.full(expression, period, functionName);
+      expression = new PropertyAccess(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 (identical(_currentToken.type, TokenType.OPEN_PAREN)) {
           if (expression is PropertyAccess) {
             PropertyAccess propertyAccess = expression as PropertyAccess;
-            expression = new MethodInvocation.full(propertyAccess.target, propertyAccess.operator, propertyAccess.propertyName, parseArgumentList());
+            expression = new MethodInvocation(propertyAccess.target, propertyAccess.operator, propertyAccess.propertyName, parseArgumentList());
           } else {
-            expression = new FunctionExpressionInvocation.full(expression, parseArgumentList());
+            expression = new FunctionExpressionInvocation(expression, parseArgumentList());
           }
         }
       }
     }
     if (_currentToken.type.isAssignmentOperator) {
       Token operator = andAdvance;
       ensureAssignable(expression);
-      expression = new AssignmentExpression.full(expression, operator, parseExpressionWithoutCascade());
+      expression = new AssignmentExpression(expression, operator, parseExpressionWithoutCascade());
     }
     return expression;
   }
 
   /**
    * Parse a class declaration.
    *
    * <pre>
    * classDeclaration ::=
    *     metadata 'abstract'? 'class' name typeParameterList? (extendsClause withClause?)? implementsClause? '{' classMembers '}' |
@@ skipping 74 matching lines @@
     Token rightBracket = null;
     if (matches5(TokenType.OPEN_CURLY_BRACKET)) {
       leftBracket = expect2(TokenType.OPEN_CURLY_BRACKET);
       members = parseClassMembers(className, getEndToken(leftBracket));
       rightBracket = expect2(TokenType.CLOSE_CURLY_BRACKET);
     } else {
       leftBracket = createSyntheticToken2(TokenType.OPEN_CURLY_BRACKET);
       rightBracket = createSyntheticToken2(TokenType.CLOSE_CURLY_BRACKET);
       reportError10(ParserErrorCode.MISSING_CLASS_BODY, []);
     }
-    ClassDeclaration classDeclaration = new ClassDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, abstractKeyword, keyword, name, typeParameters, extendsClause, withClause, implementsClause, leftBracket, members, rightBracket);
+    ClassDeclaration classDeclaration = new ClassDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, abstractKeyword, keyword, name, typeParameters, extendsClause, withClause, implementsClause, leftBracket, members, rightBracket);
     classDeclaration.nativeClause = nativeClause;
     return classDeclaration;
   }
 
   /**
    * Parse a list of class members.
    *
    * <pre>
    * classMembers ::=
    *     (metadata memberDefinition)*
@@ skipping 68 matching lines @@
       if (matches5(TokenType.OPEN_CURLY_BRACKET)) {
         reportError10(ParserErrorCode.EXPECTED_TOKEN, [TokenType.SEMICOLON.lexeme]);
         Token leftBracket = andAdvance;
         parseClassMembers(className.name, getEndToken(leftBracket));
         expect2(TokenType.CLOSE_CURLY_BRACKET);
       } else {
         reportError11(ParserErrorCode.EXPECTED_TOKEN, _currentToken.previous, [TokenType.SEMICOLON.lexeme]);
       }
       semicolon = createSyntheticToken2(TokenType.SEMICOLON);
     }
-    return new ClassTypeAlias.full(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, className, typeParameters, equals, abstractKeyword, superclass, withClause, implementsClause, semicolon);
+    return new ClassTypeAlias(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, className, 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(_SHOW) || matches2(_HIDE)) {
       Token keyword = expect2(TokenType.IDENTIFIER);
       if (keyword.lexeme == _SHOW) {
         List<SimpleIdentifier> shownNames = parseIdentifierList();
-        combinators.add(new ShowCombinator.full(keyword, shownNames));
+        combinators.add(new ShowCombinator(keyword, shownNames));
       } else {
         List<SimpleIdentifier> hiddenNames = parseIdentifierList();
-        combinators.add(new HideCombinator.full(keyword, hiddenNames));
+        combinators.add(new HideCombinator(keyword, hiddenNames));
       }
     }
     return combinators;
   }
 
   /**
    * Parse the documentation comment and metadata preceding 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.
    *
@@ skipping 46 matching lines @@
       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.full(new SimpleIdentifier.full(firstToken), secondToken, new SimpleIdentifier.full(thirdToken));
+          identifier = new PrefixedIdentifier(new SimpleIdentifier(firstToken), secondToken, new SimpleIdentifier(thirdToken));
           nextToken = thirdToken.next;
         } else {
-          identifier = new SimpleIdentifier.full(firstToken);
+          identifier = new SimpleIdentifier(firstToken);
           nextToken = firstToken.next;
         }
         if (nextToken.type != TokenType.EOF) {
           return null;
         }
-        return new CommentReference.full(newKeyword, identifier);
+        return new CommentReference(newKeyword, identifier);
       } else if (matches3(firstToken, Keyword.THIS) || matches3(firstToken, Keyword.NULL) || matches3(firstToken, Keyword.TRUE) || matches3(firstToken, Keyword.FALSE)) {
         return null;
       }
     } on JavaException catch (exception) {
     }
     return null;
   }
 
   /**
    * Parse all of the comment references occurring in the given array of documentation comments.
@@ skipping 82 matching lines @@
       } else if (matchesIdentifier() && matchesAny(peek(), [
           TokenType.OPEN_PAREN,
           TokenType.OPEN_CURLY_BRACKET,
           TokenType.FUNCTION])) {
         validateModifiersForTopLevelFunction(modifiers);
         return parseFunctionDeclaration(commentAndMetadata, modifiers.externalKeyword, returnType);
       } else {
         if (matchesIdentifier()) {
           if (matchesAny(peek(), [TokenType.EQ, TokenType.COMMA, TokenType.SEMICOLON])) {
             reportError9(ParserErrorCode.VOID_VARIABLE, returnType, []);
-            return new TopLevelVariableDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(null, validateModifiersForTopLevelVariable(modifiers), null), expect2(TokenType.SEMICOLON));
+            return new TopLevelVariableDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(null, validateModifiersForTopLevelVariable(modifiers), null), expect2(TokenType.SEMICOLON));
           }
         }
         reportError11(ParserErrorCode.EXPECTED_EXECUTABLE, _currentToken, []);
         return null;
       }
     } else if ((matches(Keyword.GET) || matches(Keyword.SET)) && matchesIdentifier2(peek())) {
       validateModifiersForTopLevelFunction(modifiers);
       return parseFunctionDeclaration(commentAndMetadata, modifiers.externalKeyword, null);
     } else if (matches(Keyword.OPERATOR) && isOperator(peek())) {
       reportError11(ParserErrorCode.TOP_LEVEL_OPERATOR, _currentToken, []);
       return convertToFunctionDeclaration(parseOperator(commentAndMetadata, modifiers.externalKeyword, null));
     } else if (!matchesIdentifier()) {
       reportError11(ParserErrorCode.EXPECTED_EXECUTABLE, _currentToken, []);
       return null;
     } else if (matches4(peek(), TokenType.OPEN_PAREN)) {
       validateModifiersForTopLevelFunction(modifiers);
       return parseFunctionDeclaration(commentAndMetadata, modifiers.externalKeyword, null);
     } else if (matchesAny(peek(), [TokenType.EQ, TokenType.COMMA, TokenType.SEMICOLON])) {
       if (modifiers.constKeyword == null && modifiers.finalKeyword == null && modifiers.varKeyword == null) {
         reportError10(ParserErrorCode.MISSING_CONST_FINAL_VAR_OR_TYPE, []);
       }
-      return new TopLevelVariableDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(null, validateModifiersForTopLevelVariable(modifiers), null), expect2(TokenType.SEMICOLON));
+      return new TopLevelVariableDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(null, validateModifiersForTopLevelVariable(modifiers), null), expect2(TokenType.SEMICOLON));
     }
     TypeName returnType = parseReturnType();
     if ((matches(Keyword.GET) || matches(Keyword.SET)) && matchesIdentifier2(peek())) {
       validateModifiersForTopLevelFunction(modifiers);
       return parseFunctionDeclaration(commentAndMetadata, modifiers.externalKeyword, returnType);
     } else if (matches(Keyword.OPERATOR) && isOperator(peek())) {
       reportError11(ParserErrorCode.TOP_LEVEL_OPERATOR, _currentToken, []);
       return convertToFunctionDeclaration(parseOperator(commentAndMetadata, modifiers.externalKeyword, returnType));
     } else if (matches5(TokenType.AT)) {
-      return new TopLevelVariableDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(null, validateModifiersForTopLevelVariable(modifiers), returnType), expect2(TokenType.SEMICOLON));
+      return new TopLevelVariableDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(null, validateModifiersForTopLevelVariable(modifiers), returnType), expect2(TokenType.SEMICOLON));
     } else if (!matchesIdentifier()) {
       reportError11(ParserErrorCode.EXPECTED_EXECUTABLE, _currentToken, []);
       Token semicolon;
       if (matches5(TokenType.SEMICOLON)) {
         semicolon = andAdvance;
       } else {
         semicolon = createSyntheticToken2(TokenType.SEMICOLON);
       }
       List<VariableDeclaration> variables = new List<VariableDeclaration>();
-      variables.add(new VariableDeclaration.full(null, null, createSyntheticIdentifier(), null, null));
-      return new TopLevelVariableDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, new VariableDeclarationList.full(null, null, null, returnType, variables), semicolon);
+      variables.add(new VariableDeclaration(null, null, createSyntheticIdentifier(), null, null));
+      return new TopLevelVariableDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, new VariableDeclarationList(null, null, null, returnType, variables), semicolon);
     }
     if (matchesAny(peek(), [
         TokenType.OPEN_PAREN,
         TokenType.FUNCTION,
         TokenType.OPEN_CURLY_BRACKET])) {
       validateModifiersForTopLevelFunction(modifiers);
       return parseFunctionDeclaration(commentAndMetadata, modifiers.externalKeyword, returnType);
     }
-    return new TopLevelVariableDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(null, validateModifiersForTopLevelVariable(modifiers), returnType), expect2(TokenType.SEMICOLON));
+    return new TopLevelVariableDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, parseVariableDeclarationList2(null, validateModifiersForTopLevelVariable(modifiers), returnType), expect2(TokenType.SEMICOLON));
   }
 
   /**
    * Parse a const expression.
    *
    * <pre>
    * constExpression ::=
    *     instanceCreationExpression
    *   | listLiteral
    *   | mapLiteral
@@ skipping 36 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.full(expect2(TokenType.SEMICOLON));
+      body = new EmptyFunctionBody(expect2(TokenType.SEMICOLON));
       if (factoryKeyword == null) {
         reportError9(ParserErrorCode.REDIRECTION_IN_NON_FACTORY_CONSTRUCTOR, redirectedConstructor, []);
       }
     } else {
       body = parseFunctionBody(true, ParserErrorCode.MISSING_FUNCTION_BODY, false);
       if (constKeyword != null && factoryKeyword != null && externalKeyword == null) {
         reportError11(ParserErrorCode.CONST_FACTORY, factoryKeyword, []);
       } else if (body is EmptyFunctionBody) {
         if (factoryKeyword != null && externalKeyword == null) {
           reportError11(ParserErrorCode.FACTORY_WITHOUT_BODY, factoryKeyword, []);
         }
       } else {
         if (constKeyword != null) {
           reportError9(ParserErrorCode.CONST_CONSTRUCTOR_WITH_BODY, body, []);
         } else if (!bodyAllowed) {
           reportError9(ParserErrorCode.EXTERNAL_CONSTRUCTOR_WITH_BODY, body, []);
         }
       }
     }
-    return new ConstructorDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, constKeyword, factoryKeyword, returnType, period, name, parameters, separator, initializers, redirectedConstructor, body);
+    return new ConstructorDeclaration(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>
    *
@@ skipping 12 matching lines @@
     TokenType tokenType = _currentToken.type;
     if (identical(tokenType, TokenType.PERIOD_PERIOD)) {
       List<Expression> cascadeSections = new List<Expression>();
       while (identical(tokenType, TokenType.PERIOD_PERIOD)) {
         Expression section = parseCascadeSection();
         if (section != null) {
           cascadeSections.add(section);
         }
         tokenType = _currentToken.type;
       }
-      expression = new CascadeExpression.full(expression, cascadeSections);
+      expression = new CascadeExpression(expression, cascadeSections);
     }
-    return new ConstructorFieldInitializer.full(keyword, period, fieldName, equals, expression);
+    return new ConstructorFieldInitializer(keyword, period, fieldName, equals, expression);
   }
 
   /**
    * 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) {
       reportError11(ParserErrorCode.CONTINUE_OUTSIDE_OF_LOOP, continueKeyword, []);
     }
     SimpleIdentifier label = null;
     if (matchesIdentifier()) {
       label = parseSimpleIdentifier();
     }
     if (_inSwitch && !_inLoop && label == null) {
       reportError11(ParserErrorCode.CONTINUE_WITHOUT_LABEL_IN_CASE, continueKeyword, []);
     }
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new ContinueStatement.full(continueKeyword, label, semicolon);
+    return new ContinueStatement(continueKeyword, label, semicolon);
   }
 
   /**
    * Parse a directive.
    *
    * <pre>
    * directive ::=
    *     exportDirective
    *   | libraryDirective
    *   | importDirective
@@ skipping 69 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.full(doKeyword, body, whileKeyword, leftParenthesis, condition, rightParenthesis, semicolon);
+      return new DoStatement(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.full(andAdvance);
+  Statement parseEmptyStatement() => new EmptyStatement(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.full(andAdvance);
+      expression = new SuperExpression(andAdvance);
     } else {
       expression = parseRelationalExpression();
     }
     bool leftEqualityExpression = false;
     while (_currentToken.type.isEqualityOperator) {
       Token operator = andAdvance;
       if (leftEqualityExpression) {
         reportError9(ParserErrorCode.EQUALITY_CANNOT_BE_EQUALITY_OPERAND, expression, []);
       }
-      expression = new BinaryExpression.full(expression, operator, parseRelationalExpression());
+      expression = new BinaryExpression(expression, operator, parseRelationalExpression());
       leftEqualityExpression = true;
     }
     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.full(commentAndMetadata.comment, commentAndMetadata.metadata, exportKeyword, libraryUri, combinators, semicolon);
+    return new ExportDirective(commentAndMetadata.comment, commentAndMetadata.metadata, exportKeyword, libraryUri, combinators, semicolon);
   }
 
   /**
    * Parse a list of expressions.
    *
    * <pre>
    * expressionList ::=
    *     expression (',' expression)*
    * </pre>
    *
@@ skipping 61 matching lines @@
   FormalParameter parseFormalParameter(ParameterKind kind) {
     NormalFormalParameter parameter = parseNormalFormalParameter();
     if (matches5(TokenType.EQ)) {
       Token seperator = andAdvance;
       Expression defaultValue = parseExpression2();
       if (identical(kind, ParameterKind.NAMED)) {
         reportError11(ParserErrorCode.WRONG_SEPARATOR_FOR_NAMED_PARAMETER, seperator, []);
       } else if (identical(kind, ParameterKind.REQUIRED)) {
         reportError9(ParserErrorCode.POSITIONAL_PARAMETER_OUTSIDE_GROUP, parameter, []);
       }
-      return new DefaultFormalParameter.full(parameter, kind, seperator, defaultValue);
+      return new DefaultFormalParameter(parameter, kind, seperator, defaultValue);
     } else if (matches5(TokenType.COLON)) {
       Token seperator = andAdvance;
       Expression defaultValue = parseExpression2();
       if (identical(kind, ParameterKind.POSITIONAL)) {
         reportError11(ParserErrorCode.WRONG_SEPARATOR_FOR_POSITIONAL_PARAMETER, seperator, []);
       } else if (identical(kind, ParameterKind.REQUIRED)) {
         reportError9(ParserErrorCode.NAMED_PARAMETER_OUTSIDE_GROUP, parameter, []);
       }
-      return new DefaultFormalParameter.full(parameter, kind, seperator, defaultValue);
+      return new DefaultFormalParameter(parameter, kind, seperator, defaultValue);
     } else if (kind != ParameterKind.REQUIRED) {
-      return new DefaultFormalParameter.full(parameter, kind, null, null);
+      return new DefaultFormalParameter(parameter, kind, null, null);
     }
     return parameter;
   }
 
   /**
    * Parse a for statement.
    *
    * <pre>
    * forStatement ::=
    *     'for' '(' forLoopParts ')' statement
@@ skipping 16 matching lines @@
     try {
       Token forKeyword = expect(Keyword.FOR);
       Token leftParenthesis = expect2(TokenType.OPEN_PAREN);
       VariableDeclarationList variableList = null;
       Expression initialization = null;
       if (!matches5(TokenType.SEMICOLON)) {
         CommentAndMetadata commentAndMetadata = parseCommentAndMetadata();
         if (matchesIdentifier() && matches3(peek(), Keyword.IN)) {
           List<VariableDeclaration> variables = new List<VariableDeclaration>();
           SimpleIdentifier variableName = parseSimpleIdentifier();
-          variables.add(new VariableDeclaration.full(null, null, variableName, null, null));
-          variableList = new VariableDeclarationList.full(commentAndMetadata.comment, commentAndMetadata.metadata, null, null, variables);
+          variables.add(new VariableDeclaration(null, null, variableName, null, null));
+          variableList = new VariableDeclarationList(commentAndMetadata.comment, commentAndMetadata.metadata, null, null, variables);
         } else if (isInitializedVariableDeclaration()) {
           variableList = parseVariableDeclarationList(commentAndMetadata);
         } else {
           initialization = parseExpression2();
         }
         if (matches(Keyword.IN)) {
           DeclaredIdentifier loopVariable = null;
           SimpleIdentifier identifier = null;
           if (variableList == null) {
             reportError10(ParserErrorCode.MISSING_VARIABLE_IN_FOR_EACH, []);
           } else {
             NodeList<VariableDeclaration> variables = variableList.variables;
             if (variables.length > 1) {
               reportError10(ParserErrorCode.MULTIPLE_VARIABLES_IN_FOR_EACH, [variables.length.toString()]);
             }
             VariableDeclaration variable = variables[0];
             if (variable.initializer != null) {
               reportError10(ParserErrorCode.INITIALIZED_VARIABLE_IN_FOR_EACH, []);
             }
             Token keyword = variableList.keyword;
             TypeName type = variableList.type;
             if (keyword != null || type != null) {
-              loopVariable = new DeclaredIdentifier.full(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, type, variable.name);
+              loopVariable = new DeclaredIdentifier(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, type, variable.name);
             } else {
               if (!commentAndMetadata.metadata.isEmpty) {
               }
               identifier = variable.name;
             }
           }
           Token inKeyword = expect(Keyword.IN);
           Expression iterator = parseExpression2();
           Token rightParenthesis = expect2(TokenType.CLOSE_PAREN);
           Statement body = parseStatement2();
           if (loopVariable == null) {
-            return new ForEachStatement.con2_full(forKeyword, leftParenthesis, identifier, inKeyword, iterator, rightParenthesis, body);
+            return new ForEachStatement.con2(forKeyword, leftParenthesis, identifier, inKeyword, iterator, rightParenthesis, body);
           }
-          return new ForEachStatement.con1_full(forKeyword, leftParenthesis, loopVariable, inKeyword, iterator, rightParenthesis, body);
+          return new ForEachStatement.con1(forKeyword, leftParenthesis, loopVariable, 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.full(forKeyword, leftParenthesis, variableList, initialization, leftSeparator, condition, rightSeparator, updaters, rightParenthesis, body);
+      return new ForStatement(forKeyword, leftParenthesis, variableList, initialization, leftSeparator, condition, rightSeparator, updaters, rightParenthesis, body);
     } finally {
       _inLoop = wasInLoop;
     }
   }
 
   /**
    * Parse a function body.
    *
    * <pre>
    * functionBody ::=
@@ skipping 14 matching lines @@
   FunctionBody parseFunctionBody(bool mayBeEmpty, ParserErrorCode emptyErrorCode, bool inExpression) {
     bool wasInLoop = _inLoop;
     bool wasInSwitch = _inSwitch;
     _inLoop = false;
     _inSwitch = false;
     try {
       if (matches5(TokenType.SEMICOLON)) {
         if (!mayBeEmpty) {
           reportError10(emptyErrorCode, []);
         }
-        return new EmptyFunctionBody.full(andAdvance);
+        return new EmptyFunctionBody(andAdvance);
       } else if (matches5(TokenType.FUNCTION)) {
         Token functionDefinition = andAdvance;
         Expression expression = parseExpression2();
         Token semicolon = null;
         if (!inExpression) {
           semicolon = expect2(TokenType.SEMICOLON);
         }
         if (!_parseFunctionBodies) {
-          return new EmptyFunctionBody.full(createSyntheticToken2(TokenType.SEMICOLON));
+          return new EmptyFunctionBody(createSyntheticToken2(TokenType.SEMICOLON));
         }
-        return new ExpressionFunctionBody.full(functionDefinition, expression, semicolon);
+        return new ExpressionFunctionBody(functionDefinition, expression, semicolon);
       } else if (matches5(TokenType.OPEN_CURLY_BRACKET)) {
         if (!_parseFunctionBodies) {
           skipBlock();
-          return new EmptyFunctionBody.full(createSyntheticToken2(TokenType.SEMICOLON));
+          return new EmptyFunctionBody(createSyntheticToken2(TokenType.SEMICOLON));
         }
-        return new BlockFunctionBody.full(parseBlock());
+        return new BlockFunctionBody(parseBlock());
       } else if (matches2(_NATIVE)) {
         Token nativeToken = andAdvance;
         StringLiteral stringLiteral = null;
         if (matches5(TokenType.STRING)) {
           stringLiteral = parseStringLiteral();
         }
-        return new NativeFunctionBody.full(nativeToken, stringLiteral, expect2(TokenType.SEMICOLON));
+        return new NativeFunctionBody(nativeToken, stringLiteral, expect2(TokenType.SEMICOLON));
       } else {
         reportError10(emptyErrorCode, []);
-        return new EmptyFunctionBody.full(createSyntheticToken2(TokenType.SEMICOLON));
+        return new EmptyFunctionBody(createSyntheticToken2(TokenType.SEMICOLON));
       }
     } finally {
       _inLoop = wasInLoop;
       _inSwitch = wasInSwitch;
     }
   }
 
   /**
    * Parse a function declaration.
    *
@@ skipping 29 matching lines @@
         reportError10(ParserErrorCode.MISSING_FUNCTION_PARAMETERS, []);
       }
     } else if (matches5(TokenType.OPEN_PAREN)) {
       reportError10(ParserErrorCode.GETTER_WITH_PARAMETERS, []);
       parseFormalParameterList();
     }
     FunctionBody body;
     if (externalKeyword == null) {
       body = parseFunctionBody(false, ParserErrorCode.MISSING_FUNCTION_BODY, false);
     } else {
-      body = new EmptyFunctionBody.full(expect2(TokenType.SEMICOLON));
+      body = new EmptyFunctionBody(expect2(TokenType.SEMICOLON));
     }
-    return new FunctionDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, returnType, keyword, name, new FunctionExpression.full(parameters, body));
+    return new FunctionDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, returnType, keyword, name, new FunctionExpression(parameters, body));
   }
 
   /**
    * Parse a function declaration statement.
    *
    * <pre>
    * functionDeclarationStatement ::=
    *     functionSignature functionBody
    * </pre>
    *
@@ skipping 21 matching lines @@
   Statement parseFunctionDeclarationStatement2(CommentAndMetadata commentAndMetadata, TypeName returnType) {
     FunctionDeclaration declaration = parseFunctionDeclaration(commentAndMetadata, null, returnType);
     Token propertyKeyword = declaration.propertyKeyword;
     if (propertyKeyword != null) {
       if (identical((propertyKeyword as KeywordToken).keyword, Keyword.GET)) {
         reportError11(ParserErrorCode.GETTER_IN_FUNCTION, propertyKeyword, []);
       } else {
         reportError11(ParserErrorCode.SETTER_IN_FUNCTION, propertyKeyword, []);
       }
     }
-    return new FunctionDeclarationStatement.full(declaration);
+    return new FunctionDeclarationStatement(declaration);
   }
 
   /**
    * 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 = parseSimpleIdentifier();
     TypeParameterList typeParameters = null;
     if (matches5(TokenType.LT)) {
       typeParameters = parseTypeParameterList();
     }
     if (matches5(TokenType.SEMICOLON) || matches5(TokenType.EOF)) {
       reportError10(ParserErrorCode.MISSING_TYPEDEF_PARAMETERS, []);
-      FormalParameterList parameters = new FormalParameterList.full(createSyntheticToken2(TokenType.OPEN_PAREN), null, null, null, createSyntheticToken2(TokenType.CLOSE_PAREN));
+      FormalParameterList parameters = new FormalParameterList(createSyntheticToken2(TokenType.OPEN_PAREN), null, null, null, createSyntheticToken2(TokenType.CLOSE_PAREN));
       Token semicolon = expect2(TokenType.SEMICOLON);
-      return new FunctionTypeAlias.full(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, returnType, name, typeParameters, parameters, semicolon);
+      return new FunctionTypeAlias(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, returnType, name, typeParameters, parameters, semicolon);
     } else if (!matches5(TokenType.OPEN_PAREN)) {
       reportError10(ParserErrorCode.MISSING_TYPEDEF_PARAMETERS, []);
-      return new FunctionTypeAlias.full(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, returnType, name, typeParameters, new FormalParameterList.full(createSyntheticToken2(TokenType.OPEN_PAREN), null, null, null, createSyntheticToken2(TokenType.CLOSE_PAREN)), createSyntheticToken2(TokenType.SEMICOLON));
+      return new FunctionTypeAlias(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, returnType, name, typeParameters, new FormalParameterList(createSyntheticToken2(TokenType.OPEN_PAREN), null, null, null, createSyntheticToken2(TokenType.CLOSE_PAREN)), createSyntheticToken2(TokenType.SEMICOLON));
     }
     FormalParameterList parameters = parseFormalParameterList();
     validateFormalParameterList(parameters);
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new FunctionTypeAlias.full(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, returnType, name, typeParameters, parameters, semicolon);
+    return new FunctionTypeAlias(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, returnType, name, typeParameters, parameters, semicolon);
   }
 
   /**
    * Parse a getter.
    *
    * <pre>
    * getter ::=
    *     getterSignature functionBody?
    *
    * getterSignature ::=
@@ skipping 13 matching lines @@
     SimpleIdentifier name = parseSimpleIdentifier();
     if (matches5(TokenType.OPEN_PAREN) && matches4(peek(), TokenType.CLOSE_PAREN)) {
       reportError10(ParserErrorCode.GETTER_WITH_PARAMETERS, []);
       advance();
       advance();
     }
     FunctionBody body = parseFunctionBody(externalKeyword != null || staticKeyword == null, ParserErrorCode.STATIC_GETTER_WITHOUT_BODY, false);
     if (externalKeyword != null && body is! EmptyFunctionBody) {
       reportError10(ParserErrorCode.EXTERNAL_GETTER_WITH_BODY, []);
     }
-    return new MethodDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, staticKeyword, returnType, propertyKeyword, null, name, null, body);
+    return new MethodDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, staticKeyword, returnType, propertyKeyword, null, name, null, body);
   }
 
   /**
    * Parse a list of identifiers.
    *
    * <pre>
    * identifierList ::=
    *     identifier (',' identifier)*
    * </pre>
    *
@@ skipping 24 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.full(ifKeyword, leftParenthesis, condition, rightParenthesis, thenStatement, elseKeyword, elseStatement);
+    return new IfStatement(ifKeyword, leftParenthesis, condition, rightParenthesis, thenStatement, elseKeyword, elseStatement);
   }
 
   /**
    * 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.full(commentAndMetadata.comment, commentAndMetadata.metadata, importKeyword, libraryUri, asToken, prefix, combinators, semicolon);
+    return new ImportDirective(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 `null` if the getter is not static
    * @param keyword the token representing the 'final', 'const' or 'var' keyword, or `null` if
    *          there is no keyword
    * @param type the type that has already been parsed, or `null` if 'var' was provided
    * @return the getter that was parsed
    */
   FieldDeclaration parseInitializedIdentifierList(CommentAndMetadata commentAndMetadata, Token staticKeyword, Token keyword, TypeName type) {
     VariableDeclarationList fieldList = parseVariableDeclarationList2(null, keyword, type);
-    return new FieldDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, staticKeyword, fieldList, expect2(TokenType.SEMICOLON));
+    return new FieldDeclaration(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.full(keyword, constructorName, argumentList);
+    return new InstanceCreationExpression(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.full(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, libraryName, semicolon);
+    return new LibraryDirective(commentAndMetadata.comment, commentAndMetadata.metadata, keyword, libraryName, semicolon);
   }
 
   /**
    * 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();
       reportError9(ParserErrorCode.NON_IDENTIFIER_LIBRARY_NAME, string, []);
     } else {
       reportError11(missingNameError, missingNameToken, []);
     }
     List<SimpleIdentifier> components = new List<SimpleIdentifier>();
     components.add(createSyntheticIdentifier());
-    return new LibraryIdentifier.full(components);
+    return new LibraryIdentifier(components);
   }
 
   /**
    * Parse a list literal.
    *
    * <pre>
    * listLiteral ::=
    *     'const'? typeArguments? '[' (expressionList ','?)? ']'
    * </pre>
    *
    * @param modifier the 'const' modifier appearing before the literal, or `null` if there is
    *          no modifier
    * @param typeArguments the type arguments appearing before the literal, or `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.endToken = rightBracket;
       rightBracket.setNext(_currentToken.next);
       leftBracket.setNext(rightBracket);
       _currentToken.previous.setNext(leftBracket);
       _currentToken = _currentToken.next;
-      return new ListLiteral.full(modifier, typeArguments, leftBracket, null, rightBracket);
+      return new ListLiteral(modifier, typeArguments, leftBracket, null, rightBracket);
     }
     Token leftBracket = expect2(TokenType.OPEN_SQUARE_BRACKET);
     if (matches5(TokenType.CLOSE_SQUARE_BRACKET)) {
-      return new ListLiteral.full(modifier, typeArguments, leftBracket, null, andAdvance);
+      return new ListLiteral(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.full(modifier, typeArguments, leftBracket, elements, andAdvance);
+        return new ListLiteral(modifier, typeArguments, leftBracket, elements, andAdvance);
       }
       elements.add(parseExpression2());
     }
     Token rightBracket = expect2(TokenType.CLOSE_SQUARE_BRACKET);
-    return new ListLiteral.full(modifier, typeArguments, leftBracket, elements, rightBracket);
+    return new ListLiteral(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 `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);
     }
     reportError10(ParserErrorCode.EXPECTED_LIST_OR_MAP_LITERAL, []);
-    return new ListLiteral.full(modifier, typeArguments, createSyntheticToken2(TokenType.OPEN_SQUARE_BRACKET), null, createSyntheticToken2(TokenType.CLOSE_SQUARE_BRACKET));
+    return new ListLiteral(modifier, typeArguments, createSyntheticToken2(TokenType.OPEN_SQUARE_BRACKET), null, createSyntheticToken2(TokenType.CLOSE_SQUARE_BRACKET));
   }
 
   /**
    * Parse a logical and expression.
    *
    * <pre>
    * logicalAndExpression ::=
    *     equalityExpression ('&&' equalityExpression)*
    * </pre>
    *
    * @return the logical and expression that was parsed
    */
   Expression parseLogicalAndExpression() {
     Expression expression = parseEqualityExpression();
     while (matches5(TokenType.AMPERSAND_AMPERSAND)) {
       Token operator = andAdvance;
-      expression = new BinaryExpression.full(expression, operator, parseEqualityExpression());
+      expression = new BinaryExpression(expression, operator, parseEqualityExpression());
     }
     return expression;
   }
 
   /**
    * Parse a map literal.
    *
    * <pre>
    * mapLiteral ::=
    *     'const'? typeArguments? '{' (mapLiteralEntry (',' mapLiteralEntry)* ','?)? '}'
    * </pre>
    *
    * @param modifier the 'const' modifier appearing before the literal, or `null` if there is
    *          no modifier
    * @param typeArguments the type arguments that were declared, or `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.full(modifier, typeArguments, leftBracket, entries, andAdvance);
+      return new MapLiteral(modifier, typeArguments, leftBracket, entries, andAdvance);
     }
     entries.add(parseMapLiteralEntry());
     while (optional(TokenType.COMMA)) {
       if (matches5(TokenType.CLOSE_CURLY_BRACKET)) {
-        return new MapLiteral.full(modifier, typeArguments, leftBracket, entries, andAdvance);
+        return new MapLiteral(modifier, typeArguments, leftBracket, entries, andAdvance);
       }
       entries.add(parseMapLiteralEntry());
     }
     Token rightBracket = expect2(TokenType.CLOSE_CURLY_BRACKET);
-    return new MapLiteral.full(modifier, typeArguments, leftBracket, entries, rightBracket);
+    return new MapLiteral(modifier, typeArguments, leftBracket, entries, rightBracket);
   }
 
   /**
    * Parse a method declaration.
    *
    * <pre>
    * functionDeclaration ::=
    *     'external'? 'static'? functionSignature functionBody
    *   | 'external'? functionSignature ';'
    * </pre>
@@ skipping 34 matching lines @@
     FunctionBody body = parseFunctionBody(externalKeyword != null || staticKeyword == null, ParserErrorCode.MISSING_FUNCTION_BODY, false);
     if (externalKeyword != null) {
       if (body is! EmptyFunctionBody) {
         reportError9(ParserErrorCode.EXTERNAL_METHOD_WITH_BODY, body, []);
       }
     } else if (staticKeyword != null) {
       if (body is EmptyFunctionBody) {
         reportError9(ParserErrorCode.ABSTRACT_STATIC_METHOD, body, []);
       }
     }
-    return new MethodDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, staticKeyword, returnType, null, null, name, parameters, body);
+    return new MethodDeclaration(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 `validateModifiersFor`.
    *
    * <pre>
    * modifiers ::=
@@ skipping 72 matching lines @@
    * 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.full(andAdvance);
+      expression = new SuperExpression(andAdvance);
     } else {
       expression = parseUnaryExpression();
     }
     while (_currentToken.type.isMultiplicativeOperator) {
       Token operator = andAdvance;
-      expression = new BinaryExpression.full(expression, operator, parseUnaryExpression());
+      expression = new BinaryExpression(expression, operator, parseUnaryExpression());
     }
     return expression;
   }
 
   /**
    * Parse a class native clause.
    *
    * <pre>
    * classNativeClause ::=
    *     'native' name
    * </pre>
    *
    * @return the class native clause that was parsed
    */
   NativeClause parseNativeClause() {
     Token keyword = andAdvance;
     StringLiteral name = parseStringLiteral();
-    return new NativeClause.full(keyword, name);
+    return new NativeClause(keyword, name);
   }
 
   /**
    * Parse a new expression.
    *
    * <pre>
    * newExpression ::=
    *     instanceCreationExpression
    * </pre>
    *
@@ skipping 23 matching lines @@
    * </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 && identical(afterString.type, TokenType.COLON)) {
-          return new ExpressionStatement.full(parseExpression2(), expect2(TokenType.SEMICOLON));
+          return new ExpressionStatement(parseExpression2(), expect2(TokenType.SEMICOLON));
         }
       }
       return parseBlock();
     } else if (matches5(TokenType.KEYWORD) && !(_currentToken as KeywordToken).keyword.isPseudoKeyword) {
       Keyword keyword = (_currentToken as KeywordToken).keyword;
       if (identical(keyword, Keyword.ASSERT)) {
         return parseAssertStatement();
       } else if (identical(keyword, Keyword.BREAK)) {
         return parseBreakStatement();
       } else if (identical(keyword, Keyword.CONTINUE)) {
         return parseContinueStatement();
       } else if (identical(keyword, Keyword.DO)) {
         return parseDoStatement();
       } else if (identical(keyword, Keyword.FOR)) {
         return parseForStatement();
       } else if (identical(keyword, Keyword.IF)) {
         return parseIfStatement();
       } else if (identical(keyword, Keyword.RETHROW)) {
-        return new ExpressionStatement.full(parseRethrowExpression(), expect2(TokenType.SEMICOLON));
+        return new ExpressionStatement(parseRethrowExpression(), expect2(TokenType.SEMICOLON));
       } else if (identical(keyword, Keyword.RETURN)) {
         return parseReturnStatement();
       } else if (identical(keyword, Keyword.SWITCH)) {
         return parseSwitchStatement();
       } else if (identical(keyword, Keyword.THROW)) {
-        return new ExpressionStatement.full(parseThrowExpression(), expect2(TokenType.SEMICOLON));
+        return new ExpressionStatement(parseThrowExpression(), expect2(TokenType.SEMICOLON));
       } else if (identical(keyword, Keyword.TRY)) {
         return parseTryStatement();
       } else if (identical(keyword, Keyword.WHILE)) {
         return parseWhileStatement();
       } else if (identical(keyword, Keyword.VAR) || identical(keyword, Keyword.FINAL)) {
         return parseVariableDeclarationStatement(commentAndMetadata);
       } else if (identical(keyword, 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])) {
               reportError9(ParserErrorCode.VOID_VARIABLE, returnType, []);
               return parseVariableDeclarationStatement(commentAndMetadata);
             }
           } else if (matches5(TokenType.CLOSE_CURLY_BRACKET)) {
             return parseVariableDeclarationStatement2(commentAndMetadata, null, returnType);
           }
           reportError10(ParserErrorCode.MISSING_STATEMENT, []);
-          return new EmptyStatement.full(createSyntheticToken2(TokenType.SEMICOLON));
+          return new EmptyStatement(createSyntheticToken2(TokenType.SEMICOLON));
         }
       } else if (identical(keyword, Keyword.CONST)) {
         if (matchesAny(peek(), [
             TokenType.LT,
             TokenType.OPEN_CURLY_BRACKET,
             TokenType.OPEN_SQUARE_BRACKET,
             TokenType.INDEX])) {
-          return new ExpressionStatement.full(parseExpression2(), expect2(TokenType.SEMICOLON));
+          return new ExpressionStatement(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.full(parseExpression2(), expect2(TokenType.SEMICOLON));
+              return new ExpressionStatement(parseExpression2(), expect2(TokenType.SEMICOLON));
             }
           }
         }
         return parseVariableDeclarationStatement(commentAndMetadata);
       } else if (identical(keyword, Keyword.NEW) || identical(keyword, Keyword.TRUE) || identical(keyword, Keyword.FALSE) || identical(keyword, Keyword.NULL) || identical(keyword, Keyword.SUPER) || identical(keyword, Keyword.THIS)) {
-        return new ExpressionStatement.full(parseExpression2(), expect2(TokenType.SEMICOLON));
+        return new ExpressionStatement(parseExpression2(), expect2(TokenType.SEMICOLON));
       } else {
         reportError10(ParserErrorCode.MISSING_STATEMENT, []);
-        return new EmptyStatement.full(createSyntheticToken2(TokenType.SEMICOLON));
+        return new EmptyStatement(createSyntheticToken2(TokenType.SEMICOLON));
       }
     } else if (matches5(TokenType.SEMICOLON)) {
       return parseEmptyStatement();
     } else if (isInitializedVariableDeclaration()) {
       return parseVariableDeclarationStatement(commentAndMetadata);
     } else if (isFunctionDeclaration()) {
       return parseFunctionDeclarationStatement();
     } else if (matches5(TokenType.CLOSE_CURLY_BRACKET)) {
       reportError10(ParserErrorCode.MISSING_STATEMENT, []);
-      return new EmptyStatement.full(createSyntheticToken2(TokenType.SEMICOLON));
+      return new EmptyStatement(createSyntheticToken2(TokenType.SEMICOLON));
     } else {
-      return new ExpressionStatement.full(parseExpression2(), expect2(TokenType.SEMICOLON));
+      return new ExpressionStatement(parseExpression2(), expect2(TokenType.SEMICOLON));
     }
   }
 
   /**
    * Parse an operator declaration.
    *
    * <pre>
    * operatorDeclaration ::=
    *     operatorSignature (';' | functionBody)
    *
@@ skipping 12 matching lines @@
     Token operatorKeyword;
     if (matches(Keyword.OPERATOR)) {
       operatorKeyword = andAdvance;
     } else {
       reportError11(ParserErrorCode.MISSING_KEYWORD_OPERATOR, _currentToken, []);
       operatorKeyword = createSyntheticToken(Keyword.OPERATOR);
     }
     if (!_currentToken.isUserDefinableOperator) {
       reportError10(ParserErrorCode.NON_USER_DEFINABLE_OPERATOR, [_currentToken.lexeme]);
     }
-    SimpleIdentifier name = new SimpleIdentifier.full(andAdvance);
+    SimpleIdentifier name = new SimpleIdentifier(andAdvance);
     if (matches5(TokenType.EQ)) {
       Token previous = _currentToken.previous;
       if ((matches4(previous, TokenType.EQ_EQ) || matches4(previous, TokenType.BANG_EQ)) && _currentToken.offset == previous.offset + 2) {
         reportError10(ParserErrorCode.INVALID_OPERATOR, ["${previous.lexeme}${_currentToken.lexeme}"]);
         advance();
       }
     }
     FormalParameterList parameters = parseFormalParameterList();
     validateFormalParameterList(parameters);
     FunctionBody body = parseFunctionBody(true, ParserErrorCode.MISSING_FUNCTION_BODY, false);
     if (externalKeyword != null && body is! EmptyFunctionBody) {
       reportError10(ParserErrorCode.EXTERNAL_OPERATOR_WITH_BODY, []);
     }
-    return new MethodDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, null, returnType, null, operatorKeyword, name, parameters, body);
+    return new MethodDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, null, returnType, null, operatorKeyword, name, parameters, body);
   }
 
   /**
    * Parse a return type if one is given, otherwise return `null` without advancing.
    *
    * @return the return type that was parsed
    */
   TypeName parseOptionalReturnType() {
     if (matches(Keyword.VOID)) {
       return parseReturnType();
@@ skipping 18 matching lines @@
    *
    * @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(_OF)) {
       Token ofKeyword = andAdvance;
       LibraryIdentifier libraryName = parseLibraryName(ParserErrorCode.MISSING_NAME_IN_PART_OF_DIRECTIVE, ofKeyword);
       Token semicolon = expect2(TokenType.SEMICOLON);
-      return new PartOfDirective.full(commentAndMetadata.comment, commentAndMetadata.metadata, partKeyword, ofKeyword, libraryName, semicolon);
+      return new PartOfDirective(commentAndMetadata.comment, commentAndMetadata.metadata, partKeyword, ofKeyword, libraryName, semicolon);
     }
     StringLiteral partUri = parseStringLiteral();
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new PartDirective.full(commentAndMetadata.comment, commentAndMetadata.metadata, partKeyword, partUri, semicolon);
+    return new PartDirective(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.full(access.target, access.operator, access.propertyName, argumentList);
+            operand = new MethodInvocation(access.target, access.operator, access.propertyName, argumentList);
           } else {
-            operand = new FunctionExpressionInvocation.full(operand, argumentList);
+            operand = new FunctionExpressionInvocation(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 Literal || operand is FunctionExpressionInvocation) {
       reportError10(ParserErrorCode.MISSING_ASSIGNABLE_SELECTOR, []);
     }
     Token operator = andAdvance;
-    return new PostfixExpression.full(operand, operator);
+    return new PostfixExpression(operand, operator);
   }
 
   /**
    * Parse a primary expression.
    *
    * <pre>
    * primary ::=
    *     thisExpression
    *   | 'super' assignableSelector
    *   | functionExpression
@@ skipping 11 matching lines @@
    *   | stringLiteral
    *   | symbolLiteral
    *   | mapLiteral
    *   | listLiteral
    * </pre>
    *
    * @return the primary expression that was parsed
    */
   Expression parsePrimaryExpression() {
     if (matches(Keyword.THIS)) {
-      return new ThisExpression.full(andAdvance);
+      return new ThisExpression(andAdvance);
     } else if (matches(Keyword.SUPER)) {
-      return parseAssignableSelector(new SuperExpression.full(andAdvance), false);
+      return parseAssignableSelector(new SuperExpression(andAdvance), false);
     } else if (matches(Keyword.NULL)) {
-      return new NullLiteral.full(andAdvance);
+      return new NullLiteral(andAdvance);
     } else if (matches(Keyword.FALSE)) {
-      return new BooleanLiteral.full(andAdvance, false);
+      return new BooleanLiteral(andAdvance, false);
     } else if (matches(Keyword.TRUE)) {
-      return new BooleanLiteral.full(andAdvance, true);
+      return new BooleanLiteral(andAdvance, true);
     } else if (matches5(TokenType.DOUBLE)) {
       Token token = andAdvance;
       double value = 0.0;
       try {
         value = double.parse(token.lexeme);
       } on FormatException catch (exception) {
       }
-      return new DoubleLiteral.full(token, value);
+      return new DoubleLiteral(token, value);
     } else if (matches5(TokenType.HEXADECIMAL)) {
       Token token = andAdvance;
       int value = null;
       try {
         value = int.parse(token.lexeme.substring(2), radix: 16);
       } on FormatException catch (exception) {
       }
-      return new IntegerLiteral.full(token, value);
+      return new IntegerLiteral(token, value);
     } else if (matches5(TokenType.INT)) {
       Token token = andAdvance;
       int value = null;
       try {
         value = int.parse(token.lexeme);
       } on FormatException catch (exception) {
       }
-      return new IntegerLiteral.full(token, value);
+      return new IntegerLiteral(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.full(leftParenthesis, expression, rightParenthesis);
+      return new ParenthesizedExpression(leftParenthesis, expression, rightParenthesis);
     } else if (matches5(TokenType.LT)) {
       return parseListOrMapLiteral(null);
     } else if (matches5(TokenType.QUESTION)) {
       return parseArgumentDefinitionTest();
     } else if (matches(Keyword.VOID)) {
       reportError10(ParserErrorCode.UNEXPECTED_TOKEN, [_currentToken.lexeme]);
       advance();
       return parsePrimaryExpression();
     } else if (matches5(TokenType.HASH)) {
       return parseSymbolLiteral();
@@ skipping 15 matching lines @@
    */
   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.full(keyword, period, constructorName, argumentList);
+    return new RedirectingConstructorInvocation(keyword, period, constructorName, argumentList);
   }
 
   /**
    * Parse a relational expression.
    *
    * <pre>
    * relationalExpression ::=
    *     bitwiseOrExpression ('is' '!'? type | 'as' type | relationalOperator bitwiseOrExpression)?
    *   | 'super' relationalOperator bitwiseOrExpression
    * </pre>
    *
    * @return the relational expression that was parsed
    */
   Expression parseRelationalExpression() {
     if (matches(Keyword.SUPER) && _currentToken.next.type.isRelationalOperator) {
-      Expression expression = new SuperExpression.full(andAdvance);
+      Expression expression = new SuperExpression(andAdvance);
       Token operator = andAdvance;
-      expression = new BinaryExpression.full(expression, operator, parseBitwiseOrExpression());
+      expression = new BinaryExpression(expression, operator, parseBitwiseOrExpression());
       return expression;
     }
     Expression expression = parseBitwiseOrExpression();
     if (matches(Keyword.AS)) {
       Token asOperator = andAdvance;
-      expression = new AsExpression.full(expression, asOperator, parseTypeName());
+      expression = new AsExpression(expression, asOperator, parseTypeName());
     } else if (matches(Keyword.IS)) {
       Token isOperator = andAdvance;
       Token notOperator = null;
       if (matches5(TokenType.BANG)) {
         notOperator = andAdvance;
       }
-      expression = new IsExpression.full(expression, isOperator, notOperator, parseTypeName());
+      expression = new IsExpression(expression, isOperator, notOperator, parseTypeName());
     } else if (_currentToken.type.isRelationalOperator) {
       Token operator = andAdvance;
-      expression = new BinaryExpression.full(expression, operator, parseBitwiseOrExpression());
+      expression = new BinaryExpression(expression, operator, parseBitwiseOrExpression());
     }
     return expression;
   }
 
   /**
    * Parse a rethrow expression.
    *
    * <pre>
    * rethrowExpression ::=
    *     'rethrow'
    * </pre>
    *
    * @return the rethrow expression that was parsed
    */
-  Expression parseRethrowExpression() => new RethrowExpression.full(expect(Keyword.RETHROW));
+  Expression parseRethrowExpression() => new RethrowExpression(expect(Keyword.RETHROW));
 
   /**
    * 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.full(returnKeyword, null, andAdvance);
+      return new ReturnStatement(returnKeyword, null, andAdvance);
     }
     Expression expression = parseExpression2();
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new ReturnStatement.full(returnKeyword, expression, semicolon);
+    return new ReturnStatement(returnKeyword, expression, semicolon);
   }
 
   /**
    * Parse a setter.
    *
    * <pre>
    * setter ::=
    *     setterSignature functionBody?
    *
    * setterSignature ::=
@@ skipping 10 matching lines @@
    */
   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(externalKeyword != null || staticKeyword == null, ParserErrorCode.STATIC_SETTER_WITHOUT_BODY, false);
     if (externalKeyword != null && body is! EmptyFunctionBody) {
       reportError10(ParserErrorCode.EXTERNAL_SETTER_WITH_BODY, []);
     }
-    return new MethodDeclaration.full(commentAndMetadata.comment, commentAndMetadata.metadata, externalKeyword, staticKeyword, returnType, propertyKeyword, null, name, parameters, body);
+    return new MethodDeclaration(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.full(andAdvance);
+      expression = new SuperExpression(andAdvance);
     } else {
       expression = parseAdditiveExpression();
     }
     while (_currentToken.type.isShiftOperator) {
       Token operator = andAdvance;
-      expression = new BinaryExpression.full(expression, operator, parseAdditiveExpression());
+      expression = new BinaryExpression(expression, operator, parseAdditiveExpression());
     }
     return expression;
   }
 
   /**
    * Parse a list of statements within a switch statement.
    *
    * <pre>
    * statements ::=
    *     statement*
@@ skipping 16 matching lines @@
   }
 
   /**
    * Parse a string literal that contains interpolations.
    *
    * @return the string literal that was parsed
    */
   StringInterpolation parseStringInterpolation(Token string) {
     List<InterpolationElement> elements = new List<InterpolationElement>();
     bool hasMore = matches5(TokenType.STRING_INTERPOLATION_EXPRESSION) || matches5(TokenType.STRING_INTERPOLATION_IDENTIFIER);
-    elements.add(new InterpolationString.full(string, computeStringValue(string.lexeme, true, !hasMore)));
+    elements.add(new InterpolationString(string, computeStringValue(string.lexeme, true, !hasMore)));
     while (hasMore) {
       if (matches5(TokenType.STRING_INTERPOLATION_EXPRESSION)) {
         Token openToken = andAdvance;
         Expression expression = parseExpression2();
         Token rightBracket = expect2(TokenType.CLOSE_CURLY_BRACKET);
-        elements.add(new InterpolationExpression.full(openToken, expression, rightBracket));
+        elements.add(new InterpolationExpression(openToken, expression, rightBracket));
       } else {
         Token openToken = andAdvance;
         Expression expression = null;
         if (matches(Keyword.THIS)) {
-          expression = new ThisExpression.full(andAdvance);
+          expression = new ThisExpression(andAdvance);
         } else {
           expression = parseSimpleIdentifier();
         }
-        elements.add(new InterpolationExpression.full(openToken, expression, null));
+        elements.add(new InterpolationExpression(openToken, expression, null));
       }
       if (matches5(TokenType.STRING)) {
         string = andAdvance;
         hasMore = matches5(TokenType.STRING_INTERPOLATION_EXPRESSION) || matches5(TokenType.STRING_INTERPOLATION_IDENTIFIER);
-        elements.add(new InterpolationString.full(string, computeStringValue(string.lexeme, false, !hasMore)));
+        elements.add(new InterpolationString(string, computeStringValue(string.lexeme, false, !hasMore)));
       }
     }
-    return new StringInterpolation.full(elements);
+    return new StringInterpolation(elements);
   }
 
   /**
    * 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.full(keyword, period, constructorName, argumentList);
+    return new SuperConstructorInvocation(keyword, period, constructorName, argumentList);
   }
 
   /**
    * Parse a switch statement.
    *
    * <pre>
    * switchStatement ::=
    *     'switch' '(' expression ')' '{' switchCase* defaultCase? '}'
    *
    * switchCase ::=
@@ skipping 21 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)) {
             reportError11(ParserErrorCode.DUPLICATE_LABEL_IN_SWITCH_STATEMENT, identifier.token, [label]);
           } else {
             definedLabels.add(label);
           }
           Token colon = expect2(TokenType.COLON);
-          labels.add(new Label.full(identifier, colon));
+          labels.add(new Label(identifier, colon));
         }
         if (matches(Keyword.CASE)) {
           Token caseKeyword = andAdvance;
           Expression caseExpression = parseExpression2();
           Token colon = expect2(TokenType.COLON);
-          members.add(new SwitchCase.full(labels, caseKeyword, caseExpression, colon, parseStatements2()));
+          members.add(new SwitchCase(labels, caseKeyword, caseExpression, colon, parseStatements2()));
           if (defaultKeyword != null) {
             reportError11(ParserErrorCode.SWITCH_HAS_CASE_AFTER_DEFAULT_CASE, caseKeyword, []);
           }
         } else if (matches(Keyword.DEFAULT)) {
           if (defaultKeyword != null) {
             reportError11(ParserErrorCode.SWITCH_HAS_MULTIPLE_DEFAULT_CASES, peek(), []);
           }
           defaultKeyword = andAdvance;
           Token colon = expect2(TokenType.COLON);
-          members.add(new SwitchDefault.full(labels, defaultKeyword, colon, parseStatements2()));
+          members.add(new SwitchDefault(labels, defaultKeyword, colon, parseStatements2()));
         } else {
           reportError10(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.full(keyword, leftParenthesis, expression, rightParenthesis, leftBracket, members, rightBracket);
+      return new SwitchStatement(keyword, leftParenthesis, expression, rightParenthesis, leftBracket, members, rightBracket);
     } finally {
       _inSwitch = wasInSwitch;
     }
   }
 
   /**
    * Parse a symbol literal.
    *
    * <pre>
    * symbolLiteral ::=
@@ skipping 16 matching lines @@
           components.add(createSyntheticToken2(TokenType.IDENTIFIER));
           break;
         }
       }
     } else if (_currentToken.isOperator) {
       components.add(andAdvance);
     } else {
       reportError10(ParserErrorCode.MISSING_IDENTIFIER, []);
       components.add(createSyntheticToken2(TokenType.IDENTIFIER));
     }
-    return new SymbolLiteral.full(poundSign, new List.from(components));
+    return new SymbolLiteral(poundSign, new List.from(components));
   }
 
   /**
    * 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)) {
       reportError11(ParserErrorCode.MISSING_EXPRESSION_IN_THROW, _currentToken, []);
-      return new ThrowExpression.full(keyword, createSyntheticIdentifier());
+      return new ThrowExpression(keyword, createSyntheticIdentifier());
     }
     Expression expression = parseExpression2();
-    return new ThrowExpression.full(keyword, expression);
+    return new ThrowExpression(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)) {
       reportError11(ParserErrorCode.MISSING_EXPRESSION_IN_THROW, _currentToken, []);
-      return new ThrowExpression.full(keyword, createSyntheticIdentifier());
+      return new ThrowExpression(keyword, createSyntheticIdentifier());
     }
     Expression expression = parseExpressionWithoutCascade();
-    return new ThrowExpression.full(keyword, expression);
+    return new ThrowExpression(keyword, expression);
   }
 
   /**
    * Parse a try statement.
    *
    * <pre>
    * tryStatement ::=
    *     'try' block (onPart+ finallyPart? | finallyPart)
    *
    * onPart ::=
@@ skipping 31 matching lines @@
         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.full(onKeyword, exceptionType, catchKeyword, leftParenthesis, exceptionParameter, comma, stackTraceParameter, rightParenthesis, catchBody));
+      catchClauses.add(new CatchClause(onKeyword, exceptionType, catchKeyword, leftParenthesis, exceptionParameter, comma, stackTraceParameter, rightParenthesis, catchBody));
     }
     Token finallyKeyword = null;
     if (matches(Keyword.FINALLY)) {
       finallyKeyword = andAdvance;
       finallyClause = parseBlock();
     } else {
       if (catchClauses.isEmpty) {
         reportError10(ParserErrorCode.MISSING_CATCH_OR_FINALLY, []);
       }
     }
-    return new TryStatement.full(tryKeyword, body, catchClauses, finallyKeyword, finallyClause);
+    return new TryStatement(tryKeyword, body, catchClauses, finallyKeyword, finallyClause);
   }
 
   /**
    * Parse a type alias.
    *
    * <pre>
    * typeAlias ::=
    *     'typedef' typeAliasBody
    *
    * typeAliasBody ::=
@@ skipping 48 matching lines @@
    *   | 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.full(operator, parseUnaryExpression());
+          return new PrefixExpression(operator, parseUnaryExpression());
         }
-        return new PrefixExpression.full(operator, new SuperExpression.full(andAdvance));
+        return new PrefixExpression(operator, new SuperExpression(andAdvance));
       }
-      return new PrefixExpression.full(operator, parseUnaryExpression());
+      return new PrefixExpression(operator, parseUnaryExpression());
     } else if (_currentToken.type.isIncrementOperator) {
       Token operator = andAdvance;
       if (matches(Keyword.SUPER)) {
         if (matches4(peek(), TokenType.OPEN_SQUARE_BRACKET) || matches4(peek(), TokenType.PERIOD)) {
-          return new PrefixExpression.full(operator, parseUnaryExpression());
+          return new PrefixExpression(operator, parseUnaryExpression());
         }
         if (identical(operator.type, TokenType.MINUS_MINUS)) {
           int offset = operator.offset;
           Token firstOperator = new Token(TokenType.MINUS, offset);
           Token secondOperator = new Token(TokenType.MINUS, offset + 1);
           secondOperator.setNext(_currentToken);
           firstOperator.setNext(secondOperator);
           operator.previous.setNext(firstOperator);
-          return new PrefixExpression.full(firstOperator, new PrefixExpression.full(secondOperator, new SuperExpression.full(andAdvance)));
+          return new PrefixExpression(firstOperator, new PrefixExpression(secondOperator, new SuperExpression(andAdvance)));
         } else {
           reportError10(ParserErrorCode.INVALID_OPERATOR_FOR_SUPER, [operator.lexeme]);
-          return new PrefixExpression.full(operator, new SuperExpression.full(andAdvance));
+          return new PrefixExpression(operator, new SuperExpression(andAdvance));
         }
       }
-      return new PrefixExpression.full(operator, parseAssignableExpression(false));
+      return new PrefixExpression(operator, parseAssignableExpression(false));
     } else if (matches5(TokenType.PLUS)) {
       reportError10(ParserErrorCode.MISSING_IDENTIFIER, []);
       return createSyntheticIdentifier();
     }
     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.full(commentAndMetadata.comment, commentAndMetadata.metadata, name, equals, initializer);
+    return new VariableDeclaration(commentAndMetadata.comment, commentAndMetadata.metadata, name, equals, initializer);
   }
 
   /**
    * Parse a variable declaration list.
    *
    * <pre>
    * variableDeclarationList ::=
    *     finalConstVarOrType variableDeclaration (',' variableDeclaration)*
    * </pre>
    *
@@ skipping 23 matching lines @@
   VariableDeclarationList parseVariableDeclarationList2(CommentAndMetadata commentAndMetadata, Token keyword, TypeName type) {
     if (type != null && keyword != null && matches3(keyword, Keyword.VAR)) {
       reportError11(ParserErrorCode.VAR_AND_TYPE, keyword, []);
     }
     List<VariableDeclaration> variables = new List<VariableDeclaration>();
     variables.add(parseVariableDeclaration());
     while (matches5(TokenType.COMMA)) {
       advance();
       variables.add(parseVariableDeclaration());
     }
-    return new VariableDeclarationList.full(commentAndMetadata != null ? commentAndMetadata.comment : null, commentAndMetadata != null ? commentAndMetadata.metadata : null, keyword, type, variables);
+    return new VariableDeclarationList(commentAndMetadata != null ? commentAndMetadata.comment : null, commentAndMetadata != null ? commentAndMetadata.metadata : null, keyword, type, variables);
   }
 
   /**
    * Parse a variable declaration statement.
    *
    * <pre>
    * variableDeclarationStatement ::=
    *     variableDeclarationList ';'
    * </pre>
    *
    * @param commentAndMetadata the metadata to be associated with the variable declaration
    *          statement, or `null` if there is no attempt at parsing the comment and metadata
    * @return the variable declaration statement that was parsed
    */
   VariableDeclarationStatement parseVariableDeclarationStatement(CommentAndMetadata commentAndMetadata) {
     VariableDeclarationList variableList = parseVariableDeclarationList(commentAndMetadata);
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new VariableDeclarationStatement.full(variableList, semicolon);
+    return new VariableDeclarationStatement(variableList, semicolon);
   }
 
   /**
    * Parse a variable declaration statement.
    *
    * <pre>
    * variableDeclarationStatement ::=
    *     variableDeclarationList ';'
    * </pre>
    *
    * @param commentAndMetadata the metadata to be associated with the variable declaration
    *          statement, or `null` if there is no attempt at parsing the comment and metadata
    * @param keyword the token representing the 'final', 'const' or 'var' keyword, or `null` if
    *          there is no keyword
    * @param type the type of the variables in the list
    * @return the variable declaration statement that was parsed
    */
   VariableDeclarationStatement parseVariableDeclarationStatement2(CommentAndMetadata commentAndMetadata, Token keyword, TypeName type) {
     VariableDeclarationList variableList = parseVariableDeclarationList2(commentAndMetadata, keyword, type);
     Token semicolon = expect2(TokenType.SEMICOLON);
-    return new VariableDeclarationStatement.full(variableList, semicolon);
+    return new VariableDeclarationStatement(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.full(keyword, leftParenthesis, condition, rightParenthesis, body);
+      return new WhileStatement(keyword, leftParenthesis, condition, rightParenthesis, body);
     } finally {
       _inLoop = wasInLoop;
     }
   }
 
   /**
    * Return the token that is immediately after the current token. This is equivalent to
    * [peek].
    *
    * @return the token that is immediately after the current token
@@ skipping 3252 matching lines @@
       if ("\n" == separator) {
         _writer.print("\n");
         indent();
       } else if (i > 0) {
         _writer.print(separator);
       }
       _writer.print(tokens[i].lexeme);
     }
   }
 }