Experimental parser: better actions

tools/lexer_generator/lexer_test.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 12 matching lines @@
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # 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.
 
 import unittest
 from generator import Generator
 
 class LexerTestCase(unittest.TestCase):
 
-  def __verify_action_stream(self, stream, expected_stream):
-    for (ix, item) in enumerate(expected_stream):
-      self.assertEquals(stream[ix][0], item[0])
-      self.assertEquals(stream[ix][4], item[1])
+  def __verify_action_stream(self, rules, string, expected_stream):
+    expected_stream.append(('terminate', '\0'))
+    for i, (action, start, stop) in enumerate(Generator(rules).lex(string)):
+      self.assertEquals(expected_stream[i][0], action)
+      self.assertEquals(expected_stream[i][1], string[start : stop])
 
   def test_simple(self):
     rules = '''
     <default>
-    "("           { LBRACE } <<continue>>
-    ")"           { RBRACE } <<continue>>
+    "("           { LBRACE }
+    ")"           { RBRACE }
 
-    "foo"         { FOO } <<continue>>
-    eof           <<terminate>>
-    default       <<break>>'''
-
-    generator = Generator(rules)
+    "foo"         { FOO }
+    eof           <<terminate>>'''
 
     string = 'foo()\0'
-    self.__verify_action_stream(
-        generator.lex(string),
+    self.__verify_action_stream(rules, string,
         [('FOO', 'foo'), ('LBRACE', '('), ('RBRACE', ')')])
 
   def test_maximal_matching(self):
     rules = '''
     <default>
-    "<"           { LT } <<continue>>
-    "<<"          { SHL } <<continue>>
-    " "           { SPACE } <<continue>>
-    eof           <<terminate>>
-    default       <<break>>'''
-
-    generator = Generator(rules)
+    "<"           { LT }
+    "<<"          { SHL }
+    " "           { SPACE }
+    eof           <<terminate>>'''
 
     string = '<< <\0'
-    self.__verify_action_stream(
-        generator.lex(string),
+    self.__verify_action_stream(rules, string,
         [('SHL', '<<'), ('SPACE', ' '), ('LT', '<')])
 
-
   def test_consecutive_epsilon_transitions(self):
-    # This rule set will create a NFA where we first have an epsilon transition,
-    # then following that, an epsilon transition with an action. This will test
-    # that the action is correctly pulled forward when creating the dfa.
     rules = '''
     digit = [0-9];
     number = (digit+ ("." digit+)?);
     <default>
-    number        { NUMBER } <<continue>>
-    eof           <<terminate>>
-    default       <<break>>'''
-
-    generator = Generator(rules)
+    number        { NUMBER }
+    eof           <<terminate>>'''
 
     string = '555\0'
-    self.__verify_action_stream(
-        generator.lex(string),
-        [('NUMBER', '555')])
+    self.__verify_action_stream(rules, string, [('NUMBER', '555')])