* src/reader.c (copy_action): When --yacc, don't append a `;'

to the user action: let it fail if lacking.
Suggested by Aharon Robbins and Tom Tromey.

diff --git a/ChangeLog b/ChangeLog
index 8a080141bb0e682ece62c8546c262496546f6c90..d1f758fb7142dda95d289145b07d3e720cdc61ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-15  Akim Demaille  <akim@epita.fr>
+
+       * src/reader.c (copy_action): When --yacc, don't append a `;'
+       to the user action: let it fail if lacking.
+       Suggested by Aharon Robbins and Tom Tromey.
+
 2001-12-14  Akim Demaille  <akim@epita.fr>
 
        * src/lex.c (literalchar): Simply return the char you decoded, non

diff --git a/THANKS b/THANKS
index e0ae913f053258836e32d35c18b2c92d15106c1b..195a04639ab255764f1046f510840b00b52fb6b7 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -2,6 +2,7 @@ Bison was originally written by Robert Corbett.  It would not be what
 it is today without the invaluable help of these people:
 
 Airy Andre              Airy.Andre@edf.fr
+Aharon Robbins          arnold@gnu.org
 Akim Demaille           akim@freefriends.org
 Albert Chin-A-Young     china@thewrittenword.com
 Alexander Belopolsky    alexb@rentec.com
@@ -28,6 +29,7 @@ Richard Stallman        rms@gnu.org
 Robert Anisko           anisko_r@epita.fr
 Shura                   debil_urod@ngs.ru
 Tom Lane                tgl@sss.pgh.pa.us
+Tom Tromey              tromey@cygnus.com
 Wolfram Wagner          ww@mpi-sb.mpg.de
 Wwp                     subscript@free.fr
 

diff --git a/src/reader.c b/src/reader.c
index 53b8b3de748f2591c2d25058150fb1acae294d96..cfcab0685fdbe66e3c6910cd6e9f437b9cfe4c4e 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1198,7 +1198,13 @@ copy_action (symbol_list *rule, int stack_offset)
        }
     }
 
-  obstack_sgrow (&action_obstack, ";\n    break;}");
+  /* As a Bison extension, add the ending semicolon.  Since some Yacc
+     don't do that, help people using bison as a Yacc finding their
+     missing semicolons.  */
+  if (yacc_flag)
+    obstack_sgrow (&action_obstack, "}\n    break;");
+  else
+    obstack_sgrow (&action_obstack, ";\n    break;}");
 }
 \f
 /*-------------------------------------------------------------------.