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

Merge pull request #2754 from def-/intval

Browse source 
Intval
This commit is contained in:
Andreas Rumpf 2015-05-19 14:36:03 +02:00
commit 5d4ee87f3b
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/vm.nim
View file

@ -1121,7 +1121,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
decodeB(rkInt) decodeB(rkInt)
let a = regs[rb].node let a = regs[rb].node
case a.kind case a.kind
of nkCharLit..nkInt64Lit: regs[ra].intVal = a.intVal of nkCharLit..nkUInt64Lit: regs[ra].intVal = a.intVal
else: stackTrace(c, tos, pc, errFieldXNotFound, "intVal") else: stackTrace(c, tos, pc, errFieldXNotFound, "intVal")
of opcNFloatVal: of opcNFloatVal:
decodeB(rkFloat) decodeB(rkFloat)
@ -1276,7 +1276,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
of opcNSetIntVal: of opcNSetIntVal:
decodeB(rkNode) decodeB(rkNode)
var dest = regs[ra].node var dest = regs[ra].node
if dest.kind in {nkCharLit..nkInt64Lit} and if dest.kind in {nkCharLit..nkUInt64Lit} and
regs[rb].kind in {rkInt}: regs[rb].kind in {rkInt}:
dest.intVal = regs[rb].intVal dest.intVal = regs[rb].intVal
else: else:

2
doc/astspec.txt
View file

@ -23,7 +23,7 @@ contains:
case kind: NimNodeKind ## the node's kind case kind: NimNodeKind ## the node's kind
of nnkNone, nnkEmpty, nnkNilLit: of nnkNone, nnkEmpty, nnkNilLit:
discard ## node contains no additional fields discard ## node contains no additional fields
of nnkCharLit..nnkInt64Lit: of nnkCharLit..nnkUInt64Lit:
intVal: biggestInt ## the int literal intVal: biggestInt ## the int literal
of nnkFloatLit..nnkFloat64Lit: of nnkFloatLit..nnkFloat64Lit:
floatVal: biggestFloat ## the float literal floatVal: biggestFloat ## the float literal