In the grammar file, the first column is 1 not 0 on the first line as

[bison.git] / src / scan-gram.l

diff --git a/src/scan-gram.l b/src/scan-gram.l
index 1af1fac66e58233b2e5e82c88aa959a8bdf9a2e6..d5d92c4c51e439f87f6e3d2f09e4c8d4ad969c87 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -54,7 +54,7 @@
    code_start = scanner_cursor = loc->start;           \
 
 /* Location of scanner cursor.  */
    code_start = scanner_cursor = loc->start;           \
 
 /* Location of scanner cursor.  */

-boundary scanner_cursor;
+static boundary scanner_cursor;

 
 #define YY_USER_ACTION  location_compute (loc, &scanner_cursor, yytext, yyleng);
 
 
 #define YY_USER_ACTION  location_compute (loc, &scanner_cursor, yytext, yyleng);
 


@@ -164,6 +164,8 @@ splice       (\\[ \f\t\v]*\n)*
   `----------------------------*/
 <INITIAL>
 {
   `----------------------------*/
 <INITIAL>
 {

+  "%after-header"                   return PERCENT_AFTER_HEADER;
+  "%before-header"                  return PERCENT_BEFORE_HEADER;

   "%binary"                        return PERCENT_NONASSOC;
   "%debug"                         return PERCENT_DEBUG;
   "%default"[-_]"prec"             return PERCENT_DEFAULT_PREC;
   "%binary"                        return PERCENT_NONASSOC;
   "%debug"                         return PERCENT_DEBUG;
   "%default"[-_]"prec"             return PERCENT_DEFAULT_PREC;


@@ -171,6 +173,7 @@ splice       (\\[ \f\t\v]*\n)*
   "%defines"                       return PERCENT_DEFINES;
   "%destructor"                            return PERCENT_DESTRUCTOR;
   "%dprec"                         return PERCENT_DPREC;
   "%defines"                       return PERCENT_DEFINES;
   "%destructor"                            return PERCENT_DESTRUCTOR;
   "%dprec"                         return PERCENT_DPREC;

+  "%end-header"                     return PERCENT_END_HEADER;

   "%error"[-_]"verbose"            return PERCENT_ERROR_VERBOSE;
   "%expect"                        return PERCENT_EXPECT;
   "%expect"[-_]"rr"                return PERCENT_EXPECT_RR;
   "%error"[-_]"verbose"            return PERCENT_ERROR_VERBOSE;
   "%expect"                        return PERCENT_EXPECT;
   "%expect"[-_]"rr"                return PERCENT_EXPECT_RR;


@@ -197,6 +200,7 @@ splice       (\\[ \f\t\v]*\n)*
   "%right"                         return PERCENT_RIGHT;
   "%skeleton"                      return PERCENT_SKELETON;
   "%start"                         return PERCENT_START;
   "%right"                         return PERCENT_RIGHT;
   "%skeleton"                      return PERCENT_SKELETON;
   "%start"                         return PERCENT_START;

+  "%start-header"                   return PERCENT_START_HEADER;

   "%term"                          return PERCENT_TOKEN;
   "%token"                         return PERCENT_TOKEN;
   "%token"[-_]"table"              return PERCENT_TOKEN_TABLE;
   "%term"                          return PERCENT_TOKEN;
   "%token"                         return PERCENT_TOKEN;
   "%token"[-_]"table"              return PERCENT_TOKEN_TABLE;


@@ -239,8 +243,6 @@ splice       (\\[ \f\t\v]*\n)*
 
   /* Code in between braces.  */
   "{" {
 
   /* Code in between braces.  */
   "{" {

-    if (current_rule && current_rule->action)
-      grammar_midrule_action ();

     STRING_GROW;
     braces_level = 0;
     code_start = loc->start;
     STRING_GROW;
     braces_level = 0;
     code_start = loc->start;


@@ -361,7 +363,6 @@ splice       (\\[ \f\t\v]*\n)*
 <SC_ESCAPED_CHARACTER>
 {
   "'" {
 <SC_ESCAPED_CHARACTER>
 {
   "'" {

-    unsigned char last_string_1;

     STRING_GROW;
     STRING_FINISH;
     loc->start = token_start;
     STRING_GROW;
     STRING_FINISH;
     loc->start = token_start;