diff options
author | Andreas Rumpf <rumpf_a@web.de> | 2015-05-19 14:36:03 +0200 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2015-05-19 14:36:03 +0200 |
commit | 5d4ee87f3b18f145c77075ac96e303b39015a515 (patch) | |
tree | f5143d0fb1a77682d88c8ed5cd37f7dc9593b3e9 | |
parent | d7c0b269cb15c29969425d717e857f4c151fda52 (diff) | |
parent | 2076e14a09ea9eb03fd389e1124a7c1847b7d584 (diff) | |
download | Nim-5d4ee87f3b18f145c77075ac96e303b39015a515.tar.gz |
Merge pull request #2754 from def-/intval
Intval
-rw-r--r-- | compiler/vm.nim | 4 | ||||
-rw-r--r-- | doc/astspec.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/vm.nim b/compiler/vm.nim index 1c6c9a30b..e49bed522 100644 --- a/compiler/vm.nim +++ b/compiler/vm.nim @@ -1121,7 +1121,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg = decodeB(rkInt) let a = regs[rb].node 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") of opcNFloatVal: decodeB(rkFloat) @@ -1276,7 +1276,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg = of opcNSetIntVal: decodeB(rkNode) var dest = regs[ra].node - if dest.kind in {nkCharLit..nkInt64Lit} and + if dest.kind in {nkCharLit..nkUInt64Lit} and regs[rb].kind in {rkInt}: dest.intVal = regs[rb].intVal else: diff --git a/doc/astspec.txt b/doc/astspec.txt index 4c27272e2..68bb9f1cd 100644 --- a/doc/astspec.txt +++ b/doc/astspec.txt @@ -23,7 +23,7 @@ contains: case kind: NimNodeKind ## the node's kind of nnkNone, nnkEmpty, nnkNilLit: discard ## node contains no additional fields - of nnkCharLit..nnkInt64Lit: + of nnkCharLit..nnkUInt64Lit: intVal: biggestInt ## the int literal of nnkFloatLit..nnkFloat64Lit: floatVal: biggestFloat ## the float literal |