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

Simplify the builtins.txt parser REs by checking the types in the code.

Browse source 
Gives us more granularity reporting errors.
This commit is contained in:
Sei Lisa 2015-03-26 23:08:54 +01:00
parent 29d003b108
commit e21173170e
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lslopt/lslparse.py
View file

@ -2393,13 +2393,13 @@ list lazy_list_set(list L, integer i, list v)
# Library read code # Library read code
parse_lin_re = re.compile( parse_lin_re = re.compile(
r'^\s*(event|void|integer|float|string|key|vector|quaternion|rotation|list)\s+' r'^\s*([a-z]+)\s+'
r'([a-zA-Z_][a-zA-Z0-9_]*)\s*\(\s*(' r'([a-zA-Z_][a-zA-Z0-9_]*)\s*\(\s*('
r'(?:integer|float|string|key|vector|quaternion|rotation|list)\s+[a-zA-Z_][a-zA-Z0-9_]*' r'[a-z]+\s+[a-zA-Z_][a-zA-Z0-9_]*'
r'(?:\s*,\s*(?:integer|float|string|key|vector|quaternion|rotation|list)\s+[a-zA-Z_][a-zA-Z0-9_]*)*' r'(?:\s*,\s*[a-z]+\s+[a-zA-Z_][a-zA-Z0-9_]*)*'
r')?\s*\)\s*$' r')?\s*\)\s*$'
r'|' r'|'
r'^\s*const\s+(integer|float|string|key|vector|quaternion|rotation|list)' r'^\s*const\s+([a-z]+)'
r'\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.*?)\s*$' r'\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.*?)\s*$'
r'|' r'|'
r'^\s*(?:#.*|//.*)?$') r'^\s*(?:#.*|//.*)?$')
@ -2415,7 +2415,7 @@ list lazy_list_set(list L, integer i, list v)
if line[-1] == '\n': line = line[:-1] if line[-1] == '\n': line = line[:-1]
match = parse_lin_re.match(line) match = parse_lin_re.match(line)
if not match: if not match:
warning('Syntax error in builtins.txt: ' + line) warning('Syntax error in builtins.txt, line ' + line)
continue continue
if match.group(1): if match.group(1):
# event or function # event or function
@ -2424,12 +2424,23 @@ list lazy_list_set(list L, integer i, list v)
typ = 'rotation' typ = 'rotation'
if typ == 'void': if typ == 'void':
typ = None typ = None
elif typ != 'event' and typ not in self.types:
warning('Invalid type in builtins.txt, line ' + line + ': ' + typ)
continue
args = [] args = []
arglist = match.group(3) arglist = match.group(3)
if arglist: if arglist:
arglist = arglist.split(',') arglist = arglist.split(',')
bad = False
for arg in arglist: for arg in arglist:
argtyp = parse_arg_re.match(arg).group(1)
if argtyp not in self.types:
warning('Invalid type in builtins.txt, line ' + line + ': ' + argtyp)
bad = True
break
args.append(parse_arg_re.match(arg).group(1)) args.append(parse_arg_re.match(arg).group(1))
if bad:
continue
name = match.group(2) name = match.group(2)
if typ == 'event': if typ == 'event':
if name in self.events: if name in self.events:
@ -2451,6 +2462,9 @@ list lazy_list_set(list L, integer i, list v)
if name in self.constants: if name in self.constants:
warning('Global already defined in bultins.txt, overwriting: ' + name) warning('Global already defined in bultins.txt, overwriting: ' + name)
typ = match.group(4) typ = match.group(4)
if typ not in self.types:
warning('Invalid type in builtins.txt, line ' + line + ': ' + typ)
continue
if typ == 'quaternion': if typ == 'quaternion':
typ = 'rotation' typ = 'rotation'
value = match.group(6) value = match.group(6)