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

Fix optimization of fn > -1 and fn < 0 when fn's minimum is -1 in conditions

Browse Source 
E.g. llSubStringIndex(...) > -1 was converted into !~llSubStringIndex(...) which is incorrect. We even had a test case for it... with a wrong expected response file.

Bug report and test case by Sinha Hynes (thanks!)
This commit is contained in:
Sei Lisa
2019-07-16 01:58:19 +02:00
parent 1bdaff32ab
commit 1ab9dd69b4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lslopt/lslfoldconst.py
View File

@@ -549,23 +549,23 @@ class foldconst(object):
sym = self.symtab[0][child[a].name]
break
# cond(FNCALL < 0) -> cond(~FNCALL) if min == -1
# cond(FNCALL < 0) -> cond(!~FNCALL) if min == -1
if (child[1].nt == 'CONST' and child[1].value == 0
and child[0].nt == 'FNCALL'
and 'min' in sym and sym['min'] == -1
):
node = parent[index] = nr(nt='~', t='integer',
ch=[child[0]])
node = parent[index] = nr(nt='!', t='integer',
ch=[nr(nt='~', t='integer', ch=[child[0]])])
self.FoldTree(parent, index)
return
# cond(FNCALL > -1) -> cond(!~FNCALL) if min == -1
# cond(FNCALL > -1) -> cond(~FNCALL) if min == -1
if (child[0].nt == 'CONST' and child[0].value == -1
and child[1].nt == 'FNCALL'
and 'min' in sym and sym['min'] == -1
):
node = parent[index] = nr(nt='!', t='integer',
ch=[nr(nt='~', t='integer', ch=[child[1]])])
node = parent[index] = nr(nt='~', t='integer',
ch=[child[1]])
self.FoldTree(parent, index)
return

2
unit_tests/regression.suite/comparison-min-max.out
View File

@@ -2,7 +2,7 @@ default
{
changed(integer ch)
{
if (~llListFindList(llGetPrimitiveParams((list)9), (list)"a"))
if (!~llListFindList(llGetPrimitiveParams((list)9), (list)"a"))
llDie();
if (!llSameGroup(llGetOwner()))
llOwnerSay("e");