diff options
| author | Zahary Karadjov <zahary@gmail.com> | 2014-02-20 23:33:58 +0200 |
|---|---|---|
| committer | Zahary Karadjov <zahary@gmail.com> | 2014-02-20 23:33:58 +0200 |
| commit | 1a6d05515ff96e8bba294b352493cb7da2794a96 (patch) | |
| tree | 1c085be2fc034c47f3632b98eb5c667b3938c847 | |
| parent | 0bbf6081d00e83329021a0051d92c3433fc8a00f (diff) | |
| download | Nim-1a6d05515ff96e8bba294b352493cb7da2794a96.tar.gz | |
fix #945
| -rw-r--r-- | compiler/semstmts.nim | 9 | ||||
| -rw-r--r-- | tests/metatype/tusertypeclasses.nim | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim index a9a907953..6c4e29f29 100644 --- a/compiler/semstmts.nim +++ b/compiler/semstmts.nim @@ -143,10 +143,11 @@ proc discardCheck(c: PContext, result: PNode) = while n.kind in skipForDiscardable: n = n.lastSon n.typ = nil - elif c.inTypeClass > 0 and result.typ.kind == tyBool: - let verdict = semConstExpr(c, result) - if verdict.intVal == 0: - localError(result.info, "type class predicate failed") + elif c.inTypeClass > 0: + if result.typ.kind == tyBool: + let verdict = semConstExpr(c, result) + if verdict.intVal == 0: + localError(result.info, "type class predicate failed") elif result.typ.kind != tyError and gCmd != cmdInteractive: if result.typ.kind == tyNil: fixNilType(result) diff --git a/tests/metatype/tusertypeclasses.nim b/tests/metatype/tusertypeclasses.nim index 4c8c0fc56..5b04c490f 100644 --- a/tests/metatype/tusertypeclasses.nim +++ b/tests/metatype/tusertypeclasses.nim @@ -31,9 +31,10 @@ proc intval(x: int) = discard # check real and virtual fields type TFoo = generic T - intval T.x + T.x + y(T) intval T.y - + proc y(x: TObj): int = 10 proc testFoo(x: TFoo) = discard |