#include "cpphash.h"
#include "intl.h"
-static void print_containing_files PARAMS ((cpp_reader *, cpp_buffer *));
-static void print_file_and_line PARAMS ((const char *, unsigned int,
- unsigned int));
+static void print_location PARAMS ((cpp_reader *,
+ const cpp_lexer_pos *));
+/* 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)
-
-/* Print the file names and line numbers of the #include
- commands which led to the current file. */
+ do { vfprintf (stderr, _(msgid), ap); putc ('\n', stderr); } while (0)
static void
-print_containing_files (pfile, ip)
+print_location (pfile, pos)
cpp_reader *pfile;
- cpp_buffer *ip;
+ const cpp_lexer_pos *pos;
{
- 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;
+ cpp_buffer *buffer = pfile->buffer;
- /* Find the other, outer source files. */
- for (ip = CPP_PREV_BUFFER (ip); ip != NULL; ip = CPP_PREV_BUFFER (ip))
+ if (!buffer)
+ fprintf (stderr, "%s: ", progname);
+ else
{
- if (first)
- {
- first = 0;
- /* The current line in each outer source file is now the
- same as the line of the #include. */
- fprintf (stderr, _("In file included from %s:%u"),
- ip->nominal_fname, CPP_BUF_LINE (ip));
- }
- 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>
-
- with all the "from"s lined up.
- The trailing comma is at the beginning of this message,
- and the trailing colon is not translated. */
- fprintf (stderr, _(",\n from %s:%u"),
- ip->nominal_fname, CPP_BUF_LINE (ip) - 1);
- }
- if (first == 0)
- fputs (":\n", stderr);
+ unsigned int line, col;
+ const struct line_map *map;
- /* Record we have printed the status as of this time. */
- pfile->input_stack_listing_current = 1;
-}
+ if (pos == 0)
+ pos = cpp_get_line (pfile);
+ map = lookup_line (&pfile->line_maps, pos->line);
-static void
-print_file_and_line (filename, line, column)
- const char *filename;
- unsigned int line, column;
-{
- if (filename == 0 || *filename == '\0')
- filename = "<stdin>";
+ print_containing_files (&pfile->line_maps, map);
- if (line == (unsigned int)-1)
- fprintf (stderr, "%s: ", filename);
- else if (column > 0)
- fprintf (stderr, "%s:%u:%u: ", filename, line, column);
- else
- fprintf (stderr, "%s:%u: ", filename, line);
+ line = SOURCE_LINE (map, pos->line);
+ col = pos->col;
+ if (col == 0)
+ col = 1;
+
+ 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);
+
+ fputc (' ', stderr);
+ }
}
/* Set up for an error message: print the file and line, bump the error
If it returns 0, this error has been suppressed. */
int
-_cpp_begin_message (pfile, code, file, pos)
+_cpp_begin_message (pfile, code, pos)
cpp_reader *pfile;
enum error_type code;
- const char *file;
const cpp_lexer_pos *pos;
{
- cpp_buffer *ip = CPP_BUFFER (pfile);
int is_warning = 0;
switch (code)
{
+ case PEDWARN:
case WARNING:
if (CPP_IN_SYSTEM_HEADER (pfile)
&& ! CPP_OPTION (pfile, warn_system_headers))
return 0;
- if (! CPP_OPTION (pfile, warnings_are_errors))
- {
- if (CPP_OPTION (pfile, inhibit_warnings))
- return 0;
- is_warning = 1;
- }
- else
+ case WARNING_SYSHDR:
+ if (CPP_OPTION (pfile, warnings_are_errors)
+ || (code == PEDWARN && CPP_OPTION (pfile, pedantic_errors)))
{
if (CPP_OPTION (pfile, inhibit_errors))
return 0;
if (pfile->errors < CPP_FATAL_LIMIT)
pfile->errors++;
}
- break;
-
- case PEDWARN:
- if (CPP_IN_SYSTEM_HEADER (pfile)
- && ! CPP_OPTION (pfile, warn_system_headers))
- return 0;
- if (! CPP_OPTION (pfile, pedantic_errors))
+ else
{
if (CPP_OPTION (pfile, inhibit_warnings))
return 0;
is_warning = 1;
}
- else
- {
- if (CPP_OPTION (pfile, inhibit_errors))
- return 0;
- if (pfile->errors < CPP_FATAL_LIMIT)
- pfile->errors++;
- }
break;
case ERROR:
break;
}
- if (ip)
- {
- if (file == NULL)
- file = ip->nominal_fname;
- if (pos == 0)
- pos = cpp_get_line (pfile);
- print_containing_files (pfile, ip);
- print_file_and_line (file, pos->line,
- CPP_OPTION (pfile, show_column) ? pos->col : 0);
- }
- else
- fprintf (stderr, "%s: ", progname);
-
+ print_location (pfile, pos);
if (is_warning)
fputs (_("warning: "), stderr);
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
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, cpp_reader *, pfile);
+ VA_FIXEDARG (ap, const char *, msgid);
- if (_cpp_begin_message (pfile, ICE, NULL, 0))
+ if (_cpp_begin_message (pfile, ICE, 0))
v_message (msgid, ap);
- va_end(ap);
+
+ VA_CLOSE (ap);
}
/* Same as cpp_error, except we consider the error to be "fatal",
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
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, cpp_reader *, pfile);
+ VA_FIXEDARG (ap, const char *, msgid);
- if (_cpp_begin_message (pfile, FATAL, NULL, 0))
+ if (_cpp_begin_message (pfile, FATAL, 0))
v_message (msgid, ap);
- va_end(ap);
+
+ VA_CLOSE (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_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, cpp_reader *, pfile);
+ VA_FIXEDARG (ap, const char *, msgid);
- VA_START(ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- pfile = va_arg (ap, cpp_reader *);
- msgid = va_arg (ap, const char *);
-#endif
-
- if (_cpp_begin_message (pfile, ERROR, NULL, 0))
+ if (_cpp_begin_message (pfile, ERROR, 0))
v_message (msgid, ap);
- va_end(ap);
+
+ VA_CLOSE (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;
cpp_lexer_pos pos;
- 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
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, cpp_reader *, pfile);
+ VA_FIXEDARG (ap, int, line);
+ VA_FIXEDARG (ap, int, column);
+ VA_FIXEDARG (ap, const char *, msgid);
pos.line = line;
pos.col = column;
- if (_cpp_begin_message (pfile, ERROR, NULL, &pos))
+ if (_cpp_begin_message (pfile, ERROR, &pos))
v_message (msgid, ap);
- va_end(ap);
+
+ VA_CLOSE (ap);
}
/* Error including a message from `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
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, cpp_reader *, pfile);
+ VA_FIXEDARG (ap, const char *, msgid);
- if (_cpp_begin_message (pfile, WARNING, NULL, 0))
+ if (_cpp_begin_message (pfile, WARNING, 0))
v_message (msgid, ap);
- va_end(ap);
+
+ VA_CLOSE (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;
cpp_lexer_pos pos;
-
- 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
+
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, cpp_reader *, pfile);
+ VA_FIXEDARG (ap, int, line);
+ VA_FIXEDARG (ap, int, column);
+ VA_FIXEDARG (ap, const char *, msgid);
pos.line = line;
pos.col = column;
- if (_cpp_begin_message (pfile, WARNING, NULL, &pos))
+ if (_cpp_begin_message (pfile, WARNING, &pos))
v_message (msgid, ap);
- va_end(ap);
+
+ VA_CLOSE (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
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, cpp_reader *, pfile);
+ VA_FIXEDARG (ap, const char *, msgid);
- if (_cpp_begin_message (pfile, PEDWARN, NULL, 0))
+ if (_cpp_begin_message (pfile, PEDWARN, 0))
v_message (msgid, ap);
- va_end(ap);
+
+ VA_CLOSE (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;
cpp_lexer_pos pos;
- 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
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, cpp_reader *, pfile);
+ VA_FIXEDARG (ap, int, line);
+ VA_FIXEDARG (ap, int, column);
+ VA_FIXEDARG (ap, const char *, msgid);
pos.line = line;
pos.col = column;
- if (_cpp_begin_message (pfile, PEDWARN, NULL, &pos))
+ if (_cpp_begin_message (pfile, PEDWARN, &pos))
v_message (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;
- cpp_lexer_pos pos;
-
- 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
-
- pos.line = line;
- pos.col = col;
- if (_cpp_begin_message (pfile, PEDWARN, file, &pos))
- v_message (msgid, ap);
- va_end(ap);
+ VA_CLOSE (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
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, cpp_reader *, pfile);
+ VA_FIXEDARG (ap, const char *, msgid);
if (pfile->errors < CPP_FATAL_LIMIT)
pfile->errors++;
- vfprintf (stderr, _(msgid), ap);
- putc('\n', stderr);
+ v_message (msgid, ap);
- va_end(ap);
+ VA_CLOSE (ap);
}
void
OSDN Git Service
