made previous commit less hairy

[bison.git] / src / muscle-tab.c

diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index 9804fe90223c69875da6806d45941c7bb249699d..8e5698127cd81e51d3a15ad0a1ef51212ca72e69 100644 (file)
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -305,11 +305,10 @@ muscle_location_grow (char const *key, location loc)
 static char *
 string_decode (char const *key)
 {
 static char *
 string_decode (char const *key)
 {

-  char const *value;
+  char const *value = muscle_find_const (key);

   char *value_decoded;
   char *result;
 
   char *value_decoded;
   char *result;
 

-  value = muscle_find_const (key);

   if (!value)
     return NULL;
   do {
   if (!value)
     return NULL;
   do {


@@ -389,7 +388,7 @@ muscle_user_name_list_grow (char const *key, char const *user_name,
  * otherwise \a variable. */
 static
 char const *
  * otherwise \a variable. */
 static
 char const *

-muscle_percent_variable_update (char const *variable)
+muscle_percent_variable_update (char const *variable, location variable_loc)

 {
   typedef struct
   {
 {
   typedef struct
   {


@@ -402,11 +401,18 @@ muscle_percent_variable_update (char const *variable)
       { "lr.keep_unreachable_states", "lr.keep-unreachable-states", },
       { "namespace", "api.namespace", },
     };
       { "lr.keep_unreachable_states", "lr.keep-unreachable-states", },
       { "namespace", "api.namespace", },
     };

+  char const *res = variable;

   int i;
   int i;

-  for (i = 0; i < sizeof conversion / sizeof *conversion; ++i)
+  for (i = 0; i < ARRAY_CARDINALITY (conversion); ++i)

     if (STREQ (conversion[i].obsolete, variable))
     if (STREQ (conversion[i].obsolete, variable))

-      return conversion[i].updated;
-  return variable;
+      {
+        res = conversion[i].updated;
+        complain_at (variable_loc, Wdeprecated,
+                     _("deprecated %%define variable name: %s, use %s"),
+                     quote (variable), quote_n (1, res));
+        break;
+      }
+  return res;

 }
 
 void
 }
 
 void


@@ -420,7 +426,7 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
   char const *how_name;
 
   /* Permit certain names with underscores for backward compatibility.  */
   char const *how_name;
 
   /* Permit certain names with underscores for backward compatibility.  */

-  variable = muscle_percent_variable_update (variable);
+  variable = muscle_percent_variable_update (variable, variable_loc);

 
   name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
   loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
 
   name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
   loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");


@@ -432,8 +438,7 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
   if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
       && muscle_find_const (name))
     {
   if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
       && muscle_find_const (name))
     {

-      muscle_percent_define_how how_old =
-        atoi (muscle_find_const (how_name));
+      muscle_percent_define_how how_old = atoi (muscle_find_const (how_name));

       if (how_old == MUSCLE_PERCENT_DEFINE_F)
         return;
       complain_at (variable_loc, complaint, _("%%define variable %s redefined"),
       if (how_old == MUSCLE_PERCENT_DEFINE_F)
         return;
       complain_at (variable_loc, complaint, _("%%define variable %s redefined"),


@@ -459,8 +464,7 @@ muscle_percent_define_ensure (char const *variable, location loc,
                               bool value)
 {
   char const *val = value ? "" : "false";
                               bool value)
 {
   char const *val = value ? "" : "false";

-  char const *name;
-  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")");

 
   /* %pure-parser is deprecated in favor of `%define api.pure', so use
      `%define api.pure' in a backward-compatible manner here.  First,
 
   /* %pure-parser is deprecated in favor of `%define api.pure', so use
      `%define api.pure' in a backward-compatible manner here.  First,


@@ -479,58 +483,46 @@ muscle_percent_define_ensure (char const *variable, location loc,
 char *
 muscle_percent_define_get (char const *variable)
 {
 char *
 muscle_percent_define_get (char const *variable)
 {

-  char const *name;
-  char const *usage_name;
-  char *value;
-
-  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
-  usage_name = UNIQSTR_CONCAT ("percent_define_bison_variables(",
-                               variable, ")");
-
-  muscle_insert (usage_name, "");
-  value = string_decode (name);
+  char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  char const *usage_name =
+    UNIQSTR_CONCAT ("percent_define_bison_variables(", variable, ")");
+  char *value = string_decode (name);

   if (!value)
     value = xstrdup ("");
   if (!value)
     value = xstrdup ("");

+
+  muscle_insert (usage_name, "");

   return value;
 }
 
 location
 muscle_percent_define_get_loc (char const *variable)
 {
   return value;
 }
 
 location
 muscle_percent_define_get_loc (char const *variable)
 {

-  char const *loc_name;
-  loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
+  char const *loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");

   if (!muscle_find_const (loc_name))
     complain (fatal, _("%s: undefined %%define variable %s"),
   if (!muscle_find_const (loc_name))
     complain (fatal, _("%s: undefined %%define variable %s"),

-          "muscle_percent_define_get_loc", quote (variable));
+              "muscle_percent_define_get_loc", quote (variable));

   return location_decode (loc_name);
 }
 
 char const *
 muscle_percent_define_get_syncline (char const *variable)
 {
   return location_decode (loc_name);
 }
 
 char const *
 muscle_percent_define_get_syncline (char const *variable)
 {

-  char const *syncline_name;
-  char const *syncline;
-  syncline_name =
+  char const *syncline_name =

     UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
     UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");

-  syncline = muscle_find_const (syncline_name);
+  char const *syncline = muscle_find_const (syncline_name);

   if (!syncline)
     complain (fatal, _("%s: undefined %%define variable %s"),
   if (!syncline)
     complain (fatal, _("%s: undefined %%define variable %s"),

-          "muscle_percent_define_get_syncline", quote (variable));
+              "muscle_percent_define_get_syncline", quote (variable));

   return syncline;
 }
 
 bool
 muscle_percent_define_ifdef (char const *variable)
 {
   return syncline;
 }
 
 bool
 muscle_percent_define_ifdef (char const *variable)
 {

-  char const *name;
-  char const *usage_name;
-  char const *value;
-
-  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
-  usage_name =
+  char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  char const *usage_name =

     UNIQSTR_CONCAT ("percent_define_bison_variables(", variable, ")");
     UNIQSTR_CONCAT ("percent_define_bison_variables(", variable, ")");

-
-  value = muscle_find_const (name);
+  char const *value = muscle_find_const (name);

   if (value)
     {
       muscle_insert (usage_name, "");
   if (value)
     {
       muscle_insert (usage_name, "");


@@ -543,11 +535,9 @@ muscle_percent_define_ifdef (char const *variable)
 bool
 muscle_percent_define_flag_if (char const *variable)
 {
 bool
 muscle_percent_define_flag_if (char const *variable)
 {

-  char const *invalid_boolean_name;
-  bool result = false;
-
-  invalid_boolean_name =
+  char const *invalid_boolean_name =

     UNIQSTR_CONCAT ("percent_define_invalid_boolean(", variable, ")");
     UNIQSTR_CONCAT ("percent_define_invalid_boolean(", variable, ")");

+  bool result = false;

 
   if (muscle_percent_define_ifdef (variable))
     {
 
   if (muscle_percent_define_ifdef (variable))
     {


@@ -576,12 +566,9 @@ muscle_percent_define_flag_if (char const *variable)
 void
 muscle_percent_define_default (char const *variable, char const *value)
 {
 void
 muscle_percent_define_default (char const *variable, char const *value)
 {

-  char const *name;
-  char const *loc_name;
-  char const *syncline_name;
-  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
-  loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
-  syncline_name =
+  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, ")");
   if (!muscle_find_const (name))
     {
     UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
   if (!muscle_find_const (name))
     {


@@ -602,12 +589,8 @@ muscle_percent_define_check_values (char const * const *values)
   for (; *values; ++values)
     {
       char const * const *variablep = values;
   for (; *values; ++values)
     {
       char const * const *variablep = values;

-      char const *name;
-      char *value;
-
-      name = UNIQSTR_CONCAT ("percent_define(", *variablep, ")");
-
-      value = string_decode (name);
+      char const *name = UNIQSTR_CONCAT ("percent_define(", *variablep, ")");
+      char *value = string_decode (name);

       if (value)
         {
           for (++values; *values; ++values)
       if (value)
         {
           for (++values; *values; ++values)


@@ -642,8 +625,7 @@ void
 muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
                           char const *code, location code_loc)
 {
 muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
                           char const *code, location code_loc)
 {

-  char const *name;
-  name = UNIQSTR_CONCAT ("percent_code(", qualifier, ")");
+  char const *name = UNIQSTR_CONCAT ("percent_code(", qualifier, ")");

   muscle_code_grow (name, code, code_loc);
   muscle_user_name_list_grow ("percent_code_user_qualifiers", qualifier,
                                qualifier_loc);
   muscle_code_grow (name, code, code_loc);
   muscle_user_name_list_grow ("percent_code_user_qualifiers", qualifier,
                                qualifier_loc);


@@ -657,8 +639,9 @@ muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
 static inline bool
 muscle_m4_output (muscle_entry *entry, FILE *out)
 {
 static inline bool
 muscle_m4_output (muscle_entry *entry, FILE *out)
 {

-  fprintf (out, "m4_define([b4_%s],\n", entry->key);
-  fprintf (out, "[[%s]])\n\n\n", entry->value);
+  fprintf (out,
+           "m4_define([b4_%s],\n"
+           "[[%s]])\n\n\n", entry->key, entry->value);

   return true;
 }
 
   return true;
 }