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

Add a basic TypeLoc; start threading it through the parser.

Browse Source 
Doug, please double-check that this is going in the right direction...



Swift SVN r2146
This commit is contained in:
Eli Friedman
2012-06-05 00:11:59 +00:00
parent 0ca4d69ab5
commit ecc56538b3
8 changed files with 162 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Parse/Parser.cpp
View File

@@ -260,7 +260,8 @@ bool Parser::parseMatchingToken(tok K, SourceLoc &TokLoc, Diag<> ErrorDiag,
/// ':' type-annotation
/// ':' type-annotation '=' expr
/// '=' expr
bool Parser::parseValueSpecifier(Type &Ty, NullablePtr<Expr> &Init) {
bool Parser::parseValueSpecifier(Type &Ty, TypeLoc *&Loc,
NullablePtr<Expr> &Init) {
// Diagnose when we don't have a type or an expression.
if (Tok.isNot(tok::colon) && Tok.isNot(tok::equal)) {
diagnose(Tok, diag::expected_type_or_init);
@@ -271,7 +272,7 @@ bool Parser::parseValueSpecifier(Type &Ty, NullablePtr<Expr> &Init) {
// Parse the type if present.
if (consumeIf(tok::colon) &&
parseTypeAnnotation(Ty, diag::expected_type))
parseTypeAnnotation(Ty, Loc, diag::expected_type))
return true;
// Parse the initializer, if present.