From f80e83a9f911d6ad59031508c14d19b65bae1738 Mon Sep 17 00:00:00 2001 From: zack Date: Tue, 4 Jul 2000 01:58:21 +0000 Subject: top level: 2000-07-03 Zack Weinberg * 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 Zack Weinberg 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 * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34859 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fix-header.c | 68 +++++++++++++++++++------------------------------------- 1 file changed, 23 insertions(+), 45 deletions(-) (limited to 'gcc/fix-header.c') diff --git a/gcc/fix-header.c b/gcc/fix-header.c index 473ef7aee99..6ff458a1102 100644 --- a/gcc/fix-header.c +++ b/gcc/fix-header.c @@ -432,8 +432,6 @@ write_lbrac () struct partial_proto { struct partial_proto *next; - char *fname; /* name of function */ - char *rtype; /* return type */ struct fn_decl *fn; int line_seen; }; @@ -497,15 +495,13 @@ recognized_macro (fname) } void -recognized_extern (name, name_length, type, type_length) - const char *name; - const char *type ATTRIBUTE_UNUSED; - int name_length, type_length ATTRIBUTE_UNUSED; +recognized_extern (name) + const cpp_token *name; { switch (special_file_handling) { case errno_h: - if (name_length == 5 && strncmp (name, "errno", 5) == 0 && !seen_errno) + if (!cpp_idcmp (name->val.name.text, name->val.name.len, "errno")) seen_errno = 1, required_other--; break; @@ -515,25 +511,17 @@ recognized_extern (name, name_length, type, type_length) } /* Called by scan_decls if it saw a function definition for a function - named FNAME, with return type RTYPE, and argument list ARGS, - in source file FILE_SEEN on line LINE_SEEN. - KIND is 'I' for an inline function; - 'F' if a normal function declaration preceded by 'extern "C"' - (or nested inside 'extern "C"' braces); or + named FNAME, in source file FILE_SEEN on line LINE_SEEN. KIND is + 'I' for an inline function; 'F' if a normal function declaration + preceded by 'extern "C"' (or nested inside 'extern "C"' braces); or 'f' for other function declarations. */ void -recognized_function (fname, fname_length, - kind, rtype, rtype_length, - have_arg_list, file_seen, line_seen) - const char *fname; - int fname_length; +recognized_function (fname, kind, have_arg_list, file_seen) + const cpp_token *fname; int kind; /* One of 'f' 'F' or 'I' */ - const char *rtype; - int rtype_length; int have_arg_list; const char *file_seen; - int line_seen; { struct partial_proto *partial; int i; @@ -543,7 +531,8 @@ recognized_function (fname, fname_length, missing_extern_C_count++; #endif - fn = lookup_std_proto (fname, fname_length); + fn = lookup_std_proto ((const char *)fname->val.name.text, + fname->val.name.len); /* Remove the function from the list of required function. */ if (fn) @@ -577,12 +566,7 @@ recognized_function (fname, fname_length, partial_count++; partial = (struct partial_proto *) obstack_alloc (&scan_file_obstack, sizeof (struct partial_proto)); - partial->fname = obstack_alloc (&scan_file_obstack, fname_length + 1); - bcopy (fname, partial->fname, fname_length); - partial->fname[fname_length] = 0; - partial->rtype = obstack_alloc (&scan_file_obstack, rtype_length + 1); - sprintf (partial->rtype, "%.*s", rtype_length, rtype); - partial->line_seen = line_seen; + partial->line_seen = fname->line; partial->fn = fn; fn->partial = partial; partial->next = partial_proto_list; @@ -590,7 +574,7 @@ recognized_function (fname, fname_length, if (verbose) { fprintf (stderr, "(%s: %s non-prototype function declaration.)\n", - inc_filename, partial->fname); + inc_filename, fn->fname); } } @@ -646,19 +630,12 @@ read_scan_file (in_fname, argc, argv) for (cur_symbols = &symbol_table[0]; cur_symbols->names; cur_symbols++) check_macro_names (&scan_in, cur_symbols->names); - if (verbose && (scan_in.errors + warnings) > 0) - fprintf (stderr, "(%s: %d errors and %d warnings from cpp)\n", - inc_filename, scan_in.errors, warnings); - if (scan_in.errors) - exit (SUCCESS_EXIT_CODE); - /* Traditionally, getc and putc are defined in terms of _filbuf and _flsbuf. If so, those functions are also required. */ if (special_file_handling == stdio_h && (fn = lookup_std_proto ("_filbuf", 7)) != NULL) { static const unsigned char getchar_call[] = "getchar();"; - int old_written = CPP_WRITTEN (&scan_in); int seen_filbuf = 0; cpp_buffer *buf = CPP_BUFFER (&scan_in); if (cpp_push_buffer (&scan_in, getchar_call, @@ -668,14 +645,17 @@ read_scan_file (in_fname, argc, argv) /* Scan the macro expansion of "getchar();". */ for (;;) { - enum cpp_ttype token = cpp_get_token (&scan_in); - int length = CPP_WRITTEN (&scan_in) - old_written; - unsigned char *id = scan_in.token_buffer + old_written; - - CPP_SET_WRITTEN (&scan_in, old_written); - if (token == CPP_EOF && CPP_BUFFER (&scan_in) == buf) - break; - if (token == CPP_NAME && cpp_idcmp (id, length, "_filbuf") == 0) + const cpp_token *t = cpp_get_token (&scan_in); + + if (t->type == CPP_EOF) + { + cpp_pop_buffer (&scan_in); + if (CPP_BUFFER (&scan_in) == buf) + break; + } + else if (t->type == CPP_NAME && cpp_idcmp (t->val.name.text, + t->val.name.len, + "_filbuf") == 0) seen_filbuf++; } if (seen_filbuf) @@ -1030,8 +1010,6 @@ check_protection (ifndef_line, endif_line) } else if (!strcmp (buf.base, "define")) { - if (if_nesting != 1) - goto skip_to_eol; c = inf_skip_spaces (c); c = inf_scan_ident (&buf, c); if (buf.base[0] > 0 && strcmp (buf.base, protect_name) == 0) -- cgit v1.2.1