Re: [PATCH 3/6] errors: support indented context info in m4 macros

[Akim Demaille]

Le 4 oct. 2012 à 12:35, Theophile Ranquet a écrit :

> * 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.

Thanks, installed.  With the following minor change:

> @@ -203,7 +208,11 @@ at_directive_perform (int argc, char *argv[], char 
> **outnamep, int *out_linenop)
>         }
>       argc -= 3;
>       argv += 3;
> -      complain_args (locp, w, argc, argv);
> +      if ((w & silent) == silent)
> +        indent += SUB_INDENT;
> +      complain_args (locp, w, &indent, argc, argv);
> +      if ((w & silent) == silent)
> +        indent -= SUB_INDENT;

+      if (w & silent)
+        indent += SUB_INDENT;
+      complain_args (locp, w, &indent, argc - 3, argv + 3);
+      if (w & silent)
+        indent -= SUB_INDENT;