Merge remote-tracking branch 'origin/maint'

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

diff --git a/src/scan-gram.l b/src/scan-gram.l
index 2275d022b7ffac51f2f11133859bad8a71dde4b8..98124556872b6251aa7ce8a6d44feb6639744520 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 

-%option debug nodefault noinput nounput noyywrap never-interactive
+%option debug nodefault noinput noyywrap never-interactive

 %option prefix="gram_" outfile="lex.yy.c"
 
 %{
 %option prefix="gram_" outfile="lex.yy.c"
 
 %{


@@ -31,6 +31,7 @@
 
 #include <src/complain.h>
 #include <src/files.h>
 
 #include <src/complain.h>
 #include <src/files.h>

+#include <src/getargs.h>

 #include <src/gram.h>
 #include <quotearg.h>
 #include <src/reader.h>
 #include <src/gram.h>
 #include <quotearg.h>
 #include <src/reader.h>


@@ -73,6 +74,17 @@ static size_t no_cr_read (FILE *, char *, size_t);
     yyless (0);                                                 \
   } while (0)
 
     yyless (0);                                                 \
   } while (0)
 

+#define DEPRECATED(Msg)                                         \
+  do {                                                          \
+    size_t i;                                                   \
+    complain (loc, Wdeprecated,                                 \
+              _("deprecated directive: %s, use %s"),            \
+              quote (yytext), quote_n (1, Msg));                \
+    scanner_cursor.column -= mbsnwidth (Msg, strlen (Msg), 0);  \
+    for (i = strlen (Msg); i != 0; --i)                         \
+      unput (Msg[i - 1]);                                       \
+  } while (0)
+

 /* A string representing the most recently saved token.  */
 static char *last_string;
 
 /* A string representing the most recently saved token.  */
 static char *last_string;
 


@@ -134,6 +146,10 @@ tag      [^\0<>]+
    white space between the backslash and the newline.  */
 splice   (\\[ \f\t\v]*\n)*
 
    white space between the backslash and the newline.  */
 splice   (\\[ \f\t\v]*\n)*
 

