Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-10 21: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");

3
src/complain.h
View File

@@ -62,7 +62,8 @@ void complain (location const *loc, warnings flags, char const *message, ...)
__attribute__ ((__format__ (__printf__, 3, 4)));
/** Likewise, but with an \a argc/argv interface. */
void complain_args (location const *loc, warnings w, int argc, char *arg[]);
void complain_args (location const *loc, warnings w, unsigned *indent,
int argc, char *arg[]);
/** Make a complaint with location and some indentation. */
void complain_indent (location const *loc, warnings flags, unsigned *indent,

13
src/scan-skel.l
View File

@@ -175,6 +175,8 @@ flag (const char *arg)
return complaint;
else if (STREQ (arg, "fatal"))
return fatal;
else if (STREQ (arg, "note"))
return silent;
else
aver (false);
}
@@ -190,9 +192,12 @@ at_directive_perform (int argc, char *argv[], char **outnamep, int *out_linenop)
}
else if (STREQ (argv[0], "@complain"))
{
static unsigned indent;
if (argc < 4)
fail_for_at_directive_too_few_args (argv[0]);
warnings w = flag (argv[1]);
if ((w & silent) != silent)
indent = 0;
location loc;
location *locp = NULL;
if (argv[2] && argv[2][0])
@@ -201,8 +206,12 @@ at_directive_perform (int argc, char *argv[], char **outnamep, int *out_linenop)
boundary_set_from_string (&loc.end, argv[3]);
locp = &loc;
}
complain_args (locp, w, argc - 3, argv + 3);
}
if (w & silent)
indent += SUB_INDENT;
complain_args (locp, w, &indent, argc - 3, argv + 3);
if (w & silent)
indent -= SUB_INDENT;
}
else if (STREQ (argv[0], "@output"))
{
if (argc > 2)