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

Fix bug where 1 + (2 + function) was folded as 4 + function

Browse Source 
After folding, our cached values changed under us. Re-cache them.
This commit is contained in:
Sei Lisa
2018-11-19 20:25:05 +01:00
parent 2740306b6c
commit 18d19b4653
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lslopt/lslfoldconst.py
View File

@@ -973,20 +973,32 @@ class foldconst(object):
return self.FoldTree(parent, index)
while lnt == 'CONST' and rnt == 'NEG' and rval.ch[0].nt == '~':
child[0].value += 1
rval = child[1] = rval.ch[0].ch[0]
rnt = rval.nt
lval.value += 1
child[1] = rval.ch[0].ch[0]
# rtype doesn't change
assert rval.t == 'integer'
assert child[1].t == 'integer'
self.FoldTree(parent, index)
node = parent[index]
nt, child = node.nt, node.ch
if nt != '+':
return
lval, rval = child[0], child[1]
lnt, rnt = lval.nt, rval.nt
ltype, rtype = lval.t, rval.t
while lnt == 'CONST' and rnt == '~' and rval.ch[0].nt == 'NEG':
lval.value -= 1
rval = child[1] = rval.ch[0].ch[0]
rnt = rval.nt
child[1] = rval.ch[0].ch[0]
# rtype doesn't change
assert rval.t == 'integer'
assert child[1].t == 'integer'
self.FoldTree(parent, index)
node = parent[index]
nt, child = node.nt, node.ch
if nt != '+':
return
lval, rval = child[0], child[1]
lnt, rnt = lval.nt, rval.nt
ltype, rtype = lval.t, rval.t
if lnt != 'CONST':
# Neither is const.