44714d8ce1
gcc/testsuite/ChangeLog: PR preprocessor/69664 * gcc.dg/cpp/trad/comment-2.c: Add expected column number. * gcc.dg/cpp/warn-comments.c: Likewise. libcpp/ChangeLog: PR preprocessor/69664 * errors.c (cpp_diagnostic_with_line): Only call rich_location::override_column if the column is non-zero. * line-map.c (rich_location::override_column): Update columns within m_ranges[0]. Add assertions to verify that doing so is sane. From-SVN: r233223
249 lines
6.1 KiB
C
249 lines
6.1 KiB
C
/* Default error handlers for CPP Library.
|
|
Copyright (C) 1986-2016 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 3, 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; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>.
|
|
|
|
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 "internal.h"
|
|
|
|
/* Print a diagnostic at the location of the previously lexed token. */
|
|
|
|
ATTRIBUTE_FPTR_PRINTF(4,0)
|
|
static bool
|
|
cpp_diagnostic (cpp_reader * pfile, int level, int reason,
|
|
const char *msgid, va_list *ap)
|
|
{
|
|
source_location src_loc;
|
|
bool ret;
|
|
|
|
if (CPP_OPTION (pfile, traditional))
|
|
{
|
|
if (pfile->state.in_directive)
|
|
src_loc = pfile->directive_line;
|
|
else
|
|
src_loc = pfile->line_table->highest_line;
|
|
}
|
|
/* We don't want to refer to a token before the beginning of the
|
|
current run -- that is invalid. */
|
|
else if (pfile->cur_token == pfile->cur_run->base)
|
|
{
|
|
src_loc = 0;
|
|
}
|
|
else
|
|
{
|
|
src_loc = pfile->cur_token[-1].src_loc;
|
|
}
|
|
|
|
if (!pfile->cb.error)
|
|
abort ();
|
|
rich_location richloc (pfile->line_table, src_loc);
|
|
ret = pfile->cb.error (pfile, level, reason, &richloc, _(msgid), ap);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* Print a warning or error, depending on the value of LEVEL. */
|
|
|
|
bool
|
|
cpp_error (cpp_reader * pfile, int level, const char *msgid, ...)
|
|
{
|
|
va_list ap;
|
|
bool ret;
|
|
|
|
va_start (ap, msgid);
|
|
|
|
ret = cpp_diagnostic (pfile, level, CPP_W_NONE, msgid, &ap);
|
|
|
|
va_end (ap);
|
|
return ret;
|
|
}
|
|
|
|
/* Print a warning. The warning reason may be given in REASON. */
|
|
|
|
bool
|
|
cpp_warning (cpp_reader * pfile, int reason, const char *msgid, ...)
|
|
{
|
|
va_list ap;
|
|
bool ret;
|
|
|
|
va_start (ap, msgid);
|
|
|
|
ret = cpp_diagnostic (pfile, CPP_DL_WARNING, reason, msgid, &ap);
|
|
|
|
va_end (ap);
|
|
return ret;
|
|
}
|
|
|
|
/* Print a pedantic warning. The warning reason may be given in REASON. */
|
|
|
|
bool
|
|
cpp_pedwarning (cpp_reader * pfile, int reason, const char *msgid, ...)
|
|
{
|
|
va_list ap;
|
|
bool ret;
|
|
|
|
va_start (ap, msgid);
|
|
|
|
ret = cpp_diagnostic (pfile, CPP_DL_PEDWARN, reason, msgid, &ap);
|
|
|
|
va_end (ap);
|
|
return ret;
|
|
}
|
|
|
|
/* Print a warning, including system headers. The warning reason may be
|
|
given in REASON. */
|
|
|
|
bool
|
|
cpp_warning_syshdr (cpp_reader * pfile, int reason, const char *msgid, ...)
|
|
{
|
|
va_list ap;
|
|
bool ret;
|
|
|
|
va_start (ap, msgid);
|
|
|
|
ret = cpp_diagnostic (pfile, CPP_DL_WARNING_SYSHDR, reason, msgid, &ap);
|
|
|
|
va_end (ap);
|
|
return ret;
|
|
}
|
|
|
|
/* Print a diagnostic at a specific location. */
|
|
|
|
ATTRIBUTE_FPTR_PRINTF(6,0)
|
|
static bool
|
|
cpp_diagnostic_with_line (cpp_reader * pfile, int level, int reason,
|
|
source_location src_loc, unsigned int column,
|
|
const char *msgid, va_list *ap)
|
|
{
|
|
bool ret;
|
|
|
|
if (!pfile->cb.error)
|
|
abort ();
|
|
rich_location richloc (pfile->line_table, src_loc);
|
|
if (column)
|
|
richloc.override_column (column);
|
|
ret = pfile->cb.error (pfile, level, reason, &richloc, _(msgid), ap);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* Print a warning or error, depending on the value of LEVEL. */
|
|
|
|
bool
|
|
cpp_error_with_line (cpp_reader *pfile, int level,
|
|
source_location src_loc, unsigned int column,
|
|
const char *msgid, ...)
|
|
{
|
|
va_list ap;
|
|
bool ret;
|
|
|
|
va_start (ap, msgid);
|
|
|
|
ret = cpp_diagnostic_with_line (pfile, level, CPP_W_NONE, src_loc,
|
|
column, msgid, &ap);
|
|
|
|
va_end (ap);
|
|
return ret;
|
|
}
|
|
|
|
/* Print a warning. The warning reason may be given in REASON. */
|
|
|
|
bool
|
|
cpp_warning_with_line (cpp_reader *pfile, int reason,
|
|
source_location src_loc, unsigned int column,
|
|
const char *msgid, ...)
|
|
{
|
|
va_list ap;
|
|
bool ret;
|
|
|
|
va_start (ap, msgid);
|
|
|
|
ret = cpp_diagnostic_with_line (pfile, CPP_DL_WARNING, reason, src_loc,
|
|
column, msgid, &ap);
|
|
|
|
va_end (ap);
|
|
return ret;
|
|
}
|
|
|
|
/* Print a pedantic warning. The warning reason may be given in REASON. */
|
|
|
|
bool
|
|
cpp_pedwarning_with_line (cpp_reader *pfile, int reason,
|
|
source_location src_loc, unsigned int column,
|
|
const char *msgid, ...)
|
|
{
|
|
va_list ap;
|
|
bool ret;
|
|
|
|
va_start (ap, msgid);
|
|
|
|
ret = cpp_diagnostic_with_line (pfile, CPP_DL_PEDWARN, reason, src_loc,
|
|
column, msgid, &ap);
|
|
|
|
va_end (ap);
|
|
return ret;
|
|
}
|
|
|
|
/* Print a warning, including system headers. The warning reason may be
|
|
given in REASON. */
|
|
|
|
bool
|
|
cpp_warning_with_line_syshdr (cpp_reader *pfile, int reason,
|
|
source_location src_loc, unsigned int column,
|
|
const char *msgid, ...)
|
|
{
|
|
va_list ap;
|
|
bool ret;
|
|
|
|
va_start (ap, msgid);
|
|
|
|
ret = cpp_diagnostic_with_line (pfile, CPP_DL_WARNING_SYSHDR, reason, src_loc,
|
|
column, msgid, &ap);
|
|
|
|
va_end (ap);
|
|
return ret;
|
|
}
|
|
|
|
/* Print a warning or error, depending on the value of LEVEL. Include
|
|
information from errno. */
|
|
|
|
bool
|
|
cpp_errno (cpp_reader *pfile, int level, const char *msgid)
|
|
{
|
|
return cpp_error (pfile, level, "%s: %s", _(msgid), xstrerror (errno));
|
|
}
|
|
|
|
/* Print a warning or error, depending on the value of LEVEL. Include
|
|
information from errno. Unlike cpp_errno, the argument is a filename
|
|
that is not localized, but "" is replaced with localized "stdout". */
|
|
|
|
bool
|
|
cpp_errno_filename (cpp_reader *pfile, int level, const char *filename)
|
|
{
|
|
if (filename[0] == '\0')
|
|
filename = _("stdout");
|
|
|
|
return cpp_error (pfile, level, "%s: %s", filename, xstrerror (errno));
|
|
}
|