+/* An equal sign, with optional leading whitespaces. This is used in some
+   deprecated constructs. */
+eqopt    ([[:space:]]*=)?
+

 %%
 %{
   /* Nesting level.  Either for nested braces, or nested angle brackets
 %%
 %{
   /* Nesting level.  Either for nested braces, or nested angle brackets


@@ -165,7 +181,7 @@ splice   (\\[ \f\t\v]*\n)*
 {
   /* Comments and white space.  */
   "," {
 {
   /* Comments and white space.  */
   "," {

-     complain_at (*loc, Wother, _("stray ',' treated as white space"));
+     complain (loc, Wother, _("stray ',' treated as white space"));

   }
   [ \f\n\t\v]  |
   "//".*       ;
   }
   [ \f\n\t\v]  |
   "//".*       ;


@@ -198,16 +214,16 @@ splice   (\\[ \f\t\v]*\n)*
   "%binary"                         return PERCENT_NONASSOC;
   "%code"                           return PERCENT_CODE;
   "%debug"                          RETURN_PERCENT_FLAG("parse.trace");
   "%binary"                         return PERCENT_NONASSOC;
   "%code"                           return PERCENT_CODE;
   "%debug"                          RETURN_PERCENT_FLAG("parse.trace");

-  "%default"[-_]"prec"              return PERCENT_DEFAULT_PREC;
+  "%default-prec"                   return PERCENT_DEFAULT_PREC;

   "%define"                         return PERCENT_DEFINE;
   "%defines"                        return PERCENT_DEFINES;
   "%destructor"                     return PERCENT_DESTRUCTOR;
   "%dprec"                          return PERCENT_DPREC;
   "%define"                         return PERCENT_DEFINE;
   "%defines"                        return PERCENT_DEFINES;
   "%destructor"                     return PERCENT_DESTRUCTOR;
   "%dprec"                          return PERCENT_DPREC;

-  "%error"[-_]"verbose"             return PERCENT_ERROR_VERBOSE;
+  "%error-verbose"                  return PERCENT_ERROR_VERBOSE;

   "%expect"                         return PERCENT_EXPECT;
   "%expect"                         return PERCENT_EXPECT;

-  "%expect"[-_]"rr"                 return PERCENT_EXPECT_RR;
+  "%expect-rr"                      return PERCENT_EXPECT_RR;

   "%file-prefix"                    return PERCENT_FILE_PREFIX;
   "%file-prefix"                    return PERCENT_FILE_PREFIX;

-  "%fixed"[-_]"output"[-_]"files"   return PERCENT_YACC;
+  "%fixed-output-files"             return PERCENT_YACC;

   "%initial-action"                 return PERCENT_INITIAL_ACTION;
   "%glr-parser"                     return PERCENT_GLR_PARSER;
   "%language"                       return PERCENT_LANGUAGE;
   "%initial-action"                 return PERCENT_INITIAL_ACTION;
   "%glr-parser"                     return PERCENT_GLR_PARSER;
   "%language"                       return PERCENT_LANGUAGE;


@@ -215,9 +231,9 @@ splice   (\\[ \f\t\v]*\n)*
   "%lex-param"                      RETURN_PERCENT_PARAM(lex);
   "%locations"                      RETURN_PERCENT_FLAG("locations");
   "%merge"                          return PERCENT_MERGE;
   "%lex-param"                      RETURN_PERCENT_PARAM(lex);
   "%locations"                      RETURN_PERCENT_FLAG("locations");
   "%merge"                          return PERCENT_MERGE;

-  "%name"[-_]"prefix"               return PERCENT_NAME_PREFIX;
-  "%no"[-_]"default"[-_]"prec"      return PERCENT_NO_DEFAULT_PREC;
-  "%no"[-_]"lines"                  return PERCENT_NO_LINES;
+  "%name-prefix"                    return PERCENT_NAME_PREFIX;
+  "%no-default-prec"                return PERCENT_NO_DEFAULT_PREC;
+  "%no-lines"                       return PERCENT_NO_LINES;

   "%nonassoc"                       return PERCENT_NONASSOC;
   "%nondeterministic-parser"        return PERCENT_NONDETERMINISTIC_PARSER;
   "%nterm"                          return PERCENT_NTERM;
   "%nonassoc"                       return PERCENT_NONASSOC;
   "%nondeterministic-parser"        return PERCENT_NONDETERMINISTIC_PARSER;
   "%nterm"                          return PERCENT_NTERM;


@@ -227,21 +243,34 @@ splice   (\\[ \f\t\v]*\n)*
   "%prec"                           return PERCENT_PREC;
   "%precedence"                     return PERCENT_PRECEDENCE;
   "%printer"                        return PERCENT_PRINTER;
   "%prec"                           return PERCENT_PREC;
   "%precedence"                     return PERCENT_PRECEDENCE;
   "%printer"                        return PERCENT_PRINTER;

-  "%pure"[-_]"parser"               RETURN_PERCENT_FLAG("api.pure");
+  "%pure-parser"                    RETURN_PERCENT_FLAG("api.pure");

   "%require"                        return PERCENT_REQUIRE;
   "%right"                          return PERCENT_RIGHT;
   "%skeleton"                       return PERCENT_SKELETON;
   "%start"                          return PERCENT_START;
   "%term"                           return PERCENT_TOKEN;
   "%token"                          return PERCENT_TOKEN;
   "%require"                        return PERCENT_REQUIRE;
   "%right"                          return PERCENT_RIGHT;
   "%skeleton"                       return PERCENT_SKELETON;
   "%start"                          return PERCENT_START;
   "%term"                           return PERCENT_TOKEN;
   "%token"                          return PERCENT_TOKEN;

-  "%token"[-_]"table"               return PERCENT_TOKEN_TABLE;
+  "%token-table"                    return PERCENT_TOKEN_TABLE;

   "%type"                           return PERCENT_TYPE;
   "%union"                          return PERCENT_UNION;
   "%verbose"                        return PERCENT_VERBOSE;
   "%yacc"                           return PERCENT_YACC;
 
   "%type"                           return PERCENT_TYPE;
   "%union"                          return PERCENT_UNION;
   "%verbose"                        return PERCENT_VERBOSE;
   "%yacc"                           return PERCENT_YACC;
 

+  /* deprecated */
+  "%default"[-_]"prec"              DEPRECATED("%default-prec");
+  "%error"[-_]"verbose"             DEPRECATED("%define parse.error verbose");
+  "%expect"[-_]"rr"                 DEPRECATED("%expect-rr");
+  "%file-prefix"{eqopt}             DEPRECATED("%file-prefix");
+  "%fixed"[-_]"output"[-_]"files"   DEPRECATED("%fixed-output-files");
+  "%name"[-_]"prefix"{eqopt}        DEPRECATED("%name-prefix");
+  "%no"[-_]"default"[-_]"prec"      DEPRECATED("%no-default-prec");
+  "%no"[-_]"lines"                  DEPRECATED("%no-lines");
+  "%output"{eqopt}                  DEPRECATED("%output");
+  "%pure"[-_]"parser"               DEPRECATED("%pure-parser");
+  "%token"[-_]"table"               DEPRECATED("%token-table");
+

   {directive} {
   {directive} {

-    complain_at (*loc, complaint, _("invalid directive: %s"), quote (yytext));
+    complain (loc, complaint, _("invalid directive: %s"), quote (yytext));

   }
 
   "="                     return EQUAL;
   }
 
   "="                     return EQUAL;


@@ -267,7 +296,7 @@ splice   (\\[ \f\t\v]*\n)*
   /* Identifiers may not start with a digit.  Yet, don't silently
      accept "1FOO" as "1 FOO".  */
   {int}{id} {
   /* Identifiers may not start with a digit.  Yet, don't silently
      accept "1FOO" as "1 FOO".  */
   {int}{id} {

-    complain_at (*loc, complaint, _("invalid identifier: %s"), quote (yytext));
+    complain (loc, complaint, _("invalid identifier: %s"), quote (yytext));

   }
 
   /* Characters.  */
   }
 
   /* Characters.  */


@@ -325,7 +354,8 @@ splice   (\\[ \f\t\v]*\n)*
   }
 
   . {
   }
 
   . {

-    complain_at (*loc, complaint, _("invalid character: %s"), quote (yytext));
+    complain (loc, complaint, _("invalid character: %s"),
+              quote_mem (yytext, yyleng));

   }
 
   <<EOF>> {
   }
 
   <<EOF>> {


@@ -342,7 +372,7 @@ splice   (\\[ \f\t\v]*\n)*
 
 <SC_ESCAPED_CHARACTER,SC_ESCAPED_STRING,SC_TAG>
 {
 
 <SC_ESCAPED_CHARACTER,SC_ESCAPED_STRING,SC_TAG>
 {

-  \0        complain_at (*loc, complaint, _("invalid null character"));
+  \0        complain (loc, complaint, _("invalid null character"));

 }
 
 
 }
 
 


@@ -394,9 +424,9 @@ splice   (\\[ \f\t\v]*\n)*
   {id} {
     if (bracketed_id_str)
       {
   {id} {
     if (bracketed_id_str)
       {

-        complain_at (*loc, complaint,
-                     _("unexpected identifier in bracketed name: %s"),
-                     quote (yytext));
+        complain (loc, complaint,
+                  _("unexpected identifier in bracketed name: %s"),
+                  quote (yytext));

       }
     else
       {
       }
     else
       {


@@ -417,11 +447,11 @@ splice   (\\[ \f\t\v]*\n)*
           }
       }
     else
           }
       }
     else

-      complain_at (*loc, complaint, _("an identifier expected"));
+      complain (loc, complaint, _("an identifier expected"));

   }
   . {
   }
   . {

-    complain_at (*loc, complaint, _("invalid character in bracketed name: %s"),
-                 quote (yytext));
+    complain (loc, complaint, _("invalid character in bracketed name: %s"),
+              quote_mem (yytext, yyleng));

   }
   <<EOF>> {
     BEGIN bracketed_id_context_state;
   }
   <<EOF>> {
     BEGIN bracketed_id_context_state;


@@ -518,12 +548,12 @@ splice   (\\[ \f\t\v]*\n)*
       /* FIXME: Eventually, make these errors.  */
       if (last_string[0] == '\0')
         {
       /* FIXME: Eventually, make these errors.  */
       if (last_string[0] == '\0')
         {

-          complain_at (*loc, Wother, _("empty character literal"));
+          complain (loc, Wother, _("empty character literal"));

           /* '\0' seems dangerous even if we are about to complain.  */
           val->character = '\'';
         }
       else if (last_string[1] != '\0')
           /* '\0' seems dangerous even if we are about to complain.  */
           val->character = '\'';
         }
       else if (last_string[1] != '\0')

-        complain_at (*loc, Wother,
+        complain (loc, Wother,

                   _("extra characters in character literal"));
     }
     if (yytext[0] == '\n')
                   _("extra characters in character literal"));
     }
     if (yytext[0] == '\n')


