Experimental parser: some cleanup and assertions for rule_parser

tools/lexer_generator/action_test.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 21 matching lines @@
 
 def dfa_from_nfa(nfa):
   (start_name, dfa_nodes) = nfa.compute_dfa()
   return Dfa(start_name, dfa_nodes)
 
 def process_rules(parser_state):
   rule_map = {}
   builder = NfaBuilder()
   for k, v in parser_state.rules.items():
     graphs = []
-    for (graph, precedence, code, condition) in v['regex']:
-      graphs.append(NfaBuilder.add_action(graph, (precedence, code, condition)))
+    for (graph, action) in v['regex']:
+      graphs.append(NfaBuilder.add_action(graph, action))
     nfa = builder.nfa(NfaBuilder.or_graphs(graphs))
     dfa = dfa_from_nfa(nfa)
     rule_map[k] = (nfa, dfa)
   return rule_map
 
 class ActionTestCase(unittest.TestCase):
 
     def __verify_last_action(self, dfa, string, expected_code,
                              expected_condition):
       actions = list(dfa.collect_actions(string))
@@ skipping 26 matching lines @@
       RuleParser.parse(rules, parser_state)
       automata_for_conditions = process_rules(parser_state)
       self.assertEqual(len(automata_for_conditions), 1)
       self.assertTrue('default' in automata_for_conditions)
       (nfa, dfa) = automata_for_conditions['default']
 
       # The keyword is not recognized because of the rule preference order (ID
       # is preferred over KEYWORD).
       self.__verify_last_action(dfa, 'foo', 'ID', 'break')
       self.__verify_last_action(dfa, 'key', 'ID', 'break')