mirror of
https://github.com/nim-lang/Nim.git
synced 2025-12-28 08:54:53 +00:00
consider generic param type as typedesc in tuple type expressions (#25316)
fixes #25312
Tuple expressions `(a, b, c)` can be either types or values depending on
if their elements are typedescs or values, this is checked by checking
if the type of the element is `tyTypeDesc`. However when an
`skGenericParam` symbol is semchecked by `semSym` it is given its own
`tyGenericParam` type rather than a `tyTypeDesc` type, this seems to be
necessary for signatures to allow wildcard generic params passed to
static constrained generic params (tested in #25315). The reason
`semSym` is called is that `semGeneric` for generic invocations calls
`matches` which sems its arguments like normal expressions.
To deal with this, an expression of type `tyGenericParam` and with a
`skGenericParam` sym is allowed as a type in the tuple expression. A
problem is that this might consider a value with a wildcard generic
param type as a type. But this is a very niche problem, and I'm not sure
how to check for this. `skGenericParam` symbols stay as idents when
semchecked so it can't be checked that the node is an `skGenericParam`
symbol. It could be checked that it's an ident but I don't know how
robust this is. And maybe there is another way to refer to a wildcard
generic param type instead of just its symbol, i.e. another kind of
node.
This also makes #5647 finally work but a test case for that can be added
after.
(cherry picked from commit 44d2472b08)
This commit is contained in:
@@ -3053,6 +3053,13 @@ proc semExport(c: PContext, n: PNode): PNode =
|
||||
|
||||
s = nextOverloadIter(o, c, a)
|
||||
|
||||
proc isTypeTupleField(n: PNode): bool {.inline.} =
|
||||
result = n.typ.kind == tyTypeDesc or
|
||||
(n.typ.kind == tyGenericParam and n.typ.sym.kind == skGenericParam)
|
||||
# `skGenericParam` stays as `tyGenericParam` type rather than being wrapped in `tyTypeDesc`
|
||||
# would check if `n` itself is an `skGenericParam` symbol, but these symbols semcheck to an ident
|
||||
# maybe check if `n` is an ident to ensure this is not a value with the generic param type?
|
||||
|
||||
proc semTupleConstr(c: PContext, n: PNode, flags: TExprFlags; expectedType: PType = nil): PNode =
|
||||
result = semTuplePositionsConstr(c, n, flags, expectedType)
|
||||
if result.typ.kind == tyFromExpr:
|
||||
@@ -3063,10 +3070,10 @@ proc semTupleConstr(c: PContext, n: PNode, flags: TExprFlags; expectedType: PTyp
|
||||
var isTupleType: bool = false
|
||||
if tupexp.len > 0: # don't interpret () as type
|
||||
internalAssert c.config, tupexp.kind == nkTupleConstr
|
||||
isTupleType = tupexp[0].typ.kind == tyTypeDesc
|
||||
isTupleType = isTypeTupleField(tupexp[0])
|
||||
# check if either everything or nothing is tyTypeDesc
|
||||
for i in 1..<tupexp.len:
|
||||
if isTupleType != (tupexp[i].typ.kind == tyTypeDesc):
|
||||
if isTupleType != isTypeTupleField(tupexp[i]):
|
||||
return localErrorNode(c, n, tupexp[i].info, "Mixing types and values in tuples is not allowed.")
|
||||
if isTupleType: # expressions as ``(int, string)`` are reinterpret as type expressions
|
||||
result = n
|
||||
|
||||
34
tests/tuples/tgenericparamtypetuple.nim
Normal file
34
tests/tuples/tgenericparamtypetuple.nim
Normal file
@@ -0,0 +1,34 @@
|
||||
# issue #25312
|
||||
|
||||
import heapqueue
|
||||
|
||||
proc test1[T](test: (float, T)) = # Works
|
||||
discard
|
||||
|
||||
proc test2[T](test: seq[(float, T)]) = # Works
|
||||
discard
|
||||
|
||||
proc test3[T](test: HeapQueue[tuple[sqd: float, data: T]]) = # Works
|
||||
discard
|
||||
|
||||
proc test4(test: HeapQueue[(float, float)]) = # Works
|
||||
discard
|
||||
|
||||
type ExampleObj = object
|
||||
a: string
|
||||
b: seq[float]
|
||||
|
||||
proc test5(test: HeapQueue[(float, ExampleObj)]) = # Works
|
||||
discard
|
||||
|
||||
proc failingTest[T](test: HeapQueue[(float, T)]) = # (Compile) Error: Mixing types and values in tuples is not allowed.
|
||||
discard
|
||||
|
||||
proc failingTest2[T](test: HeapQueue[(T, float)]) = # (Compile) Error: Mixing types and values in tuples is not allowed.
|
||||
discard
|
||||
|
||||
proc test6[T](test: HeapQueue[(T, T)]) = # works
|
||||
discard
|
||||
|
||||
proc test7[T, U](test: HeapQueue[(T, U)]) = # works
|
||||
discard
|
||||
Reference in New Issue
Block a user