Revision: 17678
Author: [email protected]
Date: Wed Nov 13 09:50:56 2013 UTC
Log: Experimental parser: cleanup rule processing result
[email protected]
BUG=
Review URL: https://codereview.chromium.org/61003003
http://code.google.com/p/v8/source/detail?r=17678
Modified:
/branches/experimental/parser/tools/lexer_generator/action_test.py
/branches/experimental/parser/tools/lexer_generator/code_generator_test.py
/branches/experimental/parser/tools/lexer_generator/dfa.py
/branches/experimental/parser/tools/lexer_generator/generator.py
/branches/experimental/parser/tools/lexer_generator/rule_parser.py
=======================================
--- /branches/experimental/parser/tools/lexer_generator/action_test.py Wed
Nov 13 08:20:20 2013 UTC
+++ /branches/experimental/parser/tools/lexer_generator/action_test.py Wed
Nov 13 09:50:56 2013 UTC
@@ -51,7 +51,7 @@
automata_for_conditions = process_rules(rules)
self.assertEqual(len(automata_for_conditions), 1)
self.assertTrue('default' in automata_for_conditions)
- (nfa, dfa) = automata_for_conditions['default']
+ dfa = automata_for_conditions['default'].dfa()
self.__verify_last_action(dfa, 'foo', 'ID')
self.__verify_last_action(dfa, 'key', 'KEYWORD')
@@ -66,7 +66,7 @@
automata_for_conditions = process_rules(rules)
self.assertEqual(len(automata_for_conditions), 1)
self.assertTrue('default' in automata_for_conditions)
- (nfa, dfa) = automata_for_conditions['default']
+ dfa = automata_for_conditions['default'].dfa()
# The keyword is not recognized because of the rule preference order
(ID
# is preferred over KEYWORD).
=======================================
---
/branches/experimental/parser/tools/lexer_generator/code_generator_test.py
Wed Nov 13 08:33:29 2013 UTC
+++
/branches/experimental/parser/tools/lexer_generator/code_generator_test.py
Wed Nov 13 09:50:56 2013 UTC
@@ -40,5 +40,5 @@
"foo" { FOO }
eof <<terminate>>'''
rule_processor = RuleProcessor.parse(rules)
- (nfa, dfa) = rule_processor.default_automata()
+ dfa = rule_processor.default_automata().dfa()
CodeGenerator.dfa_to_code(dfa)
=======================================
--- /branches/experimental/parser/tools/lexer_generator/dfa.py Wed Nov 13
08:20:20 2013 UTC
+++ /branches/experimental/parser/tools/lexer_generator/dfa.py Wed Nov 13
09:50:56 2013 UTC
@@ -26,7 +26,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from automaton import *
-from nfa import Nfa
from transition_keys import TransitionKey
class DfaState(AutomatonState):
@@ -58,14 +57,14 @@
def __init__(self, start_name, mapping):
super(Dfa, self).__init__()
self.__terminal_set = set()
- self.__name_map = {}
+ name_map = {}
for name, node_data in mapping.items():
node = DfaState(name, node_data['action'])
- self.__name_map[name] = node
+ name_map[name] = node
if node_data['terminal']:
self.__terminal_set.add(node)
for name, node_data in mapping.items():
- node = self.__name_map[name]
+ node = name_map[name]
inversion = {}
for key, state in node_data['transitions'].items():
if not state in inversion:
@@ -73,9 +72,15 @@
inversion[state].append(key)
for state, keys in inversion.items():
merged_key = TransitionKey.merged_key(keys)
- node.add_transition(merged_key, self.__name_map[state])
- self.__start = self.__name_map[start_name]
+ node.add_transition(merged_key, name_map[state])
+ self.__start = name_map[start_name]
+ self.__node_count = len(mapping)
+ self.__verify()
+
+ def __verify(self):
assert self.__terminal_set
+ state_count = self.visit_all_states(lambda state, count: count + 1, 0)
+ assert self.__node_count == state_count
def start_state(self):
return self.__start
@@ -87,7 +92,7 @@
return set(self.__terminal_set)
def all_states_iter(self):
- return iter(self.__name_map.values())
+ return self.__start.state_iter()
@staticmethod
def __match_char(state, char):
=======================================
--- /branches/experimental/parser/tools/lexer_generator/generator.py Tue
Nov 12 19:10:03 2013 UTC
+++ /branches/experimental/parser/tools/lexer_generator/generator.py Wed
Nov 13 09:50:56 2013 UTC
@@ -67,8 +67,8 @@
def generate_html(rule_processor):
scripts = []
loads = []
- for i, (name, (nfa, dfa)) in
enumerate(list(rule_processor.automata_iter())):
- if name == 'Normal': continue
+ for i, (name, automata) in
enumerate(list(rule_processor.automata_iter())):
+ (nfa, dfa) = (automata.nfa(), automata.dfa())
(nfa_i, dfa_i) = ("nfa_%d" % i, "dfa_%d" % i)
scripts.append(script_template % (nfa_i, nfa.to_dot()))
scripts.append(script_template % (dfa_i, dfa.to_dot()))
@@ -78,7 +78,7 @@
return file_template % body
def generate_code(rule_processor):
- (nfa, dfa) = rule_processor.default_automata()
+ dfa = rule_processor.default_automata().dfa()
return CodeGenerator.dfa_to_code(dfa)
def lex(rule_processor, string):
=======================================
--- /branches/experimental/parser/tools/lexer_generator/rule_parser.py Wed
Nov 13 08:20:20 2013 UTC
+++ /branches/experimental/parser/tools/lexer_generator/rule_parser.py Wed
Nov 13 09:50:56 2013 UTC
@@ -234,9 +234,26 @@
return self.__automata['default']
def lex(self, string):
- (nfa, dfa) = self.default_automata()
+ dfa = self.default_automata().dfa()
return dfa.lex(string)
+ class Automata(object):
+
+ def __init__(self, nfa):
+ (start, dfa_nodes) = nfa.compute_dfa()
+ self.__nfa = nfa
+ self.__dfa = Dfa(start, dfa_nodes)
+ self.__minimial_dfa = self.__dfa.minimize()
+
+ def nfa(self):
+ return self.__dfa
+
+ def dfa(self):
+ return self.__dfa
+
+ def minimal_dfa(self):
+ return self.__minimial_dfa
+
def __process_parser_state(self, parser_state):
rule_map = {}
builder = NfaBuilder()
@@ -281,6 +298,4 @@
# build the automata
for rule_name, graph in rule_map.items():
nfa = builder.nfa(graph)
- (start, dfa_nodes) = nfa.compute_dfa()
- dfa = Dfa(start, dfa_nodes)
- self.__automata[rule_name] = (nfa, dfa)
+ self.__automata[rule_name] = RuleProcessor.Automata(nfa)
--
--
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.
