More cleanup.

* src/reader.c (current_rule): Declare it static since it's no longer
used outside this file.
(grammar_current_rule_action_append): Remove redundant arguments from
translate_rule_action invocation.
* src/reader.h (current_rule): Remove this unused extern.
* src/scan-code.h (translate_rule_action): Remove redundant arguments.
* src/scan-code.l (translate_rule_action): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 08224ae52cdfac889868991933212c680386acfe..65ffbdad0f63d9fe1de6cba7bc0780be3ef27e5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-26  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+        More cleanup.
+        * src/reader.c (current_rule): Declare it static since it's no longer
+        used outside this file.
+        (grammar_current_rule_action_append): Remove redundant arguments from
+        translate_rule_action invocation.
+        * src/reader.h (current_rule): Remove this unused extern.
+        * src/scan-code.h (translate_rule_action): Remove redundant arguments.
+        * src/scan-code.l (translate_rule_action): Likewise.
+
 2006-06-25  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Clean up yesterday's patch.

diff --git a/src/reader.c b/src/reader.c
index 73cbd5d9961bc4e2d9c1a5715d66030a357e55aa..2c05c19a5d5aeee9d1d0a8bbfc611b4683d6266d 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -180,7 +180,7 @@ grammar_symbol_append (symbol *sym, location loc)
 /* The rule currently being defined, and the previous rule.
    CURRENT_RULE points to the first LHS of the current rule, while
    PREVIOUS_RULE_END points to the *end* of the previous rule (NULL).  */
-symbol_list *current_rule = NULL;
+static symbol_list *current_rule = NULL;
 static symbol_list *previous_rule_end = NULL;
 
 
@@ -405,8 +405,9 @@ grammar_current_rule_action_append (const char *action, location loc)
 {
   if (current_rule->action)
     grammar_midrule_action ();
-  current_rule->action = translate_rule_action (current_rule, action, loc);
+  current_rule->action = action;
   current_rule->action_location = loc;
+  current_rule->action = translate_rule_action (current_rule);
 }
 
 \f

diff --git a/src/reader.h b/src/reader.h
index a16bfaf3b9daa4ff1b7ed961443438ebe83f9eca..7b2cbac6883eae9a8930897342dfadc9f3d1cbe3 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -52,7 +52,6 @@ void grammar_current_rule_dprec_set (int dprec, location loc);
 void grammar_current_rule_merge_set (uniqstr name, location loc);
 void grammar_current_rule_symbol_append (symbol *sym, location loc);
 void grammar_current_rule_action_append (const char *action, location loc);
-extern symbol_list *current_rule;
 void reader (void);
 void free_merger_functions (void);
 

diff --git a/src/scan-code.h b/src/scan-code.h
index 8d97935714c2ce58aa8c27360f2bc975c2462fda..cf5be8759029e9d80ece1f3d3e5c79bca06b731c 100644 (file)
--- a/src/scan-code.h
+++ b/src/scan-code.h
@@ -33,9 +33,9 @@ extern int max_left_semantic_context;
 
 void code_scanner_free (void);
 
-/* The action A contains $$, $1 etc. referring to the values
+/* The action of the rule R contains $$, $1 etc. referring to the values
    of the rule R. */
-const char *translate_rule_action (symbol_list *r, const char *a, location l);
+const char *translate_rule_action (symbol_list *r);
 
 /* The action A refers to $$ and @$ only, referring to a symbol. */
 const char *translate_symbol_action (const char *a, location l);

diff --git a/src/scan-code.l b/src/scan-code.l
index 4e464a7a8002f82ee5aecd30966730be8a6525aa..aa58521c440a13e8f45e5373aa3fd9ae80b6c721 100644 (file)
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -357,9 +357,10 @@ translate_action (int sc_context, symbol_list *rule, const char *a, location l)
 }
 
 const char *
-translate_rule_action (symbol_list *rule, const char *a, location l)
+translate_rule_action (symbol_list *rule)
 {
-  return translate_action (SC_RULE_ACTION, rule, a, l);
+  return translate_action (SC_RULE_ACTION, rule, rule->action,
+                          rule->action_location);
 }
 
 const char *