From 4fd4bf71aa7025c9c7166b3a7bbf1c7274343699 Mon Sep 17 00:00:00 2001 From: Sei Lisa Date: Mon, 9 Nov 2020 02:06:37 +0100 Subject: [PATCH] Use frozenset more consistently --- lslopt/lslcommon.py | 6 +++--- lslopt/lslextrafuncs.py | 2 +- lslopt/lsloptimizer.py | 6 +++--- lslopt/lsloutput.py | 10 +++++----- lslopt/lslparse.py | 18 +++++++++--------- main.py | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lslopt/lslcommon.py b/lslopt/lslcommon.py index 8c21499..cdfc13f 100644 --- a/lslopt/lslcommon.py +++ b/lslopt/lslcommon.py @@ -21,7 +21,7 @@ import sys from strutil import * strutil_used -_exclusions = frozenset(('nt','t','name','value','ch', 'X','SEF')) +_exclusions = frozenset({'nt','t','name','value','ch', 'X','SEF'}) # Node Record type. Used for AST nodes. class nr(object): @@ -102,8 +102,8 @@ DataPath = '' # These are hardcoded because additions or modifications imply # important changes to the code anyway. -types = frozenset(('integer','float','string','key','vector', - 'quaternion','rotation','list')) +types = frozenset({'integer','float','string','key','vector', + 'quaternion','rotation','list'}) # Conversion of LSL types to Python types and vice versa. diff --git a/lslopt/lslextrafuncs.py b/lslopt/lslextrafuncs.py index 67ea311..75bda37 100644 --- a/lslopt/lslextrafuncs.py +++ b/lslopt/lslextrafuncs.py @@ -47,7 +47,7 @@ xp_error_messages = { 18:u'experience permissions request timed out' } -valid_inventory_kinds = frozenset((0, 1, 3, 5, 6, 7, 10, 13, 20, 21)) +valid_inventory_kinds = frozenset({0, 1, 3, 5, 6, 7, 10, 13, 20, 21}) def llCloud(v): v = v2f(v) diff --git a/lslopt/lsloptimizer.py b/lslopt/lsloptimizer.py index bf85283..2bc5338 100644 --- a/lslopt/lsloptimizer.py +++ b/lslopt/lsloptimizer.py @@ -34,9 +34,9 @@ class optimizer(foldconst, renamer, deadcode, lastpass): } # explicitly exclude assignments - binary_ops = frozenset(('+','-','*','/','%','<<','>>','<','<=','>','>=', - '==','!=','|','^','&','||','&&')) - assign_ops = frozenset(('=','+=','-=','*=','/=','%=','&=','|=','^=','<<=','>>=')) + binary_ops = frozenset({'+','-','*','/','%','<<','>>','<','<=','>','>=', + '==','!=','|','^','&','||','&&'}) + assign_ops = frozenset({'=','+=','-=','*=','/=','%=','&=','|=','^=','<<=','>>='}) def Cast(self, value, newtype): """Return a CAST node if the types are not equal, otherwise the diff --git a/lslopt/lsloutput.py b/lslopt/lsloutput.py index d490917..136e2a5 100644 --- a/lslopt/lsloutput.py +++ b/lslopt/lsloutput.py @@ -26,17 +26,17 @@ debugScopes = False class outscript(object): - binary_operators = frozenset(('||','&&','^','|','&','==','!=','<','<=','>', + binary_operators = frozenset({'||','&&','^','|','&','==','!=','<','<=','>', '>=','<<','>>','+','-','*','/','%', '=', '+=', '-=', '*=', '/=','%=', - )) - extended_assignments = frozenset(('&=', '|=', '^=', '<<=', '>>=')) - unary_operators = frozenset(('NEG', '!', '~')) + }) + extended_assignments = frozenset({'&=', '|=', '^=', '<<=', '>>='}) + unary_operators = frozenset({'NEG', '!', '~'}) op_priority = {'=':0, '+=':0, '-=':0, '*=':0, '/=':0, '%=':0, '&=':0, '|=':0, '^=':0, '<<=':0, '>>=':0, '||':1, '&&':1, '|':2, '^':3, '&':4, '==':5, '!=':5, '<':6, '<=':6, '>':6, '>=':6, '<<':7, '>>':7, '+':8, '-':8,# 'NEG':8, '*':9, '/':9, '%':9}#, '!':10, '~':10, '++':10, '--':10, } - assignment_ops = ('=', '+=', '-=', '*=', '/=','%=') + assignment_ops = frozenset({'=', '+=', '-=', '*=', '/=','%='}) def Value2LSL(self, value): tvalue = type(value) diff --git a/lslopt/lslparse.py b/lslopt/lslparse.py index cb816b3..2cf9ad4 100644 --- a/lslopt/lslparse.py +++ b/lslopt/lslparse.py @@ -221,19 +221,19 @@ class EInternal(Exception): pass class parser(object): - assignment_toks = frozenset(('=', '+=', '-=', '*=', '/=', '%=')) - extassignment_toks = frozenset(('|=', '&=', '^=', '<<=', '>>=')) + assignment_toks = frozenset({'=', '+=', '-=', '*=', '/=', '%='}) + extassignment_toks = frozenset({'|=', '&=', '^=', '<<=', '>>='}) - double_toks = frozenset(('++', '--', '+=', '-=', '*=', '/=', '%=', '==', - '!=', '>=', '<=', '&&', '||', '<<', '>>')) - extdouble_toks = frozenset(('|=', '&=', '^=')) + double_toks = frozenset({'++', '--', '+=', '-=', '*=', '/=', '%=', '==', + '!=', '>=', '<=', '&&', '||', '<<', '>>'}) + extdouble_toks = frozenset({'|=', '&=', '^='}) # These are hardcoded because additions or modifications imply # important changes to the code anyway. - base_keywords = frozenset(('default', 'state', 'event', 'jump', 'return', - 'if', 'else', 'for', 'do', 'while', 'print', 'TRUE', 'FALSE')) - brkcont_keywords = frozenset(('break', 'continue')) - switch_keywords = frozenset(('switch', 'case', 'break', 'default')) + base_keywords = frozenset({'default', 'state', 'event', 'jump', 'return', + 'if', 'else', 'for', 'do', 'while', 'print', 'TRUE', 'FALSE'}) + brkcont_keywords = frozenset({'break', 'continue'}) + switch_keywords = frozenset({'switch', 'case', 'break', 'default'}) PythonType2LSLToken = {int:'INTEGER_VALUE', float:'FLOAT_VALUE', unicode:'STRING_VALUE', Key:'KEY_VALUE', Vector:'VECTOR_VALUE', diff --git a/main.py b/main.py index d1948ab..d9274a0 100755 --- a/main.py +++ b/main.py @@ -373,7 +373,7 @@ break/continue syntax extension (which is inactive by default). """.format(progname=str2u(progname))) return -validoptions = frozenset(('extendedglobalexpr','breakcont','extendedtypecast', +validoptions = frozenset({'extendedglobalexpr','breakcont','extendedtypecast', 'extendedassignment','allowkeyconcat','allowmultistrings','duplabels', 'lazylists','enableswitch','errmissingdefault','funcoverride','optimize', 'optsigns','optfloats','constfold','dcr','shrinknames','addstrings', @@ -383,7 +383,7 @@ validoptions = frozenset(('extendedglobalexpr','breakcont','extendedtypecast', 'lso','expr','rsrclimit', # 'clear' is handled as a special case # 'prettify' is internal, as it's a user flag -)) +}) def main(argv): """Main executable."""