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

Improve recovery from ill-formed scope specifiers. Fixes PR3670. 

llvm-svn: 66286
This commit is contained in:
Douglas Gregor 2009-03-06 19:06:37 +00:00
parent d6ef62f0bf
commit c2fd626cac
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Sema/SemaDecl.cpp
View File

@ -1209,7 +1209,11 @@ Sema::ActOnDeclarator(Scope *S, Declarator &D, DeclTy *lastDecl,
}
// See if this is a redefinition of a variable in the same scope.
if (!D.getCXXScopeSpec().isSet() && !D.getCXXScopeSpec().isInvalid()) {
if (D.getCXXScopeSpec().isInvalid()) {
DC = CurContext;
PrevDecl = 0;
InvalidDecl = true;
} else if (!D.getCXXScopeSpec().isSet()) {
LookupNameKind NameKind = LookupOrdinaryName;
// If the declaration we're planning to build will be a function

11
clang/test/SemaCXX/nested-name-spec.cpp
View File

@ -1,5 +1,4 @@
// RUN: clang -fsyntax-only -verify -std=c++98 %s
// XFAIL
// fails due to exact diagnostic matching
namespace A {
struct C {
@ -10,8 +9,8 @@ namespace A {
}
A:: ; // expected-error {{expected unqualified-id}}
::A::ax::undef ex3; // expected-error {{expected a class or namespace}} expected-error {{expected '=', ',', ';', 'asm', or '__attribute__' after declarator}}
A::undef1::undef2 ex4; // expected-error {{no member named 'undef1'}} expected-error {{expected '=', ',', ';', 'asm', or '__attribute__' after declarator}}
::A::ax::undef ex3; // expected-error {{expected a class or namespace}} expected-error {{invalid token after top level declarator}}
A::undef1::undef2 ex4; // expected-error {{no member named 'undef1'}} expected-error {{invalid token after top level declarator}}
class C2 {
void m(); // expected-note{{member declaration nearly matches}}
@ -89,7 +88,8 @@ void f6(int A2::RC::x); // expected-error{{parameter declarator cannot be qualif
int A2::RC::x; // expected-error{{non-static data member defined out-of-line}}
void A2::CC::NC::m(); // expected-error{{out-of-line declaration of a member must be a definition}}
void A2::CC::NC::m(); // expected-error{{out-of-line declaration of a member must be a definition}} \
// expected-error{{out-of-line declaration of a member must be a definition}}
namespace E {
@ -150,3 +150,6 @@ namespace N {
void ::global_func2(int) { } // expected-error{{definition or redeclaration of 'global_func2' cannot name the global scope}}
void N::f() { } // okay
X::X() : a(5) { } // expected-error{{use of undeclared identifier 'X'}} \
// expected-error{{expected function body after function declarator}}