VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2026-05-11 09:08:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some more renames

Browse Source
This commit is contained in:
Dave Halter
2018-06-14 01:10:23 +02:00
parent a5ce2caab6
commit a277ccf288
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parso/pgen2/pgen.py
+9 -12
View File
@@ -214,27 +214,24 @@ def _make_dfas(start, finish):
assert isinstance(start, NFAState) assert isinstance(start, NFAState)
assert isinstance(finish, NFAState) assert isinstance(finish, NFAState)
def closure(state):
base = {}
addclosure(state, base)
return base
def addclosure(state, base): def addclosure(state, base):
assert isinstance(state, NFAState) assert isinstance(state, NFAState)
if state in base: if state in base:
return return
base[state] = 1 base[state] = 1
for label, next in state.arcs: for label, next_ in state.arcs:
if label is None: if label is None:
addclosure(next, base) addclosure(next_, base)
states = [DFAState(closure(start), finish)] base = {}
addclosure(start, base)
states = [DFAState(base, finish)]
for state in states: # NB states grows while we're iterating for state in states: # NB states grows while we're iterating
arcs = {} arcs = {}
for nfastate in state.nfaset: for nfastate in state.nfaset:
for label, next in nfastate.arcs: for label, next_ in nfastate.arcs:
if label is not None: if label is not None:
addclosure(next, arcs.setdefault(label, {})) addclosure(next_, arcs.setdefault(label, {}))
for label, nfaset in arcs.items(): for label, nfaset in arcs.items():
for st in states: for st in states:
if st.nfaset == nfaset: if st.nfaset == nfaset:
@@ -285,12 +282,12 @@ def generate_grammar(bnf_grammar, token_namespace):
for nfa_a, nfa_z in GrammarParser(bnf_grammar).parse(): for nfa_a, nfa_z in GrammarParser(bnf_grammar).parse():
#_dump_nfa(a, z) #_dump_nfa(a, z)
dfas = _make_dfas(nfa_a, nfa_z) dfas = _make_dfas(nfa_a, nfa_z)
#_dump_dfas(self._current_rule_name, dfas) #_dump_dfas(nfa_a.from_rule, dfas)
# oldlen = len(dfas) # oldlen = len(dfas)
_simplify_dfas(dfas) _simplify_dfas(dfas)
# newlen = len(dfas) # newlen = len(dfas)
rule_to_dfas[nfa_a.from_rule] = dfas rule_to_dfas[nfa_a.from_rule] = dfas
#print(self._current_rule_name, oldlen, newlen) #print(nfa_a.from_rule, oldlen, newlen)
if start_symbol is None: if start_symbol is None:
start_symbol = nfa_a.from_rule start_symbol = nfa_a.from_rule