* src/scan-gram.l: Move the "add a trailing ; to actions" code

to...
* src/scan-code.l: here.
* tests/input.at (Torturing the Scanner): Fix another location
error.

diff --git a/ChangeLog b/ChangeLog
index f0f0866b87cff3d1f65bd16ea9319a14ceddd6cf..5934557006e81e3b96ce303779b948929ffc1a05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-07  Akim Demaille  <akim@epita.fr>
+
+       * src/scan-gram.l: Move the "add a trailing ; to actions" code
+       to...
+       * src/scan-code.l: here.
+       * tests/input.at (Torturing the Scanner): Fix another location
+       error.
+

 2006-06-07  Akim Demaille  <akim@epita.fr>
 
        * src/Makefile.am (BUILT_SOURCES): Fix the trailing backslash.
 2006-06-07  Akim Demaille  <akim@epita.fr>
 
        * src/Makefile.am (BUILT_SOURCES): Fix the trailing backslash.

diff --git a/src/scan-code.l b/src/scan-code.l
index 70b250bc78c8bd1394bc6a1d40645edf7d524618..a24eecec0f6a362abd6eb551e859d13fff3ac9b3 100644 (file)
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -75,6 +75,9 @@ splice         (\\[ \f\t\v]*\n)*
 %%
 
 %{
 %%
 
 %{

+  /* Nesting level of the current code in braces.  */
+  int braces_level IF_LINT (= 0);
+

   /* This scanner is special: it is invoked only once, henceforth
      is expected to return only once.  This initialization is
      therefore done once per action to translate. */
   /* This scanner is special: it is invoked only once, henceforth
      is expected to return only once.  This initialization is
      therefore done once per action to translate. */


@@ -157,6 +160,30 @@ splice      (\\[ \f\t\v]*\n)*
     warn_at (*loc, _("stray `@'"));
     obstack_sgrow (&obstack_for_string, "@@");
   }
     warn_at (*loc, _("stray `@'"));
     obstack_sgrow (&obstack_for_string, "@@");
   }

+
+  "{"  STRING_GROW; ++braces_level;
+  "}"  {
+    bool outer_brace = --braces_level < 0;
+
+    /* As an undocumented Bison extension, append `;' before the last
+       brace in braced code, so that the user code can omit trailing
+       `;'.  But do not append `;' if emulating Yacc, since Yacc does
+       not append one.
+
+       FIXME: Bison should warn if a semicolon seems to be necessary
+       here, and should omit the semicolon if it seems unnecessary
+       (e.g., after ';', '{', or '}', each followed by comments or
+       white space).  Such a warning shouldn't depend on --yacc; it
+       should depend on a new --pedantic option, which would cause
+       Bison to warn if it detects an extension to POSIX.  --pedantic
+       should also diagnose other Bison extensions like %yacc.
+       Perhaps there should also be a GCC-style --pedantic-errors
+       option, so that such warnings are diagnosed as errors.  */
+    if (outer_brace && ! yacc_flag)
+      obstack_1grow (&obstack_for_string, ';');
+
+    STRING_GROW;
+  }

 }
 
 <SC_SYMBOL_ACTION>
 }
 
 <SC_SYMBOL_ACTION>

diff --git a/src/scan-gram.l b/src/scan-gram.l
index 329e5087956e3f7d405f4ebe498a797fc51e4bd4..dbe40b9c13bc8ba6c81cf587037c8fb72c54b97a 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -46,7 +46,7 @@
 #include "scan-gram.h"
 
 #define YY_DECL GRAM_LEX_DECL
 #include "scan-gram.h"
 
 #define YY_DECL GRAM_LEX_DECL

-   
+

 #define YY_USER_INIT                                   \
    code_start = scanner_cursor = loc->start;           \
 
 #define YY_USER_INIT                                   \
    code_start = scanner_cursor = loc->start;           \
 


@@ -543,28 +543,10 @@ splice     (\\[ \f\t\v]*\n)*
   "{"|"<"{splice}"%"  STRING_GROW; braces_level++;
   "%"{splice}">"      STRING_GROW; braces_level--;
   "}" {
   "{"|"<"{splice}"%"  STRING_GROW; braces_level++;
   "%"{splice}">"      STRING_GROW; braces_level--;
   "}" {

-    bool outer_brace = --braces_level < 0;
-
-    /* As an undocumented Bison extension, append `;' before the last
-       brace in braced code, so that the user code can omit trailing
-       `;'.  But do not append `;' if emulating Yacc, since Yacc does
-       not append one.
-
-       FIXME: Bison should warn if a semicolon seems to be necessary
-       here, and should omit the semicolon if it seems unnecessary
-       (e.g., after ';', '{', or '}', each followed by comments or
-       white space).  Such a warning shouldn't depend on --yacc; it
-       should depend on a new --pedantic option, which would cause
-       Bison to warn if it detects an extension to POSIX.  --pedantic
-       should also diagnose other Bison extensions like %yacc.
-       Perhaps there should also be a GCC-style --pedantic-errors
-       option, so that such warnings are diagnosed as errors.  */
-    if (outer_brace && token_type == BRACED_CODE && ! yacc_flag)
-      obstack_1grow (&obstack_for_string, ';');
-

     obstack_1grow (&obstack_for_string, '}');
 
     obstack_1grow (&obstack_for_string, '}');
 

-    if (outer_brace)
+    --braces_level;
+    if (braces_level < 0)

       {
        STRING_FINISH;
        loc->start = code_start;
       {
        STRING_FINISH;
        loc->start = code_start;

diff --git a/tests/input.at b/tests/input.at
index afacd20156c9e86e5aa7067b7c1581f74058ae9e..973cfee125f442ad1ba92e827fc4ba6d2fdca90f 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -192,7 +192,7 @@ AT_DATA([input.y],
 [{}
 ])
 AT_CHECK([bison input.y], [1], [],
 [{}
 ])
 AT_CHECK([bison input.y], [1], [],

-[[input.y:1.1-2: syntax error, unexpected {...}
+[[input.y:1.0-1: syntax error, unexpected {...}

 ]])
 
 
 ]])