Miko/LSL-PyOptimizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save a comparison (fixes a FIXME)

Browse Source
This commit is contained in:
Sei Lisa
2018-06-08 00:07:36 +02:00
parent 0808938894
commit e88e39127b
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lslopt/lslfoldconst.py
View File

@@ -1347,27 +1347,27 @@ class foldconst(object):
node.ch = [child[a]]
return
#FIXME: Could remove one comparison
if nt == '&&' or nt == '||':
if nt == '||':
# Expand to its equivalent a || b -> !!(a | b)
node = nr(nt='|', t='integer', ch=[child[0], child[1]],
SEF=child[0].SEF and child[1].SEF)
node = nr(nt='!', t='integer', ch=[node], SEF=node.SEF)
node = nr(nt='!', t='integer', ch=[node], SEF=node.SEF)
parent[index] = node
else:
orchildren = [
nr(nt='!',t='integer',ch=[child[0]],SEF=child[0].SEF),
nr(nt='!',t='integer',ch=[child[1]],SEF=child[1].SEF)
]
node = nr(nt='|', t='integer', ch=orchildren,
SEF=child[0].SEF and child[1].SEF)
node = nr(nt='!', t='integer', ch=[node], SEF=node.SEF)
parent[index] = node
if nt == '||':
# Expand to its equivalent a || b -> !!(a | b)
node = nr(nt='|', t='integer', ch=[child[0], child[1]],
SEF=child[0].SEF and child[1].SEF)
node = nr(nt='!', t='integer', ch=[node], SEF=node.SEF)
node = nr(nt='!', t='integer', ch=[node], SEF=node.SEF)
parent[index] = node
# Make another pass with the substitution
self.FoldTree(parent, index)
elif nt == '&&':
# Expand to its equivalent a && b -> !(!a | !b)
orchildren = [
nr(nt='!', t='integer', ch=[child[0]], SEF=child[0].SEF),
nr(nt='!', t='integer', ch=[child[1]], SEF=child[1].SEF)
]
node = nr(nt='|', t='integer', ch=orchildren,
SEF=child[0].SEF and child[1].SEF)
node = nr(nt='!', t='integer', ch=[node], SEF=node.SEF)
parent[index] = node
# Make another pass with the substitution
self.FoldTree(parent, index)
return
return