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

Wire data decls up to -ast-dump. Fix some minor bugs exposed along the way.

Browse Source 
Swift SVN r175
This commit is contained in:
Chris Lattner
2010-10-09 20:46:10 +00:00
parent 0ad8498114
commit a43a8f27f5
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Parse/Parser.cpp
View File

@@ -167,9 +167,9 @@ Decl *Parser::ParseDeclTopLevel() {
return 0;
case tok::kw_data:
if (ParseDeclData()) break;
return 0;
if (DataDecl *D = ParseDeclData())
return D;
break;
case tok::kw_func:
if (FuncDecl *D = ParseDeclFunc()) {
S.decl.ActOnTopLevelDecl(D);
@@ -507,7 +507,7 @@ FuncDecl *Parser::ParseDeclFunc() {
/// data-element:
/// identifier
///
bool Parser::ParseDeclData() {
DataDecl *Parser::ParseDeclData() {
SMLoc DataLoc = Tok.getLoc();
ConsumeToken(tok::kw_data);
@@ -518,8 +518,8 @@ bool Parser::ParseDeclData() {
llvm::StringRef DataName;
if (ParseIdentifier(DataName, "expected identifier in data declaration") ||
ParseToken(tok::l_brace, "expected '{' in data declaration"))
return true;
Identifier DataIdentifier = S.Context.getIdentifier(Tok.getText());
return 0;
Identifier DataIdentifier = S.Context.getIdentifier(DataName);
// Give the information about the decl to Sema. This registers the data for
// name lookup allowing recursive datas.
@@ -543,7 +543,7 @@ bool Parser::ParseDeclData() {
"expected type while parsing data element '" +
DataName + "'")) {
SkipUntil(tok::r_brace);
return true;
return 0;
}
// Require comma separation.
@@ -556,7 +556,7 @@ bool Parser::ParseDeclData() {
S.decl.ActOnCompleteDataDecl(TheDataDecl, ElementInfo.data(),
ElementInfo.size());
return false;
return TheDataDecl;
}
//===----------------------------------------------------------------------===//