Update.

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

diff --git a/src/scan-gram.l b/src/scan-gram.l
index e7ceecac338d338026dd882f7a5f3ad5d8305c5d..ef3976af3903f966c9396ce4e74db52b1344b41a 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -31,27 +31,30 @@
 #include "reader.h"
 
 /* Each time we match a string, move the end cursor to its end. */
 #include "reader.h"
 
 /* Each time we match a string, move the end cursor to its end. */

-#define YY_USER_ACTION  LOCATION_COLUMNS (*yylloc, yyleng)
-#define YY_LINES        LOCATION_LINES (*yylloc, yyleng); lineno += yyleng;
-#define YY_STEP         LOCATION_STEP (*yylloc)
-
+#define YY_USER_INIT                           \
+do {                                           \
+  LOCATION_RESET (*yylloc);                    \
+  yylloc->file = infile;                       \
+   /* This is only to avoid GCC warnings. */   \
+  if (yycontrol) {;};                          \
+} while (0)
+
+#define YY_USER_ACTION  LOCATION_COLUMNS (*yylloc, yyleng);
+#define YY_LINES        LOCATION_LINES (*yylloc, yyleng);
+#define YY_STEP         LOCATION_STEP (*yylloc);

 
 /* STRING_OBSTACK -- Used to store all the characters that we need to
    keep (to construct ID, STRINGS etc.).  Use the following macros to
    use it.
 
 
 /* STRING_OBSTACK -- Used to store all the characters that we need to
    keep (to construct ID, STRINGS etc.).  Use the following macros to
    use it.
 

-   Use YY_OBS_INIT to initialize a new growing string, YY_OBS_GROW to
-   append what has just been matched, and YY_OBS_FINISH to end the
-   string (it puts the ending 0).  YY_OBS_FINISH also stores this
-   string in LAST_STRING, which can be used, and which is used by
-   YY_OBS_FREE to free the last string.  */
+   Use YY_OBS_GROW to append what has just been matched, and
+   YY_OBS_FINISH to end the string (it puts the ending 0).
+   YY_OBS_FINISH also stores this string in LAST_STRING, which can be
+   used, and which is used by YY_OBS_FREE to free the last string.  */

 
 static struct obstack string_obstack;
 char *last_string;
 
 
 static struct obstack string_obstack;
 char *last_string;
 

-#define YY_OBS_INIT   \
-  obstack_init (&string_obstack)
-

 #define YY_OBS_GROW   \
   obstack_grow (&string_obstack, yytext, yyleng)
 
 #define YY_OBS_GROW   \
   obstack_grow (&string_obstack, yytext, yyleng)
 


@@ -59,7 +62,6 @@ char *last_string;
   do {                                                 \
     obstack_1grow (&string_obstack, '\0');             \
     last_string = obstack_finish (&string_obstack);    \
   do {                                                 \
     obstack_1grow (&string_obstack, '\0');             \
     last_string = obstack_finish (&string_obstack);    \

-    yylval->string = last_string;                      \

   } while (0)
 
 #define YY_OBS_FREE                                            \
   } while (0)
 
 #define YY_OBS_FREE                                            \


@@ -67,15 +69,20 @@ char *last_string;
     obstack_free (&string_obstack, last_string);               \
   } while (0)
 
     obstack_free (&string_obstack, last_string);               \
   } while (0)
 

-/* This is only to avoid GCC warnings. */
-#define YY_USER_INIT    if (yycontrol) {;};
+void
+scanner_last_string_free (void)
+{
+  YY_OBS_FREE;
+}

 
 
 static int braces_level = 0;
 static int percent_percent_count = 0;
 
 
 
 static int braces_level = 0;
 static int percent_percent_count = 0;
 

-static void handle_dollar PARAMS ((char *cp));
-static void handle_at PARAMS ((char *cp));
+static void handle_dollar PARAMS ((braced_code_t code_kind,
+                                  char *cp, location_t location));
+static void handle_at PARAMS ((braced_code_t code_kind,
+                              char *cp, location_t location));

 
 %}
 %x SC_COMMENT
 
 %}
 %x SC_COMMENT


