value type: accept "->" in type tags

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

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

-   Copyright (C) 2001-2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2013 Free Software Foundation, Inc.

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


@@ -28,6 +28,31 @@
 #include "muscle-tab.h"
 #include "quote.h"
 
 #include "muscle-tab.h"
 #include "quote.h"
 

+muscle_kind
+muscle_kind_new (char const *k)
+{
+  if (STREQ (k, "code"))
+    return muscle_code;
+  else if (STREQ (k, "keyword"))
+    return muscle_keyword;
+  else if (STREQ (k, "string"))
+    return muscle_string;
+  aver (0);
+}
+
+char const *
+muscle_kind_string (muscle_kind k)
+{
+  switch (k)
+    {
+    case muscle_code:    return "code";
+    case muscle_keyword: return "keyword";
+    case muscle_string:  return "string";
+    }
+  aver (0);
+}
+
+

 /* A key-value pair, along with storage that can be reclaimed when
    this pair is no longer needed.  */
 typedef struct
 /* A key-value pair, along with storage that can be reclaimed when
    this pair is no longer needed.  */
 typedef struct


@@ -35,6 +60,7 @@ typedef struct
   char const *key;
   char const *value;
   char *storage;
   char const *key;
   char const *value;
   char *storage;

+  muscle_kind kind;

 } muscle_entry;
 
 /* An obstack used to create some entries.  */
 } muscle_entry;
 
 /* An obstack used to create some entries.  */


@@ -60,10 +86,18 @@ hash_muscle (const void *x, size_t tablesize)
   return hash_string (m->key, tablesize);
 }
 
   return hash_string (m->key, tablesize);
 }
 

-/*-----------------------------------------------------------------.
-| Create the MUSCLE_TABLE, and initialize it with default values.  |
-| Also set up the MUSCLE_OBSTACK.                                  |
-`-----------------------------------------------------------------*/
+/* Create a fresh muscle name KEY, and insert in the hash table.  */
+static void *
+muscle_entry_new (char const *key)
+{
+  muscle_entry *res = xmalloc (sizeof *res);
+  res->key = key;
+  res->value = NULL;
+  res->storage = NULL;
+  if (!hash_insert (muscle_table, res))
+    xalloc_die ();
+  return res;
+}

 
 static void
 muscle_entry_free (void *entry)
 
 static void
 muscle_entry_free (void *entry)


@@ -87,10 +121,6 @@ muscle_init (void)
 }
 
 
 }
 
 

-/*------------------------------------------------------------.
-| Free all the memory consumed by the muscle machinery only.  |
-`------------------------------------------------------------*/
-

 void
 muscle_free (void)
 {
 void
 muscle_free (void)
 {


@@ -98,32 +128,26 @@ muscle_free (void)
   obstack_free (&muscle_obstack, NULL);
 }
 
   obstack_free (&muscle_obstack, NULL);
 }
 

+/* Look for the muscle named KEY.  Return NULL if does not exist.  */
+static
+muscle_entry *
+muscle_lookup (char const *key)
+{
+  muscle_entry probe;
+  probe.key = key;
+  return hash_lookup (muscle_table, &probe);
+}

 
 
 
 

-/*------------------------------------------------------------.
-| Insert (KEY, VALUE).  If KEY already existed, overwrite the |
-| previous value.                                             |
-`------------------------------------------------------------*/
-

 void
 muscle_insert (char const *key, char const *value)
 {
 void
 muscle_insert (char const *key, char const *value)
 {

-  muscle_entry probe;
-  muscle_entry *entry;
-
-  probe.key = key;
-  entry = hash_lookup (muscle_table, &probe);
-
-  if (!entry)
-    {
-      /* First insertion in the hash. */
-      entry = xmalloc (sizeof *entry);
-      entry->key = key;
-      if (!hash_insert (muscle_table, entry))
-        xalloc_die ();
-    }
-  else
+  muscle_entry *entry = muscle_lookup (key);
+  if (entry)

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

+  else
+    /* First insertion in the hash. */
+    entry = muscle_entry_new (key);

   entry->value = value;
   entry->storage = NULL;
 }
   entry->value = value;
   entry->storage = NULL;
 }


