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

fix enumtostr crash for enum-range (#13035)

Browse source
This commit is contained in:
Jasper Jenkins 2020-01-05 00:18:14 -08:00 • committed by Andreas Rumpf
commit 9474a818af
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/ccgexprs.nim
View file

@ -2070,7 +2070,7 @@ proc genDispose(p: BProc; n: PNode) =
proc genEnumToStr(p: BProc, e: PNode, d: var TLoc) = proc genEnumToStr(p: BProc, e: PNode, d: var TLoc) =
const ToStringProcSlot = -4 const ToStringProcSlot = -4
let t = e[1].typ.skipTypes(abstractInst) let t = e[1].typ.skipTypes(abstractInst+{tyRange})
var toStrProc: PSym = nil var toStrProc: PSym = nil
for idx, p in items(t.methods): for idx, p in items(t.methods):
if idx == ToStringProcSlot: if idx == ToStringProcSlot:

12
tests/enum/tenum_no_rtti.nim Normal file
View file

@ -0,0 +1,12 @@
discard """
output: '''A
B'''
cmd: '''nim c --gc:arc $file'''
"""
type
Enum = enum A, B, C
EnumRange = range[A .. B]
proc test_a(x: Enum): string = $x
proc test_b(x: EnumRange): string = $x
echo test_a(A)
echo test_b(B)