Chromium Code Reviews| Index: pkg/analyzer/lib/src/generated/parser.dart |
| diff --git a/pkg/analyzer/lib/src/generated/parser.dart b/pkg/analyzer/lib/src/generated/parser.dart |
| index 0358613db3ec8e2a21a50bcd53cdc9cd0c3243c4..bcfd78ff99d5b53d39cc25ecb042eaef5f50be4d 100644 |
| --- a/pkg/analyzer/lib/src/generated/parser.dart |
| +++ b/pkg/analyzer/lib/src/generated/parser.dart |
| @@ -2419,8 +2419,8 @@ class Parser { |
| // |
| _reportErrorForCurrentToken(ParserErrorCode.MISSING_IDENTIFIER); |
| List<VariableDeclaration> variables = new List<VariableDeclaration>(); |
| - variables.add(new VariableDeclaration( |
| - null, null, _createSyntheticIdentifier(), null, null)); |
| + variables.add( |
| + new VariableDeclaration(_createSyntheticIdentifier(), null, null)); |
| return new FieldDeclaration(commentAndMetadata.comment, |
| commentAndMetadata.metadata, null, |
| new VariableDeclarationList(null, null, keyword, null, variables), |
| @@ -4915,8 +4915,8 @@ class Parser { |
| // |
| _reportErrorForCurrentToken(ParserErrorCode.MISSING_IDENTIFIER); |
| List<VariableDeclaration> variables = new List<VariableDeclaration>(); |
| - variables.add(new VariableDeclaration( |
| - null, null, _createSyntheticIdentifier(), null, null)); |
| + variables.add( |
| + new VariableDeclaration(_createSyntheticIdentifier(), null, null)); |
| return new TopLevelVariableDeclaration(commentAndMetadata.comment, |
| commentAndMetadata.metadata, |
| new VariableDeclarationList(null, null, keyword, null, variables), |
| @@ -4967,8 +4967,8 @@ class Parser { |
| semicolon = _createSyntheticToken(TokenType.SEMICOLON); |
| } |
| List<VariableDeclaration> variables = new List<VariableDeclaration>(); |
| - variables.add(new VariableDeclaration( |
| - null, null, _createSyntheticIdentifier(), null, null)); |
| + variables.add( |
| + new VariableDeclaration(_createSyntheticIdentifier(), null, null)); |
| return new TopLevelVariableDeclaration(commentAndMetadata.comment, |
| commentAndMetadata.metadata, |
| new VariableDeclarationList(null, null, null, returnType, variables), |
| @@ -5527,8 +5527,7 @@ class Parser { |
| _tokenMatches(_peek(), TokenType.COLON))) { |
| List<VariableDeclaration> variables = new List<VariableDeclaration>(); |
| SimpleIdentifier variableName = parseSimpleIdentifier(); |
| - variables.add( |
| - new VariableDeclaration(null, null, variableName, null, null)); |
| + variables.add(new VariableDeclaration(variableName, null, null)); |
| variableList = new VariableDeclarationList(commentAndMetadata.comment, |
| commentAndMetadata.metadata, null, null, variables); |
| } else if (_isInitializedVariableDeclaration()) { |
| @@ -7471,7 +7470,6 @@ class Parser { |
| * identifier ('=' expression)? |
| */ |
| VariableDeclaration _parseVariableDeclaration() { |
| - CommentAndMetadata commentAndMetadata = _parseCommentAndMetadata(); |
|
Brian Wilkerson
2015/04/14 18:02:36
For recovery purposes, I would leave this in. If m
Paul Berry
2015/04/14 18:47:13
I suspect you are right, but I want to experiment
|
| SimpleIdentifier name = parseSimpleIdentifier(); |
| Token equals = null; |
| Expression initializer = null; |
| @@ -7479,8 +7477,7 @@ class Parser { |
| equals = getAndAdvance(); |
| initializer = parseExpression2(); |
| } |
| - return new VariableDeclaration(commentAndMetadata.comment, |
| - commentAndMetadata.metadata, name, equals, initializer); |
| + return new VariableDeclaration(name, equals, initializer); |
| } |
| /** |