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

fix #16499 (#16514)

Browse source
This commit is contained in:
flywind 2021-01-04 11:27:58 -06:00 • committed by GitHub
commit 9531afac48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/system/fatal.nim
View file

@ -30,6 +30,10 @@ elif (defined(nimQuirky) or defined(nimPanics)) and not defined(nimscript):
proc name(t: typedesc): string {.magic: "TypeTrait".} proc name(t: typedesc): string {.magic: "TypeTrait".}
proc sysFatal(exceptn: typedesc, message, arg: string) {.inline, noreturn.} = proc sysFatal(exceptn: typedesc, message, arg: string) {.inline, noreturn.} =
when nimvm:
# TODO when doAssertRaises works in CT, add a test for it
raise (ref exceptn)(msg: message & arg)
else:
writeStackTrace() writeStackTrace()
var buf = newStringOfCap(200) var buf = newStringOfCap(200)
add(buf, "Error: unhandled exception: ") add(buf, "Error: unhandled exception: ")

2
tests/assert/tassert_c.nim
View file

@ -8,7 +8,7 @@ tassert_c.nim(35) tassert_c
tassert_c.nim(34) foo tassert_c.nim(34) foo
assertions.nim(30) failedAssertImpl assertions.nim(30) failedAssertImpl
assertions.nim(23) raiseAssert assertions.nim(23) raiseAssert
fatal.nim(49) sysFatal""" fatal.nim(53) sysFatal"""
proc tmatch(x, p: string): bool = proc tmatch(x, p: string): bool =
var i = 0 var i = 0