@@ -83,7 +90,7 @@ static void handle_at PARAMS ((char *cp));
 %x SC_ESCAPED_STRING SC_ESCAPED_CHARACTER
 %x SC_BRACED_CODE SC_PROLOGUE SC_EPILOGUE
 
 %x SC_ESCAPED_STRING SC_ESCAPED_CHARACTER
 %x SC_BRACED_CODE SC_PROLOGUE SC_EPILOGUE
 

-id      [.a-zA-Z][.a-zA-Z_0-9]*
+id      [.a-zA-Z_][.a-zA-Z_0-9]*

 int     [0-9]+
 eols     (\n|\r|\n\r|\r\n)+
 blanks   [ \t\f]+
 int     [0-9]+
 eols     (\n|\r|\n\r|\r\n)+
 blanks   [ \t\f]+


@@ -94,7 +101,7 @@ blanks   [ \t\f]+
      start of the next token.  */
 #define TR_POS 0
 #if TR_POS
      start of the next token.  */
 #define TR_POS 0
 #if TR_POS

-  fprintf (stderr, "FOO1: ");
+  fprintf (stderr, "FOO1: %p: ", yylloc);

   LOCATION_PRINT (stderr, *yylloc);
   fprintf (stderr, "\n");
 #endif
   LOCATION_PRINT (stderr, *yylloc);
   fprintf (stderr, "\n");
 #endif


@@ -116,18 +123,23 @@ blanks   [ \t\f]+
   "%debug"                return PERCENT_DEBUG;
   "%define"               return PERCENT_DEFINE;
   "%defines"              return PERCENT_DEFINES;
   "%debug"                return PERCENT_DEBUG;
   "%define"               return PERCENT_DEFINE;
   "%defines"              return PERCENT_DEFINES;

+  "%destructor"           return PERCENT_DESTRUCTOR;
+  "%dprec"               return PERCENT_DPREC;

   "%error"[-_]"verbose"   return PERCENT_ERROR_VERBOSE;
   "%expect"               return PERCENT_EXPECT;
   "%file-prefix"          return PERCENT_FILE_PREFIX;
   "%fixed"[-_]"output"[-_]"files"   return PERCENT_YACC;
   "%error"[-_]"verbose"   return PERCENT_ERROR_VERBOSE;
   "%expect"               return PERCENT_EXPECT;
   "%file-prefix"          return PERCENT_FILE_PREFIX;
   "%fixed"[-_]"output"[-_]"files"   return PERCENT_YACC;

+  "%glr"[-_]"parser"     return PERCENT_GLR_PARSER;

   "%left"                 return PERCENT_LEFT;
   "%locations"            return PERCENT_LOCATIONS;
   "%left"                 return PERCENT_LEFT;
   "%locations"            return PERCENT_LOCATIONS;

+  "%merge"               return PERCENT_MERGE;

   "%name"[-_]"prefix"     return PERCENT_NAME_PREFIX;
   "%no"[-_]"lines"        return PERCENT_NO_LINES;
   "%nonassoc"             return PERCENT_NONASSOC;
   "%nterm"                return PERCENT_NTERM;
   "%output"               return PERCENT_OUTPUT;
   "%prec"                 return PERCENT_PREC;
   "%name"[-_]"prefix"     return PERCENT_NAME_PREFIX;
   "%no"[-_]"lines"        return PERCENT_NO_LINES;
   "%nonassoc"             return PERCENT_NONASSOC;
   "%nterm"                return PERCENT_NTERM;
   "%output"               return PERCENT_OUTPUT;
   "%prec"                 return PERCENT_PREC;

+  "%printer"              return PERCENT_PRINTER;

   "%pure"[-_]"parser"     return PERCENT_PURE_PARSER;
   "%right"                return PERCENT_RIGHT;
   "%skeleton"             return PERCENT_SKELETON;
   "%pure"[-_]"parser"     return PERCENT_PURE_PARSER;
   "%right"                return PERCENT_RIGHT;
   "%skeleton"             return PERCENT_SKELETON;


