mirror of
https://github.com/nim-lang/Nim.git
synced 2026-01-06 21:17:48 +00:00
* fixes #20155; repr range with distinct types is broken with ORC * skipRanges
This commit is contained in:
@@ -190,6 +190,9 @@ proc evalTypeTrait(c: PContext; traitCall: PNode, operand: PType, context: PSym)
|
||||
arg = arg.base.skipTypes(skippedTypes + {tyGenericInst})
|
||||
if not rec: break
|
||||
result = getTypeDescNode(c, arg, operand.owner, traitCall.info)
|
||||
of "skipRanges":
|
||||
var arg = operand.skipTypes({tyRange})
|
||||
result = getTypeDescNode(c, arg, operand.owner, traitCall.info)
|
||||
else:
|
||||
localError(c.config, traitCall.info, "unknown trait: " & s)
|
||||
result = newNodeI(nkEmpty, traitCall.info)
|
||||
|
||||
@@ -9,6 +9,8 @@ proc isNamedTuple(T: typedesc): bool {.magic: "TypeTrait".}
|
||||
proc distinctBase(T: typedesc, recursive: static bool = true): typedesc {.magic: "TypeTrait".}
|
||||
## imported from typetraits
|
||||
|
||||
proc skipRanges(T: typedesc): typedesc {.magic: "TypeTrait".}
|
||||
|
||||
proc repr*(x: NimNode): string {.magic: "Repr", noSideEffect.}
|
||||
|
||||
proc repr*(x: int): string =
|
||||
@@ -96,7 +98,10 @@ proc repr*(p: proc): string =
|
||||
repr(cast[ptr pointer](unsafeAddr p)[])
|
||||
|
||||
template repr*(x: distinct): string =
|
||||
repr(distinctBase(typeof(x))(x))
|
||||
when x is range: # hacks for ranges with distinct sub types
|
||||
repr(distinctBase(skipRanges(typeof(x)))(x))
|
||||
else:
|
||||
repr(distinctBase(typeof(x))(x))
|
||||
|
||||
template repr*(t: typedesc): string = $t
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
discard """
|
||||
matrix: "--mm:refc; --mm:orc"
|
||||
output: '''[1, 0, 0, 0, 0, 0, 0, 0] CTBool[Ct[system.uint32]]'''
|
||||
"""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user