Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-21 18:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make previous patch more robust.

Browse Source 
* src/output.c (ARRAY_CARDINALITY): New macro, copied from
argmatch.h.
(output_skeleton): Use it.
Suggested by Akim Demaille.

Signed-off-by: Eric Blake <ebb9@byu.net>
(cherry picked from commit 1266b63674)
This commit is contained in:
Eric Blake
2009-08-20 16:54:07 -06:00
parent d8911864c2
commit b0778bdd0c
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ChangeLog
View File

@@ -1,5 +1,11 @@
2009-08-20 Eric Blake <ebb9@byu.net> 2009-08-20 Eric Blake <ebb9@byu.net>
Make previous patch more robust.
* src/output.c (ARRAY_CARDINALITY): New macro, copied from
argmatch.h.
(output_skeleton): Use it.
Suggested by Akim Demaille.
Import latest m4/m4.m4. Import latest m4/m4.m4.
* submodules/autoconf: Update to autoconf 2.64. * submodules/autoconf: Update to autoconf 2.64.
* configure.ac (M4_GNU_OPTION): New define. * configure.ac (M4_GNU_OPTION): New define.
@@ -121,12 +127,12 @@
that perfectly supported Bison mo files. Lower the requirement. that perfectly supported Bison mo files. Lower the requirement.
http://lists.gnu.org/archive/html/bug-bison/2009-08/msg00006.html http://lists.gnu.org/archive/html/bug-bison/2009-08/msg00006.html
* configure.ac: Require need-ngettext instead of * configure.ac: Require need-ngettext instead of
need-formatstring-macros. need-formatstring-macros.
Reported by Martin Jabocs. Reported by Martin Jabocs.
Suggested by Bruno Haible. Suggested by Bruno Haible.
* INSTALL: Restructure. * INSTALL: Restructure.
(Internationalization): New. (Internationalization): New.
2009-08-14 Joel E. Denny <jdenny@clemson.edu> 2009-08-14 Joel E. Denny <jdenny@clemson.edu>
@@ -223,7 +229,7 @@
distcheck: fix. distcheck: fix.
* examples/calc++/Makefile.am: (EXTRA_DIST): Ship calc.stamp. * examples/calc++/Makefile.am: (EXTRA_DIST): Ship calc.stamp.
2009-08-10 Joel E. Denny <jdenny@clemson.edu> 2009-08-10 Joel E. Denny <jdenny@clemson.edu>
@@ -553,13 +559,13 @@
2009-06-10 Akim Demaille <demaille@gostai.com> 2009-06-10 Akim Demaille <demaille@gostai.com>
gnulib: update. gnulib: update.
* gnulib: Update to latest. * gnulib: Update to latest.
* lib/.cvsignore, lib/.gitignore, m4/.cvsignore, * lib/.cvsignore, lib/.gitignore, m4/.cvsignore,
* m4/.gitignore: Regen. * m4/.gitignore: Regen.
* src/symtab.c (symbol_from_uniqstr, semantic_type_from_uniqstr): * src/symtab.c (symbol_from_uniqstr, semantic_type_from_uniqstr):
Call xalloc_die on hash_insert failures. Call xalloc_die on hash_insert failures.
Requested by the new __warn_unused_result__ attribute of Requested by the new __warn_unused_result__ attribute of
hash_insert. hash_insert.
2009-06-10 Akim Demaille <demaille@gostai.com> 2009-06-10 Akim Demaille <demaille@gostai.com>

3
src/output.c
View File

@@ -21,6 +21,7 @@
#include <config.h> #include <config.h>
#include "system.h" #include "system.h"
#include <assert.h>
#include <configmake.h> #include <configmake.h>
#include <error.h> #include <error.h>
#include <get-errno.h> #include <get-errno.h>
@@ -40,6 +41,7 @@
#include "symtab.h" #include "symtab.h"
#include "tables.h" #include "tables.h"
# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
static struct obstack format_obstack; static struct obstack format_obstack;
@@ -635,6 +637,7 @@ output_skeleton (void)
argv[i++] = full_m4bison; argv[i++] = full_m4bison;
argv[i++] = full_skeleton; argv[i++] = full_skeleton;
argv[i++] = NULL; argv[i++] = NULL;
assert (i <= ARRAY_CARDINALITY (argv));
} }
init_subpipe (); init_subpipe ();