Experimental parser: small cleanup

tools/lexer_generator/dfa.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 200 matching lines @@
     action_map = {}
     id_map = {}
     terminal_set = self.__dfa.terminal_set()
     all_keys = []
     def f(state, visitor_state):
       state_id = len(id_map)
       id_map[state_id] = state
       action = state.action()
       all_keys.append(state.key_iter())
       if action:
-        # TODO add this back
-        # assert state in self.__terminal_set
         if state not in terminal_set:
-          action = "nonterminal action " + str(action)
+          assert action.entry_action()
+          action = ("nonterminal action", action)
       elif state in terminal_set:
         action = "terminal_set"
       if not action in action_map:
         action_map[action] = set()
       action_map[action].add(state_id)
     self.__dfa.visit_all_states(f)
     partitions = set()
     for p in action_map.values():
       partitions.add(StatePartition(p))
     reverse_id_map = {v : k for k, v in id_map.items()}
@@ skipping 120 matching lines @@
           elif len(intersection) <= len(difference):
             working_set.add(intersection)
           else:
             working_set.add(difference)
         if old_partitions:
           partitions -= old_partitions
         if new_partitions:
           partitions |= new_partitions
     (start_name, mapping) = self.__merge_partitions(partitions)
     return Dfa(start_name, mapping)