aboutsummaryrefslogtreecommitdiff
path: root/gcc/cpplib.h
diff options
context:
space:
mode:
authorZack Weinberg <zack@wolery.cumb.org>2000-08-09 19:41:12 +0000
committerZack Weinberg <zack@gcc.gnu.org>2000-08-09 19:41:12 +0000
commit9ec7291f1ffab5af0ffcbc0037046d3cf7730217 (patch)
treed5bb51bad6a6b24f2b2de095f7c7474492e78f9a /gcc/cpplib.h
parent9cc82a019817f8eaf807831dd34afc8701d37ee0 (diff)
downloadgcc-9ec7291f1ffab5af0ffcbc0037046d3cf7730217.zip
gcc-9ec7291f1ffab5af0ffcbc0037046d3cf7730217.tar.gz
gcc-9ec7291f1ffab5af0ffcbc0037046d3cf7730217.tar.bz2
configure.in (--enable-c-cpplib): Uncomment.
* configure.in (--enable-c-cpplib): Uncomment. Use AC_DEFINE instead of extra_c_flags. (--enable-c-mbchar): Use AC_DEFINE instead of extra_c_flags. * configure: Regenerate. * config.in: Regenerate. * cpperror.c (cpp_type2name): New function. * cpplex.c (lex_line): If we issued an error for an invalid preprocessing directive, discard that logical line. * cpplib.c (do_line): Call a hook function if the current file is renamed by #line. (do_ident): Pass the contents of the string, not the entire token, to the callback function. * cpplib.h (CPP_LAST_PUNCTUATOR): New #define. (cb.rename_file): New hook function. (cb.ident): Adjust prototype. (cpp_type2name): Prototype. * cppmacro.c (dump_macro_args): Correct precedence lossage. * cppmain.c (cb_ident): Update for changed interface. (cb_rename_file): New function. (main): Set rename callback. From-SVN: r35593
Diffstat (limited to 'gcc/cpplib.h')
-rw-r--r--gcc/cpplib.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index ad5909e..0318f23 100644
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -48,6 +48,7 @@ typedef struct cpp_hashnode cpp_hashnode;
/* Positions in the table. */
#define CPP_LAST_EQ CPP_MAX
#define CPP_FIRST_DIGRAPH CPP_HASH
+#define CPP_LAST_PUNCTUATOR CPP_DOT_STAR
#define TTYPE_TABLE \
OP(CPP_EQ = 0, "=") \
@@ -522,12 +523,13 @@ struct cpp_reader
struct {
void (*enter_file) PARAMS ((cpp_reader *));
void (*leave_file) PARAMS ((cpp_reader *));
+ void (*rename_file) PARAMS ((cpp_reader *));
void (*include) PARAMS ((cpp_reader *, const unsigned char *,
const unsigned char *, unsigned int, int));
void (*define) PARAMS ((cpp_reader *, cpp_hashnode *));
void (*undef) PARAMS ((cpp_reader *, cpp_hashnode *));
void (*poison) PARAMS ((cpp_reader *));
- void (*ident) PARAMS ((cpp_reader *, const cpp_token *));
+ void (*ident) PARAMS ((cpp_reader *, const unsigned char *, unsigned int));
void (*def_pragma) PARAMS ((cpp_reader *));
} cb;
@@ -693,6 +695,8 @@ extern void cpp_pedwarn_with_file_and_line PARAMS ((cpp_reader *, const char *,
extern void cpp_error_from_errno PARAMS ((cpp_reader *, const char *));
extern void cpp_notice_from_errno PARAMS ((cpp_reader *, const char *));
+extern const char *cpp_type2name PARAMS ((enum cpp_ttype));
+
/* In cpplex.c */
extern cpp_buffer *cpp_push_buffer PARAMS ((cpp_reader *,
const unsigned char *, long));