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

[backport] fix #15064, strscans.scanf edge case for '$+' (#15223)

Browse source
This commit is contained in:
Miran 2020-08-25 09:57:15 +02:00 • committed by GitHub
commit 15ff89cec1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/strscans.nim
View file

@ -396,7 +396,7 @@ macro scanf*(input: string; pattern: static[string]; results: varargs[typed]): b
var resLen = genSym(nskLet, "resLen") var resLen = genSym(nskLet, "resLen")
conds.add newLetStmt(resLen, newCall(bindSym"parseUntil", inp, conds.add newLetStmt(resLen, newCall(bindSym"parseUntil", inp,
results[i], newLit(token), idx)) results[i], newLit(token), idx))
conds.add newCall(bindSym"!=", resLen, newLit min) conds.add newCall(bindSym">=", resLen, newLit min)
conds.add resLen conds.add resLen
else: else:
matchError matchError

16
tests/stdlib/tstrscans.nim
View file

@ -79,8 +79,22 @@ block EmptyTuple:
block Arrow: block Arrow:
let text = "foo;bar;baz;" let text = "foo;bar;baz;"
var idx = 0 var idx = 0
var res = ""
doAssert scanp(text, idx, +(~{';','\0'} -> (discard $_)), ';') doAssert scanp(text, idx, +(~{';','\0'} -> (discard $_)), ';')
doAssert scanp(text, idx, +(~{';','\0'} -> (discard $_)), ';') doAssert scanp(text, idx, +(~{';','\0'} -> (discard $_)), ';')
doAssert scanp(text, idx, +(~{';','\0'} -> (discard $_)), ';') doAssert scanp(text, idx, +(~{';','\0'} -> (discard $_)), ';')
doAssert scanp(text, idx, +(~{';','\0'} -> (discard $_)), ';') == false doAssert scanp(text, idx, +(~{';','\0'} -> (discard $_)), ';') == false
block issue15064:
var nick1, msg1: string
doAssert scanf("<abcd> a", "<$+> $+", nick1, msg1)
doAssert nick1 == "abcd"
doAssert msg1 == "a"
var nick2, msg2: string
doAssert(not scanf("<abcd> ", "<$+> $+", nick2, msg2))
var nick3, msg3: string
doAssert scanf("<abcd> ", "<$+> $*", nick3, msg3)
doAssert nick3 == "abcd"
doAssert msg3 == ""