maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

improve comments, build array and array range designator nodes, 

fix an obscure memory leak.

llvm-svn: 58213
This commit is contained in:
Chris Lattner 2008-10-26 23:06:54 +00:00
parent 7243245a58
commit 8aafd35c79
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
clang/lib/Parse/ParseInit.cpp
View File

@ -104,11 +104,18 @@ ParseInitializerWithPotentialDesignator(InitListDesignations &Designations,
// We must have either an array designator now or an objc message send.
assert(Tok.is(tok::l_square) && "Unexpected token!");
// array-designator: '[' constant-expression ']'
// array-designator: '[' constant-expression '...' constant-expression ']'
// When designation is empty, this can be '[' objc-message-expr ']'. Note
// that we also have the case of [4][foo bar], which is the gnu designator
// extension + objc message send.
// Handle the two forms of array designator:
// array-designator: '[' constant-expression ']'
// array-designator: '[' constant-expression '...' constant-expression ']'
//
// Also, we have to handle the case where the expression after the
// designator an an objc message send: '[' objc-message-expr ']'.
// Interesting cases are:
// [foo bar] -> objc message send
// [foo] -> array designator
// [foo ... bar] -> array designator
// [4][foo bar] -> obsolete GNU designation with objc message send.
//
SourceLocation StartLoc = ConsumeBracket();
// If Objective-C is enabled and this is a typename or other identifier
@ -140,17 +147,26 @@ ParseInitializerWithPotentialDesignator(InitListDesignations &Designations,
// [4][foo bar].
return ParseAssignmentExprWithObjCMessageExprStart(StartLoc, 0,Idx.Val);
}
// Create designation if we haven't already.
if (Desig == 0)
Desig = &Designations.CreateDesignation(InitNum);
// Handle the gnu array range extension.
if (Tok.is(tok::ellipsis)) {
// If this is a normal array designator, remember it.
if (Tok.isNot(tok::ellipsis)) {
Desig->AddDesignator(Designator::getArray(Idx.Val));
} else {
// Handle the gnu array range extension.
Diag(Tok, diag::ext_gnu_array_range);
ConsumeToken();
ExprResult RHS = ParseConstantExpression();
if (RHS.isInvalid) {
Actions.DeleteExpr(Idx.Val);
SkipUntil(tok::r_square);
return RHS;
}
Desig->AddDesignator(Designator::getArrayRange(Idx.Val, RHS.Val));
}
MatchRHSPunctuation(tok::r_square, StartLoc);