@@ -148,32 +160,36 @@ blanks   [ \t\f]+
   {eols}      YY_LINES; YY_STEP;
   {blanks}    YY_STEP;
   {id}        {
   {eols}      YY_LINES; YY_STEP;
   {blanks}    YY_STEP;
   {id}        {

-    YY_OBS_INIT; YY_OBS_GROW; YY_OBS_FINISH;
-    yylval->symbol = getsym (last_string);
-    YY_OBS_FREE;
+    yylval->symbol = symbol_get (yytext, *yylloc);

     return ID;
   }
 
   {int}       yylval->integer = strtol (yytext, 0, 10); return INT;
 
   /* Characters.  We don't check there is only one.  */
     return ID;
   }
 
   {int}       yylval->integer = strtol (yytext, 0, 10); return INT;
 
   /* Characters.  We don't check there is only one.  */

-  \'          YY_OBS_INIT; YY_OBS_GROW; yy_push_state (SC_ESCAPED_CHARACTER);
+  "'"         YY_OBS_GROW; yy_push_state (SC_ESCAPED_CHARACTER);

 
   /* Strings. */
 
   /* Strings. */

-  \"          YY_OBS_INIT; YY_OBS_GROW; yy_push_state (SC_ESCAPED_STRING);
+  "\""        YY_OBS_GROW; yy_push_state (SC_ESCAPED_STRING);

 
   /* Comments. */
   "/*"        yy_push_state (SC_COMMENT);
   "//".*      YY_STEP;
 
   /* Prologue. */
 
   /* Comments. */
   "/*"        yy_push_state (SC_COMMENT);
   "//".*      YY_STEP;
 
   /* Prologue. */

-  "%{"        YY_OBS_INIT; yy_push_state (SC_PROLOGUE);
+  "%{"        yy_push_state (SC_PROLOGUE);

 
   /* Code in between braces.  */
 
   /* Code in between braces.  */

-  "{"         YY_OBS_INIT; YY_OBS_GROW; ++braces_level; yy_push_state (SC_BRACED_CODE);
+  "{"         YY_OBS_GROW; ++braces_level; yy_push_state (SC_BRACED_CODE);

 
   /* A type. */
 
   /* A type. */

-  "<"[^>]+">" YY_OBS_INIT; obstack_grow (&string_obstack, yytext + 1, yyleng - 2); YY_OBS_FINISH; return TYPE;
+  "<"[^>]+">" {
+    obstack_grow (&string_obstack, yytext + 1, yyleng - 2);
+    YY_OBS_FINISH;
+    yylval->string = last_string;
+    return TYPE;
+  }
+

 
   "%%"   {
     if (++percent_percent_count == 2)
 
   "%%"   {
     if (++percent_percent_count == 2)


@@ -183,7 +199,7 @@ blanks   [ \t\f]+
 
   .           {
     LOCATION_PRINT (stderr, *yylloc);
 
   .           {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": invalid character: `%c'\n", *yytext);
+    fprintf (stderr, _(": invalid character: `%c'\n"), *yytext);

     YY_STEP;
   }
 }
     YY_STEP;
   }
 }


@@ -197,8 +213,8 @@ blanks   [ \t\f]+
 
 <SC_COMMENT,SC_STRING,SC_CHARACTER,SC_BRACED_CODE,SC_PROLOGUE,SC_EPILOGUE>
 {
 
 <SC_COMMENT,SC_STRING,SC_CHARACTER,SC_BRACED_CODE,SC_PROLOGUE,SC_EPILOGUE>
 {

-  \[          obstack_sgrow (&string_obstack, "@<:@");
-  \]          obstack_sgrow (&string_obstack, "@:>@");
+  \[          if (YY_START != SC_COMMENT) obstack_sgrow (&string_obstack, "@<:@");
+  \]          if (YY_START != SC_COMMENT) obstack_sgrow (&string_obstack, "@:>@");

 }
 
 
 }
 
 


@@ -227,7 +243,7 @@ blanks   [ \t\f]+
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a comment\n");
+    fprintf (stderr, _(": unexpected end of file in a comment\n"));

     yy_pop_state ();
   }
 }
     yy_pop_state ();
   }
 }


