[cfe-commits] r61671 - in /cfe/trunk: include/clang/Basic/DiagnosticKinds.def include/clang/Parse/Parser.h lib/Parse/ParseExpr.cpp lib/Parse/ParseExprCXX.cpp lib/Parse/Parser.cpp
Chris Lattner
sabre at nondot.org
Sun Jan 4 19:55:46 PST 2009
Author: lattner
Date: Sun Jan 4 21:55:46 2009
New Revision: 61671
URL: http://llvm.org/viewvc/llvm-project?rev=61671&view=rev
Log:
remove optimization to avoid looking ahead for cases like ::foo. This
isn't worth the complexity and the code already does a ton of lookahead.
Modified:
cfe/trunk/include/clang/Basic/DiagnosticKinds.def
cfe/trunk/include/clang/Parse/Parser.h
cfe/trunk/lib/Parse/ParseExpr.cpp
cfe/trunk/lib/Parse/ParseExprCXX.cpp
cfe/trunk/lib/Parse/Parser.cpp
Modified: cfe/trunk/include/clang/Basic/DiagnosticKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticKinds.def?rev=61671&r1=61670&r2=61671&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticKinds.def (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticKinds.def Sun Jan 4 21:55:46 2009
@@ -1309,8 +1309,6 @@
"array size must be specified in new expressions")
DIAG(err_bad_new_type, ERROR,
"cannot allocate %select{function|incomplete|reference}1 type %0 with new")
-DIAG(err_invalid_qualified_new_delete, ERROR,
- "invalid use of ::%select{new|delete}0")
DIAG(err_new_array_nonconst, ERROR,
"only the first dimension of an allocated array may be non-const")
DIAG(err_array_size_not_integral, ERROR,
Modified: cfe/trunk/include/clang/Parse/Parser.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Parser.h?rev=61671&r1=61670&r2=61671&view=diff
==============================================================================
--- cfe/trunk/include/clang/Parse/Parser.h (original)
+++ cfe/trunk/include/clang/Parse/Parser.h Sun Jan 4 21:55:46 2009
@@ -269,7 +269,7 @@
/// for expressions in C.
///
/// This returns true if the token was annotated.
- bool TryAnnotateTypeOrScopeToken(const Token *GlobalQualifier = 0);
+ bool TryAnnotateTypeOrScopeToken();
/// TryAnnotateCXXScopeToken - Like TryAnnotateTypeOrScopeToken but only
/// annotates C++ scope specifiers. This returns true if the token was
@@ -610,11 +610,9 @@
/// MaybeParseCXXScopeSpecifier - Parse global scope or nested-name-specifier.
/// Returns true if a nested-name-specifier was parsed from the token stream.
+ /// Note that this routine will not parse ::new or ::delete.
///
- /// If GlobalQualifier is non-null, then it is a :: token we should use as the
- /// global qualifier.
- bool MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS,
- const Token *GlobalQualifier = 0);
+ bool MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS);
//===--------------------------------------------------------------------===//
// C++ 5.2p1: C++ Casts
Modified: cfe/trunk/lib/Parse/ParseExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExpr.cpp?rev=61671&r1=61670&r2=61671&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseExpr.cpp (original)
+++ cfe/trunk/lib/Parse/ParseExpr.cpp Sun Jan 4 21:55:46 2009
@@ -626,25 +626,21 @@
return ParsePostfixExpressionSuffix(move(Res));
case tok::coloncolon: {
+ // ::foo::bar -> global qualified name etc. If TryAnnotateTypeOrScopeToken
+ // annotates the token, tail recurse.
+ if (TryAnnotateTypeOrScopeToken())
+ return ParseCastExpression(isUnaryExpression);
+
// ::new -> [C++] new-expression
// ::delete -> [C++] delete-expression
- // ::foo::bar -> global qualified name etc.
- Token ColonColonTok = Tok;
- ConsumeToken();
+ SourceLocation CCLoc = ConsumeToken();
if (Tok.is(tok::kw_new))
- return ParseCXXNewExpression(true, ColonColonTok.getLocation());
+ return ParseCXXNewExpression(true, CCLoc);
if (Tok.is(tok::kw_delete))
- return ParseCXXDeleteExpression(true, ColonColonTok.getLocation());
- // Turn the qualified name into a annot_qualtypename or annot_cxxscope if
- // it would be valid.
- if ((Tok.is(tok::identifier) || Tok.is(tok::coloncolon)) &&
- TryAnnotateTypeOrScopeToken(&ColonColonTok)) {
- // If so, retry (tail recurse).
- return ParseCastExpression(isUnaryExpression);
- }
-
+ return ParseCXXDeleteExpression(true, CCLoc);
+
// This is not a type name or scope specifier, it is an invalid expression.
- Diag(ColonColonTok, diag::err_expected_expression);
+ Diag(CCLoc, diag::err_expected_expression);
return ExprError();
}
Modified: cfe/trunk/lib/Parse/ParseExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExprCXX.cpp?rev=61671&r1=61670&r2=61671&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseExprCXX.cpp (original)
+++ cfe/trunk/lib/Parse/ParseExprCXX.cpp Sun Jan 4 21:55:46 2009
@@ -20,8 +20,7 @@
/// MaybeParseCXXScopeSpecifier - Parse global scope or nested-name-specifier.
/// Returns true if a nested-name-specifier was parsed from the token stream.
///
-/// Note that this routine emits an error if you call it with ::new or ::delete
-/// as the current tokens, so only call it in contexts where these are invalid.
+/// Note that this routine will not parse ::new or ::delete.
///
/// '::'[opt] nested-name-specifier
/// '::'
@@ -32,42 +31,25 @@
/// nested-name-specifier identifier '::'
/// nested-name-specifier 'template'[opt] simple-template-id '::' [TODO]
///
-bool Parser::MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS,
- const Token *GlobalQualifier) {
+bool Parser::MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS) {
assert(getLang().CPlusPlus &&
"Call sites of this function should be guarded by checking for C++");
if (Tok.is(tok::annot_cxxscope)) {
- assert(GlobalQualifier == 0 &&
- "Cannot have :: followed by a resolved annotation scope");
SS.setScopeRep(Tok.getAnnotationValue());
SS.setRange(Tok.getAnnotationRange());
ConsumeToken();
return true;
}
- if (GlobalQualifier) {
- // Pre-parsed '::'.
- SS.setBeginLoc(GlobalQualifier->getLocation());
- SS.setScopeRep(Actions.ActOnCXXGlobalScopeSpecifier(CurScope,
- GlobalQualifier->getLocation()));
- SS.setEndLoc(GlobalQualifier->getLocation());
+ if (Tok.is(tok::coloncolon)) {
+ // ::new and ::delete aren't nested-name-specifiers.
+ tok::TokenKind NextKind = NextToken().getKind();
+ if (NextKind == tok::kw_new || NextKind == tok::kw_delete)
+ return false;
- assert(Tok.isNot(tok::kw_new) && Tok.isNot(tok::kw_delete) &&
- "Never called with preparsed :: qualifier and with new/delete");
- } else if (Tok.is(tok::coloncolon)) {
// '::' - Global scope qualifier.
SourceLocation CCLoc = ConsumeToken();
-
- // ::new and ::delete aren't nested-name-specifiers, and
- // MaybeParseCXXScopeSpecifier is never called in a context where one
- // could exist. This means that if we see it, we have a syntax error.
- if (Tok.is(tok::kw_new) || Tok.is(tok::kw_delete)) {
- Diag(Tok, diag::err_invalid_qualified_new_delete)
- << Tok.is(tok::kw_delete);
- return false;
- }
-
SS.setBeginLoc(CCLoc);
SS.setScopeRep(Actions.ActOnCXXGlobalScopeSpecifier(CurScope, CCLoc));
SS.setEndLoc(CCLoc);
Modified: cfe/trunk/lib/Parse/Parser.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/Parser.cpp?rev=61671&r1=61670&r2=61671&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/Parser.cpp (original)
+++ cfe/trunk/lib/Parse/Parser.cpp Sun Jan 4 21:55:46 2009
@@ -746,14 +746,14 @@
///
/// Note that this routine emits an error if you call it with ::new or ::delete
/// as the current tokens, so only call it in contexts where these are invalid.
-bool Parser::TryAnnotateTypeOrScopeToken(const Token *GlobalQualifier) {
+bool Parser::TryAnnotateTypeOrScopeToken() {
assert((Tok.is(tok::identifier) || Tok.is(tok::coloncolon)) &&
"Cannot be a type or scope token!");
// FIXME: Implement template-ids
CXXScopeSpec SS;
if (getLang().CPlusPlus)
- MaybeParseCXXScopeSpecifier(SS, GlobalQualifier);
+ MaybeParseCXXScopeSpecifier(SS);
if (Tok.is(tok::identifier)) {
// Determine whether the identifier is a type name.
More information about the cfe-commits
mailing list