* NEWS: Bison now warns if it finds a stray `$' or `@' in an action.

* src/scan-gram.l (<SC_BRACED_CODE>[$@]): Implement this.

diff --git a/ChangeLog b/ChangeLog
index ace626ad10897a068629b4185b475f6bf8636786..80bd02c583df4ee389052c02f138c8bc55b10a50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
+2005-10-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * NEWS: Bison now warns if it finds a stray `$' or `@' in an action.
+       * src/scan-gram.l (<SC_BRACED_CODE>[$@]): Implement this.
+
 2005-10-13  Akim Demaille  <akim@epita.fr>
 
        * src/scan-skel.l: Output the base name parts of the parser and
        header file names.
-       * tests/output.at (AT_CHECK_OUTPUT): Support subdirectorioes, and
+       * tests/output.at (AT_CHECK_OUTPUT): Support subdirectories, and
        additional checks.
        Use this to exercise C++ outputs in subdirs.
        Reported by Oleg Smolsky.

diff --git a/NEWS b/NEWS
index 90cc34715c608fb239359a6aa5aaa0cacafbf730..2ab95345109392bae414f129aa9bea4e2d371f3f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ Bison News
 
 Changes in version 2.1a:
 
-* DJGPP support added.
+* Bison now warns if it finds a stray `$' or `@' in an action.
 
 * %require "VERSION"
   To specify that the grammar file depends on features implemented in
@@ -23,6 +23,8 @@ Changes in version 2.1a:
   If you wish to update, then make sure older version of Bison will
   fail using `%require "2.1a"'.
 
+* DJGPP support added.
+
 Changes in version 2.1, 2005-09-16:
 
 * Bison-generated parsers now support the translation of diagnostics like

diff --git a/src/scan-gram.l b/src/scan-gram.l
index 70d56ee90ec48f11d13968fe2b32b68dbdd1a9f1..3c7d37c484d5932102804351b097cce301058175 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -618,6 +618,15 @@ splice      (\\[ \f\t\v]*\n)*
   "$"("<"{tag}">")?(-?[0-9]+|"$")  handle_dollar (token_type, yytext, *loc);
   "@"(-?[0-9]+|"$")               handle_at (token_type, yytext, *loc);
 
+  "$"  {
+    warn_at (*loc, _("stray `$'"));
+    obstack_sgrow (&obstack_for_string, "$][");
+  }
+  "@"  {
+    warn_at (*loc, _("stray `@'"));
+    obstack_sgrow (&obstack_for_string, "@@");
+  }
+
   <<EOF>>  unexpected_eof (code_start, "}"); BEGIN INITIAL;
 }