anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix logic parsing for nested and

Browse Source
This commit is contained in:
JonnyWong16
2017-07-06 09:20:32 -07:00
parent cceff2e8dd
commit e284a17034
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plexpy/helpers.py
View File

@@ -814,7 +814,8 @@ def parse_condition_logic_string(s, num_cond=0):
bool_next = False bool_next = False
open_bracket_next = True open_bracket_next = True
close_bracket_next = False close_bracket_next = False
nest_and = False nest_and = 0
nest_nest_and = 0
for i, x in enumerate(tokens): for i, x in enumerate(tokens):
if open_bracket_next and x == '(': if open_bracket_next and x == '(':
@@ -824,7 +825,8 @@ def parse_condition_logic_string(s, num_cond=0):
bool_next = False bool_next = False
open_bracket_next = True open_bracket_next = True
close_bracket_next = False close_bracket_next = False
nest_and = False if nest_and:
nest_nest_and += 1
elif close_bracket_next and x == ')': elif close_bracket_next and x == ')':
stack.pop() stack.pop()
@@ -834,8 +836,11 @@ def parse_condition_logic_string(s, num_cond=0):
bool_next = True bool_next = True
open_bracket_next = False open_bracket_next = False
close_bracket_next = True close_bracket_next = True
nest_and = False if nest_and > 0 and nest_nest_and > 0 and nest_and == nest_nest_and:
stack.pop()
nest_and -= 1
nest_nest_and -= 1
elif cond_next and re.match(conditions_pattern, x): elif cond_next and re.match(conditions_pattern, x):
try: try:
num = int(x[1:-1]) num = int(x[1:-1])
@@ -844,13 +849,13 @@ def parse_condition_logic_string(s, num_cond=0):
if not 0 < num <= num_cond: if not 0 < num <= num_cond:
raise ValueError('invalid condition number in condition logic') raise ValueError('invalid condition number in condition logic')
stack[-1].append(num) stack[-1].append(num)
if nest_and:
stack.pop()
cond_next = False cond_next = False
bool_next = True bool_next = True
open_bracket_next = False open_bracket_next = False
close_bracket_next = True close_bracket_next = True
nest_and = False if nest_and > nest_nest_and:
stack.pop()
nest_and -= 1
elif bool_next and x == 'and' and i < len(tokens)-1: elif bool_next and x == 'and' and i < len(tokens)-1:
stack[-1].append([]) stack[-1].append([])
@@ -861,7 +866,7 @@ def parse_condition_logic_string(s, num_cond=0):
bool_next = False bool_next = False
open_bracket_next = True open_bracket_next = True
close_bracket_next = False close_bracket_next = False
nest_and = True nest_and += 1
elif bool_next and x == 'or' and i < len(tokens)-1: elif bool_next and x == 'or' and i < len(tokens)-1:
stack[-1].append(x) stack[-1].append(x)
@@ -869,8 +874,7 @@ def parse_condition_logic_string(s, num_cond=0):
bool_next = False bool_next = False
open_bracket_next = True open_bracket_next = True
close_bracket_next = False close_bracket_next = False
nest_and = False
else: else:
raise ValueError('invalid condition logic') raise ValueError('invalid condition logic')