Experimental parser: handling unique keys in merges

tools/lexer_generator/nfa_builder.py

Index: tools/lexer_generator/nfa_builder.py
diff --git a/tools/lexer_generator/nfa_builder.py b/tools/lexer_generator/nfa_builder.py
index 898e29692a687fd4ba32ae13b7fa7c8a54115524..5ff7e242b90cd08b944c5ecacee3a57695be3159 100644
--- a/tools/lexer_generator/nfa_builder.py
+++ b/tools/lexer_generator/nfa_builder.py
@@ -150,8 +150,8 @@ class NfaBuilder(object):
     self.__patch_ends(ends, state['start_node'])
     return (start, [])
 
-  def __catch_all(self, graph):
-    return self.__key_state(TransitionKey.unique('catch_all'))
+  def __unique_key(self, graph):
+    return self.__key_state(TransitionKey.unique(graph[1]))
 
   def __join(self, graph):
     (graph, name, subgraph) = graph[1:]
@@ -311,8 +311,8 @@ class NfaBuilder(object):
     return ('CONTINUE', graph)
 
   @staticmethod
-  def catch_all():
-    return ('CATCH_ALL',)
+  def unique_key(name):
+    return ('UNIQUE_KEY', name)
 
   @staticmethod
   def join_subgraph(graph, name, subgraph):