From 86eff18354964702e7f32d8b1550264efa573147 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 3 Jun 2002 07:30:03 +0000 Subject: [PATCH] * src/muscle_tab.c (muscle_find, muscle_insert): Don't initialize structs with non literals. * src/scan-skel.l: never-interactive. * src/conflicts.c (enum conflict_resolution_e): No trailing comma. * src/getargs.c (usage): Split long literal strings. Reported by Hans Aberg. --- ChangeLog | 10 ++++++++++ src/conflicts.c | 2 +- src/getargs.c | 5 ++++- src/muscle_tab.c | 6 ++++-- src/scan-skel.l | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f7c6a1e..974ddd24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-06-03 Akim Demaille + + * src/muscle_tab.c (muscle_find, muscle_insert): Don't initialize + structs with non literals. + * src/scan-skel.l: never-interactive. + * src/conflicts.c (enum conflict_resolution_e): No trailing + comma. + * src/getargs.c (usage): Split long literal strings. + Reported by Hans Aberg. + 2002-05-28 Akim Demaille * data/bison.c++: Use C++ ostreams. diff --git a/src/conflicts.c b/src/conflicts.c index 299327b0..876310f5 100644 --- a/src/conflicts.c +++ b/src/conflicts.c @@ -48,7 +48,7 @@ enum conflict_resolution_e reduce_resolution, left_resolution, right_resolution, - nonassoc_resolution, + nonassoc_resolution }; diff --git a/src/getargs.c b/src/getargs.c index b4f160f0..fee3ff97 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -137,7 +137,10 @@ Output:\n\ -b, --file-prefix=PREFIX specify a PREFIX for output files\n\ -o, --output=FILE leave output to FILE\n\ -g, --graph also produce a VCG description of the automaton\n\ -\n\ +"), stream); + putc ('\n', stream); + + fputs (_("\ THINGS is a list of comma separated words that can include:\n\ `state' describe the states\n\ `itemset' complete the core item sets with their closure\n\ diff --git a/src/muscle_tab.c b/src/muscle_tab.c index 901886c0..7d344a6a 100644 --- a/src/muscle_tab.c +++ b/src/muscle_tab.c @@ -72,7 +72,8 @@ muscle_init (void) void muscle_insert (const char *key, const char *value) { - muscle_entry_t pair = { key, NULL }; + muscle_entry_t pair; + pair.key = key; muscle_entry_t *entry = hash_lookup (muscle_table, &pair); if (!entry) @@ -88,7 +89,8 @@ muscle_insert (const char *key, const char *value) const char* muscle_find (const char *key) { - muscle_entry_t pair = { key, NULL }; + muscle_entry_t pair; + pair.key = key; muscle_entry_t *result = hash_lookup (muscle_table, &pair); return result ? result->value : NULL; } diff --git a/src/scan-skel.l b/src/scan-skel.l index be336079..b624cdfb 100644 --- a/src/scan-skel.l +++ b/src/scan-skel.l @@ -18,7 +18,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -%option nodefault noyywrap nounput +%option nodefault noyywrap nounput never-interactive %option prefix="skel_" outfile="lex.yy.c" %{ -- 2.47.2