Expand preprocessor macros in C expressions.
authorJim Blandy <jimb@codesourcery.com>
Fri, 17 May 2002 17:57:48 +0000 (17:57 +0000)
committerJim Blandy <jimb@codesourcery.com>
Fri, 17 May 2002 17:57:48 +0000 (17:57 +0000)
commit84f0252a038f4c2ceb70d076f58159eaa8e3dfab
treef941a69257718ec66cee427c3cc662eab4684fb7
parent1c509ca8216de106f508b463a13ceea60ccce878
Expand preprocessor macros in C expressions.
* c-lang.h: #include "macroexp.h", for macro_lookup_ftype.
(scan_macro_expansion, scanning_macro_expansion,
finished_macro_expansion): New function declarations.
(expression_macro_lookup_func, expression_macro_lookup_baton): New
variable declarations.
* parser-defs.h (expression_context_pc): New declaration.
* parse.c (expression_context_pc): New variable.
(parse_exp_1): Set expression_context_pc, as well as
expression_context_block.
* c-exp.y (yylex): If we're not already reading the result of a
macro expansion, try to macro-expand the next token.  When we're
done scanning a macro expansion, switch back to the mainline text.
Commas and `if's in a macro's expansion don't terminate the input.
* c-lang.c: #include "macroscope.h" and "gdb_assert.h".
(macro_original_text, macro_expanded_text,
expression_macro_lookup_func, expression_macro_lookup_baton): New
variables.
(scan_macro_expansion, scanning_macro_expansion,
finished_macro_expansion, scan_macro_cleanup, null_macro_lookup,
c_preprocess_and_parse): New functions.
(c_language_defn, cplus_language_defn, asm_language_defn): Call
c_preprocess_and_parse, instead of c_parse.
* Makefile.in (c_lang_h): Note that this #includes macroexp.h.
(c-lang.o): Note dependency on macroscope.h and gdb_assert.h.
gdb/ChangeLog
gdb/Makefile.in
gdb/c-exp.y
gdb/c-lang.c
gdb/c-lang.h
gdb/parse.c
gdb/parser-defs.h