diff options
| author | Araq <rumpf_a@web.de> | 2013-08-31 16:45:10 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-08-31 16:45:10 +0200 |
| commit | 9c6de08db074dfd41ef4671f99086c1b53a8b540 (patch) | |
| tree | 37ba4161f74ce7168cfc2cb7758c6c952a44d815 | |
| parent | b40ab4dc9e4b5ee93f29864218af6b8d78fa1cc2 (diff) | |
| download | Nim-9c6de08db074dfd41ef4671f99086c1b53a8b540.tar.gz | |
fixes #516
| -rw-r--r-- | compiler/semcall.nim | 9 | ||||
| -rw-r--r-- | tests/reject/tinvalidborrow.nim | 17 |
2 files changed, 23 insertions, 3 deletions
diff --git a/compiler/semcall.nim b/compiler/semcall.nim index 735e6fac8..a29efcd8a 100644 --- a/compiler/semcall.nim +++ b/compiler/semcall.nim @@ -207,11 +207,14 @@ proc SearchForBorrowProc(c: PContext, startScope: PScope, fn: PSym): PSym = # New approach: generate fn(x, y, z) where x, y, z have the proper types # and use the overloading resolution mechanism: var call = newNode(nkCall) + var hasDistinct = false call.add(newIdentNode(fn.name, fn.info)) for i in 1.. <fn.typ.n.len: let param = fn.typ.n.sons[i] let t = skipTypes(param.typ, abstractVar-{tyTypeDesc}) + if t.kind == tyDistinct or param.typ.kind == tyDistinct: hasDistinct = true call.add(newNodeIT(nkEmpty, fn.info, t.baseOfDistinct)) - var resolved = semOverloadedCall(c, call, call, {fn.kind}) - if resolved != nil: - result = resolved.sons[0].sym + if hasDistinct: + var resolved = semOverloadedCall(c, call, call, {fn.kind}) + if resolved != nil: + result = resolved.sons[0].sym diff --git a/tests/reject/tinvalidborrow.nim b/tests/reject/tinvalidborrow.nim new file mode 100644 index 000000000..9ab9e8d64 --- /dev/null +++ b/tests/reject/tinvalidborrow.nim @@ -0,0 +1,17 @@ +discard """ + line: 11 + errormsg: "no symbol to borrow from found" +""" + +# bug #516 + +type + TAtom = culong + +proc `==`*(a, b: TAtom): bool {.borrow.} + +var + d, e: TAtom + +echo( $(d == e) ) + |