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

switch "val" to "let" in in the ASTPrinter, unbreaking tests.

Browse Source 
Produce a warning + fixit for uses of 'val'.


Swift SVN r14435
This commit is contained in:
Chris Lattner
2014-02-27 00:32:17 +00:00
parent 4e87971d81
commit c16db63ae7
7 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Parse/ParsePattern.cpp
View File

@@ -605,7 +605,7 @@ Parser::parseConstructorArguments(Pattern *&ArgPattern, Pattern *&BodyPattern,
/// pattern ::= 'let' pattern
ParserResult<Pattern> Parser::parsePattern(bool isLet) {
// If this is a let or var pattern parse it.
if (Tok.is(tok::kw_val) || Tok.is(tok::kw_var))
if (Tok.is(tok::kw_let) || Tok.is(tok::kw_var))
return parsePatternVarOrLet();
// First, parse the pattern atom.
@@ -633,8 +633,8 @@ ParserResult<Pattern> Parser::parsePattern(bool isLet) {
}
ParserResult<Pattern> Parser::parsePatternVarOrLet() {
assert((Tok.is(tok::kw_val) || Tok.is(tok::kw_var)) && "expects let or var");
bool isLet = Tok.is(tok::kw_val);
assert((Tok.is(tok::kw_let) || Tok.is(tok::kw_var)) && "expects let or var");
bool isLet = Tok.is(tok::kw_let);
SourceLoc varLoc = consumeToken();
// 'var' and 'let' patterns shouldn't nest.
@@ -872,7 +872,7 @@ ParserResult<Pattern> Parser::parseMatchingPattern() {
// Parse productions that can only be patterns.
// matching-pattern ::= matching-pattern-var
if (Tok.is(tok::kw_var) || Tok.is(tok::kw_val))
if (Tok.is(tok::kw_var) || Tok.is(tok::kw_let))
return parseMatchingPatternVarOrVal();
// matching-pattern ::= 'is' type
@@ -892,8 +892,8 @@ ParserResult<Pattern> Parser::parseMatchingPattern() {
}
ParserResult<Pattern> Parser::parseMatchingPatternVarOrVal() {
assert((Tok.is(tok::kw_val) || Tok.is(tok::kw_var)) && "expects val or var");
bool isVal = Tok.is(tok::kw_val);
assert((Tok.is(tok::kw_let) || Tok.is(tok::kw_var)) && "expects val or var");
bool isVal = Tok.is(tok::kw_let);
SourceLoc varLoc = consumeToken();
// 'var' and 'let' patterns shouldn't nest.
@@ -920,5 +920,5 @@ ParserResult<Pattern> Parser::parseMatchingPatternIs() {
}
bool Parser::isOnlyStartOfMatchingPattern() {
return Tok.is(tok::kw_var) || Tok.is(tok::kw_val) || Tok.is(tok::kw_is);
return Tok.is(tok::kw_var) || Tok.is(tok::kw_let) || Tok.is(tok::kw_is);
}