Reviewers: marja,
Message:
Committed patchset #1 manually as r19312 (tree was closed).
Description:
Experimental parser: make nfa nodes immutable
[email protected]
BUG=
Committed: https://code.google.com/p/v8/source/detail?r=19312
Please review this at https://codereview.chromium.org/148293022/
SVN Base: https://v8.googlecode.com/svn/branches/experimental/parser
Affected files (+20, -9 lines):
M tools/lexer_generator/nfa.py
M tools/lexer_generator/nfa_builder.py
Index: tools/lexer_generator/nfa.py
diff --git a/tools/lexer_generator/nfa.py b/tools/lexer_generator/nfa.py
index
cf887304a7fdc6cbe12872c5b5444787c606706d..8aa2b69088fd8f7c2a17092a888db16359b167f8
100644
--- a/tools/lexer_generator/nfa.py
+++ b/tools/lexer_generator/nfa.py
@@ -55,9 +55,19 @@ class NfaState(AutomatonState):
assert isinstance(action, Action)
self.__action = action
- def transitions(self):
+ def state_iter_for_key(self, key):
assert self.is_closed()
- return self.__transitions
+ if not key in self.__transitions:
+ return iter([])
+ return iter(self.__transitions[key])
+
+ def swap_key(self, old_key, new_key):
+ 'this is one of the few mutations allowed after closing'
+ assert self.is_closed()
+ assert not new_key == TransitionKey.epsilon(), "changes epsilon
closure"
+ value = self.__transitions[old_key]
+ del self.__transitions[old_key]
+ self.__transitions[new_key] = value
def __add_transition(self, key, next_state):
assert key != None
@@ -97,6 +107,7 @@ class NfaState(AutomatonState):
state_filter = lambda x: True,
match_func = lambda x, y: True,
yield_func = lambda x, y: (x, y)):
+ assert self.is_closed()
for key, states in self.__transitions.items():
if key_filter(key):
for state in states:
Index: tools/lexer_generator/nfa_builder.py
diff --git a/tools/lexer_generator/nfa_builder.py
b/tools/lexer_generator/nfa_builder.py
index
ea30c2ce0e605a6bd0c92073691e24df8cd6c2e5..97ecfa15512dd843c8d86170349a378e020f56cc
100644
--- a/tools/lexer_generator/nfa_builder.py
+++ b/tools/lexer_generator/nfa_builder.py
@@ -248,20 +248,20 @@ class NfaBuilder(object):
@staticmethod
def __replace_catch_all(encoding, state):
catch_all = TransitionKey.unique('catch_all')
- transitions = state.transitions()
- if not catch_all in transitions:
+ states = list(state.state_iter_for_key(catch_all))
+ if not states:
return
f = lambda acc, state: acc | set(state.epsilon_closure_iter())
- reachable_states = reduce(f, transitions[catch_all], set())
- f = lambda acc, state: acc | set(state.transitions().keys())
+ reachable_states = reduce(f, states, set())
+ f = lambda acc, state: acc | set(state.key_iter())
keys = reduce(f, reachable_states, set())
keys.discard(TransitionKey.epsilon())
keys.discard(catch_all)
keys.discard(TransitionKey.unique('eos'))
inverse_key = TransitionKey.inverse_key(encoding, keys)
- if inverse_key:
- transitions[inverse_key] = transitions[catch_all]
- del transitions[catch_all]
+ if not inverse_key:
+ inverse_key = TransitionKey.unique('no_match')
+ state.swap_key(catch_all, inverse_key)
@staticmethod
def nfa(encoding, character_classes, subtree_map, name):
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
