mirror of
https://github.com/Sei-Lisa/LSL-PyOptimizer
synced 2025-07-01 23:58:20 +00:00
Change the AST node type from dict to object
That was long overdue. Obviously, this is a large commit. The new nr (node record) class has built-in dump capabilities, rather than using print_node(). SEF always exists now, and is a boolean, rather than using the existence of SEF as the flag. This was changed for sanity. However, other flags like 'X' are still possibly absent, and in some cases the absence itself has meaning (in the case of 'X', its absence means that the node has not yet been analyzed). Similarly, an event is distinguished from a UDF by checking for the existence of the 'scope' attribute. This trick works because events are not in the symbol table therefore they have no scope. But this should probably be changed in future to something more rational and faster. A few minor bugfixes were applied while going through the code. - Some tabs used as Unicode were written as byte strings. Add the u'\t' prefix. - After simplifying a%1 -> a&0, fold again the node and return. It's not clear why it didn't return, and whether it depended on subsequent passes (e.g. after DCR) for possibly optimizing out the result. Now we're sure. - A few places lacked a SEF declaration. - Formatting changes to split lines that spilled the margin. - Some comment changes. - Expanded lazy_list_set definition while adapting it to object format. The plan was to re-compress it after done, but decided to leave it in expanded form. - Added a few TODOs & FIXMEs, resisting the temptation to fix them in the same commit: - TODO: ~-~-~-expr -> expr + -3. - FIXME: Now that we have CompareTrees, we can easily check if expr + -expr cancels out and remove a TODO. Low-hanging fruit. - TODO: Check what we can do when comparing non-SEF and non-CONST values in '>' (current code relies on converting '>' to '<' for applying more optimizations, but that may miss some opportunities). - FIXME: Could remove one comparison in nt == '&&' or nt == '||'. Low-hanging fruit.
This commit is contained in:
Sei Lisa
parent
d890f0b5fa
commit
075d3aba0c
9 changed files with 1294 additions and 1201 deletions
|
|
@ -55,7 +55,7 @@ class outscript(object):
|
|||
else:
|
||||
pfx = '((key)'
|
||||
sfx = ')'
|
||||
if '\t' in value and self.warntabs:
|
||||
if u'\t' in value and self.warntabs:
|
||||
warning(u"A string contains a tab. Tabs are expanded to four"
|
||||
" spaces by the viewer when copy-pasting the code"
|
||||
" (disable this warning by disabling the 'warntabs'"
|
||||
|
|
@ -178,22 +178,23 @@ class outscript(object):
|
|||
def FindName(self, node, scope = None):
|
||||
if scope is None:
|
||||
# node is a node
|
||||
if 'scope' in node and 'NewName' in self.symtab[node['scope']][node['name']]:
|
||||
return self.symtab[node['scope']][node['name']]['NewName']
|
||||
if node['nt'] == 'FNCALL' and 'NewName' in self.symtab[0][node['name']]:
|
||||
return self.symtab[0][node['name']]['NewName']
|
||||
if (hasattr(node, 'scope')
|
||||
and 'NewName' in self.symtab[node.scope][node.name]):
|
||||
return self.symtab[node.scope][node.name]['NewName']
|
||||
if node.nt == 'FNCALL' and 'NewName' in self.symtab[0][node.name]:
|
||||
return self.symtab[0][node.name]['NewName']
|
||||
|
||||
return node['name']
|
||||
return node.name
|
||||
# node is a name
|
||||
if 'NewName' in self.symtab[scope][node]:
|
||||
return self.symtab[scope][node]['NewName']
|
||||
return node
|
||||
|
||||
def OutIndented(self, node):
|
||||
if node['nt'] != '{}':
|
||||
if node.nt != '{}':
|
||||
self.indentlevel += 1
|
||||
ret = self.OutCode(node)
|
||||
if node['nt'] != '{}':
|
||||
if node.nt != '{}':
|
||||
self.indentlevel -= 1
|
||||
return ret
|
||||
|
||||
|
|
@ -210,14 +211,13 @@ class outscript(object):
|
|||
|
||||
def OutExpr(self, expr):
|
||||
# Handles expression nodes (as opposed to statement nodes)
|
||||
nt = expr['nt']
|
||||
if 'ch' in expr:
|
||||
child = expr['ch']
|
||||
nt = expr.nt
|
||||
child = expr.ch
|
||||
|
||||
if nt in self.binary_operands:
|
||||
lnt = child[0]['nt']
|
||||
lnt = child[0].nt
|
||||
lparen = False
|
||||
rnt = child[1]['nt']
|
||||
rnt = child[1].nt
|
||||
rparen = False
|
||||
if nt in self.assignment_ops and nt in self.op_priority:
|
||||
# Assignment is right-associative, so it needs to be dealt with
|
||||
|
|
@ -274,16 +274,17 @@ class outscript(object):
|
|||
return self.FindName(expr)
|
||||
|
||||
if nt == 'CONST':
|
||||
if self.foldconst and expr['t'] == 'list' and len(expr['value'])==1 and not self.globalmode:
|
||||
return '(list)' + self.Value2LSL(expr['value'][0])
|
||||
return self.Value2LSL(expr['value'])
|
||||
if (self.foldconst and expr.t == 'list' and len(expr.value) == 1
|
||||
and not self.globalmode):
|
||||
return '(list)' + self.Value2LSL(expr.value[0])
|
||||
return self.Value2LSL(expr.value)
|
||||
|
||||
if nt == 'CAST' or self.foldconst and nt in ('LIST', 'CONST') and len(child)==1 and not self.globalmode:
|
||||
ret = '(' + expr['t'] + ')'
|
||||
ret = '(' + expr.t + ')'
|
||||
expr = child[0]
|
||||
if expr['nt'] in ('CONST', 'IDENT', 'V++', 'V--', 'VECTOR',
|
||||
if expr.nt in ('CONST', 'IDENT', 'V++', 'V--', 'VECTOR',
|
||||
'ROTATION', 'LIST', 'FIELD', 'PRINT', 'FNCALL'):
|
||||
if expr['nt'] != 'LIST' or len(expr['ch']) != 1:
|
||||
if expr.nt != 'LIST' or len(expr.ch) != 1:
|
||||
return ret + self.OutExpr(expr)
|
||||
return ret + '(' + self.OutExpr(expr) + ')'
|
||||
|
||||
|
|
@ -309,7 +310,7 @@ class outscript(object):
|
|||
+ self.OutExpr(child[1]) + ',')
|
||||
if nt == 'ROTATION':
|
||||
ret += self.OutExpr(child[2]) + ','
|
||||
lnt = child[-1]['nt']
|
||||
lnt = child[-1].nt
|
||||
if lnt in self.op_priority \
|
||||
and self.op_priority[lnt] <= self.op_priority['>']:
|
||||
ret += '(' + self.OutExpr(child[-1]) + ')'
|
||||
|
|
@ -325,22 +326,22 @@ class outscript(object):
|
|||
|
||||
if nt in self.unary_operands:
|
||||
ret = nt
|
||||
lnt = child[0]['nt']
|
||||
lnt = child[0].nt
|
||||
paren = False
|
||||
if nt == 'NEG':
|
||||
ret = '-'
|
||||
if (lnt == 'CONST' and child[0]['t'] == 'integer'
|
||||
and child[0]['value'] < 0
|
||||
if (lnt == 'CONST' and child[0].t == 'integer'
|
||||
and child[0].value < 0
|
||||
):
|
||||
# shortcut
|
||||
ret += str(child[0]['value'] + 4294967296)
|
||||
ret += str(child[0].value + 4294967296)
|
||||
return ret
|
||||
if lnt in self.op_priority:
|
||||
paren = self.op_priority[lnt] <= self.op_priority['-']
|
||||
elif (lnt == 'NEG' or lnt == '--V'
|
||||
or lnt == 'CONST'
|
||||
and child[0]['t'] == 'float'
|
||||
and child[0]['value'] < 0
|
||||
and child[0].t == 'float'
|
||||
and child[0].value < 0
|
||||
):
|
||||
ret += ' ' # don't output "--" as that's a different token
|
||||
else:
|
||||
|
|
@ -354,7 +355,7 @@ class outscript(object):
|
|||
return ret
|
||||
|
||||
if nt == 'FLD':
|
||||
return self.OutExpr(child[0]) + '.' + expr['fld']
|
||||
return self.OutExpr(child[0]) + '.' + expr.fld
|
||||
|
||||
if nt in ('V--', 'V++'):
|
||||
return self.OutExpr(child[0]) + ('++' if nt == 'V++' else '--')
|
||||
|
|
@ -375,11 +376,8 @@ class outscript(object):
|
|||
assert False, 'Internal error: expression type "' + nt + '" not handled' # pragma: no cover
|
||||
|
||||
def OutCode(self, node):
|
||||
nt = node['nt']
|
||||
if 'ch' in node:
|
||||
child = node['ch']
|
||||
else:
|
||||
child = None
|
||||
nt = node.nt
|
||||
child = node.ch
|
||||
|
||||
if nt == 'IF':
|
||||
ret = self.dent()
|
||||
|
|
@ -390,9 +388,9 @@ class outscript(object):
|
|||
if len(child) == 3:
|
||||
testnode = child[1]
|
||||
# Find last IF in an ELSE IF chain
|
||||
while testnode['nt'] == 'IF' and len(testnode['ch']) == 3:
|
||||
testnode = testnode['ch'][2]
|
||||
if testnode['nt'] == 'IF':
|
||||
while testnode.nt == 'IF' and len(testnode.ch) == 3:
|
||||
testnode = testnode.ch[2]
|
||||
if testnode.nt == 'IF':
|
||||
# hit an IF without ELSE at the end of the chain
|
||||
needs_braces = True
|
||||
if needs_braces:
|
||||
|
|
@ -403,12 +401,12 @@ class outscript(object):
|
|||
ret += self.OutIndented(child[1])
|
||||
if len(child) < 3:
|
||||
return ret
|
||||
if child[2]['nt'] != 'IF':
|
||||
if child[2].nt != 'IF':
|
||||
ret += self.dent() + 'else\n' + self.OutIndented(child[2])
|
||||
return ret
|
||||
ret += self.dent() + 'else '
|
||||
node = child[2]
|
||||
child = node['ch']
|
||||
child = node.ch
|
||||
if nt == 'WHILE':
|
||||
ret = self.dent() + 'while (' + self.OutExpr(child[0]) + ')\n'
|
||||
ret += self.OutIndented(child[1])
|
||||
|
|
@ -436,12 +434,12 @@ class outscript(object):
|
|||
return self.dent() + 'return ' + self.OutExpr(child[0]) + ';\n'
|
||||
return self.dent() + 'return;\n'
|
||||
if nt == 'DECL':
|
||||
ret = self.dent() + node['t'] + ' ' + self.FindName(node)
|
||||
ret = self.dent() + node.t + ' ' + self.FindName(node)
|
||||
if child:
|
||||
if 'orig' in child[0] and (child[0]['orig']['nt'] != 'IDENT'
|
||||
or child[0]['orig']['name']
|
||||
in self.symtab[child[0]['orig']['scope']]):
|
||||
ret += ' = ' + self.OutExpr(child[0]['orig'])
|
||||
if hasattr(child[0], 'orig') and (child[0].orig.nt != 'IDENT'
|
||||
or child[0].orig.name
|
||||
in self.symtab[child[0].orig.scope]):
|
||||
ret += ' = ' + self.OutExpr(child[0].orig)
|
||||
else:
|
||||
ret += ' = ' + self.OutExpr(child[0])
|
||||
return ret + ';\n'
|
||||
|
|
@ -451,26 +449,26 @@ class outscript(object):
|
|||
if nt in ('STDEF', '{}'):
|
||||
ret = ''
|
||||
if nt == 'STDEF':
|
||||
if node['name'] == 'default':
|
||||
if node.name == 'default':
|
||||
ret = self.dent() + 'default\n'
|
||||
else:
|
||||
ret = self.dent() + 'state ' + self.FindName(node) + '\n'
|
||||
|
||||
ret += self.dent() + '{\n'
|
||||
self.indentlevel += 1
|
||||
for stmt in node['ch']:
|
||||
for stmt in node.ch:
|
||||
ret += self.OutCode(stmt)
|
||||
self.indentlevel -= 1
|
||||
return ret + self.dent() + '}\n'
|
||||
|
||||
if nt == 'FNDEF':
|
||||
ret = self.dent()
|
||||
if node['t'] is not None:
|
||||
ret += node['t'] + ' '
|
||||
if node.t is not None:
|
||||
ret += node.t + ' '
|
||||
ret += self.FindName(node) + '('
|
||||
scope = node['pscope']
|
||||
scope = node.pscope
|
||||
ret += ', '.join(typ + ' ' + self.FindName(name, scope)
|
||||
for typ, name in zip(node['ptypes'], node['pnames']))
|
||||
for typ, name in zip(node.ptypes, node.pnames))
|
||||
return ret + ')\n' + self.OutCode(child[0])
|
||||
|
||||
if nt == 'EXPR':
|
||||
|
|
@ -502,7 +500,7 @@ class outscript(object):
|
|||
self.globalmode = False
|
||||
self.listmode = False
|
||||
for node in self.tree:
|
||||
self.globalmode = node['nt'] == 'DECL'
|
||||
self.globalmode = node.nt == 'DECL'
|
||||
ret += self.OutCode(node)
|
||||
self.globalmode = False
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue