diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2000-03-31 23:16:11 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-03-31 23:16:11 +0000 |
| commit | ae79697b721b607964d32468c87d1881c3a39974 (patch) | |
| tree | c407bb10c858c1ee81576f79ea01d3e9c8890316 /gcc/cppexp.c | |
| parent | 7bde2862db58ec0828e26fc95768f6d008a97f6f (diff) | |
| download | gcc-ae79697b721b607964d32468c87d1881c3a39974.zip gcc-ae79697b721b607964d32468c87d1881c3a39974.tar.gz gcc-ae79697b721b607964d32468c87d1881c3a39974.tar.bz2 | |
cpplib.h: Merge struct cpp_options into struct cpp_reader.
* cpplib.h: Merge struct cpp_options into struct cpp_reader.
Reorder struct cpp_options and struct cpp_reader for better
packing. Replace CPP_OPTIONS macro with CPP_OPTION which
takes two args. Change all 'char' flags to 'unsigned char'.
Move show_column flag into struct cpp_options. Don't
prototype cpp_options_init.
* cpphash.h, cpperror.c, cppexp.c, cppfiles.c, cpphash.c,
cppinit.c, cpplex.c, cpplib.c:
Replace CPP_OPTIONS (pfile)->whatever with
CPP_OPTION (pfile, whatever), and likewise for
opts = CPP_OPTIONS (pfile); ... opts->whatever;
* cppinit.c (merge_include_chains): Take a cpp_reader *.
Extract CPP_OPTION (pfile, pending) and work with that
directly.
(cpp_options_init): Delete.
(cpp_reader_init): Turn on on-by-default options here.
Allocate the pending structure here.
(cl_options, enum opt_code): Define these from the same table,
kept in a large macro. Add -fshow-column and -fno-show-column
options.
* cpperror.c (v_message): If show_column is off, don't print
the column number.
* cppmain.c: Update for new interface.
* fix-header.c: Likewise.
From-SVN: r32850
Diffstat (limited to 'gcc/cppexp.c')
| -rw-r--r-- | gcc/cppexp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cppexp.c b/gcc/cppexp.c index 20076e2..6a391d7 100644 --- a/gcc/cppexp.c +++ b/gcc/cppexp.c @@ -204,7 +204,7 @@ parse_number (pfile, start, end) cpp_error (pfile, "invalid number in #if expression"); goto error; } - else if (spec_long > (CPP_OPTIONS (pfile)->c89 ? 1 : 2)) + else if (spec_long > (CPP_OPTION (pfile, c89) ? 1 : 2)) { cpp_error (pfile, "too many `l' suffixes in integer constant"); goto error; @@ -443,7 +443,7 @@ lex (pfile, skip_evaluation) op.unsignedp = 0; op.value = 0; - if (CPP_OPTIONS (pfile)->warn_undef && !skip_evaluation) + if (CPP_OPTION (pfile, warn_undef) && !skip_evaluation) cpp_warning (pfile, "`%.*s' is not defined", (int) (tok_end - tok_start), tok_start); return op; @@ -505,7 +505,7 @@ parse_escape (pfile, string_ptr, result_mask) return TARGET_BS; case 'e': case 'E': - if (CPP_OPTIONS (pfile)->pedantic) + if (CPP_PEDANTIC (pfile)) cpp_pedwarn (pfile, "non-ANSI-standard escape sequence, `\\%c'", c); return TARGET_ESC; case 'f': |