Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-14 23:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

errors: support indented context info in m4 macros

Browse Source 
* TODO: Address the issue, so remove it.
* data/bison.m4: Use b4_error with [[note]] rather than a complain_at
for context information.
* src/complain.c (complain_args): Take an additional argument, an
indentation pointer, to allow the dispatching of context information.
* src/complain.h (complain_args): Adjust prototype.
* src/scan-skel.l (at_directive_perform): Recognize the new @note mark.
* tests/input.at: Adjust.

Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
This commit is contained in:
Theophile Ranquet
2012-10-04 10:35:42 +00:00
committed by Akim Demaille
parent 0505df0cba
commit c6c8de1609
6 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/complain.c
View File

@@ -120,11 +120,9 @@ error_message (const location *loc, warnings flags, const char *prefix,
/** Raise a complaint. That can be a fatal error, a complaint or just a
warning. */
static inline void
complains (const location *loc, warnings flags, const char *message,
va_list args)
{
const char* prefix =
flags & fatal ? _("fatal error")
@@ -159,24 +157,26 @@ complain_indent (location const *loc, warnings flags, unsigned *indent,
}
void
complain_args (location const *loc, warnings w, int argc, char *argv[])
complain_args (location const *loc, warnings w, unsigned *indent,
int argc, char *argv[])
{
switch (argc)
{
case 2:
complain (loc, w, "%s", _(argv[1]));
complain_indent (loc, w, indent, "%s", _(argv[1]));
break;
case 3:
complain (loc, w, _(argv[1]), argv[2]);
complain_indent (loc, w, indent, _(argv[1]), argv[2]);
break;
case 4:
complain (loc, w, _(argv[1]), argv[2], argv[3]);
complain_indent (loc, w, indent, _(argv[1]), argv[2], argv[3]);
break;
case 5:
complain (loc, w, _(argv[1]), argv[2], argv[3], argv[4]);
complain_indent (loc, w, indent, _(argv[1]), argv[2], argv[3], argv[4]);
break;
case 6:
complain (loc, w, _(argv[1]), argv[2], argv[3], argv[4], argv[5]);
complain_indent (loc, w, indent, _(argv[1]), argv[2], argv[3], argv[4],
argv[5]);
break;
default:
complain (loc, fatal, "too many arguments for complains");