@@ -240,10 +256,11 @@ blanks   [ \t\f]+
 
 <SC_ESCAPED_STRING>
 {
 
 <SC_ESCAPED_STRING>
 {

-  \" {
+  "\"" {

     assert (yy_top_state () == INITIAL);
     YY_OBS_GROW;
     YY_OBS_FINISH;
     assert (yy_top_state () == INITIAL);
     YY_OBS_GROW;
     YY_OBS_FINISH;

+    yylval->string = last_string;

     yy_pop_state ();
     return STRING;
   }
     yy_pop_state ();
     return STRING;
   }


@@ -254,9 +271,10 @@ blanks   [ \t\f]+
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a string\n");
+    fprintf (stderr, _(": unexpected end of file in a string\n"));

     assert (yy_top_state () == INITIAL);
     YY_OBS_FINISH;
     assert (yy_top_state () == INITIAL);
     YY_OBS_FINISH;

+    yylval->string = last_string;

     yy_pop_state ();
     return STRING;
   }
     yy_pop_state ();
     return STRING;
   }


@@ -269,29 +287,31 @@ blanks   [ \t\f]+
 
 <SC_ESCAPED_CHARACTER>
 {
 
 <SC_ESCAPED_CHARACTER>
 {

-  \' {
+  "'" {

     YY_OBS_GROW;
     assert (yy_top_state () == INITIAL);
     {
       YY_OBS_FINISH;
     YY_OBS_GROW;
     assert (yy_top_state () == INITIAL);
     {
       YY_OBS_FINISH;

-      yylval->symbol = getsym (last_string);
-      symbol_class_set (yylval->symbol, token_sym);
-      symbol_user_token_number_set (yylval->symbol, last_string[1]);
+      yylval->symbol = symbol_get (last_string, *yylloc);
+      symbol_class_set (yylval->symbol, token_sym, *yylloc);
+      symbol_user_token_number_set (yylval->symbol,
+                                   (unsigned char) last_string[1], *yylloc);

       YY_OBS_FREE;
       yy_pop_state ();
       return ID;
     }
   }
 
       YY_OBS_FREE;
       yy_pop_state ();
       return ID;
     }
   }
 

-  [^\'\n\r\\]      YY_OBS_GROW;
+  [^\n\r\\] YY_OBS_GROW;

 
   {eols}    obstack_1grow (&string_obstack, '\n'); YY_LINES;
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);
 
   {eols}    obstack_1grow (&string_obstack, '\n'); YY_LINES;
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a character\n");
+    fprintf (stderr, _(": unexpected end of file in a character\n"));

     assert (yy_top_state () == INITIAL);
     YY_OBS_FINISH;
     assert (yy_top_state () == INITIAL);
     YY_OBS_FINISH;

+    yylval->string = last_string;

     yy_pop_state ();
     return CHARACTER;
   }
     yy_pop_state ();
     return CHARACTER;
   }


@@ -309,7 +329,7 @@ blanks   [ \t\f]+
     if (c > 255)
       {
        LOCATION_PRINT (stderr, *yylloc);
     if (c > 255)
       {
        LOCATION_PRINT (stderr, *yylloc);

-       fprintf (stderr, ": invalid escape: %s\n", yytext);
+       fprintf (stderr, _(": invalid escape: %s\n"), quote (yytext));

        YY_STEP;
       }
     else
        YY_STEP;
       }
     else


@@ -328,11 +348,13 @@ blanks   [ \t\f]+
   \\t  obstack_1grow (&string_obstack, '\t');
   \\v  obstack_1grow (&string_obstack, '\v');
   \\[\\""]   obstack_1grow (&string_obstack, yytext[1]);
   \\t  obstack_1grow (&string_obstack, '\t');
   \\v  obstack_1grow (&string_obstack, '\v');
   \\[\\""]   obstack_1grow (&string_obstack, yytext[1]);

-  \\.  {
+  \\(.|\n)     {

     LOCATION_PRINT (stderr, *yylloc);
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unrecognized escape: %s\n", yytext);
+    fprintf (stderr, _(": unrecognized escape: %s\n"), quote (yytext));

     YY_OBS_GROW;
   }
     YY_OBS_GROW;
   }

