Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-17 00:03:03 +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

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)