@@ -540,12 +570,12 @@ splice   (\\[ \f\t\v]*\n)*
       /* FIXME: Eventually, make these errors.  */
       if (last_string[0] == '\0')
         {
       /* FIXME: Eventually, make these errors.  */
       if (last_string[0] == '\0')
         {

-          complain_at (*loc, Wother, _("empty character literal"));
+          complain (loc, Wother, _("empty character literal"));

           /* '\0' seems dangerous even if we are about to complain.  */
           val->character = '\'';
         }
       else if (last_string[1] != '\0')
           /* '\0' seems dangerous even if we are about to complain.  */
           val->character = '\'';
         }
       else if (last_string[1] != '\0')

-        complain_at (*loc, Wother,
+        complain (loc, Wother,

                   _("extra characters in character literal"));
     }
     unexpected_eof (token_start, "'");
                   _("extra characters in character literal"));
     }
     unexpected_eof (token_start, "'");


@@ -599,7 +629,7 @@ splice   (\\[ \f\t\v]*\n)*
   \\[0-7]{1,3} {
     unsigned long int c = strtoul (yytext + 1, NULL, 8);
     if (!c || UCHAR_MAX < c)
   \\[0-7]{1,3} {
     unsigned long int c = strtoul (yytext + 1, NULL, 8);
     if (!c || UCHAR_MAX < c)

-      complain_at (*loc, complaint, _("invalid number after \\-escape: %s"),
+      complain (loc, complaint, _("invalid number after \\-escape: %s"),

                    yytext+1);
     else
       obstack_1grow (&obstack_for_string, c);
                    yytext+1);
     else
       obstack_1grow (&obstack_for_string, c);


@@ -609,7 +639,7 @@ splice   (\\[ \f\t\v]*\n)*
     verify (UCHAR_MAX < ULONG_MAX);
     unsigned long int c = strtoul (yytext + 2, NULL, 16);
     if (!c || UCHAR_MAX < c)
     verify (UCHAR_MAX < ULONG_MAX);
     unsigned long int c = strtoul (yytext + 2, NULL, 16);
     if (!c || UCHAR_MAX < c)

-      complain_at (*loc, complaint, _("invalid number after \\-escape: %s"),
+      complain (loc, complaint, _("invalid number after \\-escape: %s"),

                    yytext+1);
     else
       obstack_1grow (&obstack_for_string, c);
                    yytext+1);
     else
       obstack_1grow (&obstack_for_string, c);


@@ -629,7 +659,7 @@ splice   (\\[ \f\t\v]*\n)*
   \\(u|U[0-9abcdefABCDEF]{4})[0-9abcdefABCDEF]{4} {
     int c = convert_ucn_to_byte (yytext);
     if (c <= 0)
   \\(u|U[0-9abcdefABCDEF]{4})[0-9abcdefABCDEF]{4} {
     int c = convert_ucn_to_byte (yytext);
     if (c <= 0)

-      complain_at (*loc, complaint, _("invalid number after \\-escape: %s"),
+      complain (loc, complaint, _("invalid number after \\-escape: %s"),

                    yytext+1);
     else
       obstack_1grow (&obstack_for_string, c);
                    yytext+1);
     else
       obstack_1grow (&obstack_for_string, c);


@@ -641,7 +671,7 @@ splice   (\\[ \f\t\v]*\n)*
       p = quote (p);
     else
       p = quotearg_style_mem (escape_quoting_style, p, 1);
       p = quote (p);
     else
       p = quotearg_style_mem (escape_quoting_style, p, 1);

-    complain_at (*loc, complaint, _("invalid character after \\-escape: %s"),
+    complain (loc, complaint, _("invalid character after \\-escape: %s"),

                  p);
   }
 }
                  p);
   }
 }