+  /* FLex wants this rule, in case of a `\<<EOF>>'. */
+  \\                   YY_OBS_GROW;

 }
 
 
 }
 
 


@@ -343,20 +365,22 @@ blanks   [ \t\f]+
 
 <SC_CHARACTER>
 {
 
 <SC_CHARACTER>
 {

-  \' {
+  "'" {

     YY_OBS_GROW;
     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }
 
     YY_OBS_GROW;
     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }
 

-  [^\[\]\'\n\r\\]      YY_OBS_GROW;
-  \\.                  YY_OBS_GROW;
+  [^\[\]\'\n\r\\]+     YY_OBS_GROW;
+  \\(.|\n)             YY_OBS_GROW;
+  /* FLex wants this rule, in case of a `\<<EOF>>'. */
+  \\                   YY_OBS_GROW;

 
   {eols}               YY_OBS_GROW; YY_LINES;
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);
 
   {eols}               YY_OBS_GROW; YY_LINES;
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a character\n");
+    fprintf (stderr, _(": unexpected end of file in a character\n"));

     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }
     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }


@@ -370,20 +394,22 @@ blanks   [ \t\f]+
 
 <SC_STRING>
 {
 
 <SC_STRING>
 {

-  \" {
+  "\"" {

     assert (yy_top_state () != INITIAL);
     YY_OBS_GROW;
     yy_pop_state ();
   }
 
   [^\[\]\"\n\r\\]+      YY_OBS_GROW;
     assert (yy_top_state () != INITIAL);
     YY_OBS_GROW;
     yy_pop_state ();
   }
 
   [^\[\]\"\n\r\\]+      YY_OBS_GROW;

-  \\.                   YY_OBS_GROW;
+  \\(.|\n)              YY_OBS_GROW;
+  /* FLex wants this rule, in case of a `\<<EOF>>'. */
+  \\                   YY_OBS_GROW;

 
   {eols}                YY_OBS_GROW; YY_LINES;
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);
 
   {eols}                YY_OBS_GROW; YY_LINES;
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a string\n");
+    fprintf (stderr, _(": unexpected end of file in a string\n"));

     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }
     assert (yy_top_state () != INITIAL);
     yy_pop_state ();
   }


@@ -397,14 +423,17 @@ blanks   [ \t\f]+
 <SC_BRACED_CODE,SC_PROLOGUE,SC_EPILOGUE>
 {
   /* Characters.  We don't check there is only one.  */
 <SC_BRACED_CODE,SC_PROLOGUE,SC_EPILOGUE>
 {
   /* Characters.  We don't check there is only one.  */

-  \'          YY_OBS_GROW; yy_push_state (SC_CHARACTER);
+  "'"         YY_OBS_GROW; yy_push_state (SC_CHARACTER);

 
   /* Strings. */
 
   /* Strings. */

-  \"          YY_OBS_GROW; yy_push_state (SC_STRING);
+  "\""        YY_OBS_GROW; yy_push_state (SC_STRING);

 
   /* Comments. */
   "/*"        YY_OBS_GROW; yy_push_state (SC_COMMENT);
   "//".*      YY_OBS_GROW;
 
   /* Comments. */
   "/*"        YY_OBS_GROW; yy_push_state (SC_COMMENT);
   "//".*      YY_OBS_GROW;

+
+  /* Not comments. */
+  "/"         YY_OBS_GROW;

 }
 
 
 }
 
 


@@ -421,16 +450,19 @@ blanks   [ \t\f]+
       {
        yy_pop_state ();
        YY_OBS_FINISH;
       {
        yy_pop_state ();
        YY_OBS_FINISH;

+       yylval->string = last_string;

        return BRACED_CODE;
       }
   }
 
   "{"                  YY_OBS_GROW; braces_level++;
 
        return BRACED_CODE;
       }
   }
 
   "{"                  YY_OBS_GROW; braces_level++;
 

