#include "config.h"
#include "system.h"
#include "cpplib.h"
+#include "cpphash.h"
#include "intl.h"
-static const char *my_strerror PARAMS ((int));
-static void cpp_print_containing_files PARAMS ((cpp_reader *, cpp_buffer *));
-static void cpp_print_file_and_line PARAMS ((const char *, long, long));
-static void v_cpp_message PARAMS ((cpp_reader *, int,
- const char *, long, long,
- const char *, va_list));
-
-/* my_strerror - return the descriptive text associated with an
- `errno' code.
- XXX - link with libiberty so we can use its strerror(). */
-
-static const char *
-my_strerror (errnum)
- int errnum;
-{
- const char *result;
-
-#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'. */
-
- result = strerror (errnum, vaxc$errno);
-#endif
-
- if (!result)
- result = "errno = ?";
-
- return result;
-}
+static void print_containing_files PARAMS ((cpp_buffer *));
+static void print_location PARAMS ((cpp_reader *,
+ const char *,
+ const cpp_lexer_pos *));
+#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. */
-
static void
-cpp_print_containing_files (pfile, ip)
- cpp_reader *pfile;
+print_containing_files (ip)
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 != CPP_NULL_BUFFER (pfile);
- ip = CPP_PREV_BUFFER (ip))
- if (ip->fname != NULL)
- {
- 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;
+ for (ip = ip->prev; ip; ip = ip->prev)
+ {
+ 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));
+ }
+ fputs (":\n", stderr);
}
static void
-cpp_print_file_and_line (filename, line, column)
+print_location (pfile, filename, pos)
+ cpp_reader *pfile;
const char *filename;
- long line, column;
+ const cpp_lexer_pos *pos;
{
- 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);
+ cpp_buffer *buffer = pfile->buffer;
+
+ if (!buffer)
+ fprintf (stderr, "%s: ", progname);
else
- fprintf (stderr, "%s:%ld: ", filename, line);
+ {
+ unsigned int line, col = 0;
+ enum cpp_buffer_type type = buffer->type;
+
+ /* For _Pragma buffers, we want to print the location as
+ "foo.c:5:8: _Pragma:", where foo.c is the containing buffer.
+ For diagnostics relating to command line options, we want to
+ print "<command line>:" with no line number. */
+ if (type == BUF_CL_OPTION || type == BUF_BUILTIN)
+ line = 0;
+ else
+ {
+ if (type == BUF_PRAGMA)
+ {
+ buffer = buffer->prev;
+ line = CPP_BUF_LINE (buffer);
+ col = CPP_BUF_COL (buffer);
+ }
+ else
+ {
+ if (pos == 0)
+ pos = cpp_get_line (pfile);
+ line = pos->line;
+ col = pos->col;
+ }
+
+ if (col == 0)
+ col = 1;
+
+ /* Don't repeat the include stack unnecessarily. */
+ if (buffer->prev && ! buffer->include_stack_listed)
+ {
+ buffer->include_stack_listed = 1;
+ print_containing_files (buffer);
+ }
+ }
+
+ if (filename == 0)
+ filename = buffer->nominal_fname;
+ if (*filename == '\0')
+ filename = _("<stdin>");
+
+ if (line == 0)
+ fprintf (stderr, "%s: ", filename);
+ else if (CPP_OPTION (pfile, show_column) == 0)
+ fprintf (stderr, "%s:%u: ", filename, line);
+ else
+ fprintf (stderr, "%s:%u:%u: ", filename, line, col);
+
+ if (type == BUF_PRAGMA)
+ fprintf (stderr, "_Pragma: ");
+ }
}
-/* IS_ERROR is 3 for ICE, 2 for merely "fatal" error,
- 1 for error, 0 for warning. */
+/* Set up for an error message: print the file and line, bump the error
+ counter, etc.
+ If it returns 0, this error has been suppressed. */
-static void
-v_cpp_message (pfile, is_error, file, line, col, msg, ap)
+int
+_cpp_begin_message (pfile, code, file, pos)
cpp_reader *pfile;
- int is_error;
+ enum error_type code;
const char *file;
- long line;
- long col;
- const char *msg;
- va_list ap;
+ const cpp_lexer_pos *pos;
{
- cpp_buffer *ip = cpp_file_buffer (pfile);
+ int is_warning = 0;
- if (ip)
+ switch (code)
{
- if (file == NULL)
- file = ip->nominal_fname;
- if (line == -1)
- cpp_buf_line_and_col (ip, &line, &col);
-
- cpp_print_containing_files (pfile, ip);
- cpp_print_file_and_line (file, line, col);
- }
- else
- fprintf (stderr, "%s: ", progname);
+ 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
+ {
+ if (CPP_OPTION (pfile, inhibit_errors))
+ return 0;
+ if (pfile->errors < CPP_FATAL_LIMIT)
+ pfile->errors++;
+ }
+ break;
- switch (is_error)
- {
- case 0:
- fprintf (stderr, _("warning: "));
+ case PEDWARN:
+ if (CPP_IN_SYSTEM_HEADER (pfile)
+ && ! CPP_OPTION (pfile, warn_system_headers))
+ return 0;
+ if (! CPP_OPTION (pfile, pedantic_errors))
+ {
+ 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 1:
+
+ case ERROR:
+ if (CPP_OPTION (pfile, inhibit_errors))
+ return 0;
if (pfile->errors < CPP_FATAL_LIMIT)
pfile->errors++;
break;
- case 2:
+ /* Fatal errors cannot be inhibited. */
+ case FATAL:
pfile->errors = CPP_FATAL_LIMIT;
break;
- case 3:
+ case ICE:
fprintf (stderr, _("internal error: "));
pfile->errors = CPP_FATAL_LIMIT;
break;
- default:
- cpp_ice (pfile, "bad is_error(%d) in v_cpp_message", is_error);
}
- vfprintf (stderr, _(msg), ap);
- putc ('\n', stderr);
+ print_location (pfile, file, pos);
+ if (is_warning)
+ fputs (_("warning: "), stderr);
+
+ return 1;
}
/* Exported interface. */
msgid = va_arg (ap, const char *);
#endif
- v_cpp_message (pfile, 3, NULL, -1, -1, msgid, ap);
+ if (_cpp_begin_message (pfile, ICE, NULL, 0))
+ v_message (msgid, ap);
va_end(ap);
}
msgid = va_arg (ap, const char *);
#endif
- v_cpp_message (pfile, 2, NULL, -1, -1, msgid, ap);
+ if (_cpp_begin_message (pfile, FATAL, NULL, 0))
+ v_message (msgid, ap);
va_end(ap);
}
msgid = va_arg (ap, const char *);
#endif
- if (CPP_OPTIONS (pfile)->inhibit_errors)
- return;
-
- v_cpp_message (pfile, 1, NULL, -1, -1, msgid, ap);
+ if (_cpp_begin_message (pfile, ERROR, NULL, 0))
+ v_message (msgid, ap);
va_end(ap);
}
const char *msgid;
#endif
va_list ap;
+ cpp_lexer_pos pos;
VA_START (ap, msgid);
msgid = va_arg (ap, const char *);
#endif
- if (CPP_OPTIONS (pfile)->inhibit_errors)
- return;
-
- v_cpp_message (pfile, 1, NULL, line, column, msgid, ap);
+ pos.line = line;
+ pos.col = column;
+ if (_cpp_begin_message (pfile, ERROR, NULL, &pos))
+ v_message (msgid, ap);
va_end(ap);
}
cpp_reader *pfile;
const char *name;
{
- cpp_error (pfile, "%s: %s", name, my_strerror (errno));
+ cpp_error (pfile, "%s: %s", name, xstrerror (errno));
}
void
msgid = va_arg (ap, const char *);
#endif
- if (CPP_OPTIONS (pfile)->inhibit_warnings)
- return;
-
- v_cpp_message (pfile, 0, NULL, -1, -1, msgid, ap);
+ if (_cpp_begin_message (pfile, WARNING, NULL, 0))
+ v_message (msgid, ap);
va_end(ap);
}
const char *msgid;
#endif
va_list ap;
+ cpp_lexer_pos pos;
VA_START (ap, msgid);
msgid = va_arg (ap, const char *);
#endif
- if (CPP_OPTIONS (pfile)->inhibit_warnings)
- return;
-
- v_cpp_message (pfile, 0, NULL, line, column, msgid, ap);
+ pos.line = line;
+ pos.col = column;
+ if (_cpp_begin_message (pfile, WARNING, NULL, &pos))
+ v_message (msgid, ap);
va_end(ap);
}
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_cpp_message (pfile, CPP_OPTIONS (pfile)->pedantic_errors,
- NULL, -1, -1, msgid, ap);
+ if (_cpp_begin_message (pfile, PEDWARN, NULL, 0))
+ v_message (msgid, ap);
va_end(ap);
}
const char *msgid;
#endif
va_list ap;
+ cpp_lexer_pos pos;
VA_START (ap, msgid);
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_cpp_message (pfile, CPP_OPTIONS (pfile)->pedantic_errors,
- NULL, line, column, msgid, ap);
+ pos.line = line;
+ pos.col = column;
+ if (_cpp_begin_message (pfile, PEDWARN, NULL, &pos))
+ v_message (msgid, ap);
va_end(ap);
}
const char *msgid;
#endif
va_list ap;
+ cpp_lexer_pos pos;
VA_START (ap, msgid);
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_cpp_message (pfile, CPP_OPTIONS (pfile)->pedantic_errors,
- file, line, col, msgid, ap);
+ pos.line = line;
+ pos.col = col;
+ if (_cpp_begin_message (pfile, PEDWARN, file, &pos))
+ v_message (msgid, ap);
va_end(ap);
}
cpp_reader *pfile;
const char *name;
{
- cpp_notice (pfile, "%s: %s", name, my_strerror (errno));
+ if (name[0] == '\0')
+ name = "stdout";
+ cpp_notice (pfile, "%s: %s", name, xstrerror (errno));
}
OSDN Git Service
