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

re PR preprocessor/60570 (expression in 'elif' directive mis-diagnosed as error when group will be skipped)

Browse source 
DR#412
	PR preprocessor/60570
	* directives.c (do_elif): Don't evaluate #elif conditionals
	when they don't need to be.

	* gcc.dg/cpp/pr36320.c: Turn dg-error into dg-bogus.
	* gcc.dg/cpp/pr60570.c: New test.

From-SVN: r220035
This commit is contained in:
Marek Polacek 2015-01-23 11:57:43 +00:00 • committed by Marek Polacek
parent b0edd457a1
commit 10ef8f287e
5 changed files with 72 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libcpp/directives.c
View file

@ -2036,23 +2036,16 @@ do_elif (cpp_reader *pfile)
}
ifs->type = T_ELIF;
if (! ifs->was_skipping)
/* See DR#412: "Only the first group whose control condition
evaluates to true (nonzero) is processed; any following groups
are skipped and their controlling directives are processed as
if they were in a group that is skipped." */
if (ifs->skip_elses)
pfile->state.skipping = 1;
else
{
bool value;
/* The standard mandates that the expression be parsed even
if we are skipping elses at this point -- the lexical
restrictions on #elif only apply to skipped groups, but
this group is not being skipped. Temporarily set
skipping to false to get lexer warnings. */
pfile->state.skipping = 0;
value = _cpp_parse_expr (pfile, false);
if (ifs->skip_elses)
pfile->state.skipping = 1;
else
{
pfile->state.skipping = ! value;
ifs->skip_elses = value;
}
pfile->state.skipping = ! _cpp_parse_expr (pfile, false);
ifs->skip_elses = ! pfile->state.skipping;
}
/* Invalidate any controlling macro. */