diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 5 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaCXXScopeSpec.cpp | 14 | ||||
| -rw-r--r-- | clang/test/CXX/temp/temp.decls/temp.class/temp.mem.func/p1.cpp | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index f225b7e8083..5a8ffb1bb7c 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -793,7 +793,7 @@ def err_template_arg_not_pointer_to_member_form : Error< def err_template_arg_extra_parens : Error< "non-type template argument cannot be surrounded by parentheses">; -// C++ class template specialization +// C++ class template specializations and out-of-line definitions def err_template_spec_needs_header : Error< "template specialization requires 'template<>'">; def err_template_spec_needs_template_parameters : Error< @@ -802,6 +802,9 @@ def err_template_spec_needs_template_parameters : Error< def err_template_spec_extra_headers : Error< "extraneous template parameter list in template specialization or " "out-of-line template definition">; +def err_template_qualified_declarator_no_match : Error< + "nested name specifier '%0' for declaration does not refer to a class " + "template or class template partial specialization">; def err_template_spec_decl_out_of_scope_global : Error< "class template %select{|partial }0specialization of %1 must occur in the " "global scope">; diff --git a/clang/lib/Sema/SemaCXXScopeSpec.cpp b/clang/lib/Sema/SemaCXXScopeSpec.cpp index 7db0da45535..cf73725e7f3 100644 --- a/clang/lib/Sema/SemaCXXScopeSpec.cpp +++ b/clang/lib/Sema/SemaCXXScopeSpec.cpp @@ -17,6 +17,7 @@ #include "clang/AST/NestedNameSpecifier.h" #include "clang/Parse/DeclSpec.h" #include "llvm/ADT/STLExtras.h" +#include "llvm/Support/raw_ostream.h" using namespace clang; /// \brief Compute the DeclContext that is associated with the given @@ -48,7 +49,7 @@ DeclContext *Sema::computeDeclContext(const CXXScopeSpec &SS, if (EnteringContext) { // We are entering the context of the nested name specifier, so try to // match the nested name specifier to either a primary class template - // or a class template partial specialization + // or a class template partial specialization. if (const TemplateSpecializationType *SpecType = dyn_cast_or_null<TemplateSpecializationType>(NNS->getAsType())) { if (ClassTemplateDecl *ClassTemplate @@ -64,6 +65,17 @@ DeclContext *Sema::computeDeclContext(const CXXScopeSpec &SS, // FIXME: Class template partial specializations } } + + std::string NNSString; + { + llvm::raw_string_ostream OS(NNSString); + NNS->print(OS, Context.PrintingPolicy); + } + + // FIXME: Allow us to pass a nested-name-specifier to Diag? + Diag(SS.getRange().getBegin(), + diag::err_template_qualified_declarator_no_match) + << NNSString << SS.getRange(); } return 0; diff --git a/clang/test/CXX/temp/temp.decls/temp.class/temp.mem.func/p1.cpp b/clang/test/CXX/temp/temp.decls/temp.class/temp.mem.func/p1.cpp index 6979b4135c8..c1da8a1f480 100644 --- a/clang/test/CXX/temp/temp.decls/temp.class/temp.mem.func/p1.cpp +++ b/clang/test/CXX/temp/temp.decls/temp.class/temp.mem.func/p1.cpp @@ -12,6 +12,7 @@ public: void f1(size_type) const; void f2(size_type) const; void f3(size_type) const; + void f4() ; T value; }; @@ -36,6 +37,9 @@ template<class X, class Y, class Z> // expected-error{{too many template paramet void X0<X, Y>::f3(size_type) const { } +template<class X, class Y> +void X0<Y, X>::f4() { } // expected-error{{does not refer to}} + // FIXME: error message should probably say, "redefinition of 'X0<T, U>::f0'" // rather than just "redefinition of 'f0'" template<typename T, typename U> |
