From fb83319d9cdb592673f7c534e2690b2fd065cfaf Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sun, 10 Feb 2019 13:38:17 +0100 Subject: [PATCH] style: comment and names changes in map_goto * src/lalr.h, src/lalr.c: Use clearer names. --- src/lalr.c | 6 +++--- src/lalr.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lalr.c b/src/lalr.c index 03e807de..ff0e4d86 100644 --- a/src/lalr.c +++ b/src/lalr.c @@ -122,7 +122,7 @@ set_goto_map (void) goto_number -map_goto (state_number s0, symbol_number sym) +map_goto (state_number src, symbol_number sym) { goto_number low = goto_map[sym - ntokens]; goto_number high = goto_map[sym - ntokens + 1] - 1; @@ -132,9 +132,9 @@ map_goto (state_number s0, symbol_number sym) aver (low <= high); goto_number middle = (low + high) / 2; state_number s = from_state[middle]; - if (s == s0) + if (s == src) return middle; - else if (s < s0) + else if (s < src) low = middle + 1; else high = middle - 1; diff --git a/src/lalr.h b/src/lalr.h index c8ca6277..84a66f7c 100644 --- a/src/lalr.h +++ b/src/lalr.h @@ -96,8 +96,8 @@ extern state_number *from_state; /** State number it leads to. */ extern state_number *to_state; -/** Find the goto number of the goto from S on non-terminal SYM. */ -goto_number map_goto (state_number s, symbol_number sym); +/** The number of the goto from state SRC labeled with nterm SYM. */ +goto_number map_goto (state_number src, symbol_number sym); /* goto_follows[i] is the set of tokens following goto i. */ extern bitsetv goto_follows;