-  "$"("<".*">")?(-?[0-9]+|"$") { handle_dollar (yytext); }
-  "@"(-?[0-9]+|"$")            { handle_at (yytext); }
+  "$"("<"[^>]+">")?(-?[0-9]+|"$") { handle_dollar (current_braced_code,
+                                                  yytext, *yylloc); }
+  "@"(-?[0-9]+|"$")               { handle_at (current_braced_code,
+                                              yytext, *yylloc); }

 
 

-  [^\[\]$/\'\"@\{\}\n\r]+ YY_OBS_GROW;
+  [^$@\[\]/\'\"\{\}\n\r]+ YY_OBS_GROW;

   {eols}       YY_OBS_GROW; YY_LINES;
 
   /* A lose $, or /, or etc. */
   {eols}       YY_OBS_GROW; YY_LINES;
 
   /* A lose $, or /, or etc. */


@@ -438,10 +470,11 @@ blanks   [ \t\f]+
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a braced code\n");
+    fprintf (stderr, _(": unexpected end of file in a braced code\n"));

     yy_pop_state ();
     YY_OBS_FINISH;
     yy_pop_state ();
     YY_OBS_FINISH;

-    return PROLOGUE;
+    yylval->string = last_string;
+    return BRACED_CODE;

   }
 
 }
   }
 
 }


@@ -456,21 +489,22 @@ blanks   [ \t\f]+
   "%}" {
     yy_pop_state ();
     YY_OBS_FINISH;
   "%}" {
     yy_pop_state ();
     YY_OBS_FINISH;

+    yylval->string = last_string;

     return PROLOGUE;
   }
 
     return PROLOGUE;
   }
 

-  [^\[\]%\n\r]+          YY_OBS_GROW;
-  "%"+[^%\}\n\r]+ YY_OBS_GROW;
-  {eols}         YY_OBS_GROW; YY_LINES;
+  [^%\[\]/\'\"\n\r]+ YY_OBS_GROW;
+  "%"                YY_OBS_GROW;
+  {eols}            YY_OBS_GROW; YY_LINES;

 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);
 
   <<EOF>> {
     LOCATION_PRINT (stderr, *yylloc);

-    fprintf (stderr, ": unexpected end of file in a prologue\n");
+    fprintf (stderr, _(": unexpected end of file in a prologue\n"));

     yy_pop_state ();
     YY_OBS_FINISH;
     yy_pop_state ();
     YY_OBS_FINISH;

+    yylval->string = last_string;

     return PROLOGUE;
   }
     return PROLOGUE;
   }

-

 }
 
 
 }
 
 


@@ -486,6 +520,7 @@ blanks   [ \t\f]+
   <<EOF>> {
     yy_pop_state ();
     YY_OBS_FINISH;
   <<EOF>> {
     yy_pop_state ();
     YY_OBS_FINISH;

+    yylval->string = last_string;

     return EPILOGUE;
   }
 }
     return EPILOGUE;
   }
 }


@@ -494,28 +529,18 @@ blanks   [ \t\f]+
 %%
 
 /*------------------------------------------------------------------.
 %%
 
 /*------------------------------------------------------------------.

-| CP is pointing to a wannabee semantic value (i.e., a `$').        |
+| TEXT is pointing to a wannabee semantic value (i.e., a `$').      |

 |                                                                   |
 | Possible inputs: $[<TYPENAME>]($|integer)                         |
 |                                                                   |
 | Output to the STRING_OBSTACK a reference to this semantic value.  |
 `------------------------------------------------------------------*/
 
 |                                                                   |
 | Possible inputs: $[<TYPENAME>]($|integer)                         |
 |                                                                   |
 | Output to the STRING_OBSTACK a reference to this semantic value.  |
 `------------------------------------------------------------------*/
 

-static void
-handle_dollar (char *cp)
+static inline void
+handle_action_dollar (char *text, location_t location)

 {
   const char *type_name = NULL;
 {
   const char *type_name = NULL;

-
-  /* RULE_LENGTH is the number of values in the current rule so far,
-     which says where to find `$0' with respect to the top of the
-     stack.  It is not the same as the rule->length in the case of mid
-     rule actions.  */
-  int rule_length = 0;
-  symbol_list *rhs;
-  for (rhs = current_rule->next; rhs; rhs = rhs->next)
-    ++rule_length;
-
-  ++cp;
+  char *cp = text + 1;

 
   /* Get the type name if explicit. */
   if (*cp == '<')
 
   /* Get the type name if explicit. */
   if (*cp == '<')


