Experimental parser: always add all subtrees

tools/lexer_generator/rule_parser.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 277 matching lines @@
       return self.__nfa
 
     def dfa(self):
       if not self.__dfa:
         (start, dfa_nodes) = self.nfa().compute_dfa()
         self.__dfa = Dfa(self.nfa().encoding(), start, dfa_nodes)
       return self.__dfa
 
     def optimize_dfa(self, log = False):
       assert not self.__dfa
-      self.__dfa = DfaOptimizer.optimize(self.dfa(), log)
+      assert not self.__minimial_dfa
+      self.__dfa = DfaOptimizer.optimize(self.minimal_dfa(), log)
+      self.__minimial_dfa = None
 
     def minimal_dfa(self):
       if not self.__minimial_dfa:
         self.__minimial_dfa = self.dfa().minimize()
       return self.__minimial_dfa
 
   def __process_parser_state(self, parser_state):
     rule_map = {}
     assert 'default' in parser_state.rules
     def process(subgraph, v):
       graphs = []
       for graph, precedence, action in v['regex']:
         (entry_action, match_action, transition) = action
         if entry_action or match_action:
           graph = NfaBuilder.add_action(
             graph, Action(entry_action, match_action, precedence))
         if not transition:
           pass
         elif transition == 'continue':
           assert not subgraph == 'default', 'unimplemented'
           graph = NfaBuilder.add_continue(graph)
         else:
           assert subgraph == 'default', 'unimplemented'
           graph = NfaBuilder.join_subgraph(
-            graph, transition, rule_map[transition])
+            graph, rule_map[transition])
         graphs.append(graph)
       graph = NfaBuilder.or_terms(graphs)
       rule_map[subgraph] = graph
     # process first the subgraphs, then the default graph
     for k, v in parser_state.rules.items():
       if k == 'default': continue
       process(k, v)
     process('default', parser_state.rules['default'])
     # build the automata
     for rule_name, graph in rule_map.items():
       self.__automata[rule_name] = RuleProcessor.Automata(
         parser_state.encoding, parser_state.character_classes, graph)
       self.__rule_trees[rule_name] = graph
     # process default_action
     default_action = parser_state.rules['default']['default_action']
     self.__default_action = Action(Term.empty_term(), default_action)