procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

parser.c (cp_parser_template_declaration_after_parameters): Use DECL_SOURCE_LOCATION in literal operator template errors.

Browse source 
/cp
2019-05-21  Paolo Carlini  <paolo.carlini@oracle.com>

	* parser.c (cp_parser_template_declaration_after_parameters): Use
	DECL_SOURCE_LOCATION in literal operator template errors.

/testsuite
2019-05-21  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/cpp0x/udlit-tmpl-arg-neg2.C: Check locations too.
	* g++.dg/cpp0x/udlit-tmpl-parms-neg.C: Likewise.

From-SVN: r271492
This commit is contained in:
Paolo Carlini 2019-05-21 23:11:26 +00:00 • committed by Paolo Carlini
parent cdb42a36a1
commit a2c67a8d7a
5 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/ChangeLog
View file

@ -1,3 +1,8 @@
2019-05-21 Paolo Carlini <paolo.carlini@oracle.com>
* parser.c (cp_parser_template_declaration_after_parameters): Use
DECL_SOURCE_LOCATION in literal operator template errors.
2019-05-21 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/67184

16
gcc/cp/parser.c
View file

@ -27895,14 +27895,16 @@ cp_parser_template_declaration_after_parameters (cp_parser* parser,
if (!ok)
{
if (cxx_dialect > cxx17)
error ("literal operator template %qD has invalid parameter list;"
" expected non-type template parameter pack %<<char...>%> "
"or single non-type parameter of class type",
decl);
error_at (DECL_SOURCE_LOCATION (decl), "literal operator "
"template %qD has invalid parameter list; expected "
"non-type template parameter pack %<<char...>%> or "
"single non-type parameter of class type",
decl);
else
error ("literal operator template %qD has invalid parameter list;"
" expected non-type template parameter pack %<<char...>%>",
decl);
error_at (DECL_SOURCE_LOCATION (decl), "literal operator "
"template %qD has invalid parameter list; expected "
"non-type template parameter pack %<<char...>%>",
decl);
}
}

2
gcc/testsuite/g++.dg/cpp0x/decltype-pr66548.C
View file

@ -11,7 +11,7 @@ struct Meow {};
void f ()
{
decltype (Meow.purr ()) d; // { dg-error "expected primary-expression" "pr89875" { xfail c++98_only } }
decltype (Meow.purr ()) d; // { dg-error "expected primary-expression" }
(void)&d;
}

4
gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-arg-neg2.C
View file

@ -2,6 +2,6 @@
// { dg-do compile { target c++11 } }
template <T, T... U> // { dg-error "'T' has not been declared" }
int operator"" _foo (); // { dg-error "has invalid parameter list" }
int operator"" _foo (); // { dg-error "5:literal operator template .int operator\"\"_foo\\(\\). has invalid parameter list" }
template <T... U> // { dg-error "'T' has not been declared" }
int operator"" _bar (); // { dg-error "has invalid parameter list" }
int operator"" _bar (); // { dg-error "5:literal operator template .int operator\"\"_bar\\(\\). has invalid parameter list" }

6
gcc/testsuite/g++.dg/cpp0x/udlit-tmpl-parms-neg.C
View file

@ -3,10 +3,10 @@
class Foo { };
template<wchar_t...>
Foo operator"" _Foo(); // { dg-error "literal operator template|has invalid parameter list" }
Foo operator"" _Foo(); // { dg-error "7:literal operator template .Foo operator\"\"_Foo\\(\\). has invalid parameter list" }
template<char>
Foo operator"" _Bar(); // { dg-error "literal operator template|has invalid parameter list" }
Foo operator"" _Bar(); // { dg-error "7:literal operator template .Foo operator\"\"_Bar\\(\\). has invalid parameter list" }
template<typename... Type>
Foo operator"" _Bar(); // { dg-error "literal operator template|has invalid parameter list" }
Foo operator"" _Bar(); // { dg-error "7:literal operator template .Foo operator\"\"_Bar\\(\\). has invalid parameter list" }