fixes #15221 (#15230)

lib/impure/nre.nim

@@ -367,7 +367,7 @@ func contains*(pattern: CaptureBounds, name: string): bool =
 func contains*(pattern: Captures, name: string): bool =
   name in CaptureBounds(pattern)
 
-func checkNamedCaptured(pattern: RegexMatch, name: string): void =
+func checkNamedCaptured(pattern: RegexMatch, name: string) =
   if not (name in pattern.captureBounds):
     raise newException(KeyError, "Group '" & name & "' was not captured")
 

lib/pure/typetraits.nim

@@ -117,13 +117,10 @@ macro genericParamsImpl(T: typedesc): untyped =
     case impl.kind
     of nnkSym:
       impl = impl.getImpl
-        continue
     of nnkTypeDef:
       impl = impl[2]
-        continue
     of nnkTypeOfExpr:
       impl = getTypeInst(impl[0])
-        continue
     of nnkBracketExpr:
       for i in 1..<impl.len:
         let ai = impl[i]
@@ -137,7 +134,7 @@ macro genericParamsImpl(T: typedesc): untyped =
           # If so, use it directly instead of wrapping it in StaticParam.
           if (ai.kind == nnkSym and ai.symKind == nskType) or
               (ai.kind == nnkBracketExpr and ai[0].kind == nnkSym and
-                ai[0].symKind == nskType):
+              ai[0].symKind == nskType) or ai.kind in {nnkRefTy, nnkVarTy, nnkPtrTy, nnkProcTy}:
             ret = ai
           elif ai.kind == nnkInfix and ai[0].kind == nnkIdent and
                 ai[0].strVal == "..":
@@ -158,6 +155,7 @@ macro genericParamsImpl(T: typedesc): untyped =
             ret = newTree(nnkBracketExpr, @[bindSym"range", ai])
           else:
             since (1, 1):
+              echo ai.typeKind
               ret = newTree(nnkBracketExpr, @[bindSym"StaticParam", ai])
         result.add ret
       break