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

parameter runtime discriminators (#11397)

Browse source 
* allow param for runtime discriminator construction
This commit is contained in:
Jasper Jenkins 2019-06-04 13:10:39 -07:00 • committed by Andreas Rumpf
commit fc4f0808c4
3 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/semobjconstr.nim
View file

@ -129,8 +129,10 @@ proc formatUnsafeBranchVals(t: PType, diffVals: IntSet): string =
proc findUsefulCaseContext(c: PContext, discrimator: PNode): (PNode, int) =
for i in countdown(c.p.caseContext.high, 0):
let (caseNode, index) = c.p.caseContext[i]
if caseNode[0].kind == nkSym and caseNode[0].sym == discrimator.sym:
let
(caseNode, index) = c.p.caseContext[i]
skipped = caseNode[0].skipHidden
if skipped.kind == nkSym and skipped.sym == discrimator.sym:
return (caseNode, index)
proc pickCaseBranch(caseExpr, matched: PNode): PNode =
@ -252,7 +254,8 @@ proc semConstructFields(c: PContext, recNode: PNode,
let (ctorCase, ctorIdx) = findUsefulCaseContext(c, discriminatorVal)
if ctorCase == nil:
badDiscriminatorError()
elif discriminatorVal.sym.kind != skLet:
elif discriminatorVal.sym.kind notin {skLet, skParam} or
discriminatorVal.sym.typ.kind == tyVar:
localError(c.config, discriminatorVal.info,
"runtime discriminator must be immutable if branch fields are " &
"initialized, a 'let' binding is required.")