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/scan-decls.c | 159 ++++++++++++++++++++++--------------------------------- 1 file changed, 62 insertions(+), 97 deletions(-) (limited to 'gcc/scan-decls.c') diff --git a/gcc/scan-decls.c b/gcc/scan-decls.c index e65d832fda0..969b208df5b 100644 --- a/gcc/scan-decls.c +++ b/gcc/scan-decls.c @@ -45,7 +45,7 @@ skip_to_closing_brace (pfile) int nesting = 1; for (;;) { - enum cpp_ttype token = cpp_get_token (pfile); + enum cpp_ttype token = cpp_get_token (pfile)->type; if (token == CPP_EOF) break; if (token == CPP_OPEN_BRACE) @@ -84,24 +84,17 @@ scan_decls (pfile, argc, argv) char **argv ATTRIBUTE_UNUSED; { int saw_extern, saw_inline; - int start_written; - /* If declarator_start is non-zero, it marks the start of the current - declarator. If it is zero, we are either still parsing the - decl-specs, or prev_id_start marks the start of the declarator. */ - int declarator_start; - int prev_id_start, prev_id_end = 0; - enum cpp_ttype token; + const cpp_token *prev_id; + const cpp_token *token; new_statement: - CPP_SET_WRITTEN (pfile, 0); - start_written = 0; token = cpp_get_token (pfile); handle_statement: current_extern_C = 0; saw_extern = 0; saw_inline = 0; - if (token == CPP_OPEN_BRACE) + if (token->type == CPP_OPEN_BRACE) { /* Pop an 'extern "C"' nesting level, if appropriate. */ if (extern_C_braces_length @@ -110,120 +103,112 @@ scan_decls (pfile, argc, argv) brace_nesting--; goto new_statement; } - if (token == CPP_OPEN_BRACE) + if (token->type == CPP_OPEN_BRACE) { brace_nesting++; goto new_statement; } - if (token == CPP_EOF) + if (token->type == CPP_EOF) { + cpp_pop_buffer (pfile); if (CPP_BUFFER (pfile) == NULL) return 0; - else - goto new_statement; + + goto new_statement; } - if (token == CPP_SEMICOLON) + if (token->type == CPP_SEMICOLON) goto new_statement; - if (token != CPP_NAME) + if (token->type != CPP_NAME) goto new_statement; - prev_id_start = 0; - declarator_start = 0; + prev_id = 0; for (;;) { - switch (token) + switch (token->type) { + default: + goto handle_statement; + case CPP_MULT: + case CPP_AND: + case CPP_PLACEMARKER: + /* skip */ + break; + + case CPP_COMMA: + case CPP_SEMICOLON: + if (prev_id && saw_extern) + { + recognized_extern (prev_id); + } + if (token->type == CPP_COMMA) + break; + /* ... fall through ... */ + case CPP_OPEN_BRACE: case CPP_CLOSE_BRACE: + goto new_statement; + + case CPP_EOF: + cpp_pop_buffer (pfile); + if (CPP_BUFFER (pfile) == NULL) + return 0; + break; + case CPP_OPEN_PAREN: /* Looks like this is the start of a formal parameter list. */ - if (prev_id_start) + if (prev_id) { int nesting = 1; int have_arg_list = 0; - cpp_buffer *fbuf = cpp_file_buffer (pfile); - unsigned int func_lineno = CPP_BUF_LINE (fbuf); for (;;) { token = cpp_get_token (pfile); - if (token == CPP_OPEN_PAREN) + if (token->type == CPP_OPEN_PAREN) nesting++; - else if (token == CPP_CLOSE_PAREN) + else if (token->type == CPP_CLOSE_PAREN) { nesting--; if (nesting == 0) break; } - else if (token == CPP_EOF) + else if (token->type == CPP_EOF) break; - else if (token == CPP_NAME || token == CPP_ELLIPSIS) + else if (token->type == CPP_NAME + || token->type == CPP_ELLIPSIS) have_arg_list = 1; } - recognized_function (pfile->token_buffer + prev_id_start, - prev_id_end - prev_id_start, + recognized_function (prev_id, (saw_inline ? 'I' : in_extern_C_brace || current_extern_C - ? 'F' : 'f'), - pfile->token_buffer, prev_id_start, - have_arg_list, - fbuf->nominal_fname, func_lineno); - token = cpp_get_non_space_token (pfile); - if (token == CPP_OPEN_BRACE) + ? 'F' : 'f'), have_arg_list, + CPP_BUFFER (pfile)->nominal_fname); + token = cpp_get_token (pfile); + if (token->type == CPP_OPEN_BRACE) { /* skip body of (normally) inline function */ skip_to_closing_brace (pfile); goto new_statement; } - goto maybe_handle_comma; + if (token->type == CPP_SEMICOLON) + goto new_statement; } break; - case CPP_OTHER: - if (CPP_WRITTEN (pfile) == (size_t) start_written + 1 - && (CPP_PWRITTEN (pfile)[-1] == '*' - || CPP_PWRITTEN (pfile)[-1] == '&')) - declarator_start = start_written; - else - goto handle_statement; - break; - case CPP_COMMA: - case CPP_SEMICOLON: - if (prev_id_start && saw_extern) - { - recognized_extern (pfile->token_buffer + prev_id_start, - prev_id_end - prev_id_start, - pfile->token_buffer, - prev_id_start); - } - /* ... fall through ... */ - maybe_handle_comma: - if (token != CPP_COMMA) - goto new_statement; - - /* Handle multiple declarators in a single declaration, - as in: extern char *strcpy (), *strcat (), ... ; */ - if (declarator_start == 0) - declarator_start = prev_id_start; - CPP_SET_WRITTEN (pfile, declarator_start); - break; case CPP_NAME: /* "inline" and "extern" are recognized but skipped */ - if (!cpp_idcmp (pfile->token_buffer, - CPP_WRITTEN (pfile), "inline")) + if (!cpp_idcmp (token->val.name.text, token->val.name.len, "inline")) { saw_inline = 1; - CPP_SET_WRITTEN (pfile, start_written); } - else if (!cpp_idcmp (pfile->token_buffer, - CPP_WRITTEN (pfile), "extern")) + else if (!cpp_idcmp (token->val.name.text, + token->val.name.len, "extern")) { saw_extern = 1; - CPP_SET_WRITTEN (pfile, start_written); - token = cpp_get_non_space_token (pfile); - if (token == CPP_STRING - && strcmp (pfile->token_buffer, "\"C\"") == 0) + token = cpp_get_token (pfile); + if (token->type == CPP_STRING + && !cpp_idcmp (token->val.name.text, + token->val.name.len, "C")) { - CPP_SET_WRITTEN (pfile, start_written); current_extern_C = 1; - token = cpp_get_non_space_token (pfile); - if (token == CPP_OPEN_BRACE) + token = cpp_get_token (pfile); + if (token->type == CPP_OPEN_BRACE) { brace_nesting++; extern_C_braces[extern_C_braces_length++] @@ -236,29 +221,9 @@ scan_decls (pfile, argc, argv) break; } /* This may be the name of a variable or function. */ - prev_id_start = start_written; - prev_id_end = CPP_WRITTEN (pfile); - break; - - case CPP_OPEN_BRACE: case CPP_CLOSE_BRACE: case CPP_DIRECTIVE: - goto new_statement; /* handle_statement? */ - - case CPP_EOF: - if (CPP_BUFFER (pfile) == NULL) - return 0; - /* else fall through */ - - case CPP_HSPACE: case CPP_VSPACE: case CPP_COMMENT: - /* Skip initial white space. */ - if (start_written == 0) - CPP_SET_WRITTEN (pfile, 0); + prev_id = token; break; - - default: - prev_id_start = 0; } - - start_written = CPP_WRITTEN (pfile); token = cpp_get_token (pfile); } } -- cgit v1.2.1