Experimental parser: remove match actions

tools/lexer_generator/transition_keys.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 206 matching lines @@
     return isinstance(other, TransitionKey) and self.__term == other.__term
 
   def range_iter(self, encoding):
     for c in self.__flatten():
       if c.name() == 'NUMERIC_RANGE_KEY':
         yield ('PRIMARY_RANGE', (c.args()[0], c.args()[1]))
       elif c.name() == 'NAMED_RANGE_KEY':
         yield ('CLASS', c.args()[0])
       elif c.name() == 'TERM_KEY':
         yield ('UNIQUE', c.args()[0])
+      elif c.name() == 'OMEGA_KEY':
+        yield ('OMEGA', ())
       else:
         assert False, 'unimplemented %s' % c
 
   @staticmethod
   def __component_str(encoding, component):
     if component.name() == 'TERM_KEY':
       return component.args()[0]
     elif component.name() == 'NAMED_RANGE_KEY':
       return component.args()[0]
     elif component.name() == 'EPSILON_KEY':
@@ skipping 60 matching lines @@
     if c0 > 0:
       (a, b, sign) = (b, a, 1) # normalize ordering so that a0 < b0
     assert a[0] < b[0]
     if b[1] <= a[1]:  # subset
       return 3 * sign
     if a[1] < b[0]:  # non overlap
       return 2 * sign
     return 5 * sign  # partial overlap
 
   @staticmethod
+  def __is_composable(term):
+    return term.name() != 'EPSILON_KEY' and term.name() != 'OMEGA_KEY'
+
+  @staticmethod
   def __construct(encoding, components):
     if isinstance(components, Term):
       components = [components]
     is_unique = False
     acc = []
     last = Term.empty_term()
     for current in TransitionKey.__flatten_components(components):
       name = current.name()
-      if last:
-        assert name != 'EPSILON_KEY' and name != 'OMEGA_KEY', 'cannot merge'
-        c = TransitionKey.__component_compare(last, current)
-        assert c == -1 or c == -2, 'bad order %s %s' % (str(last), str(current))
+      # verify arguments
       if name == 'EPSILON_KEY' or name == 'OMEGA_KEY' or name == 'TERM_KEY':
         pass
       elif name == 'NUMERIC_RANGE_KEY':
         assert encoding.is_primary_range(current.args())
         if last.name() == 'NUMERIC_RANGE_KEY':
           assert last.args()[1] + 1 < current.args()[0], 'ranges must be merged'
       elif name == 'NAMED_RANGE_KEY':
         assert encoding.named_range(current.args()[0])
       else:
         raise Exception('illegal component %s' % str(current))
+      # verify ordering, composability
+      if last:
+        assert TransitionKey.__is_composable(current), 'cannot compose'
+        if len(acc) == 1:
+          assert TransitionKey.__is_composable(last), 'cannot compose'
+        c = TransitionKey.__component_compare(last, current)
+        assert c == -1 or c == -2, 'bad order %s %s' % (str(last), str(current))
       acc.append(current)
       last = current
     assert acc, "must have components"
     return acc[0] if len(acc) == 1 else Term('COMPOSITE_KEY', *acc)
 
   def __init__(self, encoding, components):
     self.__term = TransitionKey.__construct(encoding, components)
     self.__cached_hash = None
 
   def to_string(self, encoding):
@@ skipping 49 matching lines @@
   @staticmethod
   def __disjoint_components_from_keys(encoding, keys, merge_ranges = False):
     return TransitionKey.__disjoint_components(
       encoding, TransitionKey.__flatten_keys(keys), merge_ranges)
 
   @staticmethod
   def __disjoint_components(encoding, components, merge_ranges):
     range_map = {}
     other_keys = set([])
     for x in components:
-      assert x.name() != 'EPSILON_KEY' and x.name() != 'OMEGA_KEY'
       if x.name() != 'NUMERIC_RANGE_KEY':
         other_keys.add(x)
         continue
       (start, end) = x.args()
       if not start in range_map:
         range_map[start] = []
       range_map[start].append(end)
     ranges = TransitionKey.__disjoint_keys(encoding, range_map)
     if merge_ranges:
       ranges = TransitionKey.__merge_ranges(encoding, ranges)
@@ skipping 56 matching lines @@
         yield key(last[1] + 1, r[0] - 1)
       last = r
     upper_bound = encoding.primary_range()[1]
     if last == None:
       r = encoding.primary_range()
       yield key(r[0], r[1])
     elif last[1] < upper_bound:
       yield key(last[1] + 1, upper_bound)
     for c in sorted(classes, TransitionKey.__component_compare):
       yield c