Miko/LSL-PyOptimizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Unicode some strings that should be, and improve error reporting in builtins.txt

Browse Source 
Also work towards the convention that strings that represent text (possibly translatable) are in double quotes, not single.
This commit is contained in:
Sei Lisa
2016-12-20 19:22:48 +01:00
parent a124deb6b3
commit 39261cbfc8
5 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lslopt/lslbasefuncs.py
View File

@@ -81,15 +81,15 @@ Indet = Infinity * 0
class ELSLTypeMismatch(Exception):
def __init__(self):
super(ELSLTypeMismatch, self).__init__("Type mismatch")
super(ELSLTypeMismatch, self).__init__(u"Type mismatch")
class ELSLMathError(Exception):
def __init__(self):
super(ELSLMathError, self).__init__("Math Error")
super(ELSLMathError, self).__init__(u"Math Error")
class ELSLInvalidType(Exception):
def __init__(self):
super(ELSLInvalidType, self).__init__("Internal error: Invalid type")
super(ELSLInvalidType, self).__init__(u"Internal error: Invalid type")
class ELSLCantCompute(Exception):
pass
@@ -476,7 +476,7 @@ def InternalUTF8toString(s):
# python-coverage. It IS executed but not detected.
continue
if LSO:
raise ELSONotSupported("Byte strings not supported")
raise ELSONotSupported(u"Byte strings not supported")
ret += u'?' * len(partialchar)
partialchar = b''
# fall through to process current character
@@ -485,14 +485,14 @@ def InternalUTF8toString(s):
pending = 1 if o < 0xE0 else 2 if o < 0xF0 else 3
elif o >= 0x80:
if LSO:
raise ELSONotSupported("Byte strings not supported")
raise ELSONotSupported(u"Byte strings not supported")
ret += u'?'
else:
ret += c.decode('utf8')
if partialchar:
if LSO:
raise ELSONotSupported("Byte strings not supported")
raise ELSONotSupported(u"Byte strings not supported")
ret += u'?' * len(partialchar)
return zstr(ret)

4
lslopt/lslfoldconst.py
View File

@@ -951,7 +951,7 @@ class foldconst(object):
)
if generatesTabs:
if self.warntabs:
warning("Can't optimize call to %s because it would generate a tab character (you can force the optimization with the 'foldtabs' option, or disable this warning by disabling the 'warntabs' option)." % node['name'])
warning(u"Can't optimize call to %s because it would generate a tab character (you can force the optimization with the 'foldtabs' option, or disable this warning by disabling the 'warntabs' option)." % node['name'].decode('utf8'))
return
parent[index] = {'nt':'CONST', 't':node['t'], 'value':value}
except lslfuncs.ELSLCantCompute:
@@ -1266,6 +1266,6 @@ class foldconst(object):
self.FoldTree(tree, idx)
self.globalmode = False
if warningpass and not self.IsValidGlobalConstant(tree[idx]):
warning("Expression in globals doesn't resolve to a simple constant.")
warning(u"Expression in globals doesn't resolve to a simple constant.")
else:
self.FoldTree(tree, idx)

10
lslopt/lsloutput.py
View File

@@ -47,7 +47,7 @@ class outscript(object):
# is lost. So we emit a warning instead, letting the compiler
# report the error in the generated source.
if self.globalmode and self.listmode:
warning('Illegal combo: Key type inside a global list')
warning(u"Illegal combo: Key type inside a global list")
if self.listmode or not self.globalmode:
if self.globalmode:
pfx = '(key)'
@@ -55,10 +55,10 @@ class outscript(object):
pfx = '((key)'
sfx = ')'
if '\t' in value and self.warntabs:
warning("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'"
" option).")
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'"
" option).")
return pfx + '"' + value.encode('utf8').replace('\\','\\\\') \
.replace('"','\\"').replace('\n','\\n') + '"' + sfx
if tvalue == int:

49
lslopt/lslparse.py
View File

