averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Parser: use ParserResult in the interface of parseExpr()

Browse Source 
But the implementation of expression parsing still does not propagate the code
completion bits because it uses NullablePtr for results.


Swift SVN r7425
This commit is contained in:
Dmitri Hrybenko
2013-08-21 21:10:09 +00:00
parent 793716729e
commit ec7b2eb3db
6 changed files with 80 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Parse/ParsePattern.cpp
View File

@@ -129,8 +129,12 @@ parseSelectorArgument(Parser &P,
ExprHandle *init = nullptr;
if (P.consumeIf(tok::equal)) {
NullablePtr<Expr> initR =
ParserResult<Expr> initR =
P.parseExpr(diag::expected_initializer_expr);
if (initR.hasCodeCompletion()) {
P.skipUntil(tok::r_paren);
return makeParserCodeCompletionStatus();
}
if (initR.isNull()) {
P.skipUntil(tok::r_paren);
return makeParserError();
@@ -386,7 +390,7 @@ Parser::parsePatternTupleElement(bool allowInitExpr) {
ExprHandle *init = nullptr;
if (Tok.is(tok::equal)) {
SourceLoc EqualLoc = consumeToken();
NullablePtr<Expr> initR = parseExpr(diag::expected_initializer_expr);
ParserResult<Expr> initR = parseExpr(diag::expected_initializer_expr);
if (!allowInitExpr) {
auto inFlight = diagnose(EqualLoc, diag::non_func_decl_pattern_init);
@@ -499,7 +503,9 @@ ParserResult<Pattern> Parser::parseMatchingPattern() {
// matching-pattern ::= expr
// Fall back to expression parsing for ambiguous forms. Name lookup will
// disambiguate.
NullablePtr<Expr> subExpr = parseExpr(diag::expected_pattern);
ParserResult<Expr> subExpr = parseExpr(diag::expected_pattern);
if (subExpr.hasCodeCompletion())
return makeParserCodeCompletionStatus();
if (subExpr.isNull())
return nullptr;