c++: fix several issues with locations

[bison.git] / src / state.c

diff --git a/src/state.c b/src/state.c
index 076600c64829436749855f77d1044660a5c99c37..c11b10f7ddaf92f6e5463a59cafd7e28d3ec037f 100644 (file)
--- a/src/state.c
+++ b/src/state.c
@@ -1,7 +1,6 @@
-/* Type definitions for nondeterministic finite state machine for Bison.
+/* Type definitions for the finite state machine for Bison.

 
 

-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001-2007, 2009-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.
 


@@ -26,11 +25,12 @@
 #include "complain.h"
 #include "gram.h"
 #include "state.h"
 #include "complain.h"
 #include "gram.h"
 #include "state.h"

+#include "print-xml.h"

 
 
 
 

-                       /*-------------------.
-                       | Shifts and Gotos.  |
-                       `-------------------*/
+                        /*-------------------.
+                        | Shifts and Gotos.  |
+                        `-------------------*/

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


@@ -61,14 +61,14 @@ transitions_to (transitions *shifts, symbol_number sym)
     {
       aver (j < shifts->num);
       if (TRANSITION_SYMBOL (shifts, j) == sym)
     {
       aver (j < shifts->num);
       if (TRANSITION_SYMBOL (shifts, j) == sym)

-       return shifts->states[j];
+        return shifts->states[j];

     }
 }
 
 
     }
 }
 
 

-                       /*--------------------.
-                       | Error transitions.  |
-                       `--------------------*/
+                        /*--------------------.
+                        | Error transitions.  |
+                        `--------------------*/

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


@@ -88,9 +88,9 @@ errs_new (int num, symbol **tokens)
 
 
 
 
 
 

-                       /*-------------.
-                       | Reductions.  |
-                       `-------------*/
+                        /*-------------.
+                        | Reductions.  |
+                        `-------------*/

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


@@ -110,9 +110,9 @@ reductions_new (int num, rule **reds)
 
 
 
 
 
 

-                       /*---------.
-                       | States.  |
-                       `---------*/
+                        /*---------.
+                        | States.  |
+                        `---------*/

 
 
 state_number nstates = 0;
 
 
 state_number nstates = 0;


@@ -128,7 +128,7 @@ state *final_state = NULL;
 
 state *
 state_new (symbol_number accessing_symbol,
 
 state *
 state_new (symbol_number accessing_symbol,

-          size_t nitems, item_number *core)
+           size_t nitems, item_number *core)

 {
   state *res;
   size_t items_size = nitems * sizeof *core;
 {
   state *res;
   size_t items_size = nitems * sizeof *core;


@@ -141,8 +141,10 @@ state_new (symbol_number accessing_symbol,
   res->transitions = NULL;
   res->reductions = NULL;
   res->errs = NULL;
   res->transitions = NULL;
   res->reductions = NULL;
   res->errs = NULL;

+  res->state_list = NULL;

   res->consistent = 0;
   res->solved_conflicts = NULL;
   res->consistent = 0;
   res->solved_conflicts = NULL;

+  res->solved_conflicts_xml = NULL;

 
   res->nitems = nitems;
   memcpy (res->items, core, items_size);
 
   res->nitems = nitems;
   memcpy (res->items, core, items_size);


@@ -152,6 +154,32 @@ state_new (symbol_number accessing_symbol,
   return res;
 }
 
   return res;
 }
 

+state *
+state_new_isocore (state const *s)
+{
+  state *res;
+  size_t items_size = s->nitems * sizeof *s->items;
+
+  aver (nstates < STATE_NUMBER_MAXIMUM);
+
+  res = xmalloc (offsetof (state, items) + items_size);
+  res->number = nstates++;
+  res->accessing_symbol = s->accessing_symbol;
+  res->transitions =
+    transitions_new (s->transitions->num, s->transitions->states);
+  res->reductions = reductions_new (s->reductions->num, s->reductions->rules);
+  res->errs = NULL;
+  res->state_list = NULL;
+  res->consistent = s->consistent;
+  res->solved_conflicts = NULL;
+  res->solved_conflicts_xml = NULL;
+
+  res->nitems = s->nitems;
+  memcpy (res->items, s->items, items_size);
+
+  return res;
+}
+

 
 /*---------.
 | Free S.  |
 
 /*---------.
 | Free S.  |


@@ -236,14 +264,37 @@ state_rule_lookahead_tokens_print (state *s, rule *r, FILE *out)
       char const *sep = "";
       fprintf (out, "  [");
       BITSET_FOR_EACH (biter, reds->lookahead_tokens[red], k, 0)
       char const *sep = "";
       fprintf (out, "  [");
       BITSET_FOR_EACH (biter, reds->lookahead_tokens[red], k, 0)

-       {
-         fprintf (out, "%s%s", sep, symbols[k]->tag);
-         sep = ", ";
-       }
+        {
+          fprintf (out, "%s%s", sep, symbols[k]->tag);
+          sep = ", ";
+        }

       fprintf (out, "]");
     }
 }
 
       fprintf (out, "]");
     }
 }
 

+void
+state_rule_lookahead_tokens_print_xml (state *s, rule *r,
+                                       FILE *out, int level)
+{
+  /* Find the reduction we are handling.  */
+  reductions *reds = s->reductions;
+  int red = state_reduction_find (s, r);
+
+  /* Print them if there are.  */
+  if (reds->lookahead_tokens && red != -1)
+    {
+      bitset_iterator biter;
+      int k;
+      xml_puts (out, level, "<lookaheads>");
+      BITSET_FOR_EACH (biter, reds->lookahead_tokens[red], k, 0)
+        {
+          xml_printf (out, level + 1, "<symbol>%s</symbol>",
+                      xml_escape (symbols[k]->tag));
+        }
+      xml_puts (out, level, "</lookaheads>");
+    }
+}
+

 
 /*---------------------.
 | A state hash table.  |
 
 /*---------------------.
 | A state hash table.  |


@@ -302,10 +353,10 @@ void
 state_hash_new (void)
 {
   state_table = hash_initialize (HT_INITIAL_CAPACITY,
 state_hash_new (void)
 {
   state_table = hash_initialize (HT_INITIAL_CAPACITY,

-                                NULL,
-                                state_hasher,
-                                state_comparator,
-                                NULL);
+                                 NULL,
+                                 state_hasher,
+                                 state_comparator,
+                                 NULL);

 }
 
 
 }
 
 


@@ -327,7 +378,8 @@ state_hash_free (void)
 void
 state_hash_insert (state *s)
 {
 void
 state_hash_insert (state *s)
 {

-  hash_insert (state_table, s);
+  if (!hash_insert (state_table, s))
+    xalloc_die ();

 }
 
 
 }