OLD | NEW |
---|---|
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, 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.parser.parser; | 5 library fasta.parser.parser; |
6 | 6 |
7 import '../scanner.dart' show | 7 import '../scanner.dart' show |
8 ErrorToken; | 8 ErrorToken; |
9 | 9 |
10 import '../scanner/recover.dart' show | 10 import '../scanner/recover.dart' show |
(...skipping 2433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2444 mayParseFunctionExpressions = true; | 2444 mayParseFunctionExpressions = true; |
2445 token = parseParenthesizedExpression(token); | 2445 token = parseParenthesizedExpression(token); |
2446 mayParseFunctionExpressions = old; | 2446 mayParseFunctionExpressions = old; |
2447 return token; | 2447 return token; |
2448 } | 2448 } |
2449 } | 2449 } |
2450 | 2450 |
2451 Token parseParenthesizedExpression(Token token) { | 2451 Token parseParenthesizedExpression(Token token) { |
2452 // We expect [begin] to be of type [BeginGroupToken], but we don't know for | 2452 // We expect [begin] to be of type [BeginGroupToken], but we don't know for |
2453 // sure until after calling expect. | 2453 // sure until after calling expect. |
2454 var begin = token; | 2454 var first = token; |
2455 token = expect('(', token); | 2455 token = expect('(', token); |
2456 BeginGroupToken begin = first; | |
ahe
2017/02/07 11:03:08
I would rather keep the previous version using "dy
Siggi Cherem (dart-lang)
2017/02/07 21:59:26
Done.
| |
2456 // [begin] is now known to have type [BeginGroupToken]. | 2457 // [begin] is now known to have type [BeginGroupToken]. |
2457 token = parseExpression(token); | 2458 token = parseExpression(token); |
2458 if (!identical(begin.endGroup, token)) { | 2459 if (!identical(begin.endGroup, token)) { |
2459 reportUnrecoverableError(token, ErrorKind.UnexpectedToken); | 2460 reportUnrecoverableError(token, ErrorKind.UnexpectedToken); |
2460 token = begin.endGroup; | 2461 token = begin.endGroup; |
2461 } | 2462 } |
2462 listener.handleParenthesizedExpression(begin); | 2463 listener.handleParenthesizedExpression(begin); |
2463 return expect(')', token); | 2464 return expect(')', token); |
2464 } | 2465 } |
2465 | 2466 |
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3312 break; | 3313 break; |
3313 } | 3314 } |
3314 if (isRecoverable) { | 3315 if (isRecoverable) { |
3315 listener.handleRecoverableError(token, kind, arguments); | 3316 listener.handleRecoverableError(token, kind, arguments); |
3316 return null; | 3317 return null; |
3317 } else { | 3318 } else { |
3318 return listener.handleUnrecoverableError(token, kind, arguments); | 3319 return listener.handleUnrecoverableError(token, kind, arguments); |
3319 } | 3320 } |
3320 } | 3321 } |
3321 } | 3322 } |
OLD | NEW |