mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-31 00:25:49 +08:00
4ed5bcfb1e
* c-lex.c (cb_def_pragma): Update. (c_lex): Update, and skip padding. * cppexp.c (lex, parse_defined): Update, remove unused variable. * cpphash.h (struct toklist): Delete. (union utoken): New. (struct cpp_context): Update. (struct cpp_reader): New members eof, avoid_paste. (_cpp_temp_token): New. * cppinit.c (cpp_create_reader): Update. * cpplex.c (_cpp_temp_token): New. (_cpp_lex_direct): Add PREV_WHITE when parsing args. (cpp_output_token): Don't print leading whitespace. (cpp_output_line): Update. * cpplib.c (glue_header_name, parse_include, get__Pragma_string, do_include_common, do_line, do_ident, do_pragma, do_pragma_dependency, _cpp_do__Pragma, parse_answer, parse_assertion): Update. (get_token_no_padding): New. * cpplib.h (CPP_PADDING): New. (AVOID_LPASTE): Delete. (struct cpp_token): New union member source. (cpp_get_token): Update. * cppmacro.c (macro_arg): Convert to use pointers to const tokens. (builtin_macro, paste_all_tokens, paste_tokens, funlike_invocation_p, replace_args, quote_string, stringify_arg, parse_arg, next_context, enter_macro_context, expand_arg, _cpp_pop_context, cpp_scan_nooutput, _cpp_backup_tokens, _cpp_create_definition): Update. (push_arg_context): Delete. (padding_token, push_token_context, push_ptoken_context): New. (make_string_token, make_number_token): Update, rename. (cpp_get_token): Update to handle tokens as pointers to const, and insert padding appropriately. * cppmain.c (struct printer): New member prev. (check_multiline_token): Constify. (do_preprocessing, cb_line_change): Update. (scan_translation_unit): Update to handle spacing. * scan-decls.c (get_a_token): New. (skip_to_closing_brace, scan_decls): Update. * fix-header.c (read_scan_file): Update. * doc/cpp.texi: Update. * gcc.dg/cpp/macro10.c: New test. * gcc.dg/cpp/strify3.c: New test. * gcc.dg/cpp/spacing1.c: Add tests. * gcc.dg/cpp/19990703-1.c: Remove bogus test. * gcc.dg/cpp/20000625-2.c: Fudge to pass. From-SVN: r45793
239 lines
5.8 KiB
C
239 lines
5.8 KiB
C
/* scan-decls.c - Extracts declarations from cpp output.
|
|
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
|
|
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.
|
|
|
|
Written by Per Bothner <bothner@cygnus.com>, July 1993. */
|
|
|
|
#include "hconfig.h"
|
|
#include "system.h"
|
|
#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
|
|
indicate the (brace nesting levels of) left braces that were
|
|
prefixed by extern "C". */
|
|
int extern_C_braces_length = 0;
|
|
char extern_C_braces[20];
|
|
#define in_extern_C_brace (extern_C_braces_length>0)
|
|
|
|
/* True if the function declaration currently being scanned is
|
|
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;
|
|
{
|
|
int nesting = 1;
|
|
for (;;)
|
|
{
|
|
enum cpp_ttype token = get_a_token (pfile)->type;
|
|
|
|
if (token == CPP_EOF)
|
|
break;
|
|
if (token == CPP_OPEN_BRACE)
|
|
nesting++;
|
|
if (token == CPP_CLOSE_BRACE && --nesting == 0)
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* This function scans a C source file (actually, the output of cpp),
|
|
reading from FP. It looks for function declarations, and
|
|
external variable declarations.
|
|
|
|
The following grammar (as well as some extra stuff) is recognized:
|
|
|
|
declaration:
|
|
(decl-specifier)* declarator ("," declarator)* ";"
|
|
decl-specifier:
|
|
identifier
|
|
keyword
|
|
extern "C"
|
|
declarator:
|
|
(ptr-operator)* dname [ "(" argument-declaration-list ")" ]
|
|
ptr-operator:
|
|
("*" | "&") ("const" | "volatile")*
|
|
dname:
|
|
identifier
|
|
|
|
Here dname is the actual name being declared.
|
|
*/
|
|
|
|
int
|
|
scan_decls (pfile, argc, argv)
|
|
cpp_reader *pfile;
|
|
int argc ATTRIBUTE_UNUSED;
|
|
char **argv ATTRIBUTE_UNUSED;
|
|
{
|
|
int saw_extern, saw_inline;
|
|
cpp_token prev_id;
|
|
const cpp_token *token;
|
|
|
|
new_statement:
|
|
token = get_a_token (pfile);
|
|
|
|
handle_statement:
|
|
current_extern_C = 0;
|
|
saw_extern = 0;
|
|
saw_inline = 0;
|
|
if (token->type == CPP_OPEN_BRACE)
|
|
{
|
|
/* Pop an 'extern "C"' nesting level, if appropriate. */
|
|
if (extern_C_braces_length
|
|
&& extern_C_braces[extern_C_braces_length - 1] == brace_nesting)
|
|
extern_C_braces_length--;
|
|
brace_nesting--;
|
|
goto new_statement;
|
|
}
|
|
if (token->type == CPP_OPEN_BRACE)
|
|
{
|
|
brace_nesting++;
|
|
goto new_statement;
|
|
}
|
|
|
|
if (token->type == CPP_EOF)
|
|
return 0;
|
|
|
|
if (token->type == CPP_SEMICOLON)
|
|
goto new_statement;
|
|
if (token->type != CPP_NAME)
|
|
goto new_statement;
|
|
|
|
prev_id.type = CPP_EOF;
|
|
for (;;)
|
|
{
|
|
switch (token->type)
|
|
{
|
|
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.type != CPP_EOF)
|
|
{
|
|
int nesting = 1;
|
|
int have_arg_list = 0;
|
|
for (;;)
|
|
{
|
|
token = get_a_token (pfile);
|
|
if (token->type == CPP_OPEN_PAREN)
|
|
nesting++;
|
|
else if (token->type == CPP_CLOSE_PAREN)
|
|
{
|
|
nesting--;
|
|
if (nesting == 0)
|
|
break;
|
|
}
|
|
else if (token->type == CPP_EOF)
|
|
break;
|
|
else if (token->type == CPP_NAME
|
|
|| token->type == CPP_ELLIPSIS)
|
|
have_arg_list = 1;
|
|
}
|
|
recognized_function (&prev_id, token->line,
|
|
(saw_inline ? 'I'
|
|
: in_extern_C_brace || current_extern_C
|
|
? '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;
|
|
}
|
|
|
|
/* 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_NAME:
|
|
/* "inline" and "extern" are recognized but skipped */
|
|
if (cpp_ideq (token, "inline"))
|
|
{
|
|
saw_inline = 1;
|
|
}
|
|
else if (cpp_ideq (token, "extern"))
|
|
{
|
|
saw_extern = 1;
|
|
token = get_a_token (pfile);
|
|
if (token->type == CPP_STRING
|
|
&& token->val.str.len == 1
|
|
&& token->val.str.text[0] == 'C')
|
|
{
|
|
current_extern_C = 1;
|
|
token = get_a_token (pfile);
|
|
if (token->type == CPP_OPEN_BRACE)
|
|
{
|
|
brace_nesting++;
|
|
extern_C_braces[extern_C_braces_length++]
|
|
= brace_nesting;
|
|
goto new_statement;
|
|
}
|
|
}
|
|
else
|
|
continue;
|
|
break;
|
|
}
|
|
/* This may be the name of a variable or function. */
|
|
prev_id = *token;
|
|
break;
|
|
}
|
|
token = get_a_token (pfile);
|
|
}
|
|
}
|