@@ -138,22 +162,9 @@ muscle_insert (char const *key, char const *value)
 void
 muscle_grow (const char *key, const char *val, const char *separator)
 {
 void
 muscle_grow (const char *key, const char *val, const char *separator)
 {

-  muscle_entry probe;
-  muscle_entry *entry = NULL;
-
-  probe.key = key;
-  entry = hash_lookup (muscle_table, &probe);
+  muscle_entry *entry = muscle_lookup (key);

 
 

-  if (!entry)
-    {
-      /* First insertion in the hash. */
-      entry = xmalloc (sizeof *entry);
-      entry->key = key;
-      if (!hash_insert (muscle_table, entry))
-        xalloc_die ();
-      entry->value = entry->storage = xstrdup (val);
-    }
-  else
+  if (entry)

     {
       /* Grow the current value. */
       char *new_val;
     {
       /* Grow the current value. */
       char *new_val;


@@ -163,6 +174,12 @@ muscle_grow (const char *key, const char *val, const char *separator)
       entry->value = entry->storage = xstrdup (new_val);
       obstack_free (&muscle_obstack, new_val);
     }
       entry->value = entry->storage = xstrdup (new_val);
       obstack_free (&muscle_obstack, new_val);
     }

+  else
+    {
+      /* First insertion in the hash. */
+      entry = muscle_entry_new (key);
+      entry->value = entry->storage = xstrdup (val);
+    }

 }
 
 /*------------------------------------------------------------------.
 }
 
 /*------------------------------------------------------------------.


@@ -197,8 +214,9 @@ muscle_code_grow (const char *key, const char *val, location loc)
 }
 
 
 }
 
 

-void muscle_pair_list_grow (const char *muscle,
-                            const char *a1, const char *a2)
+void
+muscle_pair_list_grow (const char *muscle,
+                       const char *a1, const char *a2)

 {
   char *pair;
   obstack_sgrow (&muscle_obstack, "[");
 {
   char *pair;
   obstack_sgrow (&muscle_obstack, "[");


@@ -212,49 +230,28 @@ void muscle_pair_list_grow (const char *muscle,
 }
 
 
 }
 
 

-/*----------------------------------------------------------------------------.
-| Find the value of muscle KEY.  Unlike MUSCLE_FIND, this is always reliable  |
-| to determine whether KEY has a value.                                       |
-`----------------------------------------------------------------------------*/
-

 char const *
 muscle_find_const (char const *key)
 {
 char const *
 muscle_find_const (char const *key)
 {

-  muscle_entry probe;
-  muscle_entry *result = NULL;
-
-  probe.key = key;
-  result = hash_lookup (muscle_table, &probe);
-  if (result)
-    return result->value;
-  return NULL;
+  muscle_entry *entry = muscle_lookup (key);
+  return entry ? entry->value : NULL;

 }
 
 
 }
 
 

-/*----------------------------------------------------------------------------.
-| Find the value of muscle KEY.  Abort if muscle_insert was invoked more      |
-| recently than muscle_grow for KEY since muscle_find can't return a          |
-| char const *.                                                               |
-`----------------------------------------------------------------------------*/
-

 char *
 muscle_find (char const *key)
 {
 char *
 muscle_find (char const *key)
 {

-  muscle_entry probe;
-  muscle_entry *result = NULL;
-
-  probe.key = key;
-  result = hash_lookup (muscle_table, &probe);
-  if (result)
+  muscle_entry *entry = muscle_lookup (key);
+  if (entry)

     {
     {

-      aver (result->value == result->storage);
-      return result->storage;
+      aver (entry->value == entry->storage);
+      return entry->storage;

     }
   return NULL;
 }
 
 
     }
   return NULL;
 }
 
 

-/* In the format `file_name:line.column', append BOUND to MUSCLE.  Use
+/* In the format 'file_name:line.column', append BOUND to MUSCLE.  Use

    digraphs for special characters in the file name.  */
 
 static void
    digraphs for special characters in the file name.  */
 
 static void


@@ -270,7 +267,7 @@ muscle_boundary_grow (char const *key, boundary bound)
 }
 
 
 }
 
 

-/* In the format `[[file_name:line.column]], [[file_name:line.column]]',
+/* In the format '[[file_name:line.column]], [[file_name:line.column]]',

    append LOC to MUSCLE.  Use digraphs for special characters in each
    file name.  */
 
    append LOC to MUSCLE.  Use digraphs for special characters in each
    file name.  */
 


