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

diff --git a/ChangeLog b/ChangeLog
index 0f7c6a1ea72ab9db4ed2546ba5271b7f52e723af..974ddd24c766b5c91fe595ab57b6f2ecf222f3da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-06-03  Akim Demaille  <akim@epita.fr>
+
+       * 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  <akim@epita.fr>
 
        * data/bison.c++: Use C++ ostreams.

diff --git a/src/conflicts.c b/src/conflicts.c
index 299327b047dfdbe5b52c4318b2d3e32c9adf579d..876310f5a143ba231c743cf3e29d40e8ce63cf70 100644 (file)
--- 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 b4f160f0d18d565703a23e7fff5826bf82073ed9..fee3ff97b726de003220c2101fd8f9e6d6cc32ef 100644 (file)
--- 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 901886c01832765514c903b5ddaf809217814abd..7d344a6a5695da36cfd32ab99ac67d5533bdc6d8 100644 (file)
--- 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 be336079bb91df718c6dd386eb9ed0d609db4b65..b624cdfbebf1110e96af66496657c7efbdde5ba0 100644 (file)
--- 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"
 
 %{