Experimental parser: cleanup rule processing result

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 49 matching lines @@
 
 load_template = '''      draw('%s', '%s');'''
 
 load_outer_template = '''    <script>
 %s
     </script>'''
 
 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()))
     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 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):
   for t in rule_processor.lex(string + '\0'):
     print t
 
 if __name__ == '__main__':
 
   parser = argparse.ArgumentParser()
   parser.add_argument('--html')
@@ skipping 18 matching lines @@
   if code_file:
     code = generate_code(rule_processor)
     with open(code_file, 'w') as f:
       f.write(code)
       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())