| OLD | NEW |
| 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 import 'package:analyzer/dart/ast/ast.dart'; | 5 import 'package:analyzer/dart/ast/ast.dart'; |
| 6 import 'package:analyzer/dart/ast/ast_factory.dart'; | 6 import 'package:analyzer/dart/ast/ast_factory.dart'; |
| 7 import 'package:analyzer/src/dart/ast/ast.dart'; | 7 import 'package:analyzer/src/dart/ast/ast.dart'; |
| 8 import 'package:analyzer/src/generated/utilities_dart.dart'; | 8 import 'package:analyzer/src/generated/utilities_dart.dart'; |
| 9 import 'package:front_end/src/scanner/token.dart'; | 9 import 'package:front_end/src/scanner/token.dart'; |
| 10 | 10 |
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 Token staticKeyword, | 359 Token staticKeyword, |
| 360 VariableDeclarationList fieldList, | 360 VariableDeclarationList fieldList, |
| 361 Token semicolon) => | 361 Token semicolon) => |
| 362 new FieldDeclarationImpl( | 362 new FieldDeclarationImpl( |
| 363 comment, metadata, staticKeyword, fieldList, semicolon); | 363 comment, metadata, staticKeyword, fieldList, semicolon); |
| 364 | 364 |
| 365 @override | 365 @override |
| 366 FieldFormalParameter fieldFormalParameter( | 366 FieldFormalParameter fieldFormalParameter( |
| 367 Comment comment, | 367 Comment comment, |
| 368 List<Annotation> metadata, | 368 List<Annotation> metadata, |
| 369 Token covariantKeyword, | |
| 370 Token keyword, | 369 Token keyword, |
| 371 TypeAnnotation type, | 370 TypeAnnotation type, |
| 372 Token thisKeyword, | 371 Token thisKeyword, |
| 373 Token period, | 372 Token period, |
| 374 SimpleIdentifier identifier, | 373 SimpleIdentifier identifier, |
| 375 TypeParameterList typeParameters, | 374 TypeParameterList typeParameters, |
| 376 FormalParameterList parameters) => | 375 FormalParameterList parameters) => |
| 377 new FieldFormalParameterImpl(comment, metadata, covariantKeyword, keyword, | 376 new FieldFormalParameterImpl(comment, metadata, keyword, type, |
| 378 type, thisKeyword, period, identifier, typeParameters, parameters); | 377 thisKeyword, period, identifier, typeParameters, parameters); |
| 379 | 378 |
| 380 @override | 379 @override |
| 381 ForEachStatement forEachStatementWithDeclaration( | 380 ForEachStatement forEachStatementWithDeclaration( |
| 382 Token awaitKeyword, | 381 Token awaitKeyword, |
| 383 Token forKeyword, | 382 Token forKeyword, |
| 384 Token leftParenthesis, | 383 Token leftParenthesis, |
| 385 DeclaredIdentifier loopVariable, | 384 DeclaredIdentifier loopVariable, |
| 386 Token inKeyword, | 385 Token inKeyword, |
| 387 Expression iterator, | 386 Expression iterator, |
| 388 Token rightParenthesis, | 387 Token rightParenthesis, |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 489 TypeParameterList typeParameters, | 488 TypeParameterList typeParameters, |
| 490 FormalParameterList parameters, | 489 FormalParameterList parameters, |
| 491 Token semicolon) => | 490 Token semicolon) => |
| 492 new FunctionTypeAliasImpl(comment, metadata, keyword, returnType, name, | 491 new FunctionTypeAliasImpl(comment, metadata, keyword, returnType, name, |
| 493 typeParameters, parameters, semicolon); | 492 typeParameters, parameters, semicolon); |
| 494 | 493 |
| 495 @override | 494 @override |
| 496 FunctionTypedFormalParameter functionTypedFormalParameter( | 495 FunctionTypedFormalParameter functionTypedFormalParameter( |
| 497 Comment comment, | 496 Comment comment, |
| 498 List<Annotation> metadata, | 497 List<Annotation> metadata, |
| 499 Token covariantKeyword, | |
| 500 TypeAnnotation returnType, | 498 TypeAnnotation returnType, |
| 501 SimpleIdentifier identifier, | 499 SimpleIdentifier identifier, |
| 502 TypeParameterList typeParameters, | 500 TypeParameterList typeParameters, |
| 503 FormalParameterList parameters, | 501 FormalParameterList parameters, |
| 504 {Token question: null}) => | 502 {Token question: null}) => |
| 505 new FunctionTypedFormalParameterImpl(comment, metadata, covariantKeyword, | 503 new FunctionTypedFormalParameterImpl(comment, metadata, returnType, |
| 506 returnType, identifier, typeParameters, parameters, question); | 504 identifier, typeParameters, parameters, question); |
| 507 | 505 |
| 508 @override | 506 @override |
| 509 GenericFunctionType genericFunctionType( | 507 GenericFunctionType genericFunctionType( |
| 510 TypeAnnotation returnType, | 508 TypeAnnotation returnType, |
| 511 Token functionKeyword, | 509 Token functionKeyword, |
| 512 TypeParameterList typeParameters, | 510 TypeParameterList typeParameters, |
| 513 FormalParameterList _parameters) => | 511 FormalParameterList _parameters) => |
| 514 new GenericFunctionTypeImpl( | 512 new GenericFunctionTypeImpl( |
| 515 returnType, functionKeyword, typeParameters, _parameters); | 513 returnType, functionKeyword, typeParameters, _parameters); |
| 516 | 514 |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 769 | 767 |
| 770 @override | 768 @override |
| 771 ShowCombinator showCombinator( | 769 ShowCombinator showCombinator( |
| 772 Token keyword, List<SimpleIdentifier> shownNames) => | 770 Token keyword, List<SimpleIdentifier> shownNames) => |
| 773 new ShowCombinatorImpl(keyword, shownNames); | 771 new ShowCombinatorImpl(keyword, shownNames); |
| 774 | 772 |
| 775 @override | 773 @override |
| 776 SimpleFormalParameter simpleFormalParameter( | 774 SimpleFormalParameter simpleFormalParameter( |
| 777 Comment comment, | 775 Comment comment, |
| 778 List<Annotation> metadata, | 776 List<Annotation> metadata, |
| 779 Token covariantKeyword, | |
| 780 Token keyword, | 777 Token keyword, |
| 781 TypeAnnotation type, | 778 TypeAnnotation type, |
| 782 SimpleIdentifier identifier) => | 779 SimpleIdentifier identifier) => |
| 783 new SimpleFormalParameterImpl( | 780 new SimpleFormalParameterImpl( |
| 784 comment, metadata, covariantKeyword, keyword, type, identifier); | 781 comment, metadata, keyword, type, identifier); |
| 785 | 782 |
| 786 @override | 783 @override |
| 787 SimpleIdentifier simpleIdentifier(Token token, {bool isDeclaration: false}) { | 784 SimpleIdentifier simpleIdentifier(Token token, {bool isDeclaration: false}) { |
| 788 if (isDeclaration) { | 785 if (isDeclaration) { |
| 789 return new DeclaredSimpleIdentifier(token); | 786 return new DeclaredSimpleIdentifier(token); |
| 790 } | 787 } |
| 791 return new SimpleIdentifierImpl(token); | 788 return new SimpleIdentifierImpl(token); |
| 792 } | 789 } |
| 793 | 790 |
| 794 @override | 791 @override |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 913 | 910 |
| 914 @override | 911 @override |
| 915 WithClause withClause(Token withKeyword, List<TypeName> mixinTypes) => | 912 WithClause withClause(Token withKeyword, List<TypeName> mixinTypes) => |
| 916 new WithClauseImpl(withKeyword, mixinTypes); | 913 new WithClauseImpl(withKeyword, mixinTypes); |
| 917 | 914 |
| 918 @override | 915 @override |
| 919 YieldStatement yieldStatement(Token yieldKeyword, Token star, | 916 YieldStatement yieldStatement(Token yieldKeyword, Token star, |
| 920 Expression expression, Token semicolon) => | 917 Expression expression, Token semicolon) => |
| 921 new YieldStatementImpl(yieldKeyword, star, expression, semicolon); | 918 new YieldStatementImpl(yieldKeyword, star, expression, semicolon); |
| 922 } | 919 } |
| OLD | NEW |