diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2013-12-09 10:43:37 +0100 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2013-12-09 10:43:37 +0100 |
| commit | fc6c85664a06ed9f9d4fc7cd55f6c0527cd34d04 (patch) | |
| tree | d34f96e4049a6a739953e0be3982c867214737c4 /src/AnnotationList.c | |
| parent | 4f3cc9c21b69f11b7513f617871fc611a190ab00 (diff) | |
| parent | 0bd5ee5f8919a74cd3f4b8da3f51da99193e1319 (diff) | |
| download | bison-fc6c85664a06ed9f9d4fc7cd55f6c0527cd34d04.tar.gz | |
Merge remote-tracking branch 'origin/maint'
* origin/maint: (43 commits)
maint: post-release administrivia
version 3.0.2
gnulib: update
output: do not generate source files when late errors are caught
output: record what generated files are source or report files
output: do not generate source files when early errors are caught
xml: also use "%empty" with html output
style: formatting changes
xml: also display %empty for empty right-hand sides
reports: display %empty in the generated pointed-rules
news: YYERROR vs variants
style: scope reduction in lalr.cc
lalr1.cc: formatting changes
lalr1.cc: fix the support of YYERROR with variants
tests: check $$'s destruction with variant, YYERROR, and no error recovery
tests: simplify useless obfuscation
skeletons: use better names when computing a "goto"
maint: post-release administrivia
version 3.0.1
aver: it is no longer "protected against NDEBUG"
...
Conflicts:
data/glr.c
Diffstat (limited to 'src/AnnotationList.c')
| -rw-r--r-- | src/AnnotationList.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/AnnotationList.c b/src/AnnotationList.c index 9f0adb93..071a3f34 100644 --- a/src/AnnotationList.c +++ b/src/AnnotationList.c @@ -541,9 +541,13 @@ AnnotationList__compute_from_inadequacies ( { InadequacyList__prependTo (conflict_node, &inadequacy_lists[s->number]); - aver (AnnotationList__insertInto ( - annotation_node, &annotation_lists[s->number], - s->nitems)); + { + bool b = + AnnotationList__insertInto (annotation_node, + &annotation_lists[s->number], + s->nitems); + aver (b); + } /* This aver makes sure the AnnotationList__computeDominantContribution check above does discard annotations in the simplest case of a S/R |