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

Fix a bug where we'd try to look beyond the current cached tokens when 

not in backtracking mode.  This was just using the wrong predicate.

llvm-svn: 61666
This commit is contained in:
Chris Lattner 2009-01-05 01:42:04 +00:00
parent f87d41d8b9
commit c69537feb5
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Lex/Preprocessor.h
View File

@ -414,7 +414,7 @@ public:
/// invoked. /// invoked.
void AnnotateCachedTokens(const Token &Tok) { void AnnotateCachedTokens(const Token &Tok) {
assert(Tok.isAnnotationToken() && "Expected annotation token"); assert(Tok.isAnnotationToken() && "Expected annotation token");
if (CachedLexPos != 0 && InCachingLexMode()) if (CachedLexPos != 0 && isBacktrackEnabled())
AnnotatePreviousCachedTokens(Tok); AnnotatePreviousCachedTokens(Tok);
} }

4
clang/lib/Parse/ParseExprCXX.cpp
View File

@ -68,8 +68,8 @@ bool Parser::MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS,
SourceLocation CCLoc = ConsumeToken(); SourceLocation CCLoc = ConsumeToken();
// ::new and ::delete aren't nested-name-specifiers, and // ::new and ::delete aren't nested-name-specifiers, and
// MaybeParseCXXScopeSpecifier is never called in a context where one could // MaybeParseCXXScopeSpecifier is never called in a context where one
// exist. This means that if we see it, we have a syntax error. // 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)) { if (Tok.is(tok::kw_new) || Tok.is(tok::kw_delete)) {
Diag(Tok, diag::err_invalid_qualified_new_delete) Diag(Tok, diag::err_invalid_qualified_new_delete)
<< Tok.is(tok::kw_delete); << Tok.is(tok::kw_delete);

11
clang/test/SemaCXX/qualified-id-lookup.cpp
View File

@ -53,3 +53,14 @@ void test_f1(int i) {
int v3 = ::i1; int v3 = ::i1;
} }
typedef int f2_type;
namespace a {
typedef int f2_type(int, int);
void test_f2() {
::f2_type(1, 2); // expected-error {{function-style cast to a builtin type can only take one argument}}
}
}