@@ -530,27 +555,33 @@ handle_dollar (char *cp)
   if (*cp == '$')
     {
       if (!type_name)
   if (*cp == '$')
     {
       if (!type_name)

-       type_name = get_type_name (0, current_rule);
+       type_name = symbol_list_n_type_name_get (current_rule, location, 0);

       if (!type_name && typed)
       if (!type_name && typed)

-       complain (_("$$ of `%s' has no declared type"),
-                 current_rule->sym->tag);
+       complain_at (location, _("$$ of `%s' has no declared type"),
+                    current_rule->sym->tag);

       if (!type_name)
        type_name = "";
       obstack_fgrow1 (&string_obstack,
                      "]b4_lhs_value([%s])[", type_name);
     }
       if (!type_name)
        type_name = "";
       obstack_fgrow1 (&string_obstack,
                      "]b4_lhs_value([%s])[", type_name);
     }

-  else if (isdigit (*cp) || *cp == '-')
+  else if (('0' <= *cp && *cp <= '9') || *cp == '-')

     {
     {

+      /* RULE_LENGTH is the number of values in the current rule so
+        far, which says where to find `$0' with respect to the top of
+        the stack.  It is not the same as the rule->length in the
+        case of mid rule actions.  */
+      int rule_length = symbol_list_length (current_rule->next);

       int n = strtol (cp, &cp, 10);
 
       if (n > rule_length)
       int n = strtol (cp, &cp, 10);
 
       if (n > rule_length)

-       complain (_("invalid value: %s%d"), "$", n);
+       complain_at (location, _("invalid value: %s%d"), "$", n);

       else
        {
          if (!type_name && n > 0)
       else
        {
          if (!type_name && n > 0)

-           type_name = get_type_name (n, current_rule);
+           type_name = symbol_list_n_type_name_get (current_rule, location,
+                                                    n);

          if (!type_name && typed)
          if (!type_name && typed)

-           complain (_("$%d of `%s' has no declared type"),
+           complain_at (location, _("$%d of `%s' has no declared type"),

                      n, current_rule->sym->tag);
          if (!type_name)
            type_name = "";
                      n, current_rule->sym->tag);
          if (!type_name)
            type_name = "";


@@ -561,49 +592,145 @@ handle_dollar (char *cp)
     }
   else
     {
     }
   else
     {

-      char buf[] = "$c";
-      buf[1] = *cp;
-      complain (_("%s is invalid"), quote (buf));
+      complain_at (location, _("%s is invalid"), quote (text));

     }
 }
 
     }
 }
 

-/*-------------------------------------------------------.
-| CP is pointing to a location (i.e., a `@').  Output to |
-| STRING_OBSTACK a reference to this location.           |
-`-------------------------------------------------------*/
+
+/*---------------------------------------------------------------.
+| TEXT is expexted tp be $$ in some code associated to a symbol: |
+| destructor or printer.                                         |
+`---------------------------------------------------------------*/
+
+static inline void
+handle_symbol_code_dollar (char *text, location_t location)
+{
+  char *cp = text + 1;
+  if (*cp == '$')
+    obstack_sgrow (&string_obstack, "]b4_dollar_dollar[");
+  else
+    complain_at (location, _("%s is invalid"), quote (text));
+}
+
+
+/*-----------------------------------------------------------------.
+| Dispatch onto handle_action_dollar, or handle_destructor_dollar, |
+| depending upon CODE_KIND.                                        |
+`-----------------------------------------------------------------*/

 
 static void
 
 static void

