X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/bb8e56ff67d289d15f1a4dc7f5e1502cd3bbfc24..53f8e4096d887c53d04e180f759016d3d12013db:/src/muscle-tab.c?ds=sidebyside

diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index be97b800..28cfe561 100644
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -384,11 +384,23 @@ muscle_user_name_list_grow (char const *key, char const *user_name,
   muscle_grow (key, "]]", "");
 }
 
+static
+char *
+define_directive (char const *assignment, char const *value)
+{
+  char const *fmt = value && *value ? "%%define %s %s" : "%%define %s";
+  char *res = xmalloc (strlen (fmt) + strlen (assignment)
+                       + (value ? strlen (value) : 0));
+  sprintf (res, fmt, assignment, value);
+  return res;
+}
+
 /** If the \a variable name is obsolete, return the name to use,
  * otherwise \a variable. */
 static
 char const *
-muscle_percent_variable_update (char const *variable, location variable_loc)
+muscle_percent_variable_update (char const *variable, location variable_loc,
+                                char const **value)
 {
   typedef struct
   {
@@ -398,41 +410,43 @@ muscle_percent_variable_update (char const *variable, location variable_loc)
   const conversion_type conversion[] =
     {
       { "api.push_pull", "api.push-pull", },
-      { "lr.keep_unreachable_states", "lr.keep-unreachable-states", },
+      { "api.tokens.prefix", "api.token.prefix", },
+      { "lex_symbol", "api.token.constructor", },
+      { "location_type", "api.location.type", },
+      { "lr.default-reductions", "lr.default-reduction", },
+      { "lr.keep-unreachable-states", "lr.keep-unreachable-state", },
+      { "lr.keep_unreachable_states", "lr.keep-unreachable-state", },
       { "namespace", "api.namespace", },
+      { NULL, NULL, }
     };
   char const *res = variable;
-  int i;
-  for (i = 0; i < ARRAY_CARDINALITY (conversion); ++i)
-    if (STREQ (conversion[i].obsolete, variable))
+  conversion_type const *c;
+  for (c = conversion; c->obsolete; ++c)
+    if (STREQ (c->obsolete, variable))
       {
-        res = conversion[i].updated;
-        complain (&variable_loc, Wdeprecated,
-                  _("deprecated %%define variable name: %s, use %s"),
-                  quote (variable), quote_n (1, res));
+        char *old = define_directive (c->obsolete, *value);
+        char *upd = define_directive (c->updated, *value);
+        deprecated_directive (&variable_loc, old, upd);
+        free (old);
+        free (upd);
+        res = c->updated;
         break;
-      }
+    }
   return res;
 }
 
 void
-muscle_percent_define_insert (char const *variable, location variable_loc,
+muscle_percent_define_insert (char const *var, location variable_loc,
                               char const *value,
                               muscle_percent_define_how how)
 {
-  char const *name;
-  char const *loc_name;
-  char const *syncline_name;
-  char const *how_name;
-
-  /* Permit certain names with underscores for backward compatibility.  */
-  variable = muscle_percent_variable_update (variable, variable_loc);
-
-  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
-  loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
-  syncline_name =
+  /* Backward compatibility.  */
+  char *variable = muscle_percent_variable_update (var, variable_loc, &value);
+  char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  char const *loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
+  char const *syncline_name =
     UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
-  how_name = UNIQSTR_CONCAT ("percent_define_how(", variable, ")");
+  char const *how_name = UNIQSTR_CONCAT ("percent_define_how(", variable, ")");
 
   /* Command-line options are processed before the grammar file.  */
   if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
@@ -442,13 +456,12 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
       unsigned i = 0;
       if (how_old == MUSCLE_PERCENT_DEFINE_F)
         return;
-      complain_at_indent (variable_loc, complaint, &i,
-                          _("%%define variable %s redefined"),
-                          quote (variable));
+      complain_indent (&variable_loc, complaint, &i,
+                       _("%%define variable %s redefined"),
+                       quote (variable));
       i += SUB_INDENT;
-      complain_at_indent (muscle_percent_define_get_loc (variable),
-                          complaint, &i,
-                          _("previous definition"));
+      location loc = muscle_percent_define_get_loc (variable);
+      complain_indent (&loc, complaint, &i, _("previous definition"));
     }
 
   MUSCLE_INSERT_STRING (name, value);
@@ -606,14 +619,13 @@ muscle_percent_define_check_values (char const * const *values)
             {
               unsigned i = 0;
               location loc = muscle_percent_define_get_loc (*variablep);
-              complain_at_indent
-                (loc, complaint, &i,
-                 _("invalid value for %%define variable %s: %s"),
-                 quote (*variablep), quote_n (1, value));
+              complain_indent (&loc, complaint, &i,
+                               _("invalid value for %%define variable %s: %s"),
+                               quote (*variablep), quote_n (1, value));
               i += SUB_INDENT;
               for (values = variablep + 1; *values; ++values)
-                complain_at_indent (loc, complaint, &i, _("accepted value: %s"),
-                                    quote (*values));
+                complain_indent (&loc, complaint | no_caret, &i,
+                                 _("accepted value: %s"), quote (*values));
             }
           else
             {