Unpack mSlice tupleconstr for static openarrays (#20615)
This commit is contained in:
parent
0faae4d5e2
commit
da0a2fdca2
3 changed files with 36 additions and 0 deletions
|
|
@ -66,6 +66,27 @@ proc annotateType*(n: PNode, t: PType; conf: ConfigRef) =
|
|||
if i >= x.len: globalError conf, n.info, "invalid field at index " & $i
|
||||
else: annotateType(n[i], x[i], conf)
|
||||
elif x.kind == tyProc and x.callConv == ccClosure:
|
||||
n.typ = t
|
||||
elif x.kind == tyOpenArray: # `opcSlice` transforms slices into tuples
|
||||
if n.kind == nkTupleConstr:
|
||||
let
|
||||
bracketExpr = newNodeI(nkBracket, n.info)
|
||||
left = int n[1].intVal
|
||||
right = int n[2].intVal
|
||||
bracketExpr.flags = n.flags
|
||||
case n[0].kind # is this a string slice or a array slice
|
||||
of nkStrKinds:
|
||||
for i in left..right:
|
||||
bracketExpr.add newIntNode(nkCharLit, BiggestInt n[0].strVal[i])
|
||||
annotateType(bracketExpr[^1], t[0], conf)
|
||||
of nkBracket:
|
||||
for i in left..right:
|
||||
bracketExpr.add n[0][i]
|
||||
annotateType(bracketExpr[^1], t[0], conf)
|
||||
else:
|
||||
globalError(conf, n.info, "Incorrectly generated tuple constr")
|
||||
n[] = bracketExpr[]
|
||||
|
||||
n.typ = t
|
||||
else:
|
||||
globalError(conf, n.info, "() must have a tuple type")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue