Experimental parser: rule 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, type, data = None, precedence = -1):
+  def __init__(self, entry_action, match_action = None, precedence = -1):
     assert type
-    self.__type = type
-    self.__data = data
+    self.__entry_action = entry_action
+    self.__match_action = match_action
     self.__precedence = precedence
 
-  def type(self):
-    return self.__type
+  def entry_action(self):
+    return self.__entry_action
 
-  def data(self):
-    return self.__data
+  def match_action(self):
+    return self.__match_action
 
   def precedence(self):
     return self.__precedence
 
   def __hash__(self):
-    return hash((self.__type, self.__data))
+    return hash((self.__entry_action, self.__match_action))
 
   def __eq__(self, other):
     return (isinstance(other, self.__class__) and
-            self.__type == other.__type and
-            self.__data == other.__data)
+            self.__entry_action == other.__entry_action and
+            self.__match_action == other.__match_action)
 
   def __str__(self):
-    if not self.__data:
-      return "action<%s>" % self.__type
-    return "action<%s, %s>" % (self.__type, self.__data)
+    return "action<%s, %s>" % (self.__entry_action, self.__match_action)
 
 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 57 matching lines @@
   def to_dot(self):
 
     def escape(v):
       v = str(v)
       v = v.replace('\r', '\\\\r').replace('\t', '\\\\t').replace('\n', '\\\\n')
       v = v.replace('\\', '\\\\').replace('\"', '\\\"')
       return v
 
     def f(node, (node_content, edge_content)):
       if node.action():
-        action = node.action()
-        if action.type() == 'code':
-          action_text = action.data()
-        elif action.type() == 'push_token':
-          action_text = "token(" + action.data() + ")"
-        else:
-          action_text = action.type()
-        action_text = escape(action_text)
+        action_text = escape(node.action())
         node_content.append('  S_l%s[shape = box, label="%s"];' %
                             (node.node_number(), action_text))
         node_content.append('  S_%s -> S_l%s [arrowhead = none];' %
                             (node.node_number(), node.node_number()))
       for key, state in node.key_state_iter():
         if key == TransitionKey.epsilon():
           key = "&epsilon;"
         edge_content.append("  S_%s -> S_%s [ label = \"%s\" ];" % (
             node.node_number(), state.node_number(), escape(key)))
       return (node_content, edge_content)
@@ skipping 18 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))