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

Change option --scriptname to --shortname and change help text.

Browse source 
Option --scriptname did nothing, because the program expected --shortname instead. --scriptname is far more confusing, given that it's intended as the value that lands in the __SHORTFILE__ macro, so it has been renamed.

Improve the help text regarding that option; also fix the wording for what -O help does and add an example of how to use -O.
This commit is contained in:
Sei Lisa 2017-01-08 05:23:50 +01:00
parent b623d6ae5c
commit 8b9fe7693e
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
main.py
View file

@ -180,14 +180,18 @@ Usage: {progname}
[--precmd=<cmd>] preprocessor command ('cpp' by default) [--precmd=<cmd>] preprocessor command ('cpp' by default)
[--prenodef] no LSL specific defines (__AGENTKEY__ etc.) [--prenodef] no LSL specific defines (__AGENTKEY__ etc.)
[--preshow] show preprocessor output, and stop [--preshow] show preprocessor output, and stop
[--avid=<UUID>] specify UUID of avatar saving the script [--avid=<UUID>] * specify UUID of avatar saving the script
[--avname=<name>] specify name of avatar saving the script [--avname=<name>] * specify name of avatar saving the script
[--assetid=<UUID>] specify the asset UUID of the script [--assetid=<UUID>] * specify the asset UUID of the script
[--scriptname=<name>] specify the script's file name [--shortname=<name>] * specify the script's short file name
filename input file filename input file
Options marked with * are used to define the preprocessor macros __AGENTID__,
__AGENTKEY__, __AGENTIDRAW__, __AGENTNAME__, __ASSETID__ and __SHORTFILE__,
and have no effect if --prenodef is specified.
If filename is a dash (-) then standard input is used. If filename is a dash (-) then standard input is used.
Use: {progname} -O help for help on the command line options. Use: {progname} -O help for help on the optimizer control options.
Preprocessor modes: Preprocessor modes:
ext Invoke preprocessor ext Invoke preprocessor
@ -226,7 +230,7 @@ Case insensitive.
with a preprocessor. Similar to addstrings, but this one with a preprocessor. Similar to addstrings, but this one
is not an optimization, it introduces new syntax. is not an optimization, it introduces new syntax.
DupLabels - Normally, a duplicate label within a function is allowed DupLabels - Normally, a duplicate label within a function is allowed
by the syntax by using {} blocks; however, the server by the syntax by using {{}} blocks; however, the server
will just refuse to save the script (under Mono) or do will just refuse to save the script (under Mono) or do
something completely unexpected (under LSO: all jumps something completely unexpected (under LSO: all jumps
will go to the last label with that name). This flag will go to the last label with that name). This flag
@ -298,7 +302,12 @@ Case insensitive.
Clear - Set all options to inactive, Normally used as the first Clear - Set all options to inactive, Normally used as the first
option, to start afresh. Note that this sets to inactive option, to start afresh. Note that this sets to inactive
even the options that are active by default. even the options that are active by default.
""")
For example:
{progname} -O -DCR,+BreakCont scriptname.lsl
would turn off dead code removal (which is active by default) and turn on the
break/continue syntax extension (which is inactive by default).
""".format(progname=progname))
return return
validoptions = frozenset(('extendedglobalexpr','breakcont','extendedtypecast', validoptions = frozenset(('extendedglobalexpr','breakcont','extendedtypecast',
@ -332,7 +341,7 @@ def main(argv):
('optimizer-options=', 'help', 'version', 'output=', 'header', ('optimizer-options=', 'help', 'version', 'output=', 'header',
'timestamp', 'timestamp',
'preproc=', 'precmd=', 'prearg=', 'prenodef', 'preshow', 'preproc=', 'precmd=', 'prearg=', 'prenodef', 'preshow',
'avid=', 'avname=', 'assetid=', 'scriptname=')) 'avid=', 'avname=', 'assetid=', 'shortname='))
except getopt.GetoptError as e: except getopt.GetoptError as e:
Usage(argv[0]) Usage(argv[0])
sys.stderr.write(u"\nError: " + str(e).decode('utf8') + u"\n") sys.stderr.write(u"\nError: " + str(e).decode('utf8') + u"\n")