Merge pull request #20 from 15five/g17-logexp-order

Fix LogExp Ordering Issue

src/scim2_filter_parser/parser.py

@@ -110,9 +110,8 @@ class SCIMParser(Parser):
     #       which takes precedence over "or"
     #   3.  Attribute operators
     precedence = (
-        ('nonassoc', OR),  # noqa F821
-        ('nonassoc', AND), # noqa F821
-        ('nonassoc', NOT), # noqa F821
+        ('left', OR, AND),  # noqa F821
+        ('right', NOT), # noqa F821
     )
 
     # FILTER    = attrExp / logExp / valuePath / *1"not" "(" FILTER ")"

tests/test_parser.py

@@ -47,6 +47,24 @@ def test_no_quotes_around_comp_value(self):
         with self.assertRaises(parser.SCIMParserError):
             self.parser.parse(token_stream)
 
+    def test_g17_1_log_exp_order(self):
+        query = 'displayName co "username"  or nickName co "username"  or userName co "username"'
+
+        tokens = self.lexer.tokenize(query)
+        self.parser.parse(tokens)  # Should not raise error
+
+    def test_g17_2_log_exp_order(self):
+        query = 'displayName co "username" and nickName co "username" and userName co "username"'
+
+        tokens = self.lexer.tokenize(query)
+        self.parser.parse(tokens)  # Should not raise error
+
+    def test_g17_3_log_exp_order(self):
+        query = 'displayName co "username" and nickName co "username"  or userName co "username"'
+
+        tokens = self.lexer.tokenize(query)
+        self.parser.parse(tokens)  # Should not raise error
+
 
 class CommandLine(TestCase):
     def setUp(self):