AriasCreations/LSL-PyOptimizer
3
0
Fork 0
mirror of https://github.com/Sei-Lisa/LSL-PyOptimizer synced 2025-07-01 15:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for,while,if,do condition test during optimization.

Browse source 
That's exactly what 'cond' is for. Things like a loop with a constant zero vector condition should be recognized.

It was correct before just by chance, because FoldCond currently transforms a constant node into an integer node, but let's not rely on that.
This commit is contained in:
Sei Lisa 2017-09-11 18:05:05 +02:00
parent b97b2a78e8
commit de29a9aa07
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lslopt/lslfoldconst.py
View file

@ -1275,7 +1275,7 @@ class foldconst(object):
self.FoldCond(child, 0) self.FoldCond(child, 0)
if child[0]['nt'] == 'CONST': if child[0]['nt'] == 'CONST':
# We might be able to remove one of the branches. # We might be able to remove one of the branches.
if child[0]['value']: if lslfuncs.cond(child[0]['value']):
self.FoldTree(child, 1) self.FoldTree(child, 1)
# If it has a state switch, the if() must be preserved # If it has a state switch, the if() must be preserved
# (but the else branch may be removed). # (but the else branch may be removed).
@ -1336,15 +1336,15 @@ class foldconst(object):
if nt == 'WHILE': if nt == 'WHILE':
# Loops are not considered side-effect free. If the expression is # Loops are not considered side-effect free. If the expression is
# TRUE, it's definitely not SEF. If it's FALSE, it will be optimized # TRUE, it's definitely not SEF. If it's FALSE, it will be optimized
# anyway. Otherwise we just don't know if it may be infinite, even # out anyway. Otherwise we just don't know if it may be infinite,
# if every component is SEF. # even if every component is SEF.
self.ExpandCondition(child, 0) self.ExpandCondition(child, 0)
self.FoldTree(child, 0) self.FoldTree(child, 0)
self.FoldCond(child, 0) self.FoldCond(child, 0)
if child[0]['nt'] == 'CONST': if child[0]['nt'] == 'CONST':
# See if the whole WHILE can be eliminated. # See if the whole WHILE can be eliminated.
if child[0]['value']: if lslfuncs.cond(child[0]['value']):
# Endless loop which must be kept. # Endless loop which must be kept.
# Recurse on the statement. # Recurse on the statement.
self.FoldTree(child, 1) self.FoldTree(child, 1)
@ -1372,7 +1372,7 @@ class foldconst(object):
self.FoldCond(child, 1) self.FoldCond(child, 1)
# See if the latest part is a constant. # See if the latest part is a constant.
if child[1]['nt'] == 'CONST': if child[1]['nt'] == 'CONST':
if not child[1]['value']: if not lslfuncs.cond(child[1]['value']):
# Only one go. Replace with the statement(s). # Only one go. Replace with the statement(s).
parent[index] = child[0] parent[index] = child[0]
return return
@ -1392,7 +1392,7 @@ class foldconst(object):
# They are expressions, no declarations or labels allowed, thus # They are expressions, no declarations or labels allowed, thus
# no new identifiers may be created in the new scope, but it # no new identifiers may be created in the new scope, but it
# still feels dodgy. # still feels dodgy.
if child[1]['value']: if lslfuncs.cond(child[1]['value']):
# Endless loop. Traverse the loop and the iterator. # Endless loop. Traverse the loop and the iterator.
self.FoldTree(child, 3) self.FoldTree(child, 3)
self.FoldStmt(child, 3) self.FoldStmt(child, 3)