041c31944c
2000-07-03 Zack Weinberg <zack@wolery.cumb.org>
* fix-header.c (struct partial_proto): Remove unnecessary fields.
(recognized_extern, recognized_function, read_scan_file):
Update for new scheme.
(check_protection): It's still a multiple include guard even
if it doesn't always trigger.
* scan-decls.c (skip_to_closing_brace, scan_decls): Update for
new scheme.
* scan.h: Declare struct cpp_token. Update prototypes.
2000-07-03 Neil Booth <neilb@earthling.net>
Zack Weinberg <zack@wolery.cumb.org>
Complete overhaul of the lexer and macro expander.
* cpphash.c (object_defn, funct_defn, push_macro_expansion,
arg, arglist, argdata, reflist, collect_objlike_expansion,
collect_funlike_expansion, collect_params,
warn_trad_stringify, trad_stringify, duplicate_arg_p, add_pat,
unsafe_chars, macarg, compare_defs, special_symbol,
scan_arguments, stringify, funlike_macroexpand,
_cpp_quote_string, monthnames): Delete.
(cpp_lookup, _cpp_free_definition, dump_funlike_macro,
_cpp_create_definition, _cpp_dump_definition,
dump_hash_helper): Adjust.
(find_param, count_params, parse_define, var_args_str,
check_macro_redefinition, save_expansion): New.
* cpplex.c (skip_block_comment, skip_line_comment, parse_name,
parse_string, output_line_command, trigraph_replace,
lex_line, cpp_push_buffer, cpp_pop_buffer, cpp_output_tokens,
cpp_scan_buffer_nooutput, cpp_scan_buffer, cpp_free_toklist,
cpp_idcmp, _cpp_get_directive_token, _cpp_init_input_buffer,
_cpp_skip_rest_of_line): Modify.
(maybe_macroexpand, skip_comment, copy_comment, skip_string,
find_position, null_warning, bump_column, expand_name_space,
pedantic_whitespace, _cpp_output_list, _cpp_slice_toklist,
_cpp_squeeze_toklist, _cpp_scan_until, _cpp_skip_hspace,
_cpp_parse_name, _cpp_lex_token, cpp_get_non_space_token,
_cpp_prescan): Delete.
(dump_param_spelling, process_directive, lex_next,
is_macro_disabled, stringify_arg, expand_context_stack,
output_token, make_string_token, alloc_number_token,
special_symbol, duplicate_token, maybe_paste_with_next,
can_paste, prevent_macro_expansion, restore_macro_expansion,
get_temp_token, release_temp_tokens, quote_string,
token_names, token_spellings, _cpp_expand_name_space,
_cpp_glue_header_name, _cpp_reserve_name_space,
digraph_spellings, trigraph_ok, skip_whitespace, save_comment,
placemarker_token, eof_token, cpp_context, macro_args,
get_raw_token, parse_arg, parse_args, save_token,
push_arg_context, push_macro_context, pop_context,
do_pop_context, free_macro_args, _cpp_get_line,
_cpp_run_directive): New.
* cpplib.c (validate_else, parse_include, push_conditional,
pass_thru_directive, read_line_number, parse_ifdef,
detect_if_not_defined, _cpp_check_directive, do_define,
do_undef, do_include, do_import, do_include_next, do_error,
do_warning, do_ident, do_pragma, pragma_dispatch, gcc_pragmas,
top_pragmas, do_pragma_gcc, do_pragma_implementation,
do_pragma_poison, do_pragma_system_header,
do_pragma_dependency, do_sccs, do_ifdef, do_ifndef, do_else,
dl_elif, do_endif, _cpp_unwind_if_stack, do_assert,
do_unassert, cpp_define, cpp_undef, cpp_assert, cpp_unassert,
cpp_defined): Update for new scheme.
(strtoul_for_line, get_define_node, dump_macro_name,
_cpp_check_linemarker, _cpp_parse_assertion): New.
(_cpp_handle_directive, do_pragma_default): Delete.
* cpphash.h (struct predicate): Now struct answer.
(enum spell_type, struct token_spelling, struct directive,
directive_handler): New.
Update prototypes. Remove unused macros.
* cpplib.h: Update prototypes. Remove unused macros,
structure definitions, and fields.
* cpperror.c (print_containing_files, v_message): Adjust.
* cppexp.c (parse_assertion, lex, parse_escape,
_cpp_parse_expr): Adjust.
* cppfiles.c (open_include_file, _cpp_execute_include,
_cpp_compare_file_date, cpp_read_file, read_include_file):
Adjust.
* cppinit.c (dump_special_to_buffer): Delete.
(append_include_chain, merge_include_chains, cpp_reader_init,
cpp_cleanup, initialize_builtins, builtin_array, cpp_start_read,
cpp_finish, handle_option, print_help): Adjust.
* cppmain.c (main): Adjust.
testsuite:
2000-07-03 Zack Weinberg <zack@wolery.cumb.org>
* testsuite/gcc.dg/cpp/19951025-1.c: Adjust regexps.
* testsuite/gcc.dg/cpp/19990703-1.c: Likewise.
* testsuite/gcc.dg/cpp/20000625-1.c: Likewise.
* testsuite/gcc.dg/cpp/20000625-2.c: Likewise.
* testsuite/gcc.dg/cpp/macro1.c,
testsuite/gcc.dg/cpp/paste1.c, testsuite/gcc.dg/cpp/paste2.c,
testsuite/gcc.dg/cpp/paste3.c, testsuite/gcc.dg/cpp/paste4.c,
testsuite/gcc.dg/cpp/strify1.c,
testsuite/gcc.dg/cpp/strify2.c: New tests.
From-SVN: r34859
83 lines
2.7 KiB
C
83 lines
2.7 KiB
C
/* scan.h - Utility declarations for scan-decls and fix-header programs.
|
|
Copyright (C) 1993, 1998, 1999 Free Software Foundation, Inc.
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 2, or (at your option) any
|
|
later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
|
|
#include <stdio.h>
|
|
|
|
typedef struct sstring
|
|
{
|
|
char *base;
|
|
char *ptr;
|
|
char *limit;
|
|
} sstring;
|
|
|
|
#define INIT_SSTRING(STR) ((STR)->base = 0, (STR)->ptr = 0, (STR)->limit = 0)
|
|
#define FREE_SSTRING(STR) do { if ((STR)->base) free (STR)->base; } while(0)
|
|
#define SSTRING_PUT(STR, C) do {\
|
|
if ((STR)->limit <= (STR)->ptr) make_sstring_space (STR, 1); \
|
|
*(STR)->ptr++ = (C); } while (0)
|
|
#define SSTRING_LENGTH(STR) ((STR)->ptr - (STR)->base)
|
|
#define MAKE_SSTRING_SPACE(STR, COUNT) \
|
|
if ((STR)->limit - (STR)->ptr < (COUNT)) make_sstring_space (STR, COUNT);
|
|
|
|
#ifndef _PARAMS
|
|
#if defined(ANSI_PROTOTYPES) || defined(__cplusplus)
|
|
#define _PARAMS(args) args
|
|
#else
|
|
#define _PARAMS(args) ()
|
|
#endif
|
|
#endif
|
|
|
|
struct partial_proto;
|
|
struct fn_decl
|
|
{
|
|
const char *fname;
|
|
const char *rtype;
|
|
const char *params;
|
|
struct partial_proto *partial;
|
|
};
|
|
|
|
struct cpp_token;
|
|
|
|
extern int lineno;
|
|
extern void sstring_append _PARAMS((sstring *, sstring *));
|
|
extern void make_sstring_space _PARAMS((sstring *, int));
|
|
extern int skip_spaces _PARAMS((FILE *, int));
|
|
extern int scan_ident _PARAMS((FILE *, sstring *, int));
|
|
extern int scan_string _PARAMS((FILE *, sstring *, int));
|
|
extern int read_upto _PARAMS((FILE *, sstring *, int));
|
|
extern unsigned long hash _PARAMS((const char *));
|
|
extern void recognized_function _PARAMS((const struct cpp_token *, int, int,
|
|
const char *));
|
|
extern void recognized_extern _PARAMS((const struct cpp_token *));
|
|
extern unsigned int hashstr _PARAMS((const char *, unsigned int));
|
|
|
|
struct cpp_reader;
|
|
extern int scan_decls _PARAMS((struct cpp_reader *, int, char **));
|
|
|
|
/* get_token is a simple C lexer. */
|
|
#define IDENTIFIER_TOKEN 300
|
|
#define CHAR_TOKEN 301
|
|
#define STRING_TOKEN 302
|
|
#define INT_TOKEN 303
|
|
extern int get_token _PARAMS ((FILE *, sstring *));
|
|
|
|
/* Current file and line numer, taking #-directives into account */
|
|
extern int source_lineno;
|
|
extern sstring source_filename;
|
|
/* Current physical line number */
|
|
extern int lineno;
|