Skip to content
Merged

V2.2 #23

Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix issues
  • Loading branch information
lucafs committed May 12, 2021
commit 22be0c4c8fae078d5e17a3a30fa19da483a11383
10 changes: 5 additions & 5 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def tToken_finder(char):
return "NEG"
elif(char == "&"):
return "AND"
elif(char == ""):
elif(char == "|"):
return "OR"
elif(char.isalpha() or char == "-" or char == "_"):
return "IDENT"
Expand Down Expand Up @@ -128,11 +128,11 @@ def Evaluate(self, ST):
elif self.value == "==":
return self.children[0].Evaluate(ST) == self.children[1].Evaluate(ST)
elif self.value == "&&":
return self.children[0].Evaluate(ST) or self.children[1].Evaluate(ST)
return self.children[0].Evaluate(ST) and self.children[1].Evaluate(ST)
elif self.value == "!":
return not self.children[0].Evaluate(ST)
elif self.value == "││":
return self.children[0].Evaluate(ST) and self.children[1].Evaluate(ST)
elif self.value == "||":
return self.children[0].Evaluate(ST) or self.children[1].Evaluate(ST)


class WhileOp(Node):
Expand Down Expand Up @@ -257,7 +257,7 @@ def __init__(self):
def parseOrexPR():
res = Parser.parseAndexPR()
while(Parser.tokens.actual.type == "OR"):
node = LogOp("││",[])
node = LogOp("||",[])
node.children.append(res)
node.children.append(Parser.parseAndexPR())
res = node
Expand Down
5 changes: 2 additions & 3 deletions teste.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

{
if ((1==1)){
{
if (((1==1) || (1==1) || (1==1)) || ((1==0) && (1==0) && (1==0))){
println(1);
}
}