/* Default error handlers for CPP Library.
- Copyright (C) 1986, 87, 89, 92, 93, 94, 1995 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1998, 1999, 2000,
+ 2001, 2002 Free Software Foundation, Inc.
Written by Per Bothner, 1994.
- Based on CCCP program by by Paul Rubin, June 1986
+ 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
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+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 "coretypes.h"
+#include "tm.h"
#include "cpplib.h"
-#include <stdio.h>
+#include "cpphash.h"
+#include "intl.h"
-/* This defines "errno" properly for VMS, and gives us EACCES. */
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
+static void print_location PARAMS ((cpp_reader *, unsigned int, unsigned int));
-#ifndef VMS
-#ifndef HAVE_STRERROR
-extern int sys_nerr;
-#if defined(bsd4_4) || defined(__NetBSD__)
-extern const char *const sys_errlist[];
-#else
-extern char *sys_errlist[];
-#endif
-#else /* HAVE_STERRROR */
-char *strerror ();
-#endif
-#else /* VMS */
-char *strerror (int,...);
-#endif
-
-/* Print the file names and line numbers of the #include
- commands which led to the current file. */
-
-void
-cpp_print_containing_files (pfile)
+/* Print the logical file location (LINE, COL) in preparation for a
+ diagnostic. Outputs the #include chain if it has changed. A line
+ of zero suppresses the include stack, and outputs the program name
+ instead. */
+static void
+print_location (pfile, line, col)
cpp_reader *pfile;
+ unsigned int line, col;
{
- cpp_buffer *ip;
- int i;
- 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;
+ if (!pfile->buffer || line == 0)
+ fprintf (stderr, "%s: ", progname);
+ else
+ {
+ const struct line_map *map;
- ip = cpp_file_buffer (pfile);
+ map = lookup_line (&pfile->line_maps, line);
+ print_containing_files (&pfile->line_maps, map);
- /* Give up if we don't find a source file. */
- if (ip == NULL)
- return;
+ line = SOURCE_LINE (map, line);
+ if (col == 0)
+ col = 1;
- /* Find the other, outer source files. */
- while ((ip = CPP_PREV_BUFFER (ip)), ip != CPP_NULL_BUFFER (pfile))
- {
- long line, col;
- cpp_buf_line_and_col (ip, &line, &col);
- if (ip->fname != NULL)
- {
- if (first)
- {
- first = 0;
- fprintf (stderr, "In file included");
- }
- else
- fprintf (stderr, ",\n ");
- }
+ if (line == 0)
+ fprintf (stderr, "%s:", map->to_file);
+ else if (CPP_OPTION (pfile, show_column) == 0)
+ fprintf (stderr, "%s:%u:", map->to_file, line);
+ else
+ fprintf (stderr, "%s:%u:%u:", map->to_file, line, col);
-/* start-sanitize-mpw */
-#ifdef MPW
- fprintf (stderr, " File \"%s\"; Line %d # ", ip->nominal_fname, line);
-#else
-/* end-sanitize-mpw */
- fprintf (stderr, " from %s:%d", ip->nominal_fname, line);
-/* start-sanitize-mpw */
-#endif /* MPW */
-/* end-sanitize-mpw */
+ fputc (' ', stderr);
}
- if (! first)
- fprintf (stderr, ":\n");
-
- /* Record we have printed the status as of this time. */
- pfile->input_stack_listing_current = 1;
}
-void
-cpp_print_file_and_line (pfile)
+/* Set up for a diagnostic: print the file and line, bump the error
+ counter, etc. LINE is the logical line number; zero means to print
+ at the location of the previously lexed token, which tends to be
+ the correct place by default. Returns 0 if the error has been
+ suppressed. */
+int
+_cpp_begin_message (pfile, code, line, column)
cpp_reader *pfile;
+ int code;
+ unsigned int line, column;
{
- cpp_buffer *ip = cpp_file_buffer (pfile);
+ int level = DL_EXTRACT (code);
- if (ip != NULL)
+ switch (level)
{
- long line, col;
- cpp_buf_line_and_col (ip, &line, &col);
- if (pfile->show_column)
- fprintf (stderr, "%s:%d:%d: ", ip->nominal_fname, line, col);
- else
- fprintf (stderr, "%s:%d: ", ip->nominal_fname, line);
+ case DL_WARNING:
+ case DL_PEDWARN:
+ if (CPP_IN_SYSTEM_HEADER (pfile)
+ && ! CPP_OPTION (pfile, warn_system_headers))
+ return 0;
+ /* Fall through. */
+
+ case DL_WARNING_SYSHDR:
+ if (CPP_OPTION (pfile, warnings_are_errors)
+ || (level == DL_PEDWARN && CPP_OPTION (pfile, pedantic_errors)))
+ {
+ if (CPP_OPTION (pfile, inhibit_errors))
+ return 0;
+ level = DL_ERROR;
+ pfile->errors++;
+ }
+ else if (CPP_OPTION (pfile, inhibit_warnings))
+ return 0;
+ break;
+
+ case DL_ERROR:
+ if (CPP_OPTION (pfile, inhibit_errors))
+ return 0;
+ /* ICEs cannot be inhibited. */
+ case DL_ICE:
+ pfile->errors++;
+ break;
}
-}
-
-void
-cpp_error (pfile, msg, arg1, arg2, arg3)
- cpp_reader *pfile;
- char *msg;
- char *arg1, *arg2, *arg3;
-{
- cpp_print_containing_files (pfile);
- cpp_print_file_and_line (pfile);
- fprintf (stderr, msg, arg1, arg2, arg3);
- fprintf (stderr, "\n");
- pfile->errors++;
-}
-
-/* Print error message but don't count it. */
-
-void
-cpp_warning (pfile, msg, arg1, arg2, arg3)
- cpp_reader *pfile;
- char *msg;
- char *arg1, *arg2, *arg3;
-{
- if (CPP_OPTIONS (pfile)->inhibit_warnings)
- return;
-
- if (CPP_OPTIONS (pfile)->warnings_are_errors)
- pfile->errors++;
-
- cpp_print_containing_files (pfile);
- cpp_print_file_and_line (pfile);
- fprintf (stderr, "warning: ");
- fprintf (stderr, msg, arg1, arg2, arg3);
- fprintf (stderr, "\n");
-}
-
-void
-cpp_error_with_line (pfile, line, msg, arg1, arg2, arg3)
- cpp_reader *pfile;
- int line;
- char *msg;
- char *arg1, *arg2, *arg3;
-{
- int i;
- cpp_buffer *ip = cpp_file_buffer (pfile);
-
- cpp_print_containing_files (pfile);
-
- if (ip != NULL)
- fprintf (stderr, "%s:%d: ", ip->nominal_fname, line);
-
- fprintf (stderr, msg, arg1, arg2, arg3);
- fprintf (stderr, "\n");
- pfile->errors++;
-}
-
-void
-cpp_warning_with_line (pfile, line, msg, arg1, arg2, arg3)
- cpp_reader *pfile;
- int line;
- char *msg;
- char *arg1, *arg2, *arg3;
-{
- int i;
- cpp_buffer *ip;
-
- if (CPP_OPTIONS (pfile)->inhibit_warnings)
- return;
-
- if (CPP_OPTIONS (pfile)->warnings_are_errors)
- pfile->errors++;
- cpp_print_containing_files (pfile);
+ print_location (pfile, line, column);
+ if (DL_WARNING_P (level))
+ fputs (_("warning: "), stderr);
+ else if (level == DL_ICE)
+ fputs (_("internal error: "), stderr);
- ip = cpp_file_buffer (pfile);
-
- if (ip != NULL)
- fprintf (stderr, "%s:%d: ", ip->nominal_fname, line);
- fprintf (stderr, "warning: ");
- fprintf (stderr, msg, arg1, arg2, arg3);
- fprintf (stderr, "\n");
+ return 1;
}
-/* Print an error message and maybe count it. */
+/* Don't remove the blank before do, as otherwise the exgettext
+ script will mistake this as a function definition */
+#define v_message(msgid, ap) \
+ do { vfprintf (stderr, _(msgid), ap); putc ('\n', stderr); } while (0)
-void
-cpp_pedwarn (pfile, msg, arg1, arg2, arg3)
- cpp_reader *pfile;
- char *msg;
- char *arg1, *arg2, *arg3;
-{
- if (CPP_OPTIONS (pfile)->pedantic_errors)
- cpp_error (pfile, msg, arg1, arg2, arg3);
- else
- cpp_warning (pfile, msg, arg1, arg2, arg3);
-}
+/* Exported interface. */
+/* Print an error at the location of the previously lexed token. */
void
-cpp_pedwarn_with_line (pfile, line, msg, arg1, arg2, arg3)
- cpp_reader *pfile;
- int line;
- char *msg;
- char *arg1, *arg2, *arg3;
+cpp_error VPARAMS ((cpp_reader * pfile, int level, const char *msgid, ...))
{
- if (CPP_OPTIONS (pfile)->pedantic_errors)
- cpp_error_with_line (pfile, line, msg, arg1, arg2, arg3);
- else
- cpp_warning_with_line (pfile, line, msg, arg1, arg2, arg3);
-}
+ unsigned int line, column;
-/* Report a warning (or an error if pedantic_errors)
- giving specified file name and line number, not current. */
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, cpp_reader *, pfile);
+ VA_FIXEDARG (ap, int, level);
+ VA_FIXEDARG (ap, const char *, msgid);
-void
-cpp_pedwarn_with_file_and_line (pfile, file, line, msg, arg1, arg2, arg3)
- cpp_reader *pfile;
- char *file;
- int line;
- char *msg;
- char *arg1, *arg2, *arg3;
-{
- if (!CPP_OPTIONS (pfile)->pedantic_errors
- && CPP_OPTIONS (pfile)->inhibit_warnings)
- return;
- if (file != NULL)
- fprintf (stderr, "%s:%d: ", file, line);
- if (CPP_OPTIONS (pfile)->pedantic_errors)
- pfile->errors++;
+ if (pfile->buffer)
+ {
+ if (CPP_OPTION (pfile, traditional))
+ {
+ if (pfile->state.in_directive)
+ line = pfile->directive_line;
+ else
+ line = pfile->line;
+ column = 0;
+ }
+ else
+ {
+ line = pfile->cur_token[-1].line;
+ column = pfile->cur_token[-1].col;
+ }
+ }
else
- fprintf (stderr, "warning: ");
- fprintf (stderr, msg, arg1, arg2, arg3);
- fprintf (stderr, "\n");
-}
-
-void
-fatal (str, arg)
- char *str, *arg;
-{
- fprintf (stderr, "%s: ", progname);
- fprintf (stderr, str, arg);
- fprintf (stderr, "\n");
- exit (FAILURE_EXIT_CODE);
-}
-
-\f
-/*
- * my_strerror - return the descriptive text associated with an `errno' code.
- */
-
-char *
-my_strerror (errnum)
- int errnum;
-{
- char *result;
+ line = column = 0;
-#ifndef VMS
-#ifndef HAVE_STRERROR
- result = (char *) ((errnum < sys_nerr) ? sys_errlist[errnum] : 0);
-#else
- result = strerror (errnum);
-#endif
-#else /* VMS */
- /* VAXCRTL's strerror() takes an optional second argument, which only
- matters when the first argument is EVMSERR. However, it's simplest
- just to pass it unconditionally. `vaxc$errno' is declared in
- <errno.h>, and maintained by the library in parallel with `errno'.
- We assume that caller's `errnum' either matches the last setting of
- `errno' by the library or else does not have the value `EVMSERR'. */
+ if (_cpp_begin_message (pfile, level, line, column))
+ v_message (msgid, ap);
- result = strerror (errnum, vaxc$errno);
-#endif
-
- if (!result)
- result = "undocumented I/O error";
-
- return result;
+ VA_CLOSE (ap);
}
-/* Error including a message from `errno'. */
-
+/* Print an error at a specific location. */
void
-cpp_error_from_errno (pfile, name)
- cpp_reader *pfile;
- char *name;
+cpp_error_with_line VPARAMS ((cpp_reader *pfile, int level,
+ unsigned int line, unsigned int column,
+ const char *msgid, ...))
{
- int i;
- cpp_buffer *ip = cpp_file_buffer (pfile);
-
- cpp_print_containing_files (pfile);
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, cpp_reader *, pfile);
+ VA_FIXEDARG (ap, int, level);
+ VA_FIXEDARG (ap, unsigned int, line);
+ VA_FIXEDARG (ap, unsigned int, column);
+ VA_FIXEDARG (ap, const char *, msgid);
- if (ip != NULL)
- fprintf (stderr, "%s:%d: ", ip->nominal_fname, ip->lineno);
+ if (_cpp_begin_message (pfile, level, line, column))
+ v_message (msgid, ap);
- fprintf (stderr, "%s: %s\n", name, my_strerror (errno));
-
- pfile->errors++;
+ VA_CLOSE (ap);
}
void
-cpp_perror_with_name (pfile, name)
+cpp_errno (pfile, level, msgid)
cpp_reader *pfile;
- char *name;
+ int level;
+ const char *msgid;
{
- fprintf (stderr, "%s: ", progname);
- fprintf (stderr, "%s: %s\n", name, my_strerror (errno));
- pfile->errors++;
-}
+ if (msgid[0] == '\0')
+ msgid = _("stdout");
-void
-cpp_pfatal_with_name (pfile, name)
- cpp_reader *pfile;
- char *name;
-{
- cpp_perror_with_name (pfile, name);
-#ifdef VMS
- exit (vaxc$errno);
-#else
- exit (FAILURE_EXIT_CODE);
-#endif
+ cpp_error (pfile, level, "%s: %s", msgid, xstrerror (errno));
}
OSDN Git Service