@@ -29,8 +29,8 @@ import sys, re
# reading it.
def warning(txt):
assert type(txt) == str
sys.stderr.write('WARNING: ' + txt + '\n')
assert type(txt) == unicode
sys.stderr.write(u"WARNING: " + txt + u"\n")
def isdigit(c):
return '0' <= c <= '9'
@@ -2688,13 +2688,24 @@ list lazy_list_set(list L, integer i, list v)
f = open(lslcommon.DataPath + builtins, 'rb')
try:
linenum = 0
try:
ubuiltins = builtins.decode('utf8')
except UnicodeDecodeError:
ubuiltins = builtins.decode('iso-8859-15')
while True:
linenum += 1
line = f.readline()
if not line: break
if line[-1] == '\n': line = line[:-1]
try:
uline = line.decode('utf8')
except UnicodeDecodeError:
warning(u"Bad Unicode in %s line %d" % (ubuiltins, linenum))
continue
match = parse_lin_re.search(line)
if not match:
warning('Syntax error in ' + builtins + ', line ' + line)
warning(u"Syntax error in %s, line %d" % (ubuiltins, linenum))
continue
if match.group(1):
# event or function
@@ -2704,7 +2715,7 @@ list lazy_list_set(list L, integer i, list v)
if typ == 'void':
typ = None
elif typ != 'event' and typ not in self.types:
warning('Invalid type in ' + builtins + ', line ' + line + ': ' + typ)
warning(u"Invalid type in %s, line %d: %s" % (ubuiltins, linenum, typ))
continue
args = []
arglist = match.group(3)
@@ -2714,23 +2725,29 @@ list lazy_list_set(list L, integer i, list v)
for arg in arglist:
argtyp = parse_arg_re.search(arg).group(1)
if argtyp not in self.types:
warning('Invalid type in ' + builtins + ', line ' + line + ': ' + argtyp)
uargtyp = argtyp.decode('utf8')
warning(u"Invalid type in %s, line %d: %s" % (ubuiltins, linenum, uargtyp))
del uargtyp
bad = True
break
args.append(parse_arg_re.search(arg).group(1))
args.append(argtyp)
if bad:
continue
name = match.group(2)
if typ == 'event':
if name in self.events:
warning('Event already defined in ' + builtins + ', overwriting: ' + name)
uname = name.decode('utf8')
warning(u"Event at line %d was already defined in %s, overwriting: %s" % (linenum, ubuiltins, uname))
del uname
self.events[name] = tuple(args)
else:
# Library functions go to the functions table. If
# they are implemented in lslfuncs.*, they get a
# reference to the implementation; otherwise None.
if name in self.funclibrary:
warning('Function already defined in ' + builtins + ', overwriting: ' + name)
uname = name.decode('utf8')
warning(u"Function at line %d was already defined in %s, overwriting: %s" % (linenum, ubuiltins, uname))
del uname
fn = getattr(lslfuncs, name, None)
self.funclibrary[name] = {'Kind':'f', 'Type':typ, 'ParamTypes':args}
if fn is not None:
@@ -2739,10 +2756,14 @@ list lazy_list_set(list L, integer i, list v)
# constant
name = match.group(5)
if name in self.constants:
warning('Global already defined in ' + builtins + ', overwriting: ' + name)
uname = name.decode('utf8')
warning(u"Global at line %d was already defined in %s, overwriting: %s" % (linenum, ubuiltins, uname))
del uname
typ = match.group(4)
if typ not in self.types:
warning('Invalid type in ' + builtins + ', line ' + line + ': ' + typ)
utyp = typ.decode('utf8')
warning(u"Invalid type in %s, line %d: %s" % (ubuiltins, linenum, utyp))
del utyp
continue
if typ == 'quaternion':
typ = 'rotation'
@@ -2772,10 +2793,10 @@ list lazy_list_set(list L, integer i, list v)
#if typ == 'key':
# value = Key(value)
else:
warning('Invalid string in ' + builtins + ': ' + line)
warning(u"Invalid string in %s line %d: %s" % (ubuiltins, linenum, uline))
value = None
elif typ == 'key':
warning('Key constants not supported in ' + builtins + ': ' + line)
warning(u"Key constants not supported in %s, line %d: %s" % (ubuiltins, linenum, uline))
value = None
elif typ in ('vector', 'rotation'):
try:
@@ -2805,10 +2826,10 @@ list lazy_list_set(list L, integer i, list v)
value[3] = lslfuncs.F32(float(num.group(1)))
value = Quaternion(value)
except ValueError:
warning('Invalid vector/rotation syntax in ' + builtins + ': ' + line)
warning(u"Invalid vector/rotation syntax in %s line %d: %s" % (ubuiltins, linenum, uline))
else:
assert typ == 'list'
warning('List constants not supported in ' + builtins + ': ' + line)
warning(u"List constants not supported in %s, line %d: %s" % (ubuiltins, linenum, uline))
value = None
if value is not None:
self.constants[name] = value