/* 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! */
-#ifndef EMACS
#include "config.h"
-#endif /* not EMACS */
-
+#include "system.h"
#include "cpplib.h"
-#include <stdio.h>
+#include "cpphash.h"
+#include "intl.h"
-/* Print the file names and line numbers of the #include
- commands which led to the current file. */
+static void print_location (cpp_reader *, unsigned int, unsigned int);
-void
-cpp_print_containing_files (pfile)
- cpp_reader *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 (cpp_reader *pfile, unsigned int line, unsigned int col)
{
- cpp_buffer *ip;
- int i;
- int first = 1;
+ if (!pfile->buffer || line == 0)
+ fprintf (stderr, "%s: ", progname);
+ else
+ {
+ const struct line_map *map;
- /* If stack of files hasn't changed since we last printed
- this info, don't repeat it. */
- if (pfile->input_stack_listing_current)
- return;
+ map = linemap_lookup (&pfile->line_maps, line);
+ linemap_print_containing_files (&pfile->line_maps, map);
- ip = cpp_file_buffer (pfile);
+ line = SOURCE_LINE (map, line);
+ if (col == 0)
+ col = 1;
- /* Give up if we don't find a source file. */
- if (ip == NULL)
- return;
+ 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);
- /* Find the other, outer source files. */
- while ((ip = CPP_PREV_BUFFER (ip)), ip != CPP_NULL_BUFFER (pfile))
+ fputc (' ', stderr);
+ }
+}
+
+/* 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 (cpp_reader *pfile, int code, unsigned int line,
+ unsigned int column)
+{
+ int level = DL_EXTRACT (code);
+
+ switch (level)
{
- long line, col;
- cpp_buf_line_and_col (ip, &line, &col);
- if (ip->fname != NULL)
+ 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 (first)
- {
- first = 0;
- fprintf (stderr, "In file included");
- }
- else
- fprintf (stderr, ",\n ");
+ if (CPP_OPTION (pfile, inhibit_errors))
+ return 0;
+ level = DL_ERROR;
+ pfile->errors++;
}
-
- fprintf (stderr, " from %s:%d", ip->nominal_fname, line);
+ 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;
}
- if (! first)
- fprintf (stderr, ":\n");
- /* Record we have printed the status as of this time. */
- pfile->input_stack_listing_current = 1;
+ print_location (pfile, line, column);
+ if (DL_WARNING_P (level))
+ fputs (_("warning: "), stderr);
+ else if (level == DL_ICE)
+ fputs (_("internal error: "), stderr);
+
+ return 1;
}
+/* 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)
+
+/* Exported interface. */
+
+/* Print an error at the location of the previously lexed token. */
void
-cpp_file_line_for_message (pfile, filename, line, column)
- cpp_reader *pfile;
- char *filename;
- int line, column;
+cpp_error (cpp_reader * pfile, int level, const char *msgid, ...)
{
- if (column > 0)
- fprintf (stderr, "%s:%d:%d: ", filename, line, column);
- else
- fprintf (stderr, "%s:%d: ", filename, line);
-}
+ unsigned int line, column;
+ va_list ap;
+
+ va_start (ap, msgid);
-/* IS_ERROR is 1 for error, 0 for warning */
-void cpp_message (pfile, is_error, msg, arg1, arg2, arg3)
- int is_error;
- cpp_reader *pfile;
- char *msg;
- char *arg1, *arg2, *arg3;
-{
- if (is_error)
- 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");
+ line = column = 0;
+
+ if (_cpp_begin_message (pfile, level, line, column))
+ v_message (msgid, ap);
+
+ va_end (ap);
}
+/* Print an error at a specific location. */
void
-fatal (str, arg)
- char *str, *arg;
+cpp_error_with_line (cpp_reader *pfile, int level,
+ unsigned int line, unsigned int column,
+ const char *msgid, ...)
{
- fprintf (stderr, "%s: ", progname);
- fprintf (stderr, str, arg);
- fprintf (stderr, "\n");
- exit (FATAL_EXIT_CODE);
+ va_list ap;
+
+ va_start (ap, msgid);
+
+ if (_cpp_begin_message (pfile, level, line, column))
+ v_message (msgid, ap);
+
+ va_end (ap);
}
-\f
void
-cpp_pfatal_with_name (pfile, name)
- cpp_reader *pfile;
- char *name;
+cpp_errno (cpp_reader *pfile, int level, const char *msgid)
{
- cpp_perror_with_name (pfile, name);
-#ifdef VMS
- exit (vaxc$errno);
-#else
- exit (FATAL_EXIT_CODE);
-#endif
+ if (msgid[0] == '\0')
+ msgid = _("stdout");
+
+ cpp_error (pfile, level, "%s: %s", msgid, xstrerror (errno));
}
OSDN Git Service
