portability: fix spawning on at least FreeBSD 8 and FreeBSD 9.

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

diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index b998ad6c254b7561648b590cbf65082b70c2424a..f1267a32c43a89d4ec698a3d5d2e6780ff028ad8 100644 (file)
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -1,7 +1,6 @@
 /* Muscle table manager for Bison.
 
 /* Muscle table manager for Bison.
 

-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2001-2010 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -120,7 +119,8 @@ muscle_insert (char const *key, char const *value)
       /* First insertion in the hash. */
       entry = xmalloc (sizeof *entry);
       entry->key = key;
       /* First insertion in the hash. */
       entry = xmalloc (sizeof *entry);
       entry->key = key;

-      hash_insert (muscle_table, entry);
+      if (!hash_insert (muscle_table, entry))
+        xalloc_die ();

     }
   else
     free (entry->storage);
     }
   else
     free (entry->storage);


@@ -149,7 +149,8 @@ muscle_grow (const char *key, const char *val, const char *separator)
       /* First insertion in the hash. */
       entry = xmalloc (sizeof *entry);
       entry->key = key;
       /* First insertion in the hash. */
       entry = xmalloc (sizeof *entry);
       entry->key = key;

-      hash_insert (muscle_table, entry);
+      if (!hash_insert (muscle_table, entry))
+        xalloc_die ();

       entry->value = entry->storage = xstrdup (val);
     }
   else
       entry->value = entry->storage = xstrdup (val);
     }
   else


@@ -387,58 +388,71 @@ muscle_user_name_list_grow (char const *key, char const *user_name,
   muscle_grow (key, "]]", "");
 }
 
   muscle_grow (key, "]]", "");
 }
 

-#define MUSCLE_USER_NAME_CONVERT(NAME, PREFIX, USER_NAME, SUFFIX)    \
-do {                                                                 \
-  char *tmp;                                                         \
-  size_t length = strlen ((USER_NAME));                              \
-  tmp = xmalloc (sizeof (PREFIX) - 1 + length + sizeof (SUFFIX));    \
-  strcpy (tmp, (PREFIX));                                            \
-  strcpy (tmp + sizeof (PREFIX) - 1, (USER_NAME));                   \
-  strcpy (tmp + sizeof (PREFIX) - 1 + length, (SUFFIX));             \
-  (NAME) = uniqstr_new (tmp);                                        \
-  free (tmp);                                                        \
-} while (0)
+/** 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)
+{
+  typedef struct
+  {
+    const char *obsolete;
+    const char *updated;
+  } conversion_type;
+  const conversion_type conversion[] =
+    {
+      { "api.push_pull", "api.push-pull", },
+      { "lr.keep_unreachable_states", "lr.keep-unreachable-states", },
+      { "namespace", "api.namespace", },
+    };
+  int i;
+  for (i = 0; i < sizeof conversion / sizeof *conversion; ++i)
+    if (!strcmp (conversion[i].obsolete, variable))
+      return conversion[i].updated;
+  return variable;
+}

 
 void
 muscle_percent_define_insert (char const *variable, location variable_loc,
 
 void
 muscle_percent_define_insert (char const *variable, location variable_loc,

-                              char const *value)
+                              char const *value,
+                              muscle_percent_define_how how)

 {
 {

-  char *variable_tr = NULL;

   char const *name;
   char const *loc_name;
   char const *syncline_name;
   char const *name;
   char const *loc_name;
   char const *syncline_name;

+  char const *how_name;

 
   /* Permit certain names with underscores for backward compatibility.  */
 
   /* Permit certain names with underscores for backward compatibility.  */

-  if (0 == strcmp (variable, "api.push_pull")
-      || 0 == strcmp (variable, "lr.keep_unreachable_states"))
-    {
-      variable_tr = strdup (variable);
-      tr (variable_tr, '_', '-');
-      variable = variable_tr;
-    }
+  variable = muscle_percent_variable_update (variable);

 
 

-  MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (syncline_name,
-                            "percent_define_syncline(", variable, ")");
+  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
+  syncline_name =
+    UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
+  how_name = UNIQSTR_CONCAT ("percent_define_how(", variable, ")");

 
 

-  if (muscle_find_const (name))
+  /* Command-line options are processed before the grammar file.  */
+  if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
+      && muscle_find_const (name))

     {
     {

-      warn_at (variable_loc, _("%s `%s' redefined"),
-               "%define variable", variable);
-      warn_at (muscle_percent_define_get_loc (variable),
-               _("previous definition"));
+      muscle_percent_define_how how_old =
+        atoi (muscle_find_const (how_name));
+      if (how_old == MUSCLE_PERCENT_DEFINE_F)
+        return;
+      complain_at (variable_loc, _("%s `%s' redefined"),
+                   "%define variable", variable);
+      complain_at (muscle_percent_define_get_loc (variable),
+                   _("previous definition"));

     }
     }

-  MUSCLE_INSERT_STRING (name, value);

 
 

+  MUSCLE_INSERT_STRING (name, value);

   muscle_insert (loc_name, "");
   muscle_location_grow (loc_name, variable_loc);
   muscle_insert (syncline_name, "");
   muscle_syncline_grow (syncline_name, variable_loc);
   muscle_user_name_list_grow ("percent_define_user_variables", variable,
                               variable_loc);
   muscle_insert (loc_name, "");
   muscle_location_grow (loc_name, variable_loc);
   muscle_insert (syncline_name, "");
   muscle_syncline_grow (syncline_name, variable_loc);
   muscle_user_name_list_grow ("percent_define_user_variables", variable,
                               variable_loc);

