mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-20 19:50:00 +08:00
38b24ee220
* cpplib.h (parse_underflow_t, CPP_NULL_BUFFER): Delete. (struct cpp_buffer): Remove fname and underflow fields. (struct cpp_reader): Remove get_token field. (struct include_hash): Rename to struct ihash. Add typedef to IHASH. (struct if_stack): Remove fname field. (IF_STACK_FRAME): Rename to IF_STACK. * cpperror.c (print_containing_files): Trust that there are no macro buffers below the top file buffer. * cppfiles.c: Replace all references to 'struct include_hash' with 'IHASH'. Rename initialize_input_buffer to init_input_buffer. Don't set or reference cpp_buffer->fname, use buffer->ihash->name instead. * cpphash.c (special_symbol): Use cpp_file_buffer. Use NULL not CPP_NULL_BUFFER. * cppinit.c: Use NULL not CPP_NULL_BUFFER, IF_STACK not IF_STACK_FRAME, IHASH not struct include_hash. * cpplib.c: Rename eval_if_expression to eval_if_expr. Remove null_underflow. Use IF_STACK not IF_STACK_FRAME, IHASH not struct include_hash, NULL not CPP_NULL_BUFFER. Remove all references to cpp_buffer->fname (delete entirely, or use ->ihash->name instead) and IF_STACK->fname. (cpp_push_buffer): Don't set new->underflow. (do_include): Use cpp_file_buffer. * cpphash.c (collect_formal_parameters): Remove duplicate increment of argslen. Pedwarn in C99 mode if __VA_ARGS__ is used as a macro argument name. Don't append "..." to namebuf for varargs macros. After we're done scanning, go through namebuf and make it NUL separated, not comma separated. (_cpp_compare_defs): Remove register tag from variables. Expect defn->argnames to be NUL separated. (_cpp_dump_definition): Expect defn->argnames to be NUL separated and in forward order. * cpphash.h: Update documentation of argnames field. From-SVN: r32430
441 lines
10 KiB
C
441 lines
10 KiB
C
/* Default error handlers for CPP Library.
|
|
Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1998, 1999, 2000
|
|
Free Software Foundation, Inc.
|
|
Written by Per Bothner, 1994.
|
|
Based on CCCP program by Paul Rubin, June 1986
|
|
Adapted to ANSI C, Richard Stallman, Jan 1987
|
|
|
|
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.
|
|
|
|
In other words, you are welcome to use, share and improve this program.
|
|
You are forbidden to forbid anyone else to use, share and improve
|
|
what you give them. Help stamp out software-hoarding! */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "cpplib.h"
|
|
#include "intl.h"
|
|
|
|
static void print_containing_files PARAMS ((cpp_reader *, cpp_buffer *));
|
|
static void print_file_and_line PARAMS ((const char *, long, long));
|
|
static void v_message PARAMS ((cpp_reader *, int,
|
|
const char *, long, long,
|
|
const char *, va_list));
|
|
|
|
/* Print the file names and line numbers of the #include
|
|
commands which led to the current file. */
|
|
|
|
static void
|
|
print_containing_files (pfile, ip)
|
|
cpp_reader *pfile;
|
|
cpp_buffer *ip;
|
|
{
|
|
int first = 1;
|
|
|
|
/* If stack of files hasn't changed since we last printed
|
|
this info, don't repeat it. */
|
|
if (pfile->input_stack_listing_current)
|
|
return;
|
|
|
|
/* Find the other, outer source files. */
|
|
for (ip = CPP_PREV_BUFFER (ip); ip != NULL; ip = CPP_PREV_BUFFER (ip))
|
|
{
|
|
long line;
|
|
cpp_buf_line_and_col (ip, &line, NULL);
|
|
if (first)
|
|
{
|
|
first = 0;
|
|
fprintf (stderr, _("In file included from %s:%ld"),
|
|
ip->nominal_fname, line);
|
|
}
|
|
else
|
|
/* Translators note: this message is used in conjunction
|
|
with "In file included from %s:%ld" and some other
|
|
tricks. We want something like this:
|
|
|
|
In file included from sys/select.h:123,
|
|
from sys/types.h:234,
|
|
from userfile.c:31:
|
|
bits/select.h:45: <error message here>
|
|
|
|
The trailing comma is at the beginning of this message,
|
|
and the trailing colon is not translated. */
|
|
fprintf (stderr, _(",\n from %s:%ld"),
|
|
ip->nominal_fname, line);
|
|
}
|
|
if (first == 0)
|
|
fputs (":\n", stderr);
|
|
|
|
/* Record we have printed the status as of this time. */
|
|
pfile->input_stack_listing_current = 1;
|
|
}
|
|
|
|
static void
|
|
print_file_and_line (filename, line, column)
|
|
const char *filename;
|
|
long line, column;
|
|
{
|
|
if (filename == 0 || *filename == '\0')
|
|
filename = "<stdin>";
|
|
if (line <= 0)
|
|
fputs (_("<command line>: "), stderr);
|
|
else if (column > 0)
|
|
fprintf (stderr, "%s:%ld:%ld: ", filename, line, column);
|
|
else
|
|
fprintf (stderr, "%s:%ld: ", filename, line);
|
|
}
|
|
|
|
/* IS_ERROR is 3 for ICE, 2 for merely "fatal" error,
|
|
1 for error, 0 for warning. */
|
|
|
|
static void
|
|
v_message (pfile, is_error, file, line, col, msg, ap)
|
|
cpp_reader *pfile;
|
|
int is_error;
|
|
const char *file;
|
|
long line;
|
|
long col;
|
|
const char *msg;
|
|
va_list ap;
|
|
{
|
|
cpp_buffer *ip = cpp_file_buffer (pfile);
|
|
|
|
if (ip)
|
|
{
|
|
if (file == NULL)
|
|
file = ip->nominal_fname;
|
|
if (line == -1)
|
|
cpp_buf_line_and_col (ip, &line, &col);
|
|
|
|
print_containing_files (pfile, ip);
|
|
print_file_and_line (file, line, col);
|
|
}
|
|
else
|
|
fprintf (stderr, "%s: ", progname);
|
|
|
|
switch (is_error)
|
|
{
|
|
case 0:
|
|
fprintf (stderr, _("warning: "));
|
|
break;
|
|
case 1:
|
|
if (pfile->errors < CPP_FATAL_LIMIT)
|
|
pfile->errors++;
|
|
break;
|
|
case 2:
|
|
pfile->errors = CPP_FATAL_LIMIT;
|
|
break;
|
|
case 3:
|
|
fprintf (stderr, _("internal error: "));
|
|
pfile->errors = CPP_FATAL_LIMIT;
|
|
break;
|
|
default:
|
|
cpp_ice (pfile, "bad is_error(%d) in v_message", is_error);
|
|
}
|
|
|
|
vfprintf (stderr, _(msg), ap);
|
|
putc ('\n', stderr);
|
|
}
|
|
|
|
/* Exported interface. */
|
|
|
|
/* For reporting internal errors. Prints "internal error: " for you,
|
|
otherwise identical to cpp_fatal. */
|
|
|
|
void
|
|
cpp_ice VPARAMS ((cpp_reader *pfile, const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
v_message (pfile, 3, NULL, -1, -1, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
/* Same as cpp_error, except we consider the error to be "fatal",
|
|
such as inconsistent options. I.e. there is little point in continuing.
|
|
(We do not exit, to support use of cpplib as a library.
|
|
Instead, it is the caller's responsibility to check
|
|
CPP_FATAL_ERRORS. */
|
|
|
|
void
|
|
cpp_fatal VPARAMS ((cpp_reader *pfile, const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
v_message (pfile, 2, NULL, -1, -1, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
cpp_error VPARAMS ((cpp_reader * pfile, const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START(ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->inhibit_errors)
|
|
return;
|
|
|
|
v_message (pfile, 1, NULL, -1, -1, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
cpp_error_with_line VPARAMS ((cpp_reader *pfile, int line, int column,
|
|
const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
int line;
|
|
int column;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
line = va_arg (ap, int);
|
|
column = va_arg (ap, int);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->inhibit_errors)
|
|
return;
|
|
|
|
v_message (pfile, 1, NULL, line, column, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
/* Error including a message from `errno'. */
|
|
void
|
|
cpp_error_from_errno (pfile, name)
|
|
cpp_reader *pfile;
|
|
const char *name;
|
|
{
|
|
cpp_error (pfile, "%s: %s", name, xstrerror (errno));
|
|
}
|
|
|
|
void
|
|
cpp_warning VPARAMS ((cpp_reader * pfile, const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->inhibit_warnings)
|
|
return;
|
|
|
|
v_message (pfile, 0, NULL, -1, -1, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
cpp_warning_with_line VPARAMS ((cpp_reader * pfile, int line, int column,
|
|
const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
int line;
|
|
int column;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
line = va_arg (ap, int);
|
|
column = va_arg (ap, int);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->inhibit_warnings)
|
|
return;
|
|
|
|
v_message (pfile, 0, NULL, line, column, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
cpp_pedwarn VPARAMS ((cpp_reader * pfile, const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->pedantic_errors
|
|
? CPP_OPTIONS (pfile)->inhibit_errors
|
|
: CPP_OPTIONS (pfile)->inhibit_warnings)
|
|
return;
|
|
|
|
v_message (pfile, CPP_OPTIONS (pfile)->pedantic_errors,
|
|
NULL, -1, -1, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
cpp_pedwarn_with_line VPARAMS ((cpp_reader * pfile, int line, int column,
|
|
const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
int line;
|
|
int column;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
line = va_arg (ap, int);
|
|
column = va_arg (ap, int);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->pedantic_errors
|
|
? CPP_OPTIONS (pfile)->inhibit_errors
|
|
: CPP_OPTIONS (pfile)->inhibit_warnings)
|
|
return;
|
|
|
|
v_message (pfile, CPP_OPTIONS (pfile)->pedantic_errors,
|
|
NULL, line, column, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
/* Report a warning (or an error if pedantic_errors)
|
|
giving specified file name and line number, not current. */
|
|
|
|
void
|
|
cpp_pedwarn_with_file_and_line VPARAMS ((cpp_reader *pfile,
|
|
const char *file, int line, int col,
|
|
const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *file;
|
|
int line;
|
|
int col;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
file = va_arg (ap, const char *);
|
|
line = va_arg (ap, int);
|
|
col = va_arg (ap, int);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (CPP_OPTIONS (pfile)->pedantic_errors
|
|
? CPP_OPTIONS (pfile)->inhibit_errors
|
|
: CPP_OPTIONS (pfile)->inhibit_warnings)
|
|
return;
|
|
|
|
v_message (pfile, CPP_OPTIONS (pfile)->pedantic_errors,
|
|
file, line, col, msgid, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
/* Print an error message not associated with a file. */
|
|
void
|
|
cpp_notice VPARAMS ((cpp_reader *pfile, const char *msgid, ...))
|
|
{
|
|
#ifndef ANSI_PROTOTYPES
|
|
cpp_reader *pfile;
|
|
const char *msgid;
|
|
#endif
|
|
va_list ap;
|
|
|
|
VA_START (ap, msgid);
|
|
|
|
#ifndef ANSI_PROTOTYPES
|
|
pfile = va_arg (ap, cpp_reader *);
|
|
msgid = va_arg (ap, const char *);
|
|
#endif
|
|
|
|
if (pfile->errors < CPP_FATAL_LIMIT)
|
|
pfile->errors++;
|
|
|
|
vfprintf (stderr, _(msgid), ap);
|
|
putc('\n', stderr);
|
|
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
cpp_notice_from_errno (pfile, name)
|
|
cpp_reader *pfile;
|
|
const char *name;
|
|
{
|
|
cpp_notice (pfile, "%s: %s", name, xstrerror (errno));
|
|
}
|