From 55d6a69aada2ec98ac40bb698b31f2a1c39d73d5 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Mon, 18 Jun 2018 01:14:09 +0200 Subject: [PATCH] Some more renames --- parso/pgen2/grammar.py | 10 +++++----- parso/pgen2/pgen.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/parso/pgen2/grammar.py b/parso/pgen2/grammar.py index 86ed4d9..727dd7d 100644 --- a/parso/pgen2/grammar.py +++ b/parso/pgen2/grammar.py @@ -108,8 +108,8 @@ class Grammar(object): states = [] for state in dfas: arcs = [] - for label, next_ in state.arcs.items(): - arcs.append((self._make_label(label), dfas.index(next_))) + for terminal_or_nonterminal, next_ in state.arcs.items(): + arcs.append((self._make_label(terminal_or_nonterminal), dfas.index(next_))) if state.isfinal: arcs.append((0, dfas.index(state))) states.append(arcs) @@ -119,9 +119,9 @@ class Grammar(object): def _make_first(self, nonterminal): rawfirst = self._first_terminals[nonterminal] first = set() - for label in rawfirst: - ilabel = self._make_label(label) - ##assert ilabel not in first, "%s failed on <> ... !=" % label + for terminal_or_nonterminal in rawfirst: + ilabel = self._make_label(terminal_or_nonterminal) + ##assert ilabel not in first, "%s failed on <> ... !=" % terminal_or_nonterminal first.add(ilabel) return first diff --git a/parso/pgen2/pgen.py b/parso/pgen2/pgen.py index 4453577..8caff85 100644 --- a/parso/pgen2/pgen.py +++ b/parso/pgen2/pgen.py @@ -30,7 +30,7 @@ class DFAState(object): self.from_rule = from_rule self.nfa_set = nfa_set self.isfinal = final in nfa_set - self.arcs = {} # map from nonterminals or strings to DFAState + self.arcs = {} # map from terminals/nonterminals to DFAState def add_arc(self, next_, label): assert isinstance(label, str)