From e9d3c5de1998e142b1653152f2a235fdd2652b74 Mon Sep 17 00:00:00 2001 From: zah Date: Fri, 1 Mar 2019 12:09:13 +0200 Subject: Fix corner-case uses of newLit (#10760) --- lib/core/macros.nim | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'lib/core') diff --git a/lib/core/macros.nim b/lib/core/macros.nim index 8e6b93a11..4b9b628af 100644 --- a/lib/core/macros.nim +++ b/lib/core/macros.nim @@ -703,6 +703,17 @@ when compiles(float128): result = newNimNode(nnkFloat128Lit) result.floatVal = f +proc newLit*(arg: enum): NimNode {.compileTime.} = + result = newCall( + arg.type.getTypeInst[1], + newLit(int(arg)) + ) + +proc newLit*[N,T](arg: array[N,T]): NimNode {.compileTime.} +proc newLit*[T](arg: seq[T]): NimNode {.compileTime.} +proc newLit*[T](s: set[T]): NimNode {.compileTime.} +proc newLit*(arg: tuple): NimNode {.compileTime.} + proc newLit*(arg: object): NimNode {.compileTime.} = result = nnkObjConstr.newTree(arg.type.getTypeInst[1]) for a, b in arg.fieldPairs: @@ -725,11 +736,6 @@ proc newLit*[T](arg: seq[T]): NimNode {.compileTime.} = ), bracket ) -proc newLit*(arg: enum): NimNode {.compileTime.} = - result = newCall( - arg.type.getTypeInst[1], - newLit(int(arg)) - ) proc newLit*[T](s: set[T]): NimNode {.compileTime.} = result = nnkCurly.newTree -- cgit 1.4.1-2-gfad0