cpplex.c (trigraph_ok): Ensure we don't warn twice.

	* cpplex.c (trigraph_ok): Ensure we don't warn twice.
	* cpplib.h (struct cpp_buffer): New member last_Wtrigraphs.

From-SVN: r37669

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c8bde8c640caef1b7302bca6fcba667fe5d3db42..0966d8fa23777406e5a6705500ed8137f5b10da3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-22  Neil Booth  <neilb@earthling.net>
+
+       * cpplex.c (trigraph_ok): Ensure we don't warn twice.
+       * cpplib.h (struct cpp_buffer): New member last_Wtrigraphs.
+       
 2000-11-22  Richard Henderson  <rth@redhat.com>
 
        * haifa-sched.c (sched_analyze_1): Don't special-case calls

diff --git a/gcc/cpplex.c b/gcc/cpplex.c
index 96e2454316ab8d15ba1811de4c89b7339268c285..bec14e76042edbaf5bc6131452e0e5031ab13dc4 100644 (file)
--- a/gcc/cpplex.c
+++ b/gcc/cpplex.c
@@ -159,9 +159,13 @@ trigraph_ok (pfile, from_char)
                               "trigraph ??%c converted to %c",
                               (int) from_char,
                               (int) _cpp_trigraph_map[from_char]);
-      else
-       cpp_warning_with_line (pfile, buffer->lineno, CPP_BUF_COL (buffer) - 2,
-                              "trigraph ??%c ignored", (int) from_char);
+      else if (buffer->cur != buffer->last_Wtrigraphs)
+       {
+         buffer->last_Wtrigraphs = buffer->cur;
+         cpp_warning_with_line (pfile, buffer->lineno,
+                                CPP_BUF_COL (buffer) - 2,
+                                "trigraph ??%c ignored", (int) from_char);
+       }
     }
 
   return accept;

diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index 5922f94290f1f2f0f8dfe130cceeacea7e641fcb..91cca9007335e056a0dead105a40d8e50e4e797d 100644 (file)
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -282,6 +282,10 @@ struct cpp_buffer
   /* Line number at line_base (above). */
   unsigned int lineno;
 
+  /* Because of the way the lexer works, -Wtrigraphs can sometimes
+     warn twice for the same trigraph.  This helps prevent that.  */
+  const unsigned char *last_Wtrigraphs;
+
   /* True if we have already warned about C++ comments in this file.
      The warning happens only for C89 extended mode with -pedantic on,
      or for -Wtraditional, and only once per file (otherwise it would