-
-  free (variable_tr);
+  MUSCLE_INSERT_INT (how_name, how);

 }
 
 /* This is used for backward compatibility, e.g., "%define api.pure"
 }
 
 /* This is used for backward compatibility, e.g., "%define api.pure"


@@ -449,18 +463,20 @@ muscle_percent_define_ensure (char const *variable, location loc,
 {
   char const *val = value ? "" : "false";
   char const *name;
 {
   char const *val = value ? "" : "false";
   char const *name;

-  MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
+  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,
      don't complain if %pure-parser is specified multiple times.  */
   if (!muscle_find_const (name))
 
   /* %pure-parser is deprecated in favor of `%define api.pure', so use
      `%define api.pure' in a backward-compatible manner here.  First,
      don't complain if %pure-parser is specified multiple times.  */
   if (!muscle_find_const (name))

-    muscle_percent_define_insert (variable, loc, val);
+    muscle_percent_define_insert (variable, loc, val,
+                                  MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);

   /* In all cases, use api.pure now so that the backend doesn't complain if
      the skeleton ignores api.pure, but do warn now if there's a previous
      conflicting definition from an actual %define.  */
   if (muscle_percent_define_flag_if (variable) != value)
   /* In all cases, use api.pure now so that the backend doesn't complain if
      the skeleton ignores api.pure, but do warn now if there's a previous
      conflicting definition from an actual %define.  */
   if (muscle_percent_define_flag_if (variable) != value)

-    muscle_percent_define_insert (variable, loc, val);
+    muscle_percent_define_insert (variable, loc, val,
+                                  MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);

 }
 
 char *
 }
 
 char *


@@ -470,9 +486,9 @@ muscle_percent_define_get (char const *variable)
   char const *usage_name;
   char *value;
 
   char const *usage_name;
   char *value;
 

-  MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (usage_name, "percent_define_bison_variables(",
-                            variable, ")");
+  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  usage_name = UNIQSTR_CONCAT ("percent_define_bison_variables(",
+                               variable, ")");

 
   muscle_insert (usage_name, "");
   value = muscle_string_decode (name);
 
   muscle_insert (usage_name, "");
   value = muscle_string_decode (name);


@@ -485,10 +501,10 @@ location
 muscle_percent_define_get_loc (char const *variable)
 {
   char const *loc_name;
 muscle_percent_define_get_loc (char const *variable)
 {
   char const *loc_name;

-  MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")");
+  loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");

   if (!muscle_find_const (loc_name))
   if (!muscle_find_const (loc_name))

-    fatal(_("undefined %%define variable `%s' passed to muscle_percent_define_get_loc"),
-          variable);
+    fatal(_("undefined %%define variable `%s' passed to"
+            " muscle_percent_define_get_loc"), variable);

   return muscle_location_decode (loc_name);
 }
 
   return muscle_location_decode (loc_name);
 }
 


@@ -497,12 +513,12 @@ muscle_percent_define_get_syncline (char const *variable)
 {
   char const *syncline_name;
   char const *syncline;
 {
   char const *syncline_name;
   char const *syncline;

-  MUSCLE_USER_NAME_CONVERT (syncline_name,
-                            "percent_define_syncline(", variable, ")");
+  syncline_name =
+    UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");

   syncline = muscle_find_const (syncline_name);
   if (!syncline)
   syncline = muscle_find_const (syncline_name);
   if (!syncline)

-    fatal(_("undefined %%define variable `%s' passed to muscle_percent_define_get_syncline"),
-          variable);
+    fatal(_("undefined %%define variable `%s' passed to"
+            " muscle_percent_define_get_syncline"), variable);

   return syncline;
 }
 
   return syncline;
 }
 


@@ -513,9 +529,9 @@ muscle_percent_define_ifdef (char const *variable)
   char const *usage_name;
   char const *value;
 
   char const *usage_name;
   char const *value;
 

-  MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (usage_name, "percent_define_bison_variables(",
-                            variable, ")");
+  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  usage_name =
+    UNIQSTR_CONCAT ("percent_define_bison_variables(", variable, ")");

 
   value = muscle_find_const (name);
   if (value)
 
   value = muscle_find_const (name);
   if (value)


@@ -533,8 +549,8 @@ muscle_percent_define_flag_if (char const *variable)
   char const *invalid_boolean_name;
   bool result = false;
 
   char const *invalid_boolean_name;
   bool result = false;
 

-  MUSCLE_USER_NAME_CONVERT (invalid_boolean_name,
-                            "percent_define_invalid_boolean(", variable, ")");
+  invalid_boolean_name =
+    UNIQSTR_CONCAT ("percent_define_invalid_boolean(", variable, ")");

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


@@ -565,10 +581,10 @@ muscle_percent_define_default (char const *variable, char const *value)
   char const *name;
   char const *loc_name;
   char const *syncline_name;
   char const *name;
   char const *loc_name;
   char const *syncline_name;

-  MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (syncline_name,
-                            "percent_define_syncline(", variable, ")");
+  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
+  syncline_name =
+    UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");

   if (!muscle_find_const (name))
     {
       location loc;
   if (!muscle_find_const (name))
     {
       location loc;


@@ -591,7 +607,7 @@ muscle_percent_define_check_values (char const * const *values)
       char const *name;
       char *value;
 
       char const *name;
       char *value;
 

-      MUSCLE_USER_NAME_CONVERT (name, "percent_define(", *variablep, ")");
+      name = UNIQSTR_CONCAT ("percent_define(", *variablep, ")");

 
       value = muscle_string_decode (name);
       if (value)
 
       value = muscle_string_decode (name);
       if (value)


@@ -629,7 +645,7 @@ muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
                           char const *code, location code_loc)
 {
   char const *name;
                           char const *code, location code_loc)
 {
   char const *name;

-  MUSCLE_USER_NAME_CONVERT (name, "percent_code(", qualifier, ")");
+  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);