-handle_at (char *cp)
+handle_dollar (braced_code_t braced_code_kind,
+              char *text, location_t location)

 {
 {

-  /* RULE_LENGTH is the number of values in the current rule so far,
-     which says where to find `$0' with respect to the top of the
-     stack.  It is not the same as the rule->length in the case of mid
-     rule actions.  */
-  int rule_length = 0;
-  symbol_list *rhs;
-  for (rhs = current_rule->next; rhs; rhs = rhs->next)
-    ++rule_length;
+  switch (braced_code_kind)
+    {
+    case action_braced_code:
+      handle_action_dollar (text, location);
+      break;
+
+    case destructor_braced_code:
+    case printer_braced_code:
+      handle_symbol_code_dollar (text, location);
+      break;
+    }
+}

 
 

+
+/*------------------------------------------------------.
+| TEXT is a location token (i.e., a `@...').  Output to |
+| STRING_OBSTACK a reference to this location.          |
+`------------------------------------------------------*/
+
+static inline void
+handle_action_at (char *text, location_t location)
+{
+  char *cp = text + 1;

   locations_flag = 1;
   locations_flag = 1;

-  ++cp;

 
   if (*cp == '$')
     {
       obstack_sgrow (&string_obstack, "]b4_lhs_location[");
     }
 
   if (*cp == '$')
     {
       obstack_sgrow (&string_obstack, "]b4_lhs_location[");
     }

-  else if (isdigit (*cp) || *cp == '-')
+  else if (('0' <= *cp && *cp <= '9') || *cp == '-')

     {
     {

+      /* RULE_LENGTH is the number of values in the current rule so
+        far, which says where to find `$0' with respect to the top of
+        the stack.  It is not the same as the rule->length in the
+        case of mid rule actions.  */
+      int rule_length = symbol_list_length (current_rule->next);

       int n = strtol (cp, &cp, 10);
       int n = strtol (cp, &cp, 10);

+

       if (n > rule_length)
       if (n > rule_length)

-       complain (_("invalid value: %s%d"), "@", n);
+       complain_at (location, _("invalid value: %s%d"), "@", n);

       else
        obstack_fgrow2 (&string_obstack, "]b4_rhs_location([%d], [%d])[",
                        rule_length, n);
     }
   else
     {
       else
        obstack_fgrow2 (&string_obstack, "]b4_rhs_location([%d], [%d])[",
                        rule_length, n);
     }
   else
     {

-      char buf[] = "@c";
-      buf[1] = *cp;
-      complain (_("%s is invalid"), quote (buf));
+      complain_at (location, _("%s is invalid"), quote (text));
+    }
+}
+
+
+/*---------------------------------------------------------------.
+| TEXT is expexted tp be @$ in some code associated to a symbol: |
+| destructor or printer.                                         |
+`---------------------------------------------------------------*/
+
+static inline void
+handle_symbol_code_at (char *text, location_t location)
+{
+  char *cp = text + 1;
+  if (*cp == '$')
+    obstack_sgrow (&string_obstack, "]b4_at_dollar[");
+  else
+    complain_at (location, _("%s is invalid"), quote (text));
+}
+
+
+/*-------------------------------------------------------------------.
+| Dispatch onto handle_action_at, or handle_destructor_at, depending |
+| upon CODE_KIND.                                                    |
+`-------------------------------------------------------------------*/
+
+static void
+handle_at (braced_code_t braced_code_kind,
+          char *text, location_t location)
+{
+  switch (braced_code_kind)
+    {
+    case action_braced_code:
+      handle_action_at (text, location);
+      break;
+
+    case destructor_braced_code:
+    case printer_braced_code:
+      handle_symbol_code_at (text, location);
+      break;

     }
 }
     }
 }

+
+
+/*-------------------------.
+| Initialize the scanner.  |
+`-------------------------*/
+
+void
+scanner_initialize (void)
+{
+  obstack_init (&string_obstack);
+}
+
+
+/*-----------------------------------------------.
+| Free all the memory allocated to the scanner.  |
+`-----------------------------------------------*/
+
+void
+scanner_free (void)
+{
+  obstack_free (&string_obstack, 0);
+  /* Reclaim Flex's buffers.  */
+  yy_delete_buffer (YY_CURRENT_BUFFER);
+}