Experimental parser: rule grammar refactor

tools/lexer_generator/dfa.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 115 matching lines @@
         return
       if state.action():
         yield state.action()
     if state in self.__terminal_set:
       yield Action('TERMINATE')
     else:
       yield Action('MISS')
 
   def matches(self, string):
     actions = list(self.collect_actions(string))
-    return actions and actions[-1].type() == 'TERMINATE'
+    return actions and actions[-1].entry_action() == 'TERMINATE'
 
   def lex(self, string):
     state = self.__start
     last_position = 0
     for pos, c in enumerate(string):
       next = Dfa.__match_char(state, c)
       if not next:
         assert state.action() # must invoke default action here
         yield (state.action(), last_position, pos)
         last_position = pos
@@ skipping 200 matching lines @@
           elif len(intersection) <= len(difference):
             working_set.add(intersection)
           else:
             working_set.add(difference)
         if old_partitions:
           partitions -= old_partitions
         if new_partitions:
           partitions |= new_partitions
     (start_name, mapping) = self.__merge_partitions(partitions)
     return Dfa(start_name, mapping)