Experimental parser: use Terms instead of tuples

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 68 matching lines @@
     loads.append(load_template % ("dfa [%s]" % name, dfa_i))
     if mdfa and mdfa.node_count() != dfa.node_count():
       scripts.append(script_template % (mdfa_i, mdfa.to_dot()))
       loads.append(load_template % ("mdfa [%s]" % name, mdfa_i))
   body = "\n".join(scripts) + (load_outer_template % "\n".join(loads))
   return file_template % body
 
 def generate_rule_tree_html(rule_processor):
   scripts = []
   loads = []
-  rule_tree_dots = rule_processor.rule_tree_dots()
-  for i, (rule, dot) in enumerate(rule_tree_dots.items()):
+  for i, (name, automata) in enumerate(list(rule_processor.automata_iter())):
     rule_i = "rule_%d" % i
+    dot = automata.rule_term().to_dot()
     scripts.append(script_template % (rule_i, dot))
-    loads.append(load_template % ("rules [%s]" % rule, rule_i))
+    loads.append(load_template % ("rules [%s]" % name, rule_i))
   body = "\n".join(scripts) + (load_outer_template % "\n".join(loads))
   return file_template % body
 
 def generate_code(rule_processor, minimize_default):
   return CodeGenerator.rule_processor_to_code(rule_processor, minimize_default)
 
 def lex(rule_processor, string):
   for t in rule_processor.default_automata().dfa().lex(string + '\0'):
     print t
 
@@ skipping 62 matching lines @@
     code = code_generator.process()
     with open(code_file, 'w') as f:
       f.write(code)
       if verbose:
         print "wrote code to %s" % code_file
 
   input_file = args.input
   if input_file:
     with open(input_file, 'r') as f:
       lex(rule_processor, f.read())