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

Fix the obnoxious issue with globals propagation in full expressions.

Browse source 
Fixed by backtracking in the parser, and keeping a copy of the original expression if it's a simple_expr, which is used for output in place of the folded one.

There's still the potential issue that if a global is optimized away, then it will "come back" during output and cause an error because the definition is missing.
This commit is contained in:
Sei Lisa 2014-07-31 04:47:19 +02:00
parent 5b401ff9a5
commit e5714eba25
3 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lslopt/lslparse.py
View file

@ -1465,7 +1465,7 @@ class parser(object):
raise EParseAlreadyDefined(self)
self.NextToken()
if self.tok[0] == '=' or self.tok[0] == ';':
if self.tok[0] in ('=', ';'):
# This is a variable definition
if typ is None: # Typeless variables are not allowed
raise EParseSyntax(self)
@ -1474,11 +1474,27 @@ class parser(object):
self.NextToken()
if self.extendedglobalexpr:
self.globalmode = True # Disallow forward globals.
value = self.Parse_expression() # Use advanced expression evaluation.
# Mark backtracking position
pos = self.pos
errorpos = self.errorpos
tok = self.tok
try:
value = self.Parse_simple_expr()
self.expect(';')
value['Simple'] = True # Success - mark it as simple
except EParse:
# Backtrack
self.pos = pos
self.errorpos = errorpos
self.tok = tok
# Use advanced expression evaluation.
value = self.Parse_expression()
self.expect(';')
self.globalmode = False # Allow forward globals again.
else:
value = self.Parse_simple_expr() # Use LSL's dull global expression.
self.expect(';')
# Use LSL's dull global expression.
value = self.Parse_simple_expr()
self.expect(';')
self.NextToken()
else: # must be semicolon
self.NextToken()