| 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 library fasta.analyzer.ast_builder; | 5 library fasta.analyzer.ast_builder; |
| 6 | 6 |
| 7 import 'package:analyzer/analyzer.dart'; | 7 import 'package:analyzer/analyzer.dart'; |
| 8 import 'package:analyzer/dart/ast/ast_factory.dart' show AstFactory; | 8 import 'package:analyzer/dart/ast/ast_factory.dart' show AstFactory; |
| 9 import 'package:analyzer/dart/ast/standard_ast_factory.dart' as standard; | 9 import 'package:analyzer/dart/ast/standard_ast_factory.dart' as standard; |
| 10 import 'package:analyzer/dart/ast/token.dart' as analyzer show Token; | 10 import 'package:analyzer/dart/ast/token.dart' as analyzer show Token; |
| (...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 node = ast.fieldFormalParameter2( | 630 node = ast.fieldFormalParameter2( |
| 631 covariantKeyword: toAnalyzerToken(covariantKeyword), | 631 covariantKeyword: toAnalyzerToken(covariantKeyword), |
| 632 keyword: toAnalyzerToken(keyword), | 632 keyword: toAnalyzerToken(keyword), |
| 633 type: type, | 633 type: type, |
| 634 thisKeyword: toAnalyzerToken(thisKeyword), | 634 thisKeyword: toAnalyzerToken(thisKeyword), |
| 635 period: toAnalyzerToken(period), | 635 period: toAnalyzerToken(period), |
| 636 identifier: name); | 636 identifier: name); |
| 637 } | 637 } |
| 638 } | 638 } |
| 639 | 639 |
| 640 if (defaultValue != null) { | 640 ParameterKind analyzerKind = _toAnalyzerParameterKind(kind); |
| 641 node = ast.defaultFormalParameter(node, _toAnalyzerParameterKind(kind), | 641 if (analyzerKind != ParameterKind.REQUIRED) { |
| 642 toAnalyzerToken(defaultValue.separator), defaultValue.value); | 642 node = ast.defaultFormalParameter(node, analyzerKind, |
| 643 toAnalyzerToken(defaultValue?.separator), defaultValue?.value); |
| 643 } | 644 } |
| 644 | 645 |
| 645 scope[name.name] = name.staticElement = new AnalyzerParameterElement(node); | 646 if (name != null) { |
| 647 scope[name.name] = |
| 648 name.staticElement = new AnalyzerParameterElement(node); |
| 649 } |
| 646 push(node); | 650 push(node); |
| 647 } | 651 } |
| 648 | 652 |
| 649 @override | 653 @override |
| 650 void endFunctionTypedFormalParameter( | 654 void endFunctionTypedFormalParameter( |
| 651 Token covariantKeyword, Token thisKeyword, FormalParameterType kind) { | 655 Token covariantKeyword, Token thisKeyword, FormalParameterType kind) { |
| 652 debugEvent("FunctionTypedFormalParameter"); | 656 debugEvent("FunctionTypedFormalParameter"); |
| 653 | 657 |
| 654 FormalParameterList formalParameters = pop(); | 658 FormalParameterList formalParameters = pop(); |
| 655 TypeParameterList typeParameters = pop(); | 659 TypeParameterList typeParameters = pop(); |
| (...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1483 } else if (identical('static', s)) { | 1487 } else if (identical('static', s)) { |
| 1484 staticKeyword = token; | 1488 staticKeyword = token; |
| 1485 } else if (identical('var', s)) { | 1489 } else if (identical('var', s)) { |
| 1486 finalConstOrVarKeyword = token; | 1490 finalConstOrVarKeyword = token; |
| 1487 } else { | 1491 } else { |
| 1488 internalError('Unhandled modifier: $s'); | 1492 internalError('Unhandled modifier: $s'); |
| 1489 } | 1493 } |
| 1490 } | 1494 } |
| 1491 } | 1495 } |
| 1492 } | 1496 } |
| OLD | NEW |