jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #11294

Browse source
This commit is contained in:
Araq 2019-05-24 09:43:04 +02:00
commit cacd6d1070
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/commands.nim
View file

@ -106,7 +106,7 @@ proc writeCommandLineUsage*(conf: ConfigRef) =
msgWriteln(conf, getCommandLineDesc(conf), {msgStdout}) msgWriteln(conf, getCommandLineDesc(conf), {msgStdout})
proc addPrefix(switch: string): string = proc addPrefix(switch: string): string =
if len(switch) == 1: result = "-" & switch if len(switch) <= 1: result = "-" & switch
else: result = "--" & switch else: result = "--" & switch
const const
@ -770,6 +770,8 @@ proc processSwitch*(switch, arg: string, pass: TCmdLinePass, info: TLineInfo;
processOnOffSwitchG(conf, {optDocInternal}, arg, pass, info) processOnOffSwitchG(conf, {optDocInternal}, arg, pass, info)
of "multimethods": of "multimethods":
processOnOffSwitchG(conf, {optMultiMethods}, arg, pass, info) processOnOffSwitchG(conf, {optMultiMethods}, arg, pass, info)
of "":
conf.projectName = "-"
else: else:
if strutils.find(switch, '.') >= 0: options.setConfigVar(conf, switch, arg) if strutils.find(switch, '.') >= 0: options.setConfigVar(conf, switch, arg)
else: invalidCmdLineOption(conf, pass, switch, info) else: invalidCmdLineOption(conf, pass, switch, info)

7
lib/pure/parseopt.nim
View file

@ -274,8 +274,9 @@ when declared(os.paramCount):
proc handleShortOption(p: var OptParser; cmd: string) = proc handleShortOption(p: var OptParser; cmd: string) =
var i = p.pos var i = p.pos
p.kind = cmdShortOption p.kind = cmdShortOption
add(p.key.string, cmd[i]) if i < cmd.len:
inc(i) add(p.key.string, cmd[i])
inc(i)
p.inShortState = true p.inShortState = true
while i < cmd.len and cmd[i] in {'\t', ' '}: while i < cmd.len and cmd[i] in {'\t', ' '}:
inc(i) inc(i)
@ -446,7 +447,7 @@ when declared(initOptParser):
tuple[kind: CmdLineKind, key, val: TaintedString] = tuple[kind: CmdLineKind, key, val: TaintedString] =
## Convenience iterator for iterating over command line arguments. ## Convenience iterator for iterating over command line arguments.
## ##
## This creates a new `OptParser<#OptParser>`_. If no command line ## This creates a new `OptParser<#OptParser>`_. If no command line
## arguments are provided, the real command line as provided by the ## arguments are provided, the real command line as provided by the
## ``os`` module is retrieved instead. ## ``os`` module is retrieved instead.
## ##