Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Side by Side Diff: pkg/analyzer/lib/src/dart/ast/utilities.dart

Issue 2714843002: Add NormalFormalParameter.covariantKeyword setter and factory parameter. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2014, 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 library analyzer.src.dart.ast.utilities; 5 library analyzer.src.dart.ast.utilities;
6 6
7 import 'dart:collection'; 7 import 'dart:collection';
8 8
9 import 'package:analyzer/dart/ast/ast.dart'; 9 import 'package:analyzer/dart/ast/ast.dart';
10 import 'package:analyzer/dart/ast/standard_ast_factory.dart'; 10 import 'package:analyzer/dart/ast/standard_ast_factory.dart';
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 cloneNodeList(node.metadata), 437 cloneNodeList(node.metadata),
438 cloneToken(node.staticKeyword), 438 cloneToken(node.staticKeyword),
439 cloneNode(node.fields), 439 cloneNode(node.fields),
440 cloneToken(node.semicolon)); 440 cloneToken(node.semicolon));
441 441
442 @override 442 @override
443 FieldFormalParameter visitFieldFormalParameter(FieldFormalParameter node) => 443 FieldFormalParameter visitFieldFormalParameter(FieldFormalParameter node) =>
444 astFactory.fieldFormalParameter( 444 astFactory.fieldFormalParameter(
445 cloneNode(node.documentationComment), 445 cloneNode(node.documentationComment),
446 cloneNodeList(node.metadata), 446 cloneNodeList(node.metadata),
447 cloneToken(node.covariantKeyword),
447 cloneToken(node.keyword), 448 cloneToken(node.keyword),
448 cloneNode(node.type), 449 cloneNode(node.type),
449 cloneToken(node.thisKeyword), 450 cloneToken(node.thisKeyword),
450 cloneToken(node.period), 451 cloneToken(node.period),
451 cloneNode(node.identifier), 452 cloneNode(node.identifier),
452 cloneNode(node.typeParameters), 453 cloneNode(node.typeParameters),
453 cloneNode(node.parameters)); 454 cloneNode(node.parameters));
454 455
455 @override 456 @override
456 ForEachStatement visitForEachStatement(ForEachStatement node) { 457 ForEachStatement visitForEachStatement(ForEachStatement node) {
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 cloneNode(node.typeParameters), 539 cloneNode(node.typeParameters),
539 cloneNode(node.parameters), 540 cloneNode(node.parameters),
540 cloneToken(node.semicolon)); 541 cloneToken(node.semicolon));
541 542
542 @override 543 @override
543 FunctionTypedFormalParameter visitFunctionTypedFormalParameter( 544 FunctionTypedFormalParameter visitFunctionTypedFormalParameter(
544 FunctionTypedFormalParameter node) => 545 FunctionTypedFormalParameter node) =>
545 astFactory.functionTypedFormalParameter( 546 astFactory.functionTypedFormalParameter(
546 cloneNode(node.documentationComment), 547 cloneNode(node.documentationComment),
547 cloneNodeList(node.metadata), 548 cloneNodeList(node.metadata),
549 cloneToken(node.covariantKeyword),
548 cloneNode(node.returnType), 550 cloneNode(node.returnType),
549 cloneNode(node.identifier), 551 cloneNode(node.identifier),
550 cloneNode(node.typeParameters), 552 cloneNode(node.typeParameters),
551 cloneNode(node.parameters)); 553 cloneNode(node.parameters));
552 554
553 @override 555 @override
554 AstNode visitGenericFunctionType(GenericFunctionType node) => 556 AstNode visitGenericFunctionType(GenericFunctionType node) =>
555 astFactory.genericFunctionType( 557 astFactory.genericFunctionType(
556 cloneNode(node.returnType), 558 cloneNode(node.returnType),
557 cloneToken(node.functionKeyword), 559 cloneToken(node.functionKeyword),
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 @override 813 @override
812 ShowCombinator visitShowCombinator(ShowCombinator node) => astFactory 814 ShowCombinator visitShowCombinator(ShowCombinator node) => astFactory
813 .showCombinator(cloneToken(node.keyword), cloneNodeList(node.shownNames)); 815 .showCombinator(cloneToken(node.keyword), cloneNodeList(node.shownNames));
814 816
815 @override 817 @override
816 SimpleFormalParameter visitSimpleFormalParameter( 818 SimpleFormalParameter visitSimpleFormalParameter(
817 SimpleFormalParameter node) => 819 SimpleFormalParameter node) =>
818 astFactory.simpleFormalParameter( 820 astFactory.simpleFormalParameter(
819 cloneNode(node.documentationComment), 821 cloneNode(node.documentationComment),
820 cloneNodeList(node.metadata), 822 cloneNodeList(node.metadata),
823 cloneToken(node.covariantKeyword),
821 cloneToken(node.keyword), 824 cloneToken(node.keyword),
822 cloneNode(node.type), 825 cloneNode(node.type),
823 cloneNode(node.identifier)); 826 cloneNode(node.identifier));
824 827
825 @override 828 @override
826 SimpleIdentifier visitSimpleIdentifier(SimpleIdentifier node) => 829 SimpleIdentifier visitSimpleIdentifier(SimpleIdentifier node) =>
827 astFactory.simpleIdentifier(cloneToken(node.token), 830 astFactory.simpleIdentifier(cloneToken(node.token),
828 isDeclaration: node.inDeclarationContext()); 831 isDeclaration: node.inDeclarationContext());
829 832
830 @override 833 @override
(...skipping 2342 matching lines...) Expand 10 before | Expand all | Expand 10 after
3173 _cloneNodeList(node.metadata), 3176 _cloneNodeList(node.metadata),
3174 _mapToken(node.staticKeyword), 3177 _mapToken(node.staticKeyword),
3175 _cloneNode(node.fields), 3178 _cloneNode(node.fields),
3176 _mapToken(node.semicolon)); 3179 _mapToken(node.semicolon));
3177 3180
3178 @override 3181 @override
3179 FieldFormalParameter visitFieldFormalParameter(FieldFormalParameter node) => 3182 FieldFormalParameter visitFieldFormalParameter(FieldFormalParameter node) =>
3180 astFactory.fieldFormalParameter( 3183 astFactory.fieldFormalParameter(
3181 _cloneNode(node.documentationComment), 3184 _cloneNode(node.documentationComment),
3182 _cloneNodeList(node.metadata), 3185 _cloneNodeList(node.metadata),
3186 _mapToken(node.covariantKeyword),
3183 _mapToken(node.keyword), 3187 _mapToken(node.keyword),
3184 _cloneNode(node.type), 3188 _cloneNode(node.type),
3185 _mapToken(node.thisKeyword), 3189 _mapToken(node.thisKeyword),
3186 _mapToken(node.period), 3190 _mapToken(node.period),
3187 _cloneNode(node.identifier), 3191 _cloneNode(node.identifier),
3188 _cloneNode(node.typeParameters), 3192 _cloneNode(node.typeParameters),
3189 _cloneNode(node.parameters)); 3193 _cloneNode(node.parameters));
3190 3194
3191 @override 3195 @override
3192 ForEachStatement visitForEachStatement(ForEachStatement node) { 3196 ForEachStatement visitForEachStatement(ForEachStatement node) {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
3289 _cloneNode(node.typeParameters), 3293 _cloneNode(node.typeParameters),
3290 _cloneNode(node.parameters), 3294 _cloneNode(node.parameters),
3291 _mapToken(node.semicolon)); 3295 _mapToken(node.semicolon));
3292 3296
3293 @override 3297 @override
3294 FunctionTypedFormalParameter visitFunctionTypedFormalParameter( 3298 FunctionTypedFormalParameter visitFunctionTypedFormalParameter(
3295 FunctionTypedFormalParameter node) => 3299 FunctionTypedFormalParameter node) =>
3296 astFactory.functionTypedFormalParameter( 3300 astFactory.functionTypedFormalParameter(
3297 _cloneNode(node.documentationComment), 3301 _cloneNode(node.documentationComment),
3298 _cloneNodeList(node.metadata), 3302 _cloneNodeList(node.metadata),
3303 _mapToken(node.covariantKeyword),
3299 _cloneNode(node.returnType), 3304 _cloneNode(node.returnType),
3300 _cloneNode(node.identifier), 3305 _cloneNode(node.identifier),
3301 _cloneNode(node.typeParameters), 3306 _cloneNode(node.typeParameters),
3302 _cloneNode(node.parameters)); 3307 _cloneNode(node.parameters));
3303 3308
3304 @override 3309 @override
3305 AstNode visitGenericFunctionType(GenericFunctionType node) => 3310 AstNode visitGenericFunctionType(GenericFunctionType node) =>
3306 astFactory.genericFunctionType( 3311 astFactory.genericFunctionType(
3307 _cloneNode(node.returnType), 3312 _cloneNode(node.returnType),
3308 _mapToken(node.functionKeyword), 3313 _mapToken(node.functionKeyword),
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
3656 @override 3661 @override
3657 ShowCombinator visitShowCombinator(ShowCombinator node) => astFactory 3662 ShowCombinator visitShowCombinator(ShowCombinator node) => astFactory
3658 .showCombinator(_mapToken(node.keyword), _cloneNodeList(node.shownNames)); 3663 .showCombinator(_mapToken(node.keyword), _cloneNodeList(node.shownNames));
3659 3664
3660 @override 3665 @override
3661 SimpleFormalParameter visitSimpleFormalParameter( 3666 SimpleFormalParameter visitSimpleFormalParameter(
3662 SimpleFormalParameter node) => 3667 SimpleFormalParameter node) =>
3663 astFactory.simpleFormalParameter( 3668 astFactory.simpleFormalParameter(
3664 _cloneNode(node.documentationComment), 3669 _cloneNode(node.documentationComment),
3665 _cloneNodeList(node.metadata), 3670 _cloneNodeList(node.metadata),
3671 _mapToken(node.covariantKeyword),
3666 _mapToken(node.keyword), 3672 _mapToken(node.keyword),
3667 _cloneNode(node.type), 3673 _cloneNode(node.type),
3668 _cloneNode(node.identifier)); 3674 _cloneNode(node.identifier));
3669 3675
3670 @override 3676 @override
3671 SimpleIdentifier visitSimpleIdentifier(SimpleIdentifier node) { 3677 SimpleIdentifier visitSimpleIdentifier(SimpleIdentifier node) {
3672 Token mappedToken = _mapToken(node.token); 3678 Token mappedToken = _mapToken(node.token);
3673 if (mappedToken == null) { 3679 if (mappedToken == null) {
3674 // This only happens for SimpleIdentifiers created by the parser as part 3680 // This only happens for SimpleIdentifiers created by the parser as part
3675 // of scanning documentation comments (the tokens for those identifiers 3681 // of scanning documentation comments (the tokens for those identifiers
(...skipping 5687 matching lines...) Expand 10 before | Expand all | Expand 10 after
9363 if (node.star != null) { 9369 if (node.star != null) {
9364 sink.write("yield* "); 9370 sink.write("yield* ");
9365 } else { 9371 } else {
9366 sink.write("yield "); 9372 sink.write("yield ");
9367 } 9373 }
9368 safelyVisitNode(node.expression); 9374 safelyVisitNode(node.expression);
9369 sink.write(";"); 9375 sink.write(";");
9370 return null; 9376 return null;
9371 } 9377 }
9372 } 9378 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698