* src/LR0.c (save_reductions): Remove, replaced by...

* src/state.h, src/state.c (state_reductions_set): New.
(reductions, errs): Rename as...
(reductions_t, errs_t): these.
Adjust all dependencies.

diff --git a/ChangeLog b/ChangeLog
index 673ecece3e113768f9f4afd7d5638dd48f13370f..65776e5597503245c5cc13e14d6f10059ee75e49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-30  Akim Demaille  <akim@epita.fr>
+
+       * src/LR0.c (save_reductions): Remove, replaced by...
+       * src/state.h, src/state.c (state_reductions_set): New.
+       (reductions, errs): Rename as...
+       (reductions_t, errs_t): these.
+       Adjust all dependencies.
+
+       

 2002-06-30  Akim Demaille  <akim@epita.fr>
 
        * src/LR0.c (state_list_t, state_list_append): New.
 2002-06-30  Akim Demaille  <akim@epita.fr>
 
        * src/LR0.c (state_list_t, state_list_append): New.

diff --git a/src/LR0.c b/src/LR0.c
index 27282bd1e88590337082ad773eab60b6a1022bc7..d402d910b3c55c8eb0d01c07d2506e0bdeabe06f 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -94,7 +94,7 @@ allocate_itemsets (void)
   /* See comments before new_itemsets.  All the vectors of items
      live inside KERNEL_ITEMS.  The number of active items after
      some symbol cannot be more than the number of times that symbol
   /* See comments before new_itemsets.  All the vectors of items
      live inside KERNEL_ITEMS.  The number of active items after
      some symbol cannot be more than the number of times that symbol

-     appears as an item, which is symbol_count[symbol].
+     appears as an item, which is SYMBOL_COUNT[SYMBOL].

      We allocate that much space for each symbol.  */
 
   kernel_base = XCALLOC (item_number_t *, nsyms);
      We allocate that much space for each symbol.  */
 
   kernel_base = XCALLOC (item_number_t *, nsyms);


@@ -313,8 +313,7 @@ save_reductions (state_t *state)
     }
 
   /* Make a reductions structure and copy the data into it.  */
     }
 
   /* Make a reductions structure and copy the data into it.  */

-  state->reductions = reductions_new (count);
-  memcpy (state->reductions->rules, redset, count * sizeof (redset[0]));
+  state_reductions_set (state, count, redset);

 }
 
 \f
 }
 
 \f


@@ -340,7 +339,7 @@ set_states (void)
       if (!state->errs)
        state->errs = errs_new (0);
       if (!state->reductions)
       if (!state->errs)
        state->errs = errs_new (0);
       if (!state->reductions)

-       state->reductions = reductions_new (0);
+       state_reductions_set (state, 0, 0);

 
       states[state->number] = state;
 
 
       states[state->number] = state;
 

diff --git a/src/conflicts.c b/src/conflicts.c
index 028768174ed80765ea3be9637a7a98839d10abe9..aef33e6d3b44f4cc944dde96d71b9f90aa038245 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -179,7 +179,7 @@ resolve_sr_conflict (state_t *state, int lookahead)
   rule_t *redrule = state->lookaheads_rule[lookahead];
   int redprec = redrule->prec->prec;
   bitset lookaheads = state->lookaheads[lookahead];
   rule_t *redrule = state->lookaheads_rule[lookahead];
   int redprec = redrule->prec->prec;
   bitset lookaheads = state->lookaheads[lookahead];

-  errs *errp = errs_new (ntokens + 1);
+  errs_t *errp = errs_new (ntokens + 1);

   errp->nerrs = 0;
 
   for (i = 0; i < ntokens; i++)
   errp->nerrs = 0;
 
   for (i = 0; i < ntokens; i++)