@@ -873,7 +903,7 @@ scan_integer (char const *number, int base, location loc)
 
   if (INT_MAX < num)
     {
 
   if (INT_MAX < num)
     {

-      complain_at (loc, complaint, _("integer out of range: %s"),
+      complain (&loc, complaint, _("integer out of range: %s"),

                    quote (number));
       num = INT_MAX;
     }
                    quote (number));
       num = INT_MAX;
     }


@@ -952,7 +982,7 @@ handle_syncline (char *args, location loc)
   *strchr (file, '"') = '\0';
   if (INT_MAX <= lineno)
     {
   *strchr (file, '"') = '\0';
   if (INT_MAX <= lineno)
     {

-      complain_at (loc, Wother, _("line number overflow"));
+      complain (&loc, Wother, _("line number overflow"));

       lineno = INT_MAX;
     }
   current_file = uniqstr_new (file);
       lineno = INT_MAX;
     }
   current_file = uniqstr_new (file);


@@ -976,7 +1006,7 @@ unexpected_end (boundary start, char const *msgid, char const *token_end)
   // Instead of '\'', display "'".
   if (STREQ (token_end, "'\\''"))
     token_end = "\"'\"";
   // Instead of '\'', display "'".
   if (STREQ (token_end, "'\\''"))
     token_end = "\"'\"";

-  complain_at (loc, complaint, _(msgid), token_end);
+  complain (&loc, complaint, _(msgid), token_end);

 }
 
 
 }