Experimental parser: some cleanup and assertions for rule_parser

tools/lexer_generator/generator.py

 # Copyright 2013 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 61 matching lines @@
     scripts.append(script_template % (dfa_i, dfa.to_dot()))
     loads.append(load_template % ("nfa [%s]" % name, nfa_i))
     loads.append(load_template % ("dfa [%s]" % name, dfa_i))
   body = "\n".join(scripts) + (load_outer_template % "\n".join(loads))
   return file_template % body
 
 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))
   return html_data
 
 if __name__ == '__main__':
 
   parser = argparse.ArgumentParser()
   parser.add_argument('--html')
   args = parser.parse_args()
 
   re_file = 'src/lexer/lexer_py.re'
 
   parser_state = RuleParserState()
   with open(re_file, 'r') as f:
     RuleParser.parse(f.read(), parser_state)
   html_data = process_rules(parser_state)
 
   html_file = args.html
   if html_file:
     html = generate_html(html_data)
     with open(args.html, 'w') as f:
       f.write(html)
       print "wrote html to %s" % html_file