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

intVal works now on enum field symbols (#11403)

Browse source 
* intVal works now on enum field symbols

* disable flakey titerators test
This commit is contained in:
Arne Döring 2019-06-05 14:55:47 +02:00 • committed by Andreas Rumpf
commit efbf43d4a9
4 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/vm.nim
View file

@ -1418,9 +1418,12 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
of opcNIntVal:
decodeB(rkInt)
let a = regs[rb].node
case a.kind
of nkCharLit..nkUInt64Lit: regs[ra].intVal = a.intVal
else: stackTrace(c, tos, pc, errFieldXNotFound & "intVal")
if a.kind in {nkCharLit..nkUInt64Lit}:
regs[ra].intVal = a.intVal
elif a.kind == nkSym and a.sym.kind == skEnumField:
regs[ra].intVal = a.sym.position
else:
stackTrace(c, tos, pc, errFieldXNotFound & "intVal")
of opcNFloatVal:
decodeB(rkFloat)
let a = regs[rb].node
@ -1692,6 +1695,8 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
if dest.kind in {nkCharLit..nkUInt64Lit} and
regs[rb].kind in {rkInt}:
dest.intVal = regs[rb].intVal
elif dest.kind == nkSym and dest.sym.kind == skEnumField:
stackTrace(c, tos, pc, "`intVal` cannot be changed for an enum symbol.")
else:
stackTrace(c, tos, pc, errFieldXNotFound & "intVal")
of opcNSetFloatVal: