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

fix range[enum] type conversion (#13204) [backport]

Browse source
This commit is contained in:
Jasper Jenkins 2020-01-20 07:56:59 -08:00 • committed by Andreas Rumpf
commit 0606b6a44e
2 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/sigmatch.nim
View file

@ -1149,9 +1149,10 @@ proc typeRel(c: var TCandidate, f, aOrig: PType,
f.n[i] = tryResolvingStaticExpr(c, f.n[i])
result = typeRangeRel(f, a)
else:
if skipTypes(f, {tyRange}).kind == a.kind:
let f = skipTypes(f, {tyRange})
if f.kind == a.kind and (f.kind != tyEnum or sameEnumTypes(f, a)):
result = isIntConv
elif isConvertibleToRange(skipTypes(f, {tyRange}), a):
elif isConvertibleToRange(f, a):
result = isConvertible # a convertible to f
of tyInt: result = handleRange(f, a, tyInt8, tyInt32)
of tyInt8: result = handleRange(f, a, tyInt8, tyInt8)