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

fix typetraits.$ regression https://github.com/c-blake/cligen/issues/84 (#10131)

Browse source 
* fix typetraits.`$` regression https://github.com/c-blake/cligen/issues/84
* add test
This commit is contained in:
Timothee Cour 2018-12-30 00:40:21 -08:00 • committed by Andreas Rumpf
commit a6633b9658
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/semmagic.nim
View file

@ -129,7 +129,8 @@ proc evalTypeTrait(c: PContext; traitCall: PNode, operand: PType, context: PSym)
template typeWithSonsResult(kind, sons): PNode =
newTypeWithSons(context, kind, sons).toNode(traitCall.info)
case trait.sym.name.s
let s = trait.sym.name.s
case s
of "or", "|":
return typeWithSonsResult(tyOr, @[operand, operand2])
of "and":
@ -160,7 +161,7 @@ proc evalTypeTrait(c: PContext; traitCall: PNode, operand: PType, context: PSym)
hasDestructor(t)
result = newIntNodeT(ord(not complexObj), traitCall, c.graph)
else:
localError(c.config, traitCall.info, "unknown trait")
localError(c.config, traitCall.info, "unknown trait: " & s)
result = newNodeI(nkEmpty, traitCall.info)
proc semTypeTraits(c: PContext, n: PNode): PNode =