diff --git a/src/lalr.c b/src/lalr.c
index 84f32894578b89dd547e1de05779a5eb6ab4ca52..8050f9f0ff0a0098cdaf2cd1fcc77871ecbc949e 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -521,7 +521,7 @@ states_lookaheads_count (void)
     {
       int k;
       int nlookaheads = 0;
     {
       int k;
       int nlookaheads = 0;

-      reductions *rp = states[i]->reductions;
+      reductions_t *rp = states[i]->reductions;

       shifts_t *sp = states[i]->shifts;
 
       /* We need a lookahead either to distinguish different
       shifts_t *sp = states[i]->shifts;
 
       /* We need a lookahead either to distinguish different

diff --git a/src/output.c b/src/output.c
index ea4186c81c639125e50b5efbbc95b012401c3394..daf753e4574efba14c63076e95dcb5c8eb4a361b 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -429,9 +429,9 @@ action_row (state_t *state)
 {
   int i;
   int default_rule = 0;
 {
   int i;
   int default_rule = 0;

-  reductions *redp = state->reductions;
+  reductions_t *redp = state->reductions;

   shifts_t *shiftp = state->shifts;
   shifts_t *shiftp = state->shifts;

-  errs *errp = state->errs;
+  errs_t *errp = state->errs;

   /* set nonzero to inhibit having any default reduction */
   int nodefault = 0;
   int conflicted = 0;
   /* set nonzero to inhibit having any default reduction */
   int nodefault = 0;
   int conflicted = 0;

diff --git a/src/print.c b/src/print.c
index b967c73fe51c084fa470748c497e733f41265d85..927d2beec7c5849230905fdb04c8363d08c7e3fc 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -128,7 +128,7 @@ print_shifts (FILE *out, state_t *state)
 static void
 print_errs (FILE *out, state_t *state)
 {
 static void
 print_errs (FILE *out, state_t *state)
 {

-  errs *errp = state->errs;
+  errs_t *errp = state->errs;

   int i;
 
   for (i = 0; i < errp->nerrs; ++i)
   int i;
 
   for (i = 0; i < errp->nerrs; ++i)


@@ -170,8 +170,8 @@ print_reductions (FILE *out, state_t *state)
 {
   int i;
   shifts_t *shiftp = state->shifts;
 {
   int i;
   shifts_t *shiftp = state->shifts;

-  reductions *redp = state->reductions;
-  errs *errp = state->errs;
+  reductions_t *redp = state->reductions;
+  errs_t *errp = state->errs;

   int nodefault = 0;
 
   if (redp->nreds == 0)
   int nodefault = 0;
 
   if (redp->nreds == 0)


@@ -304,7 +304,7 @@ print_reductions (FILE *out, state_t *state)
 static void
 print_actions (FILE *out, state_t *state)
 {
 static void
 print_actions (FILE *out, state_t *state)
 {

-  reductions *redp = state->reductions;
+  reductions_t *redp = state->reductions;

   shifts_t *shiftp = state->shifts;
 
   if (shiftp->nshifts == 0 && redp->nreds == 0)
   shifts_t *shiftp = state->shifts;
 
   if (shiftp->nshifts == 0 && redp->nreds == 0)

diff --git a/src/print_graph.c b/src/print_graph.c
index 7d81e2fe0f66a11f87cd5c56fa58b7a55029f985..1b83f1406f272ba0088921ace63e2381cdaad981 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -123,8 +123,8 @@ print_actions (state_t *state, const char *node_name)
 {
   int i;
 
 {
   int i;
 

-  shifts_t   *shiftp = state->shifts;
-  reductions *redp = state->reductions;
+  shifts_t     *shiftp = state->shifts;
+  reductions_t *redp = state->reductions;

 
   static char buff[10];
   edge_t edge;
 
   static char buff[10];
   edge_t edge;

diff --git a/src/state.c b/src/state.c
index 8148702e57e05ce1446dc2edf0805c18dae45321..dd8ec7500c5387e82313f81c8aad0e028c17cc88 100644 (file)
--- a/src/state.c
+++ b/src/state.c
@@ -61,23 +61,23 @@ shifts_new (int nshifts, state_number_t *shifts)
 `-------------------------------*/
 
 #define ERRS_ALLOC(Nerrs)                                              \
 `-------------------------------*/
 
 #define ERRS_ALLOC(Nerrs)                                              \

-  (errs *) xcalloc ((unsigned) (sizeof (errs)                          \
+  (errs_t *) xcalloc ((unsigned) (sizeof (errs_t)                      \

                                   + (Nerrs - 1) * sizeof (short)), 1)
 
 
                                   + (Nerrs - 1) * sizeof (short)), 1)
 
 

-errs *
+errs_t *

 errs_new (int n)
 {
 errs_new (int n)
 {

-  errs *res = ERRS_ALLOC (n);
+  errs_t *res = ERRS_ALLOC (n);

   res->nerrs = n;
   return res;
 }
 
 
   res->nerrs = n;
   return res;
 }
 
 

-errs *
-errs_dup (errs *src)
+errs_t *
+errs_dup (errs_t *src)

 {
 {

-  errs *res = errs_new (src->nerrs);
+  errs_t *res = errs_new (src->nerrs);

   memcpy (res->errs, src->errs, src->nerrs * sizeof (src->errs[0]));
   return res;
 }
   memcpy (res->errs, src->errs, src->nerrs * sizeof (src->errs[0]));
   return res;
 }


@@ -95,14 +95,15 @@ errs_dup (errs *src)
 `-------------------------------------*/
 
 #define REDUCTIONS_ALLOC(Nreductions)                                  \
 `-------------------------------------*/
 
 #define REDUCTIONS_ALLOC(Nreductions)                                  \

-  (reductions *) xcalloc ((unsigned) (sizeof (reductions)              \
+  (reductions_t *) xcalloc ((unsigned) (sizeof (reductions_t)          \

                                   + (Nreductions - 1) * sizeof (short)), 1)
 
                                   + (Nreductions - 1) * sizeof (short)), 1)
 

-reductions *
-reductions_new (int n)
+static reductions_t *
+reductions_new (int nreductions, short *reductions)

 {
 {

-  reductions *res = REDUCTIONS_ALLOC (n);
-  res->nreds = n;
+  reductions_t *res = REDUCTIONS_ALLOC (nreductions);
+  res->nreds = nreductions;
+  memcpy (res->rules, reductions, nreductions * sizeof (reductions[0]));

   return res;
 }
 
   return res;
 }
 


@@ -159,6 +160,17 @@ state_shifts_set (state_t *state, int nshifts, state_number_t *shifts)
 }
 
 
 }
 
 

+/*------------------------------.
+| Set the reductions of STATE.  |
+`------------------------------*/
+
+void
+state_reductions_set (state_t *state, int nreductions, short *reductions)
+{
+  state->reductions = reductions_new (nreductions, reductions);
+}
+
+

 
 /*--------------------------------------------------------------.
 | Print on OUT all the lookaheads such that this STATE wants to |
 
 /*--------------------------------------------------------------.
 | Print on OUT all the lookaheads such that this STATE wants to |

diff --git a/src/state.h b/src/state.h
index 8634b44b8255c5105fecab53f3502bf599a9f932..074b1eea47bdfd0e63b0f86316c77632c79310ec 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -144,27 +144,26 @@ typedef struct shifts_s
 | Errs.  |
 `-------*/
 
 | Errs.  |
 `-------*/
 

-typedef struct errs
+typedef struct errs_s

 {
   short nerrs;
   short errs[1];
 {
   short nerrs;
   short errs[1];

-} errs;
+} errs_t;

 
 

-errs *errs_new PARAMS ((int n));
-errs *errs_dup PARAMS ((errs *src));
+errs_t *errs_new PARAMS ((int n));
+errs_t *errs_dup PARAMS ((errs_t *src));

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

-typedef struct reductions
+typedef struct reductions_s

 {
   short nreds;
   short rules[1];
 {
   short nreds;
   short rules[1];

-} reductions;
+} reductions_t;

 
 

-reductions *reductions_new PARAMS ((int n));

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


@@ -176,8 +175,8 @@ typedef struct state_s
   state_number_t number;
   symbol_number_t accessing_symbol;
   shifts_t     *shifts;
   state_number_t number;
   symbol_number_t accessing_symbol;
   shifts_t     *shifts;

-  reductions *reductions;
-  errs       *errs;
+  reductions_t *reductions;
+  errs_t       *errs;

 
   /* Nonzero if no lookahead is needed to decide what to do in state S.  */
   char consistent;
 
   /* Nonzero if no lookahead is needed to decide what to do in state S.  */
   char consistent;


@@ -208,6 +207,10 @@ state_t *state_new PARAMS ((symbol_number_t accessing_symbol,
 void state_shifts_set PARAMS ((state_t *state,
                               int nshifts, state_number_t *shifts));
 
 void state_shifts_set PARAMS ((state_t *state,
                               int nshifts, state_number_t *shifts));
 

+/* Set the reductions of STATE.  */
+void state_reductions_set PARAMS ((state_t *state,
+                                  int nreductions, short *reductions));
+

 /* Print on OUT all the lookaheads such that this STATE wants to
    reduce this RULE.  */
 void state_rule_lookaheads_print PARAMS ((state_t *state, rule_t *rule,
 /* Print on OUT all the lookaheads such that this STATE wants to
    reduce this RULE.  */
 void state_rule_lookaheads_print PARAMS ((state_t *state, rule_t *rule,