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

fixed incorrect implicit conversion between arrays of different sizes; see #202

Browse source
This commit is contained in:
Zahary Karadjov 2012-09-13 03:02:36 +03:00
commit b2814df5cd
2 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
compiler/sigmatch.nim
View file

@ -370,23 +370,22 @@ proc typeRel(c: var TCandidate, f, a: PType): TTypeRelation =
of tyVar:
if a.kind == f.kind: result = typeRel(c, base(f), base(a))
else: result = typeRel(c, base(f), a)
of tyArray, tyArrayConstr:
of tyArray, tyArrayConstr:
# tyArrayConstr cannot happen really, but
# we wanna be safe here
case a.kind
of tyArray:
result = minRel(typeRel(c, f.sons[0], a.sons[0]),
typeRel(c, f.sons[1], a.sons[1]))
if result < isGeneric: result = isNone
of tyArrayConstr:
of tyArray, tyArrayConstr:
var fRange = f.sons[0]
if fRange.kind == tyGenericParam:
var prev = PType(idTableGet(c.bindings, fRange))
if prev == nil:
put(c.bindings, fRange, a.sons[0])
fRange = a
else:
fRange = prev
result = typeRel(c, f.sons[1], a.sons[1])
if result < isGeneric:
result = isNone
else:
if (result != isGeneric) and (lengthOrd(f) != lengthOrd(a)):
result = isNone
elif f.sons[0].kind in GenericTypes:
result = minRel(result, typeRel(c, f.sons[0], a.sons[0]))
if result < isGeneric: result = isNone
elif lengthOrd(fRange) != lengthOrd(a): result = isNone
else: nil
of tyOpenArray, tyVarargs:
case a.Kind