diff options
| author | Dan Rose <dan@digilabs.io> | 2022-08-15 17:37:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-15 18:37:10 -0400 |
| commit | c579243e0cdba83a07357637d4bcef8594263207 (patch) | |
| tree | 318c4f28cb8da676c62c631ee3130218cb12118b | |
| parent | 691026f5076e4e0f1aea20fb56e3346a6c24e18c (diff) | |
| download | Nim-c579243e0cdba83a07357637d4bcef8594263207.tar.gz | |
Pass check condition directly to if (#20217)
When checking conditions, pass `check` untyped argument directly to if. This results in better error messages when the condition is malformed. Previously `check 1` would fail at compile time with `Error: type mismatch: got 'int literal(-2)' for '-2' but expected 'bool'` Now it fails with `Error: type mismatch: got 'int literal(1)' for '1' but expected 'bool'`. Similarly `check "foo"` would fail with ``` Error: type mismatch: got <string> but expected one of: proc `not`(a: typedesc): typedesc first type mismatch at position: 1 required type for a: typedesc but expression '"somestring"' is of type: string ... ``` Now it fails with `Error: type mismatch: got 'string' for '"somestring"' but expected 'bool'`
| -rw-r--r-- | lib/pure/unittest.nim | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/pure/unittest.nim b/lib/pure/unittest.nim index b1c01f8db..ec8058c1a 100644 --- a/lib/pure/unittest.nim +++ b/lib/pure/unittest.nim @@ -704,7 +704,9 @@ macro check*(conditions: untyped): untyped = result = quote do: block: `assigns` - if not `check`: + if `check`: + discard + else: checkpoint(`lineinfo` & ": Check failed: " & `callLit`) `printOuts` fail() @@ -720,7 +722,9 @@ macro check*(conditions: untyped): untyped = let callLit = checked.toStrLit result = quote do: - if not `checked`: + if `checked`: + discard + else: checkpoint(`lineinfo` & ": Check failed: " & `callLit`) fail() |