* src/reader.c, src/symlist.h, src/symlist.c: s/mid_rule/midrule/.

diff --git a/ChangeLog b/ChangeLog
index 82fad9e6feaf6f52be47f20b29df2b6b14653e28..5da2b92bd72d0646463460051957a535bb0d0a91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-05  Akim Demaille  <akim@epita.fr>
+
+       * src/reader.c, src/symlist.h, src/symlist.c: s/mid_rule/midrule/.
+

 2006-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        * data/c.m4 (b4_c_modern): New macro, with a new provision for
 2006-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        * data/c.m4 (b4_c_modern): New macro, with a new provision for

diff --git a/src/reader.c b/src/reader.c
index 573cb14d10de4040a598a2aaa2223ac2ec433e08..f2370a989b7d164e813230097a052bd5633377d3 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -221,7 +221,7 @@ static bool
 symbol_typed_p (const symbol_list *s)
 {
   return (s->sym->type_name
 symbol_typed_p (const symbol_list *s)
 {
   return (s->sym->type_name

-         || s->mid_rule && s->mid_rule->used);
+         || s->midrule && s->midrule->used);

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


@@ -341,7 +341,7 @@ grammar_midrule_action (void)
   /* Insert the dummy nonterminal replacing the midrule action into
      the current rule.  Bind it to its dedicated rule.  */
   grammar_current_rule_symbol_append (dummy, dummy_location);
   /* Insert the dummy nonterminal replacing the midrule action into
      the current rule.  Bind it to its dedicated rule.  */
   grammar_current_rule_symbol_append (dummy, dummy_location);

-  grammar_end->mid_rule = midrule;
+  grammar_end->midrule = midrule;

 }
 
 /* Set the precedence symbol of the current rule to PRECSYM. */
 }
 
 /* Set the precedence symbol of the current rule to PRECSYM. */

diff --git a/src/symlist.c b/src/symlist.c
index eeb54e5a8617c054c519ab00fb3c081df53eec86..70db82f07cd8a04242cbdce0e41a1b1284540baf 100644 (file)
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -38,7 +38,7 @@ symbol_list_new (symbol *sym, location loc)
   res->sym = sym;
   res->location = loc;
 
   res->sym = sym;
   res->location = loc;
 

-  res->mid_rule = NULL;
+  res->midrule = NULL;

 
   res->action = NULL;
   res->used = false;
 
   res->action = NULL;
   res->used = false;

diff --git a/src/symlist.h b/src/symlist.h
index bff56683aa94d5b62a279cab7472f6a9c7bb080e..0423d016d12046ae000292261752fc65c78f8744 100644 (file)
--- a/src/symlist.h
+++ b/src/symlist.h
@@ -34,7 +34,7 @@ typedef struct symbol_list
 
   /* If this symbol is the generated lhs for a mid-rule, a pointer to
      that mid-rule.  */
 
   /* If this symbol is the generated lhs for a mid-rule, a pointer to
      that mid-rule.  */

-  struct symbol_list *mid_rule;
+  struct symbol_list *midrule;

 
   /* The action is attached to the LHS of a rule. */
   const char *action;
 
   /* The action is attached to the LHS of a rule. */
   const char *action;