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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38982
138bc75d-0d04-0410-961f-
82ee72b054a4
+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.
init_c_lex (filename)
const char *filename;
{
+ struct cpp_callbacks *cb;
struct c_fileinfo *toplevel;
orig_filename = 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, "-"))
finish_parse ()
{
cpp_finish (parse_in);
- errorcount += parse_in->errors;
+ errorcount += cpp_errors (parse_in);
}
#define NAME(type) cpp_type2name (type)
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;
finish_parse ()
{
cpp_finish (parse_in);
- errorcount += parse_in->errors;
+ errorcount += cpp_errors (parse_in);
}
\f
inline void
#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;