Experimental parser: cleanup after grammar refactor

tools/lexer_generator/automaton.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 13 matching lines @@
 # 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.
 
 from types import TupleType, ListType
 from itertools import chain
 from transition_keys import TransitionKey
 
 class Action(object):
 
-  def __init__(self, entry_action, match_action = None, precedence = -1):
-    assert type
+  def __init__(self, entry_action, match_action, precedence = -1):
+    for action in [entry_action, match_action]:
+      if action == None:
+        continue
+      assert type(action) == TupleType and len(action)
+      assert action[0] != None
     self.__entry_action = entry_action
     self.__match_action = match_action
     self.__precedence = precedence
 
   def entry_action(self):
     return self.__entry_action
 
   def match_action(self):
     return self.__match_action
 
   def precedence(self):
     return self.__precedence
 
   def __hash__(self):
     return hash((self.__entry_action, self.__match_action))
 
   def __eq__(self, other):
     return (isinstance(other, self.__class__) and
             self.__entry_action == other.__entry_action and
             self.__match_action == other.__match_action)
 
   def __str__(self):
-    return "action<%s, %s>" % (self.__entry_action, self.__match_action)
+    parts = []
+    for action in [self.__entry_action, self.__match_action]:
+      part = ""
+      if action:
+        part += action[0]
+        if action[1]:
+          part += "(%s)" % action[1]
+      parts.append(part)
+    return "action< %s >" % " | ".join(parts)
 
 class AutomatonState(object):
 
   __node_number_counter = 0
 
   def __init__(self):
     self.__node_number = AutomatonState.__node_number_counter
     AutomatonState.__node_number_counter += 1
 
   def __hash__(self):
@@ skipping 96 matching lines @@
   node [shape = doublecircle, style=unfilled]; %s
   node [shape = circle];
 %s
 %s
 }
     ''' % (start_shape,
            start_number,
            " ".join(terminals),
            "\n".join(edge_content),
            "\n".join(node_content))