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

fixes a parseopt regression (#8820)

Browse source
This commit is contained in:
Andreas Rumpf 2018-08-30 23:50:09 +02:00 • committed by GitHub
commit 36473acf47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pure/parseopt.nim
View file

@ -207,9 +207,12 @@ proc next*(p: var OptParser) {.rtl, extern: "npo$1".} =
i = parseWord(p.cmds[p.idx], i, p.key.string, {' ', '\t', ':', '='}) i = parseWord(p.cmds[p.idx], i, p.key.string, {' ', '\t', ':', '='})
while i < p.cmds[p.idx].len and p.cmds[p.idx][i] in {'\t', ' '}: inc(i) while i < p.cmds[p.idx].len and p.cmds[p.idx][i] in {'\t', ' '}: inc(i)
if i < p.cmds[p.idx].len and p.cmds[p.idx][i] in {':', '='}: if i < p.cmds[p.idx].len and p.cmds[p.idx][i] in {':', '='}:
if i < p.cmds[p.idx].len and p.cmds[p.idx][i] in {':', '='}: inc(i)
inc(i)
while i < p.cmds[p.idx].len and p.cmds[p.idx][i] in {'\t', ' '}: inc(i) while i < p.cmds[p.idx].len and p.cmds[p.idx][i] in {'\t', ' '}: inc(i)
# if we're at the end, use the next command line option:
if i >= p.cmds[p.idx].len and p.idx < p.cmds.len:
inc p.idx
i = 0
p.val = TaintedString p.cmds[p.idx].substr(i) p.val = TaintedString p.cmds[p.idx].substr(i)
elif len(p.longNoVal) > 0 and p.key.string notin p.longNoVal and p.idx+1 < p.cmds.len: elif len(p.longNoVal) > 0 and p.key.string notin p.longNoVal and p.idx+1 < p.cmds.len:
p.val = TaintedString p.cmds[p.idx+1] p.val = TaintedString p.cmds[p.idx+1]