s444440/Logic-Formulae-Validator-dla-ubogich
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xd

Browse Source
This commit is contained in:
emile 2019-05-30 20:53:08 +02:00
parent 427d769aa6
commit 23abf51c5f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
program.py
View File

@ -30,22 +30,26 @@ class SimpleInterpreter(AbstractInterpreter):
prev = formula.s[i-1] if i>0 else None #None, gdy jesteśmy na pierwszym znaku prev = formula.s[i-1] if i>0 else None #None, gdy jesteśmy na pierwszym znaku
if (char=='(' and isVariable(prev) and prev is not None): #a(b|c) if (char=='(' and isVariable(prev) and prev is not None): #a(b|c)
return False return False
if (prev is None): if (prev is None):
if not (isVariable(char) or isParentice(char) or isNegation(char)): if not (isVariable(char) or isParentice(char) or isNegation(char)):
return False
if isSign(char):
return False
if isSign(char) and prev is not None:
if (not isNegation(char)): if (not isNegation(char)):
if isSign(prev) and not isNegation(prev): # tylko negacje mogą się powtarzać po innym znaku if isSign(prev) and not isNegation(prev): # tylko negacje mogą się powtarzać po innym znaku
return False return False
if isNegation(prev): if isNegation(prev):
if not (isNegation(char) or isParentice(char)): if not (isNegation(char) or isParentice(char)):
print("xd")
return False return False
if isVariable(prev): #a! if isNegation(char):
return False if isVariable(prev): #a!
return False
else: else:
#if current char is a variable #if current char is a variable
if isVariable(prev) and prev is not None: #Obrona abc>d if isVariable(prev) and prev is not None: #Obrona abc>d