Experimental parser: refactor TransitionKey to use Term

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 48 matching lines @@
 
   @staticmethod
   def __transform_state(encoding, state):
     # action data
     action = state.action()
     entry_action = action.entry_action()
     match_action = action.match_action()
     # generate ordered transitions
     transitions = map(lambda (k, v) : (k, v.node_number()),
                       state.key_state_iter())
-    def cmp(left, right):
-      return TransitionKey.canonical_compare(left[0], right[0])
-    transitions = sorted(transitions, cmp)
+    transitions = sorted(
+      transitions, cmp = TransitionKey.compare, key = lambda x : x[0])
     # map transition keys to disjoint ranges and collect stats
     disjoint_keys = []
     unique_transitions = {}
     old_transitions = transitions
     transitions = []
     (class_keys, distinct_keys, ranges) = (0, 0, 0)
     zero_transition = None
     total_transitions = 0
     for key, transition_id in old_transitions:
       keys = []
@@ skipping 118 matching lines @@
     'non_primary_identifier_part_not_letter' : 'IsIdentifierPartNotLetter',
     'non_primary_line_terminator' : 'IsLineTerminator',
   }
 
   def __rewrite_deferred_transitions(self, state):
     transitions = state['deferred_transitions']
     if not transitions:
       return
     encoding = self.__dfa.encoding()
     catch_all = 'non_primary_everything_else'
-    all_classes = set(encoding.class_name_iter())
+    all_classes = set(encoding.named_range_key_iter())
     call_classes = all_classes - set([catch_all])
     def remap_transition(class_name):
       if class_name in call_classes:
         return ('LONG_CHAR_CLASS', 'call', self.__call_map[class_name])
       raise Exception(class_name)
     long_class_transitions = []
     long_class_map = {}
     catchall_transition = None
     # loop through and remove catch_all_transitions
     for (classes, transition_node_id) in transitions:
@@ skipping 202 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])