Experimental parser: simplify goto logic

tools/lexer_generator/code_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 281 matching lines @@
     return id_map
 
   def __rewrite_gotos(self):
     goto_map = {}
     for state in self.__dfa_states:
       if (state['match_action'] and
           state['match_action'][0] == 'do_stored_token'):
         assert not state['match_action'][1] in goto_map
         goto_map[state['match_action'][1]] = state['node_number']
         state['has_goto_after_entry'] = True
+    mapped_actions = set([
+      'store_harmony_token_and_goto',
+      'store_token_and_goto',
+      'goto_start'])
     for state in self.__dfa_states:
-      if state['match_action'] and state['match_action'][0] == 'goto':
-        state['match_action'] = ('goto', goto_map[state['match_action'][1]])
+      if not state['match_action']:
+        continue
+      if state['match_action'][0] in mapped_actions:
+        value = state['match_action'][1]
+        value = tuple(list(value[:-1]) + [goto_map[value[-1]]])
+        state['match_action'] = (state['match_action'][0], value)
 
   def process(self):
 
     id_map = self.__canonicalize_traversal()
     self.__rewrite_gotos()
 
     dfa_states = self.__dfa_states
     # set nodes to inline
     if self.__inline:
       inlined = reduce(self.__set_inline, dfa_states, 0)
@@ skipping 24 matching lines @@
     char_type = char_types[encoding.name()]
 
     return template.render(
       start_node_number = 0,
       debug_print = self.__debug_print,
       default_action = default_action,
       dfa_states = dfa_states,
       encoding = encoding.name(),
       char_type = char_type,
       upper_bound = encoding.primary_range()[1])