Convert warnings to add the WARNING: title in the function.

This commit is contained in:
Sei Lisa 2014-08-05 15:55:49 +02:00
parent 58e22f77ce
commit 5773449edb
3 changed files with 5 additions and 5 deletions

View file

@ -430,7 +430,7 @@ class optimizer(renamer, deadcode):
fn = self.symtab[0][node['name']]['Fn'] fn = self.symtab[0][node['name']]['Fn']
value = fn(*tuple(arg['value'] for arg in child)) value = fn(*tuple(arg['value'] for arg in child))
if not self.foldtabs and isinstance(value, unicode) and '\t' in value: if not self.foldtabs and isinstance(value, unicode) and '\t' in value:
warning('WARNING: Tab in function result and foldtabs option not used.') warning('Tab in function result and foldtabs option not used.')
return return
parent[index] = {'nt':'CONST', 't':node['t'], 'value':value} parent[index] = {'nt':'CONST', 't':node['t'], 'value':value}
elif node['name'] == 'llGetListLength' and child[0]['nt'] == 'IDENT': elif node['name'] == 'llGetListLength' and child[0]['nt'] == 'IDENT':
@ -662,7 +662,7 @@ class optimizer(renamer, deadcode):
self.FoldTree(tree, idx) self.FoldTree(tree, idx)
self.globalmode = False self.globalmode = False
if not self.IsValidGlobalConstant(tree[idx]): if not self.IsValidGlobalConstant(tree[idx]):
warning('WARNING: Expression does not resolve to a single constant.') warning('Expression does not resolve to a single constant.')
else: else:
self.FoldTree(tree, idx) self.FoldTree(tree, idx)

View file

@ -23,7 +23,7 @@ class outscript(object):
# is lost. So we emit a warning instead, letting the compiler # is lost. So we emit a warning instead, letting the compiler
# report the error in the generated source. # report the error in the generated source.
if self.globalmode and self.listmode: if self.globalmode and self.listmode:
warning('WARNING: Illegal combo: Key type inside a global list') warning('Illegal combo: Key type inside a global list')
if self.listmode or not self.globalmode: if self.listmode or not self.globalmode:
if self.globalmode: if self.globalmode:
pfx = '(key)' pfx = '(key)'
@ -31,7 +31,7 @@ class outscript(object):
pfx = '((key)' pfx = '((key)'
sfx = ')' sfx = ')'
if '\t' in value: if '\t' in value:
warning('WARNING: A string contains a tab. Tabs are expanded to four' warning('A string contains a tab. Tabs are expanded to four'
' spaces by the viewer when copy-pasting the code.') ' spaces by the viewer when copy-pasting the code.')
return pfx + '"' + value.encode('utf8').replace('\\','\\\\') \ return pfx + '"' + value.encode('utf8').replace('\\','\\\\') \
.replace('"','\\"').replace('\n','\\n') + '"' + sfx .replace('"','\\"').replace('\n','\\n') + '"' + sfx

View file

@ -10,7 +10,7 @@ import random
def warning(txt): def warning(txt):
assert type(txt) == str assert type(txt) == str
sys.stderr.write(txt + '\n') sys.stderr.write('WARNING: ' + txt + '\n')
def isdigit(c): def isdigit(c):
return '0' <= c <= '9' return '0' <= c <= '9'