Experimental parser: some tuple removal

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 12 matching lines @@
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import os
 import sys
 import jinja2
 from copy import deepcopy
 from dfa import Dfa
+from automaton import Term
 from transition_keys import TransitionKey
 
 class CodeGenerator:
 
   def __init__(self,
                rule_processor,
                minimize_default = True,
                inline = True,
                switching = True,
                debug_print = False,
@@ skipping 247 matching lines @@
     assert len(dfa_states) == self.__dfa.node_count()
     # mark eos states
     self.__mark_eos_states(dfa_states, eos_states)
     self.__dfa_states = dfa_states
 
   def __rewrite_gotos(self):
     goto_map = {}
     states = self.__dfa_states
     for state in 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['match_action'].name() == 'do_stored_token'):
+        assert not state['match_action'].args()[0] in goto_map
+        goto_map[state['match_action'].args()[0]] = state['node_number']
     mapped_actions = set([
       'store_harmony_token_and_goto',
       'store_token_and_goto',
       'goto_start'])
     for state in states:
       if not state['match_action']:
         continue
-      action = state['match_action'][0]
+      action = state['match_action'].name()
       if action in mapped_actions:
-        value = state['match_action'][1]
+        value = state['match_action'].args()
         target_id = goto_map[value[-1]]
         states[target_id]['must_not_inline'] = True
         if action != 'goto_start':
           state['can_elide_read'] = False
           label = 'after_entry_code'
         else:
           states[target_id]['can_elide_read'] = False
           label = 'state_entry'
         jump_label = self.__register_jump(target_id, label)
-        state['match_action'] = (action, tuple(list(value[:-1]) + [jump_label]))
+        new_args = list(value[:-1]) + [str(jump_label)]
+        state['match_action'] = Term(action, *new_args)
 
   def __inlined_state(self, target_id):
     state = deepcopy(self.__dfa_states[target_id])
     state['node_number'] = len(self.__dfa_states)
     self.__dfa_states.append(state)
     # mark as just generated, so it will correctly rewritten
     state['just_generated_inline_state'] = True
     # clear entry points
     state['entry_points'] = {k : False for k in CodeGenerator.__jump_labels}
     return state['node_number']
@@ skipping 89 matching lines @@
 
     return template.render(
       start_node_number = 0,
       debug_print = self.__debug_print,
       default_action = default_action,
       dfa_states = dfa_states,
       jump_table = self.__jump_table,
       encoding = encoding.name(),
       char_type = char_type,
       upper_bound = encoding.primary_range()[1])