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

fixes #20807, refs #20450, regression with seq inference (#20818)

Browse source
This commit is contained in:
metagn 2022-11-12 07:27:51 +03:00 • committed by GitHub
commit 77e58bf573
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/semexprs.nim
View file

@ -2402,12 +2402,16 @@ proc semMagic(c: PContext, n: PNode, s: PSym, flags: TExprFlags; expectedType: P
markUsed(c, n.info, s) markUsed(c, n.info, s)
result = semSizeof(c, setMs(n, s)) result = semSizeof(c, setMs(n, s))
of mArrToSeq, mOpenArrayToSeq: of mArrToSeq, mOpenArrayToSeq:
if n.len == 2 and expectedType != nil and ( if expectedType != nil and (
let expected = expectedType.skipTypes(abstractRange-{tyDistinct}); let expected = expectedType.skipTypes(abstractRange-{tyDistinct});
expected.kind in {tySequence, tyOpenArray}): expected.kind in {tySequence, tyOpenArray}):
# seq type inference # seq type inference
var arrayType = newType(tyOpenArray, nextTypeId(c.idgen), expected.owner) var arrayType = newType(tyOpenArray, nextTypeId(c.idgen), expected.owner)
arrayType.rawAddSon(expected[0]) arrayType.rawAddSon(expected[0])
if n[0].kind == nkSym and sfFromGeneric in n[0].sym.flags:
# may have been resolved to `@`[empty] at some point,
# reset to `@` to deal with this
n[0] = newSymNode(n[0].sym.owner, n[0].info)
n[1] = semExpr(c, n[1], flags, arrayType) n[1] = semExpr(c, n[1], flags, arrayType)
result = semDirectOp(c, n, flags, expectedType) result = semDirectOp(c, n, flags, expectedType)
else: else:

11
tests/types/ttopdowninference.nim
View file

@ -244,3 +244,14 @@ block: # bug #11777
type S = set[0..5] type S = set[0..5]
var s: S = {1, 2} var s: S = {1, 2}
doAssert 1 in s doAssert 1 in s
block: # regression #20807
var s: seq[string]
template fail =
s = @[]
template test(body: untyped) =
body
proc test(a: string) = discard
test: fail()
doAssert not (compiles do:
let x: seq[int] = `@`[string]([]))