From f7d151fbe129a06497b605d3191276d58b143fca Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 19 Apr 2003 07:41:15 +0000 Subject: [PATCH] * skip_whitespace: Rearrange to avoid stage1 ICE. From-SVN: r65809 --- gcc/cpplex.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gcc/cpplex.c b/gcc/cpplex.c index 930e887..ce9a8d4 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -334,7 +334,7 @@ skip_whitespace (pfile, c) cppchar_t c; { cpp_buffer *buffer = pfile->buffer; - unsigned int warned = 0; + bool saw_NUL = false; do { @@ -343,13 +343,7 @@ skip_whitespace (pfile, c) ; /* Just \f \v or \0 left. */ else if (c == '\0') - { - if (!warned) - { - cpp_error (pfile, DL_WARNING, "null character(s) ignored"); - warned = 1; - } - } + saw_NUL = true; else if (pfile->state.in_directive && CPP_PEDANTIC (pfile)) cpp_error_with_line (pfile, DL_PEDWARN, pfile->line, CPP_BUF_COL (buffer), @@ -361,6 +355,9 @@ skip_whitespace (pfile, c) /* We only want non-vertical space, i.e. ' ' \t \f \v \0. */ while (is_nvspace (c)); + if (saw_NUL) + cpp_error (pfile, DL_WARNING, "null character(s) ignored"); + buffer->cur--; } -- 2.7.4