diff options
author | Brandon Pickering <brandonpickering95@gmail.com> | 2017-01-10 20:54:04 -0800 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2017-01-11 05:54:04 +0100 |
commit | c98a8f3701c4410b6596cee7809f5e18ec6cf6b7 (patch) | |
tree | 8684c0c35bc80a8cea2e807fe4f294fe47201639 /lib | |
parent | 88f95a2f7e6a3bf1db7d2cd73606e395ae818d0e (diff) | |
download | Nim-c98a8f3701c4410b6596cee7809f5e18ec6cf6b7.tar.gz |
Handle different enum sizes in reprAux (#5207)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/system/repr.nim | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/system/repr.nim b/lib/system/repr.nim index cf7d6d7a9..b067d7a3d 100644 --- a/lib/system/repr.nim +++ b/lib/system/repr.nim @@ -233,6 +233,14 @@ when not defined(useNimRtl): add result, " --> " reprAux(result, p, typ.base, cl) + proc getInt(p: pointer, size: int): int = + case size + of 1: return int(cast[ptr uint8](p)[]) + of 2: return int(cast[ptr uint16](p)[]) + of 4: return int(cast[ptr uint32](p)[]) + of 8: return int(cast[ptr uint64](p)[]) + else: discard + proc reprAux(result: var string, p: pointer, typ: PNimType, cl: var ReprClosure) = if cl.recdepth == 0: @@ -266,7 +274,7 @@ when not defined(useNimRtl): of tyFloat: add result, $(cast[ptr float](p)[]) of tyFloat32: add result, $(cast[ptr float32](p)[]) of tyFloat64: add result, $(cast[ptr float64](p)[]) - of tyEnum: add result, reprEnum(cast[ptr int](p)[], typ) + of tyEnum: add result, reprEnum(getInt(p, typ.size), typ) of tyBool: add result, reprBool(cast[ptr bool](p)[]) of tyChar: add result, reprChar(cast[ptr char](p)[]) of tyString: reprStrAux(result, cast[ptr string](p)[]) |