From b61c5ed0058862f8ddd6ac88b7fcc5f6625ab06f Mon Sep 17 00:00:00 2001
From: Neil Booth <neil@daikokuya.demon.co.uk>
Date: Sat, 13 Jan 2001 14:23:04 +0000
Subject: [PATCH] c-lex.c (init_c_lex): Use cpp_get_callbacks to set callbacks.

        * c-lex.c (init_c_lex): Use cpp_get_callbacks to set
        callbacks.
        * c-parse.in (finish_parse): Use cpp_errors.
        (__yylex): Use return value of cpp_pop_buffer.
        * cp/lex.c (finish_parse): Use cpp_errors.
        * cp/spew.c (read_token): Use return value of cpp_pop_buffer.

From-SVN: r38982
---
 gcc/ChangeLog  |  9 +++++++++
 gcc/c-lex.c    | 13 ++++++++-----
 gcc/c-parse.in |  5 ++---
 gcc/cp/lex.c   |  2 +-
 gcc/cp/spew.c  |  3 +--
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8818fc9e2e2..c73d1c60428 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2001-01-13  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+        * c-lex.c (init_c_lex): Use cpp_get_callbacks to set
+        callbacks.
+        * c-parse.in (finish_parse): Use cpp_errors.
+        (__yylex): Use return value of cpp_pop_buffer.
+        * cp/lex.c (finish_parse): Use cpp_errors.
+        * cp/spew.c (read_token): Use return value of cpp_pop_buffer.
+
 Sat Jan 13 16:57:40 2001  Denis Chertykov  <denisc@overta.ru>
 
 	* README.AVR: URLs corrected.
diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index 0cddf7e4937..f30cd715cbd 100644
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -99,6 +99,7 @@ const char *
 init_c_lex (filename)
      const char *filename;
 {
+  struct cpp_callbacks *cb;
   struct c_fileinfo *toplevel;
 
   orig_filename = filename;
@@ -121,16 +122,18 @@ init_c_lex (filename)
   GET_ENVIRONMENT (literal_codeset, "LANG");
 #endif
 
-  parse_in->cb.ident = cb_ident;
-  parse_in->cb.file_change = cb_file_change;
-  parse_in->cb.def_pragma = cb_def_pragma;
+  cb = cpp_get_callbacks (parse_in);
+
+  cb->ident = cb_ident;
+  cb->file_change = cb_file_change;
+  cb->def_pragma = cb_def_pragma;
 
   /* Set the debug callbacks if we can use them.  */
   if (debug_info_level == DINFO_LEVEL_VERBOSE
       && (write_symbols == DWARF_DEBUG || write_symbols == DWARF2_DEBUG))
     {
-      parse_in->cb.define = cb_define;
-      parse_in->cb.undef = cb_undef;
+      cb->define = cb_define;
+      cb->undef = cb_undef;
     }
 
   if (filename == 0 || !strcmp (filename, "-"))
diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index 5c46b20b41a..daff75f3f51 100644
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -3161,7 +3161,7 @@ void
 finish_parse ()
 {
   cpp_finish (parse_in);
-  errorcount += parse_in->errors;
+  errorcount += cpp_errors (parse_in);
 }
 
 #define NAME(type) cpp_type2name (type)
@@ -3257,8 +3257,7 @@ _yylex ()
     case CPP_DOT:					return '.';
 
     case CPP_EOF:
-      cpp_pop_buffer (parse_in);
-      if (! CPP_BUFFER (parse_in))
+      if (cpp_pop_buffer (parse_in) == 0)
 	return 0;
       goto retry;
 
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index f295e7ca192..c8d6587f784 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -755,7 +755,7 @@ void
 finish_parse ()
 {
   cpp_finish (parse_in);
-  errorcount += parse_in->errors;
+  errorcount += cpp_errors (parse_in);
 }
 
 inline void
diff --git a/gcc/cp/spew.c b/gcc/cp/spew.c
index d7fd78e33f4..ba2013b8142 100644
--- a/gcc/cp/spew.c
+++ b/gcc/cp/spew.c
@@ -329,8 +329,7 @@ read_token (t)
 #undef YYCODE
 
     case CPP_EOF:
-      cpp_pop_buffer (parse_in);
-      if (CPP_BUFFER (parse_in))
+      if (cpp_pop_buffer (parse_in) != 0)
 	goto retry;
       t->yychar = 0;
       break;
-- 
2.30.2