OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

parser.c (cp_ensure_no_oacc_routine): Update error message.

Browse Source 
gcc/cp/
	* parser.c (cp_ensure_no_oacc_routine): Update error message.
	(cp_parser_oacc_routine): Likewise.
	(cp_parser_late_parsing_oacc_routine): Likewise.  Update comment
	describing this function.
	(cp_finalize_oacc_routine): Update error message.

From-SVN: r231243
This commit is contained in:
Cesar Philippidis 2015-12-03 16:17:48 -08:00 committed by Cesar Philippidis
parent 3b90d51eee
commit 72cc0e5803
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2015-12-03 Cesar Philippidis <cesar@codesourcery.com>
* parser.c (cp_ensure_no_oacc_routine): Update error message.
(cp_parser_oacc_routine): Likewise.
(cp_parser_late_parsing_oacc_routine): Likewise. Update comment
describing this function.
(cp_finalize_oacc_routine): Update error message.
2015-12-02 Jason Merrill <jason@redhat.com>
* Make-lang.in (check-c++1z, check-c++-all): New.

15
gcc/cp/parser.c
View File

@ -1329,7 +1329,7 @@ cp_ensure_no_oacc_routine (cp_parser *parser)
tree clauses = parser->oacc_routine->clauses;
location_t loc = OMP_CLAUSE_LOCATION (TREE_PURPOSE (clauses));
error_at (loc, "%<#pragma oacc routine%> not followed by function "
error_at (loc, "%<#pragma acc routine%> not followed by a function "
"declaration or definition");
parser->oacc_routine = NULL;
}
@ -35857,7 +35857,7 @@ cp_parser_oacc_routine (cp_parser *parser, cp_token *pragma_tok,
cp_parser_require_pragma_eol (parser, pragma_tok);
error_at (OMP_CLAUSE_LOCATION (parser->oacc_routine->clauses),
"%<#pragma oacc routine%> not followed by a single "
"%<#pragma acc routine%> not followed by a "
"function declaration or definition");
parser->oacc_routine->error_seen = true;
@ -35962,7 +35962,7 @@ cp_parser_oacc_routine (cp_parser *parser, cp_token *pragma_tok,
if (parser->oacc_routine
&& !parser->oacc_routine->error_seen
&& !parser->oacc_routine->fndecl_seen)
error_at (loc, "%<#pragma acc routine%> not followed by "
error_at (loc, "%<#pragma acc routine%> not followed by a "
"function declaration or definition");
data.tokens.release ();
@ -35972,7 +35972,7 @@ cp_parser_oacc_routine (cp_parser *parser, cp_token *pragma_tok,
}
/* Finalize #pragma acc routine clauses after direct declarator has
been parsed, and put that into "oacc routine" attribute. */
been parsed, and put that into "oacc function" attribute. */
static tree
cp_parser_late_parsing_oacc_routine (cp_parser *parser, tree attrs)
@ -35987,7 +35987,7 @@ cp_parser_late_parsing_oacc_routine (cp_parser *parser, tree attrs)
if ((!data->error_seen && data->fndecl_seen)
|| data->tokens.length () != 1)
{
error_at (loc, "%<#pragma oacc routine%> not followed by a single "
error_at (loc, "%<#pragma acc routine%> not followed by a "
"function declaration or definition");
data->error_seen = true;
return attrs;
@ -36003,7 +36003,7 @@ cp_parser_late_parsing_oacc_routine (cp_parser *parser, tree attrs)
cp_token *pragma_tok = cp_lexer_consume_token (parser->lexer);
cl = cp_parser_oacc_all_clauses (parser, OACC_ROUTINE_CLAUSE_MASK,
"#pragma oacc routine", pragma_tok);
"#pragma acc routine", pragma_tok);
cp_parser_pop_lexer (parser);
tree c_head = build_omp_clause (loc, OMP_CLAUSE_SEQ);
@ -36044,7 +36044,8 @@ cp_finalize_oacc_routine (cp_parser *parser, tree fndecl, bool is_defn)
if (!fndecl || TREE_CODE (fndecl) != FUNCTION_DECL)
{
error_at (loc,
"%<#pragma acc routine%> not followed by single function");
"%<#pragma acc routine%> not followed by a function "
"declaration or definition");
parser->oacc_routine = NULL;
}