Fixed precedence of operators.

Closes #32.
jerrymakesjelly · May 13, 2019 · 67a89f0 · 67a89f0
1 parent 4b196ba
commit 67a89f0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -107,7 +107,3 @@ venv.bak/
 .vscode
 
 .pytest_cache/
-
-# python yacc file
-parser.out
-parsetab.py
diff --git a/autoremovetorrents/conditionparser.py b/autoremovetorrents/conditionparser.py
@@ -28,6 +28,10 @@ class ConditionParser(object):
 
     tokens = ConditionLexer.tokens
 
+    precedence = (
+        ('left', 'AND', 'OR'),
+    )
+
     def p_statement(self, t):
         'statement : expression'
         self.remove = t[1]

diff --git a/pytest/test_strategies/cases/remove_conditions/test_no_bracket_grammer.yml b/pytest/test_strategies/cases/remove_conditions/test_no_bracket_grammer.yml
@@ -0,0 +1,4 @@
+test:
+  remove: seeding_time > 60000 or ratio > 3 and create_time > 1400000
+remove:
+  - Torrent - 4