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

Fold again after applying distributibity or absortion.

Browse Source 
Failure to do so was blocking some constant folding, like in:

if (a&1 || a&2 || a&4) -> if (a&(3|4))

Fixed. Now it correctly outputs if (a&7).
This commit is contained in:
Sei Lisa
2017-10-17 23:28:14 +02:00
parent 6c73ba95c2
commit 4cbdbefe1b
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lslopt/lslfoldconst.py
View File

@@ -1125,6 +1125,7 @@ class foldconst(object):
parent[index] = child[b] parent[index] = child[b]
# Apply boolean distributivity # Apply boolean distributivity
applied = False
opposite = '&' if nt == '|' else '|' opposite = '&' if nt == '|' else '|'
if child[0]['nt'] == child[1]['nt'] == opposite: if child[0]['nt'] == child[1]['nt'] == opposite:
left = child[0]['ch'] left = child[0]['ch']
@@ -1136,6 +1137,7 @@ class foldconst(object):
opposite = child[1]['nt'] opposite = child[1]['nt']
right[d] = left[1 - c] right[d] = left[1 - c]
child[0] = left[c] child[0] = left[c]
applied = True
break break
# Apply absorption, possibly after distributivity # Apply absorption, possibly after distributivity
@@ -1148,8 +1150,13 @@ class foldconst(object):
node = parent[index] = child[c] node = parent[index] = child[c]
nt = node['nt'] nt = node['nt']
child = node['ch'] if 'ch' in node else None child = node['ch'] if 'ch' in node else None
applied = True
break break
if applied:
# Re-fold
self.FoldTree(parent, index)
return return
if nt == '^': if nt == '^':