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

improve the error messages for std/tasks [backport: 1.6] (#19695)

Browse source
This commit is contained in:
flywind 2022-04-08 02:56:34 +08:00 • committed by GitHub
commit c8aeea9d62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/std/tasks.nim
View file

@ -111,10 +111,10 @@ macro toTask*(e: typed{nkCall | nkInfix | nkPrefix | nkPostfix | nkCommand | nkC
when compileOption("threads"): when compileOption("threads"):
if not isGcSafe(e[0]): if not isGcSafe(e[0]):
error("'toTask' takes a GC safe call expression") error("'toTask' takes a GC safe call expression", e)
if hasClosure(e[0]): if hasClosure(e[0]):
error("closure call is not allowed") error("closure call is not allowed", e)
if e.len > 1: if e.len > 1:
let scratchIdent = genSym(kind = nskTemp, ident = "scratch") let scratchIdent = genSym(kind = nskTemp, ident = "scratch")
@ -141,17 +141,17 @@ macro toTask*(e: typed{nkCall | nkInfix | nkPrefix | nkPostfix | nkCommand | nkC
param = param[0] param = param[0]
if param.typeKind in {ntyExpr, ntyStmt}: if param.typeKind in {ntyExpr, ntyStmt}:
error("'toTask'ed function cannot have a 'typed' or 'untyped' parameter") error("'toTask'ed function cannot have a 'typed' or 'untyped' parameter", e)
case param.kind case param.kind
of nnkVarTy: of nnkVarTy:
error("'toTask'ed function cannot have a 'var' parameter") error("'toTask'ed function cannot have a 'var' parameter", e)
of nnkBracketExpr: of nnkBracketExpr:
if param[0].typeKind == ntyTypeDesc: if param[0].typeKind == ntyTypeDesc:
callNode.add nnkExprEqExpr.newTree(formalParams[i][0], e[i]) callNode.add nnkExprEqExpr.newTree(formalParams[i][0], e[i])
elif param[0].typeKind in {ntyVarargs, ntyOpenArray}: elif param[0].typeKind in {ntyVarargs, ntyOpenArray}:
if param[1].typeKind in {ntyExpr, ntyStmt}: if param[1].typeKind in {ntyExpr, ntyStmt}:
error("'toTask'ed function cannot have a 'typed' or 'untyped' parameter") error("'toTask'ed function cannot have a 'typed' or 'untyped' parameter", e)
let let
seqType = nnkBracketExpr.newTree(newIdentNode("seq"), param[1]) seqType = nnkBracketExpr.newTree(newIdentNode("seq"), param[1])
seqCallNode = newCall("@", e[i]) seqCallNode = newCall("@", e[i])
@ -167,7 +167,7 @@ macro toTask*(e: typed{nkCall | nkInfix | nkPrefix | nkPostfix | nkCommand | nkC
of nnkCharLit..nnkNilLit: of nnkCharLit..nnkNilLit:
callNode.add nnkExprEqExpr.newTree(formalParams[i][0], e[i]) callNode.add nnkExprEqExpr.newTree(formalParams[i][0], e[i])
else: else:
error("not supported type kinds") error("'toTask'ed function cannot have a parameter of " & $param.kind & " kind", e)
let scratchObjType = genSym(kind = nskType, ident = "ScratchObj") let scratchObjType = genSym(kind = nskType, ident = "ScratchObj")
let scratchObj = nnkTypeSection.newTree( let scratchObj = nnkTypeSection.newTree(