X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parser%2Ftest_parser.py;h=cf053b85f58393a93eb7e29ca676b8fd7dc1c070;hb=bee03d50e5a6c083962d5d855cea5445bc015472;hp=046c31c056b0f1bd7d11184597c8e64e55121f46;hpb=3eadd8423e41b70e89854bd63e0e9875e259978c;p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git

diff --git a/parser/test_parser.py b/parser/test_parser.py
index 046c31c..cf053b8 100755
--- a/parser/test_parser.py
+++ b/parser/test_parser.py
@@ -1,60 +1,82 @@
-#! /usr/bin/env python
-
+#! /usr/bin/env python3
 
 import unittest
-from grako.exceptions import FailedParse
+from lark import LexError, ParseError
+from parser import parse
 
 
 class TestParser(unittest.TestCase):
-    def test_01_import(self):
-        global parser, TagsSemantics
-        from parser import TagsParser
-        from build_ast import TagsSemantics
-        parser = TagsParser(parseinfo=False)
-
     def _parse(self, input):
-        return parser.parse(input, semantics=TagsSemantics())
+        return parse(input)
 
     def test_02_tag(self):
         self.assertEqual(self._parse('xxx'), ('NAME', 'xxx'))
 
     def test_03_bad_tag(self):
-        self.assertRaises(FailedParse, self._parse, 'XXX')
+        self.assertRaises(LexError, self._parse, 'XXX')
 
     def test_04_expression(self):
-        self.assertEqual(self._parse('!(xxx&yyy)'),
+        self.assertEqual(
+            self._parse('!(xxx&yyy)'),
             ('NOT', ('PARENS', ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))))
         )
-        self.assertEqual(self._parse('!(xxx & yyy)'),
+        self.assertEqual(
+            self._parse('!(xxx & yyy)'),
             ('NOT', ('PARENS', ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))))
         )
-        self.assertEqual(self._parse('!xxx&yyy&zzz|ooo'),
-            ('OR', ('AND', ('AND', ('NOT', ('NAME', 'xxx')), ('NAME', 'yyy')), ('NAME', 'zzz')), ('NAME', 'ooo'))
+        self.assertEqual(
+            self._parse('!xxx&yyy&zzz|ooo'),
+            ('OR', ('AND',
+                    ('NOT', ('NAME', 'xxx')),
+                    ('AND', ('NAME', 'yyy'), ('NAME', 'zzz'))),
+                ('NAME', 'ooo'))
         )
-        self.assertEqual(self._parse('!(xxx &&  yyy)'),
+        self.assertEqual(
+            self._parse('!(xxx &&  yyy)'),
             ('NOT', ('PARENS', ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))))
         )
-        self.assertEqual(self._parse('!(xxx || yyy)'),
+        self.assertEqual(
+            self._parse('!(xxx || yyy)'),
             ('NOT', ('PARENS', ('OR', ('NAME', 'xxx'), ('NAME', 'yyy'))))
         )
-        self.assertEqual(self._parse('xxx and yyy'),
+        self.assertEqual(
+            self._parse('xxx and yyy'),
             ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))
         )
-        self.assertEqual(self._parse('xxx or  yyy'),
+        self.assertEqual(
+            self._parse('xxx or  yyy'),
             ('OR', ('NAME', 'xxx'), ('NAME', 'yyy'))
         )
-        self.assertEqual(self._parse('xxx OR yyy'),
+        self.assertEqual(
+            self._parse('xxx OR yyy'),
             ('OR', ('NAME', 'xxx'), ('NAME', 'yyy'))
         )
-        self.assertEqual(self._parse('not xxx'),
+        self.assertEqual(
+            self._parse('not xxx'),
             ('NOT', ('NAME', 'xxx'))
         )
-        self.assertEqual(self._parse('NOT xxx'),
+        self.assertEqual(
+            self._parse('NOT xxx'),
             ('NOT', ('NAME', 'xxx'))
         )
+        self.assertEqual(
+            self._parse('NOT (xxx & yyy) AND zzz | ooo'),
+            ('OR',
+                ('AND',
+                    ('NOT',
+                        ('PARENS',
+                            ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))
+                         )
+                     ),
+                    ('NAME', 'zzz')
+                 ),
+                ('NAME', 'ooo')
+             )
+        )
 
     def test_05_bad_expression(self):
-        self.assertRaises(FailedParse, self._parse, '!(xxx&yyy')
+        self.assertRaises(ParseError, self._parse, '!(xxx&yyy')
+
 
 if __name__ == "__main__":
     unittest.main()