Commit Graph
20 Commits
Author SHA1 Message Date
Theophile RanquetandAkim Demaille f60321dc59 scan-skel.l: shift complain_args arguments
Because argv[0] is never used, shift it out from the argument list.

* src/complain.c (complain_args): Here.
* src/scan-skel.l (at_complain): Adjust argv and argc.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-15 17:11:50 +02:00
Theophile RanquetandAkim Demaille 56f0d1d187 scan-skel.l: formatting changes
* src/scan-skel.l (fail_for_at_directive_too_few_args): Here.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-15 17:11:41 +02:00
Theophile RanquetandAkim Demaille 9fc99ca350 graphs: style: prefix state number with "state"
* src/print_graph.c (print_core): Here.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-11 15:59:35 +02:00
Theophile RanquetandAkim Demaille 2be37f19fe graphs: style: prefix rules and change shapes
* src/graphviz.c (start_graph): Use box rather than ellipsis.
* src/print_graph.c (print_core): Prefix rules with their number.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-11 09:31:32 +02:00
Theophile RanquetandAkim Demaille 47a31596c6 obstack: import obstack_finish0 from master
* src/system.h (obstack_finish0): New.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-11 09:30:18 +02:00
Theophile RanquetandAkim Demaille 92f39ba6dc scan-skel: recognize the @directives directly in scanner
* src/scan-skel.l (at_directive, at_init): New.
(at_ptr): New, function pointer used to call the right at_directive
function (at_basename, etc.).
(outname): Rename as...
(out_name): this, for consistency with out_lineno.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-04 17:13:38 +02:00
Theophile RanquetandAkim Demaille 896517cdf0 scan-skel: split @directive functions
* src/scan-skel.l (at_directive_perform): Split as...
(at_basename, at_complain, at_output): these.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-04 17:13:38 +02:00
Theophile RanquetandAkim Demaille c6c8de1609 errors: support indented context info in m4 macros
* 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 <[email protected]>
2012-10-04 17:13:38 +02:00
Theophile RanquetandAkim Demaille 0505df0cba errors: factor b4_error @directives
Instead of @complain, @warn, and @fatal, use a unique @complain
directive. This directive's first argument is "complain", "warn", etc.

* data/bison.m4 (m4_error): Here.
* src/scan-skel.l (at_directive_perform): Adjust.
(flag): Replace the switch by safer and more explicit if branches.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-04 17:13:38 +02:00
Theophile RanquetandAkim Demaille b999409e09 errors: pointerize complain_at_indent
* src/complain.c (complain_at_indent): Rename as...
(complaint_indent): This, and take the location as a pointer.
* src/complain.h, src/muscle-tab.c, src/reader.c, src/scan-code.l,
src/symtab.c: Adjust.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-04 17:13:37 +02:00
Theophile RanquetandAkim Demaille a2b3f10183 maint: fix an erroneous include
This fixes test 130 (Several parsers).

* data/location.cc: Include <iostream> rather than <iosfwd> since
we really need << on strings for instance.
* NEWS: Document this.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-03 16:03:06 +02:00
Theophile RanquetandAkim Demaille 20964c33f9 warnings: separate flags_argmatch
This function is now a mere iterator that calls flag_argmatch,
a new function, that matches a single option parameter.

* src/getargs.c (flag_argmatch): New, taken from...
(flags_argmatch): Here.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-01 15:48:59 +02:00
Theophile RanquetandAkim Demaille a686f6cdc0 warnings: refactoring
The code here was too confusing, this seems more natural.

* src/complain.c (error_message): Move the indentation check and the category
output to complains. Also, no longer take a 'warnings' argument.
(complains): Factor calls to error_message.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-01 15:45:25 +02:00
Theophile RanquetandAkim Demaille 46b7d74cb5 formatting changes
* src/complain.c: Here.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-01 15:45:09 +02:00
Theophile RanquetandAkim Demaille 782e818718 warnings: organize variadic complaints call
Move the dispatch of variadic complains to complain.c, rather than do
it in a scanner.

* src/complain.h, src/complain.c (complain_args): New.
* src/scan-skel.l (at_directive_perform): Use it.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-01 15:41:35 +02:00
Theophile RanquetandAkim Demaille bb8e56ff67 warnings: fusion of complain and complain_at
These functions are very similar, and keeping them seperate makes
future improvements difficult, so merge them.

This impacts 89 calls.

* src/bootstrap.conf: Adjust.
* src/complain.c (complain, complain_at): Merge into...
(complain): this.
(complain_args): Adjust.
* src/complain.h, src/conflicts.c, src/files.c, src/getargs.c,
* src/gram.c, src/location.c, src/muscle-tab.c, src/parse-gram.y,
* src/reader.c, src/reduce.c, src/scan-code.l, src/scan-gram.l,
* src/scan-skel.l, src/symlist.c, src/symtab.c:
Adjust.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-01 14:15:47 +02:00
Theophile RanquetandAkim Demaille a49f4904c3 warnings: remove spurious suffixes on context
Rectify a bug that introduced suffixes out of place.

* src/complainc.c (complains): Handle all three special warning bits.
* src/scan-code.l (show_sub_message): Remove useless argument.
* tests/named-refs.at: Adjust.

Signed-off-by: Akim Demaille <[email protected]>
2012-10-01 14:11:27 +02:00
Theophile RanquetandAkim Demaille b506d9bfcb errors: indent "user token number redeclaration" context
This is the continuation of the work on the readability of errors
context.

* src/symtab.c (user_token_number_redeclaration): Use
complain_at_indent to output with increased indentation level.
* tests/input:at: Apply this change.

Signed-off-by: Akim Demaille <[email protected]>
2012-09-28 14:00:09 +02:00
Theophile RanquetandAkim Demaille 46bdb8ec59 errors: don't display "warnings treated as errors"
This line doesn't add any meaningful information anymore, the appended
[-Werror=CATEGORY] is enough.  It is actually more insightful, as it
allows to distinguish warnings treated as errors from those that
aren't.  This line is also removed by gcc 4.8.

* src/complain.c (set_warnings_issued): The only action left was
checking if the error bit corresponding to the warning issued was set,
and that function was only called once. Therefore, remove it, and do
its job directly in the caller...
(complains): here.
* src/complains.h: Adjust.
* tests/input.at: Adjust.
* NEWS: Document this change.

Signed-off-by: Akim Demaille <[email protected]>
2012-09-27 12:26:05 +02:00
Theophile RanquetandAkim Demaille 9503b0a4a8 errors: introduce the -Werror=CATEGORY option
This new option is a lot more flexible than the previous one. Its
details will be discussed in the NEWS and info file, in a forthcoming
change.

If no category is specified (ie: used as simply "-Werror"), the
functionality is the same as before.

* src/complain.c (errors_flag): New variable.
(set_warning_issued): Accept warning categories as an argument.
* src/complain.h (Wall): Better definition.
* src/getargs.c (flags_argmatch): Support for the new format.
(usage): Update -Werror to -Werror[=CATEGORY] format.

* src/complain.c (errors_flag): New variable.
(set_warning_issued): Accept warning categories as an argument.
* src/complain.h (Wall): Better definition.
* src/getargs.c (flags_argmatch): Support for the new format.
(usage): Update -Werror to -Werror=[CATEGORY] format.

Signed-off-by: Akim Demaille <[email protected]>
2012-09-27 11:08:07 +02:00