* tests/input.at (Invalid $n, Invalid @n): Add the ending `;'.

* tests/output.at (AT_CHECK_OUTPUT): Likewise.
* tests/headers.at (AT_TEST_CPP_GUARD_H): Ditto.
* tests/semantic.at (Parsing Guards): Similarly.
* src/reader.at (readgram): Complain if the last rule is not ended
with a semi-colon.

diff --git a/ChangeLog b/ChangeLog
index 8b1988d4f341a888553064bd986c0b5e1ebd862c..e05aaa51492a6c627a213eeeb0b2e779560a3096 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-03-04  Akim Demaille  <akim@epita.fr>
+
+       * tests/input.at (Invalid $n, Invalid @n): Add the ending `;'.
+       * tests/output.at (AT_CHECK_OUTPUT): Likewise.
+       * tests/headers.at (AT_TEST_CPP_GUARD_H): Ditto.
+       * tests/semantic.at (Parsing Guards): Similarly.
+       * src/reader.at (readgram): Complain if the last rule is not ended
+       with a semi-colon.
+
 2002-03-04  Akim Demaille  <akim@epita.fr>
 
        * src/warshall.h, src/warshall.c (bitmatrix_print): Move to...
@@ -5750,3 +5759,5 @@
 1987-12-16  Richard Stallman  <rms@gnu.org>
 
        * REFERENCES: entered into RCS
+
+       $Revision$ $Date$

diff --git a/src/reader.c b/src/reader.c
index 5f2419ff0a4ed8fa45ed5eef358bc7f590c62404..ce9c34f070a523eaae3808aeacef597868838715 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1445,6 +1445,8 @@ readgram (void)
        /* Warn if there is no default for $$ but we need one.  */
        else if (!xactions && !first_rhs && lhs->type_name != 0)
          complain (_("empty rule for typed nonterminal, and no action"));
+       if (t == tok_two_percents || t == tok_eof)
+         complain (_("previous rule lacks an ending `;'"));
        if (t == tok_semicolon)
          t = lex ();
       }

diff --git a/tests/headers.at b/tests/headers.at
index fb04301519b484b330b67e74003c8d018aee2e3e..122e58460f63a3815292ef3a4ccaebda3c2f4931 100644 (file)
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -57,7 +57,7 @@ AS_MKDIR_P([$dirname])
 
 AT_DATA([$1.y],
 [%%
-dummy:
+dummy:;
 ])
 
 AT_CHECK([bison --defines=$1.h $1.y])

diff --git a/tests/input.at b/tests/input.at
index 978affc598d7dda88b3160507a7feefa03ab96cd..2ee59f29f7b9cd7166209e040415db6eb536e50e 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -29,7 +29,7 @@ AT_SETUP([Invalid $n])
 
 AT_DATA([input.y],
 [[%%
-exp: { $$ = $1 ; }
+exp: { $$ = $1 ; };
 ]])
 
 AT_CHECK([bison input.y], [1], [],
@@ -48,7 +48,7 @@ AT_SETUP([Invalid @n])
 
 AT_DATA([input.y],
 [[%%
-exp: { @$ = @1 ; }
+exp: { @$ = @1 ; };
 ]])
 
 AT_CHECK([bison input.y], [1], [],

diff --git a/tests/output.at b/tests/output.at
index 4332372dd781f839c940e615a5bfe0e4b2e4bb8e..147e8b28addf0d9f43ea902604163a6b9ddf65a1 100644 (file)
--- a/tests/output.at
+++ b/tests/output.at
@@ -26,7 +26,7 @@ m4_define([AT_CHECK_OUTPUT],
 AT_DATA([$1],
 [[$2
 %%
-foo: {}
+foo: {};
 ]])
 
 AT_CHECK([bison $3 $1], 0)

diff --git a/tests/regression.at b/tests/regression.at
index d0e751513ee3cb49f7b9e072a474a1cca7459873..7517b931e8278335b4a0082eda14e2ee5235261f 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -103,7 +103,7 @@ AT_DATA([input.y],
 [[/* Bison used to swallow the character after `}'. */
 
 %%
-exp: { tests = {{{{{{{{{{}}}}}}}}}}; }
+exp: { tests = {{{{{{{{{{}}}}}}}}}}; };
 %%
 ]])
 
@@ -382,7 +382,7 @@ expr:
 
 {
 
-}
+};
 ]])
 
 AT_CHECK([bison input.y -o input.c -v], 0, [], [])

diff --git a/tests/semantic.at b/tests/semantic.at
index b03329d35eb23da412bfd25dc4c485195ff512b9..9f88352b7cb8b3aba622d45c03b21c2149be5ac1 100644 (file)
--- a/tests/semantic.at
+++ b/tests/semantic.at
@@ -38,7 +38,7 @@ AT_DATA([input.y],
 %%
 exp: exp '+' exp { $$ = $1 + $3 }
    | exp '/' exp %guard { if ($3 == 0) yyerror = 1 } { $$ = $1 / $3 }
-   | INT
+   | INT;
 %%
 ]])