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

minor bugfixes for 'func' and .borrow

Browse source
This commit is contained in:
Araq 2020-06-23 10:58:55 +02:00
commit ebd1cc0265
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/ast.nim
View file

@ -1756,7 +1756,7 @@ proc isRoutine*(s: PSym): bool {.inline.} =
proc isCompileTimeProc*(s: PSym): bool {.inline.} = proc isCompileTimeProc*(s: PSym): bool {.inline.} =
result = s.kind == skMacro or result = s.kind == skMacro or
s.kind == skProc and sfCompileTime in s.flags s.kind in {skProc, skFunc} and sfCompileTime in s.flags
proc isRunnableExamples*(n: PNode): bool = proc isRunnableExamples*(n: PNode): bool =
# Templates and generics don't perform symbol lookups. # Templates and generics don't perform symbol lookups.

3
compiler/semcall.nim
View file

@ -682,7 +682,8 @@ proc searchForBorrowProc(c: PContext, startScope: PScope, fn: PSym): PSym =
x = t.baseOfDistinct x = t.baseOfDistinct
call.add(newNodeIT(nkEmpty, fn.info, x)) call.add(newNodeIT(nkEmpty, fn.info, x))
if hasDistinct: if hasDistinct:
var resolved = semOverloadedCall(c, call, call, {fn.kind}, {}) let filter = if fn.kind in {skProc, skFunc}: {skProc, skFunc} else: {fn.kind}
var resolved = semOverloadedCall(c, call, call, filter, {})
if resolved != nil: if resolved != nil:
result = resolved[0].sym result = resolved[0].sym
if not compareTypes(result.typ[0], fn.typ[0], dcEqIgnoreDistinct): if not compareTypes(result.typ[0], fn.typ[0], dcEqIgnoreDistinct):