Experimental parser: KeyEncoding class added

tools/lexer_generator/nfa.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 88 matching lines @@
     return chain(*iters)
 
   def transition_state_iter_for_char(self, value):
     return self.__matches(lambda k, v : k.matches_char(v), value)
 
   def transition_state_iter_for_key(self, value):
     return self.__matches(lambda k, v : k.is_superset_of_key(v), value)
 
 class Nfa(Automaton):
 
-  def __init__(self, start, end, nodes_created):
-    super(Nfa, self).__init__()
+  def __init__(self, encoding, start, end, nodes_created):
+    super(Nfa, self).__init__(encoding)
     self.__start = start
     self.__end = end
     self.__verify(nodes_created)
 
   def start_state(self):
     return self.__start
 
   def terminal_set(self):
     return set([self.__end])
 
   def __verify(self, nodes_created):
     def f(node, count):
       assert node.is_closed()
       return count + 1
     count = self.visit_all_states(f, 0)
     assert count == nodes_created
 
   @staticmethod
-  def __gather_transition_keys(state_set):
+  def __gather_transition_keys(encoding, state_set):
     keys = set(chain(*map(lambda state: state.key_iter(), state_set)))
     keys.discard(TransitionKey.epsilon())
-    return TransitionKey.disjoint_keys(keys)
+    return TransitionKey.disjoint_keys(encoding, keys)
 
-  @staticmethod
-  def __to_dfa(nfa_state_set, dfa_nodes, end_node):
+  def __to_dfa(self, nfa_state_set, dfa_nodes, end_node):
     nfa_state_set = Automaton.epsilon_closure(nfa_state_set)
     assert nfa_state_set
     name = ".".join(str(x.node_number()) for x in sorted(nfa_state_set))
     if name in dfa_nodes:
       return name
     dfa_nodes[name] = {
       'transitions': {},
       'terminal': end_node in nfa_state_set,
       'action' : Action.dominant_action(nfa_state_set)}
-    for key in Nfa.__gather_transition_keys(nfa_state_set):
+    for key in Nfa.__gather_transition_keys(self.encoding(), nfa_state_set):
       match_states = set()
       f = lambda state: state.transition_state_iter_for_key(key)
       match_states |= set(chain(*map(f, nfa_state_set)))
-      transition_state = Nfa.__to_dfa(match_states, dfa_nodes, end_node)
+      transition_state = self.__to_dfa(match_states, dfa_nodes, end_node)
       dfa_nodes[name]['transitions'][key] = transition_state
     return name
 
   def compute_dfa(self):
     dfa_nodes = {}
     start_name = self.__to_dfa(set([self.__start]), dfa_nodes, self.__end)
     return (start_name, dfa_nodes)