style: rename duplicate_directive as duplicate_rule_directive

[Akim Demaille]

commit 2c8fb4d126f5c63d92308a32b0dca4295effd413
Author: Akim Demaille <address@hidden>
Date:   Wed Jan 16 07:13:43 2019 +0100

    style: rename duplicate_directive as duplicate_rule_directive
    
    * src/complain.h, src/complain.c: here.
    Adjust callers.

diff --git a/src/complain.c b/src/complain.c
index af2d337e..3f8c5118 100644
--- a/src/complain.c
+++ b/src/complain.c
@@ -400,11 +400,10 @@ deprecated_directive (location const *loc, char const 
*old, char const *upd)
 }
 
 void
-duplicate_directive (char const *directive,
-                     location first, location second)
+duplicate_rule_directive (char const *directive,
+                          location first, location second)
 {
-  unsigned i = 0;
   complain (&second, complaint, _("only one %s allowed per rule"), directive);
-  i += SUB_INDENT;
+  unsigned i = SUB_INDENT;
   complain_indent (&first, complaint, &i, _("previous declaration"));
 }
diff --git a/src/complain.h b/src/complain.h
index 45e50737..e5f6d7e6 100644
--- a/src/complain.h
+++ b/src/complain.h
@@ -127,8 +127,8 @@ void deprecated_directive (location const *loc,
                            char const *obsolete, char const *updated);
 
 /** Report a repeated directive for a rule.  */
-void duplicate_directive (char const *directive,
-                          location first, location second);
+void duplicate_rule_directive (char const *directive,
+                               location first, location second);
 
 /** Warnings treated as errors shouldn't stop the execution as regular
     errors should (because due to their nature, it is safe to go
diff --git a/src/reader.c b/src/reader.c
index f3ad1a2e..8d373416 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -467,8 +467,8 @@ grammar_current_rule_prec_set (symbol *precsym, location 
loc)
      not defined separately as a token.  */
   symbol_class_set (precsym, token_sym, loc, false);
   if (current_rule->ruleprec)
-    duplicate_directive ("%prec",
-                         current_rule->ruleprec->location, loc);
+    duplicate_rule_directive ("%prec",
+                              current_rule->ruleprec->location, loc);
   else
     current_rule->ruleprec = precsym;
 }
@@ -483,8 +483,8 @@ grammar_current_rule_empty_set (location loc)
   if (warning_is_unset (Wempty_rule))
     warning_argmatch ("empty-rule", 0, 0);
   if (current_rule->percent_empty_loc.start.file)
-    duplicate_directive ("%empty",
-                         current_rule->percent_empty_loc, loc);
+    duplicate_rule_directive ("%empty",
+                              current_rule->percent_empty_loc, loc);
   else
     current_rule->percent_empty_loc = loc;
 }
@@ -501,8 +501,8 @@ grammar_current_rule_dprec_set (int dprec, location loc)
     complain (&loc, complaint, _("%s must be followed by positive number"),
               "%dprec");
   else if (current_rule->dprec != 0)
-    duplicate_directive ("%dprec",
-                         current_rule->dprec_location, loc);
+    duplicate_rule_directive ("%dprec",
+                              current_rule->dprec_location, loc);
   else
     {
       current_rule->dprec = dprec;
@@ -520,8 +520,8 @@ grammar_current_rule_merge_set (uniqstr name, location loc)
     complain (&loc, Wother, _("%s affects only GLR parsers"),
               "%merge");
   if (current_rule->merger != 0)
-    duplicate_directive ("%merge",
-                         current_rule->merger_declaration_location, loc);
+    duplicate_rule_directive ("%merge",
+                              current_rule->merger_declaration_location, loc);
   else
     {
       current_rule->merger = get_merge_function (name);