X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fscan-decls.c;h=cbd99004e9c923f8e1a6a4600d15b349fb4440fd;hb=bb9594ed71fc9d4d347495ae70cb925196c0da46;hp=5b947a412e39716fa41ab248d7457bbd753d6fac;hpb=4a7d7a8b8e7463d645033554f142adb4ad165165;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/scan-decls.c b/gcc/scan-decls.c index 5b947a412e3..cbd99004e9c 100644 --- a/gcc/scan-decls.c +++ b/gcc/scan-decls.c @@ -1,5 +1,6 @@ /* scan-decls.c - Extracts declarations from cpp output. - Copyright (C) 1993, 1995, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1993, 1995, 1997, 1998, + 1999, 2000 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 @@ -22,6 +23,9 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "cpplib.h" #include "scan.h" +static void skip_to_closing_brace PARAMS ((cpp_reader *)); +static const cpp_token *get_a_token PARAMS ((cpp_reader *)); + int brace_nesting = 0; /* The first extern_C_braces_length elements of extern_C_braces @@ -35,6 +39,19 @@ char extern_C_braces[20]; prefixed by extern "C". */ int current_extern_C = 0; +/* Get a token but skip padding. */ +static const cpp_token * +get_a_token (pfile) + cpp_reader *pfile; +{ + for (;;) + { + const cpp_token *result = cpp_get_token (pfile); + if (result->type != CPP_PADDING) + return result; + } +} + static void skip_to_closing_brace (pfile) cpp_reader *pfile; @@ -42,12 +59,13 @@ skip_to_closing_brace (pfile) int nesting = 1; for (;;) { - enum cpp_token token = cpp_get_token (pfile); + enum cpp_ttype token = get_a_token (pfile)->type; + if (token == CPP_EOF) break; - if (token == CPP_LBRACE) + if (token == CPP_OPEN_BRACE) nesting++; - if (token == CPP_RBRACE && --nesting == 0) + if (token == CPP_CLOSE_BRACE && --nesting == 0) break; } } @@ -77,28 +95,21 @@ Here dname is the actual name being declared. int scan_decls (pfile, argc, argv) cpp_reader *pfile; - int argc; - char **argv; + int argc ATTRIBUTE_UNUSED; + 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; - enum cpp_token token; + cpp_token prev_id; + const cpp_token *token; new_statement: - CPP_SET_WRITTEN (pfile, 0); - start_written = 0; - token = cpp_get_token (pfile); + token = get_a_token (pfile); handle_statement: current_extern_C = 0; saw_extern = 0; saw_inline = 0; - if (token == CPP_RBRACE) + if (token->type == CPP_OPEN_BRACE) { /* Pop an 'extern "C"' nesting level, if appropriate. */ if (extern_C_braces_length @@ -107,114 +118,106 @@ scan_decls (pfile, argc, argv) brace_nesting--; goto new_statement; } - if (token == CPP_LBRACE) + if (token->type == CPP_OPEN_BRACE) { brace_nesting++; goto new_statement; } - if (token == CPP_EOF) + + if (token->type == CPP_EOF) return 0; - 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.type = CPP_EOF; for (;;) { - switch (token) + switch (token->type) { - case CPP_LPAREN: + default: + goto handle_statement; + case CPP_MULT: + case CPP_AND: + /* skip */ + break; + + case CPP_COMMA: + case CPP_SEMICOLON: + if (prev_id.type != CPP_EOF && 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: + return 0; + + case CPP_OPEN_PAREN: /* Looks like this is the start of a formal parameter list. */ - if (prev_id_start) + if (prev_id.type != CPP_EOF) { int nesting = 1; int have_arg_list = 0; - cpp_buffer *fbuf = cpp_file_buffer (pfile); - long func_lineno; - cpp_buf_line_and_col (fbuf, &func_lineno, NULL); for (;;) { - token = cpp_get_token (pfile); - if (token == CPP_LPAREN) + token = get_a_token (pfile); + if (token->type == CPP_OPEN_PAREN) nesting++; - else if (token == CPP_RPAREN) + 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_3DOTS) + 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, token->line, (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_LBRACE) + ? 'F' : 'f'), have_arg_list); + token = get_a_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; + + /* skip a possible __attribute__ or throw expression after the + parameter list */ + while (token->type != CPP_SEMICOLON && token->type != CPP_EOF) + token = get_a_token (pfile); + goto new_statement; } break; - case CPP_OTHER: - if (CPP_WRITTEN (pfile) == 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_comma: - /* 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 (strcmp (pfile->token_buffer, "inline") == 0) + if (cpp_ideq (token, "inline")) { saw_inline = 1; - CPP_SET_WRITTEN (pfile, start_written); } - if (strcmp (pfile->token_buffer, "extern") == 0) + else if (cpp_ideq (token, "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 = get_a_token (pfile); + if (token->type == CPP_STRING + && token->val.str.len == 1 + && token->val.str.text[0] == 'C') { - CPP_SET_WRITTEN (pfile, start_written); current_extern_C = 1; - token = cpp_get_non_space_token (pfile); - if (token == CPP_LBRACE) + token = get_a_token (pfile); + if (token->type == CPP_OPEN_BRACE) { brace_nesting++; extern_C_braces[extern_C_braces_length++] @@ -227,27 +230,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); + prev_id = *token; break; - - case CPP_EOF: - return 0; - - case CPP_LBRACE: case CPP_RBRACE: case CPP_DIRECTIVE: - goto new_statement; /* handle_statement? */ - - case CPP_HSPACE: case CPP_VSPACE: case CPP_COMMENT: case CPP_POP: - /* Skip initial white space. */ - if (start_written == 0) - CPP_SET_WRITTEN (pfile, 0); - break; - - default: - prev_id_start = 0; } - - start_written = CPP_WRITTEN (pfile); - token = cpp_get_token (pfile); + token = get_a_token (pfile); } }