AriasCreations/LSL-PyOptimizer
3
0
Fork 0
mirror of https://github.com/Sei-Lisa/LSL-PyOptimizer synced 2025-07-04 12:14:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix double negation and constant nodes; add optimization of -~-~ chains. Fix a case of addition. Add a case of parentheses.

Browse source 
(Changes were pending since Aug 19)
This commit is contained in:
Sei Lisa 2014-12-13 14:16:28 +01:00
parent e89869a563
commit 716be215f2
1 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lslopt/lslfoldconst.py
View file

@ -102,13 +102,31 @@ class foldconst(object):
if child[0]['nt'] == 'NEG': if child[0]['nt'] == 'NEG':
# Double negation: - - expr --> expr # Double negation: - - expr --> expr
# NOTE: Not 100% sure this doesn't need parentheses around expr. # NOTE: Not 100% sure this doesn't need parentheses around expr.
parent[index] = child[0]['ch'][0] node = parent[index] = child[0]['ch'][0]
child = node['ch'] if 'ch' in node else None
elif child[0]['nt'] == 'CONST': elif child[0]['nt'] == 'CONST':
node = parent[index] = child[0] node = parent[index] = child[0]
node['value'] = lslfuncs.neg(node['value']) node['value'] = lslfuncs.neg(node['value'])
child = None
elif 'SEF' in child[0]: elif 'SEF' in child[0]:
# propagate Side Effect Free flag # propagate Side Effect Free flag
node['SEF'] = True node['SEF'] = True
if child and node['nt'] == 'NEG' and child[0]['nt'] == '~':
track = child[0]['ch'][0]
const = 1
while track['nt'] == 'NEG' and track['ch'][0]['nt'] == '~':
const += 1
track = track['ch'][0]['ch'][0]
if const > 2:
# -~-~-~expr -> expr+3
SEF = 'SEF' in track
node = {'nt':'CONST', 't':'integer', 'SEF':True, 'value':const}
node = {'nt':'+', 't':'integer', 'ch':[node, track]}
parent[index] = node = {'nt':'()', 't':'integer', 'ch':[node]}
if SEF:
node['SEF'] = node['ch'][0]['SEF'] = True
return return
if nt == '!': if nt == '!':
@ -339,8 +357,8 @@ class foldconst(object):
return return
if lnt == '+' and (lval['ch'][0]['nt'] == 'CONST' if lnt == '+' and (lval['ch'][0]['nt'] == 'CONST'
or rval['ch'][0]['nt'] == 'CONST'): or lval['ch'][1]['nt'] == 'CONST'):
# We have var + const + const or const + var + const. # We have expr + const + const or const + expr + const.
# Addition of integers mod 2^32 is associative and # Addition of integers mod 2^32 is associative and
# commutative, so constants can be merged. # commutative, so constants can be merged.
if lval['ch'][0]['nt'] == 'CONST': if lval['ch'][0]['nt'] == 'CONST':
@ -351,6 +369,14 @@ class foldconst(object):
lval = child[0] = lval['ch'][0] lval = child[0] = lval['ch'][0]
lnt = lval['nt'] lnt = lval['nt']
if rnt == '+' and rval['ch'][0]['nt'] == '()' and rval['ch'][0]['ch'][0]['nt'] == '+' \
and (rval['ch'][0]['ch'][0]['nt'] == 'CONST'
or rval['ch'][0]['ch'][1]['nt'] == 'CONST'):
# const + (expr + const) or const + (const + expr)
# same as above, join them
pass # TODO: implement
if rnt == 'CONST': if rnt == 'CONST':
# Swap the vars to deal with const in lval always # Swap the vars to deal with const in lval always
lval, lnt, rval, rnt = rval, rnt, lval, lnt lval, lnt, rval, rnt = rval, rnt, lval, lnt