Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-23 03:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: shift/reduce, not shift-reduce

Browse Source 
* src/reader.c: here.
This commit is contained in:
Akim Demaille
2020-06-28 08:33:24 +02:00
parent feb0bb0a59
commit 0e5cbd38b2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README-hacking.md
View File

@@ -38,8 +38,10 @@ assert/abort), and all the --trace output which is meant for the maintainers
only. only.
## Vocabulary ## Vocabulary
Use "nonterminal", not "variable" or "non-terminal" or "non terminal". - "nonterminal", not "variable" or "non-terminal" or "non terminal".
Abbreviated as "nterm". Abbreviated as "nterm".
- "shift/reduce" and "reduce/reduce", not "shift-reduce" or "shift reduce",
etc.
## Syntax highlighting ## Syntax highlighting
It's quite nice to be in C++ mode when editing lalr1.cc for instance. It's quite nice to be in C++ mode when editing lalr1.cc for instance.

4
src/reader.c
View File

@@ -576,8 +576,8 @@ grammar_current_rule_predicate_append (const char *pred, location loc)
/* is_predicate */ true); /* is_predicate */ true);
} }
/* Set the expected number of shift-reduce (reduce-reduce) conflicts for /* Set the expected number of shift/reduce (reduce/reduce) conflicts
* the current rule. If a midrule is encountered later, the count * for the current rule. If a midrule is encountered later, the count
* is transferred to it and reset in the current rule to -1. */ * is transferred to it and reset in the current rule to -1. */
void void