From 6cab596218f9b16f32153ccba57ac6fec9984bed Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Sun, 9 Feb 2014 06:54:23 +0000 Subject: [PATCH] Improve diagnostic for using non-class/namespace/scoped enum in a nested name specifier. Rather than simply saying "X is not a class or namespace", clarify what X is by providing the aka type in the case where X is a type, or pointing to the named declaration if there's an unambiguous one to refer to. In the ambiguous case, the ambiguities are already enumerated (though could be clarified by describing what kind of entities they are) Included a few FIXMEs in tests where some further improvements could be made. llvm-svn: 201038 --- .../clang/Basic/DiagnosticSemaKinds.td | 7 +++-- clang/lib/Sema/SemaCXXScopeSpec.cpp | 31 ++++++++++--------- .../basic.lookup.qual/class.qual/p2.cpp | 3 +- .../test/CXX/temp/temp.res/temp.local/p3.cpp | 2 +- .../test/SemaCXX/constructor-initializer.cpp | 2 +- clang/test/SemaCXX/member-pointer.cpp | 2 +- clang/test/SemaCXX/nested-name-spec.cpp | 13 +++++--- clang/test/SemaObjCXX/propert-dot-error.mm | 6 ++-- 8 files changed, 37 insertions(+), 29 deletions(-) diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 0e8e213dc962..edbf97e500f0 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -5253,9 +5253,10 @@ def err_typecheck_deleted_function : Error< "conversion function %diff{from $ to $|between types}0,1 " "invokes a deleted function">; -def err_expected_class_or_namespace : Error<"expected a class or namespace">; -def err_expected_class : Error<"%0 is not a class%select{ or namespace|, " - "namespace, or scoped enumeration}1">; +def err_expected_class_or_namespace : Error<"%0 is not a class" + "%select{ or namespace|, namespace, or scoped enumeration}1">; +def note_expected_class_or_namespace_declared_here : Note< + "%0 declared here">; def err_invalid_declarator_scope : Error<"cannot define or redeclare %0 here " "because namespace %1 does not enclose namespace %2">; def err_invalid_declarator_global_scope : Error< diff --git a/clang/lib/Sema/SemaCXXScopeSpec.cpp b/clang/lib/Sema/SemaCXXScopeSpec.cpp index 9a390a7e266a..ef1eaf2c1460 100644 --- a/clang/lib/Sema/SemaCXXScopeSpec.cpp +++ b/clang/lib/Sema/SemaCXXScopeSpec.cpp @@ -654,20 +654,23 @@ bool Sema::BuildCXXNestedNameSpecifier(Scope *S, } } - unsigned DiagID; - if (!Found.empty()) - DiagID = diag::err_expected_class_or_namespace; - else if (SS.isSet()) { - Diag(IdentifierLoc, diag::err_no_member) - << &Identifier << LookupCtx << SS.getRange(); - return true; - } else - DiagID = diag::err_undeclared_var_use; - - if (SS.isSet()) - Diag(IdentifierLoc, DiagID) << &Identifier << SS.getRange(); + if (!Found.empty()) { + if (TypeDecl *TD = Found.getAsSingle()) + Diag(IdentifierLoc, diag::err_expected_class_or_namespace) + << QualType(TD->getTypeForDecl(), 0) << getLangOpts().CPlusPlus; + else { + Diag(IdentifierLoc, diag::err_expected_class_or_namespace) + << &Identifier << getLangOpts().CPlusPlus; + if (NamedDecl *ND = Found.getAsSingle()) + Diag(ND->getLocation(), + diag::note_expected_class_or_namespace_declared_here) + << &Identifier; + } + } else if (SS.isSet()) + Diag(IdentifierLoc, diag::err_no_member) << &Identifier << LookupCtx + << SS.getRange(); else - Diag(IdentifierLoc, DiagID) << &Identifier; + Diag(IdentifierLoc, diag::err_undeclared_var_use) << &Identifier; return true; } @@ -698,7 +701,7 @@ bool Sema::ActOnCXXNestedNameSpecifierDecltype(CXXScopeSpec &SS, QualType T = BuildDecltypeType(DS.getRepAsExpr(), DS.getTypeSpecTypeLoc()); if (!T->isDependentType() && !T->getAs()) { - Diag(DS.getTypeSpecTypeLoc(), diag::err_expected_class) + Diag(DS.getTypeSpecTypeLoc(), diag::err_expected_class_or_namespace) << T << getLangOpts().CPlusPlus; return true; } diff --git a/clang/test/CXX/basic/basic.lookup/basic.lookup.qual/class.qual/p2.cpp b/clang/test/CXX/basic/basic.lookup/basic.lookup.qual/class.qual/p2.cpp index 1f78a738f38b..b9e83988cfb8 100644 --- a/clang/test/CXX/basic/basic.lookup/basic.lookup.qual/class.qual/p2.cpp +++ b/clang/test/CXX/basic/basic.lookup/basic.lookup.qual/class.qual/p2.cpp @@ -105,9 +105,10 @@ namespace InhCtor { }; + // FIXME: Consider reusing the same diagnostic between dependent and non-dependent contexts typedef int I; struct UsingInt { - using I::I; // expected-error {{expected a class or namespace}} + using I::I; // expected-error {{'I' (aka 'int') is not a class, namespace, or scoped enumeration}} }; template struct UsingIntTemplate { using T::T; // expected-error {{type 'int' cannot be used prior to '::' because it has no members}} diff --git a/clang/test/CXX/temp/temp.res/temp.local/p3.cpp b/clang/test/CXX/temp/temp.res/temp.local/p3.cpp index 54da8856fe46..e29ced19bc4f 100644 --- a/clang/test/CXX/temp/temp.res/temp.local/p3.cpp +++ b/clang/test/CXX/temp/temp.res/temp.local/p3.cpp @@ -15,7 +15,7 @@ template struct Derived: Base, Base { t->Base::f(); t->Base::f(); // expected-error{{member 'Base' found in multiple base classes of different types}} \ // expected-error{{no member named 'f' in 'X0'}} \ - // expected-error{{expected a class or namespace}} + // expected-error{{'Base' is not a class, namespace, or scoped enumeration}} } }; diff --git a/clang/test/SemaCXX/constructor-initializer.cpp b/clang/test/SemaCXX/constructor-initializer.cpp index 697f718eabb8..81dc19ea6dfc 100644 --- a/clang/test/SemaCXX/constructor-initializer.cpp +++ b/clang/test/SemaCXX/constructor-initializer.cpp @@ -94,7 +94,7 @@ struct Current : Derived { Derived::Base1(), // expected-error {{type 'Derived::Base1' is not a direct or virtual base of 'Current'}} Derived::V(), ::NonExisting(), // expected-error {{member initializer 'NonExisting' does not name a non-static data member or}} - INT::NonExisting() {} // expected-error {{expected a class or namespace}} \ + INT::NonExisting() {} // expected-error {{'INT' (aka 'int') is not a class, namespace, or scoped enumeration}} \ // expected-error {{member initializer 'NonExisting' does not name a non-static data member or}} }; diff --git a/clang/test/SemaCXX/member-pointer.cpp b/clang/test/SemaCXX/member-pointer.cpp index 82873d9c7dae..b8631bcf3efc 100644 --- a/clang/test/SemaCXX/member-pointer.cpp +++ b/clang/test/SemaCXX/member-pointer.cpp @@ -13,7 +13,7 @@ int A::*pdi1; int (::A::*pdi2); int (A::*pfi)(int); -int B::*pbi; // expected-error {{expected a class or namespace}} +int B::*pbi; // expected-error {{'B' is not a class, namespace, or scoped enumeration}} int C::*pci; // expected-error {{'pci' does not point into a class}} void A::*pdv; // expected-error {{'pdv' declared as a member pointer to void}} int& A::*pdr; // expected-error {{'pdr' declared as a member pointer to a reference}} diff --git a/clang/test/SemaCXX/nested-name-spec.cpp b/clang/test/SemaCXX/nested-name-spec.cpp index a0bac059a20d..8587e70158b0 100644 --- a/clang/test/SemaCXX/nested-name-spec.cpp +++ b/clang/test/SemaCXX/nested-name-spec.cpp @@ -85,10 +85,13 @@ struct A2::CC::NC { void f3() { N::x = 0; // expected-error {{use of undeclared identifier 'N'}} - int N; - N::x = 0; // expected-error {{expected a class or namespace}} + // FIXME: Consider including the kind of entity that 'N' is ("variable 'N' + // declared here", "template 'X' declared here", etc) to help explain what it + // is if it's 'not a class, namespace, or scoped enumeration'. + int N; // expected-note {{'N' declared here}} + N::x = 0; // expected-error {{'N' is not a class, namespace, or scoped enumeration}} { int A; A::ax = 0; } - { typedef int A; A::ax = 0; } // expected-error{{expected a class or namespace}} + { typedef int A; A::ax = 0; } // expected-error{{'A' (aka 'int') is not a class, namespace, or scoped enumeration}} { typedef A::C A; A::ax = 0; } // expected-error {{no member named 'ax'}} { typedef A::C A; A::cx = 0; } } @@ -114,7 +117,7 @@ namespace E { }; void f() { - return E::X; // expected-error{{expected a class or namespace}} + return E::X; // expected-error{{'E::Nested::E' is not a class, namespace, or scoped enumeration}} } } } @@ -308,4 +311,4 @@ namespace N { } namespace TypedefNamespace { typedef int F; }; -TypedefNamespace::F::NonexistentName BadNNSWithCXXScopeSpec; // expected-error {{expected a class or namespace}} +TypedefNamespace::F::NonexistentName BadNNSWithCXXScopeSpec; // expected-error {{'F' (aka 'int') is not a class, namespace, or scoped enumeration}} diff --git a/clang/test/SemaObjCXX/propert-dot-error.mm b/clang/test/SemaObjCXX/propert-dot-error.mm index 2a462e4ffa37..e28204c665fc 100644 --- a/clang/test/SemaObjCXX/propert-dot-error.mm +++ b/clang/test/SemaObjCXX/propert-dot-error.mm @@ -53,7 +53,7 @@ void g(B *b) { // PR9759 class Forward; -@interface D { +@interface D { // expected-note 2 {{'D' declared here}} @public int ivar; } @@ -64,6 +64,6 @@ class Forward; void testD(D *d) { d.Forward::property = 17; // expected-error{{property access cannot be qualified with 'Forward::'}} d->Forward::ivar = 12; // expected-error{{instance variable access cannot be qualified with 'Forward::'}} - d.D::property = 17; // expected-error{{expected a class or namespace}} - d->D::ivar = 12; // expected-error{{expected a class or namespace}} + d.D::property = 17; // expected-error{{'D' is not a class, namespace, or scoped enumeration}} + d->D::ivar = 12; // expected-error{{'D' is not a class, namespace, or scoped enumeration}} }