@@ -439,6 +436,7 @@ muscle_percent_variable_update (char const *variable, location variable_loc,
       { "lr.keep-unreachable-states", "lr.keep-unreachable-state", },
       { "lr.keep_unreachable_states", "lr.keep-unreachable-state", },
       { "namespace", "api.namespace", },
       { "lr.keep-unreachable-states", "lr.keep-unreachable-state", },
       { "lr.keep_unreachable_states", "lr.keep-unreachable-state", },
       { "namespace", "api.namespace", },

+      { "stype", "api.value.type", },

       { "variant=",     "api.value.type=variant", },
       { "variant=true", "api.value.type=variant", },
       { NULL, NULL, }
       { "variant=",     "api.value.type=variant", },
       { "variant=true", "api.value.type=variant", },
       { NULL, NULL, }


@@ -474,6 +472,7 @@ muscle_percent_variable_update (char const *variable, location variable_loc,
 
 void
 muscle_percent_define_insert (char const *var, location variable_loc,
 
 void
 muscle_percent_define_insert (char const *var, location variable_loc,

+                              muscle_kind kind,

                               char const *value,
                               muscle_percent_define_how how)
 {
                               char const *value,
                               muscle_percent_define_how how)
 {


@@ -484,6 +483,8 @@ muscle_percent_define_insert (char const *var, location variable_loc,
   char const *syncline_name =
     UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
   char const *how_name = UNIQSTR_CONCAT ("percent_define_how(", variable, ")");
   char const *syncline_name =
     UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
   char const *how_name = UNIQSTR_CONCAT ("percent_define_how(", variable, ")");

+  char const *kind_name =
+    UNIQSTR_CONCAT ("percent_define_kind(", variable, ")");

 
   /* Command-line options are processed before the grammar file.  */
   if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
 
   /* Command-line options are processed before the grammar file.  */
   if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE


@@ -509,6 +510,7 @@ muscle_percent_define_insert (char const *var, location variable_loc,
   muscle_user_name_list_grow ("percent_define_user_variables", variable,
                               variable_loc);
   MUSCLE_INSERT_INT (how_name, how);
   muscle_user_name_list_grow ("percent_define_user_variables", variable,
                               variable_loc);
   MUSCLE_INSERT_INT (how_name, how);

+  MUSCLE_INSERT_STRING (kind_name, muscle_kind_string (kind));

  end:
   free (variable);
 }
  end:
   free (variable);
 }


@@ -519,20 +521,16 @@ void
 muscle_percent_define_ensure (char const *variable, location loc,
                               bool value)
 {
 muscle_percent_define_ensure (char const *variable, location loc,
                               bool value)
 {

-  char const *val = value ? "" : "false";

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

+  char const *val = value ? "" : "false";

 
 

-  /* %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.  */
+  /* Don't complain is VARIABLE is already defined, but be sure to set
+     its value to VAL.  */

   if (!muscle_find_const (name))
   if (!muscle_find_const (name))

-    muscle_percent_define_insert (variable, loc, val,
+    muscle_percent_define_insert (variable, loc, muscle_keyword, val,

                                   MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
                                   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)
   if (muscle_percent_define_flag_if (variable) != value)

-    muscle_percent_define_insert (variable, loc, val,
+    muscle_percent_define_insert (variable, loc, muscle_keyword, val,

                                   MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
 }
 
                                   MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
 }
 


@@ -663,7 +661,7 @@ muscle_percent_define_check_values (char const * const *values)
                                quote (*variablep), quote_n (1, value));
               i += SUB_INDENT;
               for (values = variablep + 1; *values; ++values)
                                quote (*variablep), quote_n (1, value));
               i += SUB_INDENT;
               for (values = variablep + 1; *values; ++values)

-                complain_indent (&loc, complaint | no_caret, &i,
+                complain_indent (&loc, complaint | no_caret | silent, &i,

                                  _("accepted value: %s"), quote (*values));
             }
           else
                                  _("accepted value: %s"), quote (*values));
             }
           else


@@ -710,11 +708,6 @@ muscle_m4_output_processor (void *entry, void *out)
 }
 
 
 }
 
 

-/*----------------------------------------------------------------.
-| Output the definition of all the current muscles into a list of |
-| m4_defines.                                                     |
-`----------------------------------------------------------------*/
-

 void
 muscles_m4_output (FILE *out)
 {
 void
 muscles_m4_output (FILE *out)
 {