diff options
| author | Neil Booth <neil@daikokuya.demon.co.uk> | 2002-04-28 19:42:54 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2002-04-28 19:42:54 +0000 |
| commit | 87ed109f1f7fab7afc05afca460523a2493c0f43 (patch) | |
| tree | c4adc85edfa9fa27de90af625624219e92a87257 /gcc/cpphash.h | |
| parent | 14dbfa70082438ba474626d210d4f151354e10d0 (diff) | |
| download | gcc-87ed109f1f7fab7afc05afca460523a2493c0f43.zip gcc-87ed109f1f7fab7afc05afca460523a2493c0f43.tar.gz gcc-87ed109f1f7fab7afc05afca460523a2493c0f43.tar.bz2 | |
cppexp.c (lex): Update to use state.skip_eval.
* cppexp.c (lex): Update to use state.skip_eval.
(struct op): Remove prio and flags members.
(FLAG_BITS, FLAG_MASK, PRIO_SHIFT, EXTRACT_PRIO, EXTRACT_FLAGS,
SHORT_CIRCUIT, RIGHT_ASSOC, ..._PRIO, op_to_prio): Remove.
(LEFT_ASSOC): New macro.
(optab): New table of operator priorities and flags.
(SHIFT): Update.
(_cpp_parse_expr): Clean up logic. Return bool. Use a
malloc-ed parser stack.
(reduce): New; reduce the operator stack.
(_cpp_expand_op_stack): Expand the operator stack as necessary.
* cpphash.h (struct op): Predeclare.
(struct cpp_reader): New members op_stack, op_limit.
(struct lexer_state): New member skip_eval.
(_cpp_parse_expr): Update.
(_cpp_expand_op_stack): New.
* cpplib.c (do_if): Update.
* cppinit.c (cpp_create_reader): Create op stack.
(cpp_destroy): And destroy it.
* cpplib.h (CPP_LAST_CPP_OP): Correct.
(TTYPE_TABLE): Correct.
testsuite:
* gcc.dg/cpp/if-mop.c: Update.
* gcc.dg/cpp/if-mpar.c: Add test.
* gcc.dg/cpp/if-oppr.c: Update.
From-SVN: r52853
Diffstat (limited to 'gcc/cpphash.h')
| -rw-r--r-- | gcc/cpphash.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gcc/cpphash.h b/gcc/cpphash.h index 773c3cc..743feea 100644 --- a/gcc/cpphash.h +++ b/gcc/cpphash.h @@ -27,6 +27,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ struct directive; /* Deliberately incomplete. */ struct pending_option; +struct op; /* Test if a sign is valid within a preprocessing number. */ #define VALID_SIGN(c, prevc) \ @@ -153,6 +154,9 @@ struct lexer_state /* Nonzero when parsing arguments to a function-like macro. */ unsigned char parsing_args; + + /* Nonzero to skip evaluating part of an expression. */ + unsigned int skip_eval; }; /* Special nodes - identifiers with predefined significance. */ @@ -312,6 +316,9 @@ struct cpp_reader /* Identifier hash table. */ struct ht *hash_table; + /* Expression parser stack. */ + struct op *op_stack, *op_limit; + /* User visible options. */ struct cpp_options opts; @@ -391,7 +398,8 @@ extern void _cpp_pop_file_buffer PARAMS ((cpp_reader *, struct include_file *)); /* In cppexp.c */ -extern int _cpp_parse_expr PARAMS ((cpp_reader *)); +extern bool _cpp_parse_expr PARAMS ((cpp_reader *)); +extern struct op *_cpp_expand_op_stack PARAMS ((cpp_reader *)); /* In cpplex.c */ extern cpp_token *_cpp_temp_token PARAMS ((cpp_reader *)); |