style: shift/reduce, not shift-reduce

[Akim Demaille]

commit 0e5cbd38b24e83c0f223e2d1d37b8aa27aac0073
Author: Akim Demaille <akim.demaille@gmail.com>
Date:   Sun Jun 28 08:33:24 2020 +0200

    style: shift/reduce, not shift-reduce
    
    * src/reader.c: here.

diff --git a/README-hacking.md b/README-hacking.md
index 3690ba7f..a7c33af7 100644
--- a/README-hacking.md
+++ b/README-hacking.md
@@ -38,8 +38,10 @@ assert/abort), and all the --trace output which is meant for 
the maintainers
 only.
 
 ## Vocabulary
-Use "nonterminal", not "variable" or "non-terminal" or "non terminal".
-Abbreviated as "nterm".
+- "nonterminal", not "variable" or "non-terminal" or "non terminal".
+  Abbreviated as "nterm".
+- "shift/reduce" and "reduce/reduce", not "shift-reduce" or "shift reduce",
+  etc.
 
 ## Syntax highlighting
 It's quite nice to be in C++ mode when editing lalr1.cc for instance.
diff --git a/src/reader.c b/src/reader.c
index 9289e087..1ba710c6 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -576,8 +576,8 @@ grammar_current_rule_predicate_append (const char *pred, 
location loc)
                                /* is_predicate */ true);
 }
 
-/* Set the expected number of shift-reduce (reduce-reduce) conflicts for
- * the current rule.  If a midrule is encountered later, the count
+/* Set the expected number of shift/reduce (reduce/reduce) conflicts
+ * for the current rule.  If a midrule is encountered later, the count
  * is transferred to it and reset in the current rule to -1. */
 
 void