diff options
| author | Marek Polacek <polacek@redhat.com> | 2015-01-23 11:57:43 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2015-01-23 11:57:43 +0000 |
| commit | 10ef8f287e92cad2f6963a9ee25d954c87567629 (patch) | |
| tree | b588bb547ecd04e5b2df8f148a1b0e9e0cdc32fc /libcpp | |
| parent | b0edd457a1b282528b98cb56b153d049ad03542a (diff) | |
re PR preprocessor/60570 (expression in 'elif' directive mis-diagnosed as error when group will be skipped)
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
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 7 | ||||
| -rw-r--r-- | libcpp/directives.c | 25 |
2 files changed, 16 insertions, 16 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 23251619472..41aa56fa9c3 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,10 @@ +2015-01-23 Marek Polacek <polacek@redhat.com> + + DR#412 + PR preprocessor/60570 + * directives.c (do_elif): Don't evaluate #elif conditionals + when they don't need to be. + 2015-01-16 Jakub Jelinek <jakub@redhat.com> * expr.c (cpp_classify_number): Add N_() around ?: string diff --git a/libcpp/directives.c b/libcpp/directives.c index ab4f15c5bd7..37cd109ed8a 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -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. */ |