Experimental parser: some cleanup and assertions for rule_parser

tools/lexer_generator/generator.py

Index: tools/lexer_generator/generator.py
diff --git a/tools/lexer_generator/generator.py b/tools/lexer_generator/generator.py
index a257568a8ec10b194387bdcd29298f9b4b8a6200..035b5a746294691dae525be36db6f8fa753c0477 100644
--- a/tools/lexer_generator/generator.py
+++ b/tools/lexer_generator/generator.py
@@ -79,13 +79,16 @@ def process_rules(parser_state):
   rule_map = {}
   builder = NfaBuilder()
   builder.set_character_classes(parser_state.character_classes)
+  assert 'default' in parser_state.rules
   for k, v in parser_state.rules.items():
+    assert 'default' in v
     graphs = []
-    for (graph, precedence, code, action) in v['regex']:
-      graphs.append(NfaBuilder.add_action(graph, (precedence, code, action)))
-    rule_map[k] = builder.nfa(NfaBuilder.or_graphs(graphs))
+    for (graph, action) in v['regex']:
+      graphs.append(NfaBuilder.add_action(graph, action))
+    rule_map[k] = NfaBuilder.or_graphs(graphs)
   html_data = []
-  for rule_name, nfa in rule_map.items():
+  for rule_name, graph in rule_map.items():
+    nfa = builder.nfa(graph)
     (start, dfa_nodes) = nfa.compute_dfa()
     dfa = Dfa(start, dfa_nodes)
     html_data.append((rule_name, nfa, dfa))