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, |
369 Token keyword, | 370 Token keyword, |
370 TypeAnnotation type, | 371 TypeAnnotation type, |
371 Token thisKeyword, | 372 Token thisKeyword, |
372 Token period, | 373 Token period, |
373 SimpleIdentifier identifier, | 374 SimpleIdentifier identifier, |
374 TypeParameterList typeParameters, | 375 TypeParameterList typeParameters, |
375 FormalParameterList parameters) => | 376 FormalParameterList parameters) => |
376 new FieldFormalParameterImpl(comment, metadata, keyword, type, | 377 new FieldFormalParameterImpl(comment, metadata, covariantKeyword, keyword, |
377 thisKeyword, period, identifier, typeParameters, parameters); | 378 type, thisKeyword, period, identifier, typeParameters, parameters); |
378 | 379 |
379 @override | 380 @override |
380 ForEachStatement forEachStatementWithDeclaration( | 381 ForEachStatement forEachStatementWithDeclaration( |
381 Token awaitKeyword, | 382 Token awaitKeyword, |
382 Token forKeyword, | 383 Token forKeyword, |
383 Token leftParenthesis, | 384 Token leftParenthesis, |
384 DeclaredIdentifier loopVariable, | 385 DeclaredIdentifier loopVariable, |
385 Token inKeyword, | 386 Token inKeyword, |
386 Expression iterator, | 387 Expression iterator, |
387 Token rightParenthesis, | 388 Token rightParenthesis, |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
488 TypeParameterList typeParameters, | 489 TypeParameterList typeParameters, |
489 FormalParameterList parameters, | 490 FormalParameterList parameters, |
490 Token semicolon) => | 491 Token semicolon) => |
491 new FunctionTypeAliasImpl(comment, metadata, keyword, returnType, name, | 492 new FunctionTypeAliasImpl(comment, metadata, keyword, returnType, name, |
492 typeParameters, parameters, semicolon); | 493 typeParameters, parameters, semicolon); |
493 | 494 |
494 @override | 495 @override |
495 FunctionTypedFormalParameter functionTypedFormalParameter( | 496 FunctionTypedFormalParameter functionTypedFormalParameter( |
496 Comment comment, | 497 Comment comment, |
497 List<Annotation> metadata, | 498 List<Annotation> metadata, |
| 499 Token covariantKeyword, |
498 TypeAnnotation returnType, | 500 TypeAnnotation returnType, |
499 SimpleIdentifier identifier, | 501 SimpleIdentifier identifier, |
500 TypeParameterList typeParameters, | 502 TypeParameterList typeParameters, |
501 FormalParameterList parameters, | 503 FormalParameterList parameters, |
502 {Token question: null}) => | 504 {Token question: null}) => |
503 new FunctionTypedFormalParameterImpl(comment, metadata, returnType, | 505 new FunctionTypedFormalParameterImpl(comment, metadata, covariantKeyword, |
504 identifier, typeParameters, parameters, question); | 506 returnType, identifier, typeParameters, parameters, question); |
505 | 507 |
506 @override | 508 @override |
507 GenericFunctionType genericFunctionType( | 509 GenericFunctionType genericFunctionType( |
508 TypeAnnotation returnType, | 510 TypeAnnotation returnType, |
509 Token functionKeyword, | 511 Token functionKeyword, |
510 TypeParameterList typeParameters, | 512 TypeParameterList typeParameters, |
511 FormalParameterList _parameters) => | 513 FormalParameterList _parameters) => |
512 new GenericFunctionTypeImpl( | 514 new GenericFunctionTypeImpl( |
513 returnType, functionKeyword, typeParameters, _parameters); | 515 returnType, functionKeyword, typeParameters, _parameters); |
514 | 516 |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
767 | 769 |
768 @override | 770 @override |
769 ShowCombinator showCombinator( | 771 ShowCombinator showCombinator( |
770 Token keyword, List<SimpleIdentifier> shownNames) => | 772 Token keyword, List<SimpleIdentifier> shownNames) => |
771 new ShowCombinatorImpl(keyword, shownNames); | 773 new ShowCombinatorImpl(keyword, shownNames); |
772 | 774 |
773 @override | 775 @override |
774 SimpleFormalParameter simpleFormalParameter( | 776 SimpleFormalParameter simpleFormalParameter( |
775 Comment comment, | 777 Comment comment, |
776 List<Annotation> metadata, | 778 List<Annotation> metadata, |
| 779 Token covariantKeyword, |
777 Token keyword, | 780 Token keyword, |
778 TypeAnnotation type, | 781 TypeAnnotation type, |
779 SimpleIdentifier identifier) => | 782 SimpleIdentifier identifier) => |
780 new SimpleFormalParameterImpl( | 783 new SimpleFormalParameterImpl( |
781 comment, metadata, keyword, type, identifier); | 784 comment, metadata, covariantKeyword, keyword, type, identifier); |
782 | 785 |
783 @override | 786 @override |
784 SimpleIdentifier simpleIdentifier(Token token, {bool isDeclaration: false}) { | 787 SimpleIdentifier simpleIdentifier(Token token, {bool isDeclaration: false}) { |
785 if (isDeclaration) { | 788 if (isDeclaration) { |
786 return new DeclaredSimpleIdentifier(token); | 789 return new DeclaredSimpleIdentifier(token); |
787 } | 790 } |
788 return new SimpleIdentifierImpl(token); | 791 return new SimpleIdentifierImpl(token); |
789 } | 792 } |
790 | 793 |
791 @override | 794 @override |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
910 | 913 |
911 @override | 914 @override |
912 WithClause withClause(Token withKeyword, List<TypeName> mixinTypes) => | 915 WithClause withClause(Token withKeyword, List<TypeName> mixinTypes) => |
913 new WithClauseImpl(withKeyword, mixinTypes); | 916 new WithClauseImpl(withKeyword, mixinTypes); |
914 | 917 |
915 @override | 918 @override |
916 YieldStatement yieldStatement(Token yieldKeyword, Token star, | 919 YieldStatement yieldStatement(Token yieldKeyword, Token star, |
917 Expression expression, Token semicolon) => | 920 Expression expression, Token semicolon) => |
918 new YieldStatementImpl(yieldKeyword, star, expression, semicolon); | 921 new YieldStatementImpl(yieldKeyword, star, expression, semicolon); |
919 } | 922 } |
OLD | NEW |