Merge branch 'devel' of github.com:nim-lang/Nim into devel

This commit is contained in:
Andreas Rumpf 2019-03-21 09:34:02 +01:00
commit 83c105c3a3
16 changed files with 75 additions and 25 deletions

View file

@ -29,8 +29,7 @@ const
nativeStackTraceSupported = false
hasSomeStackTrace = false
proc quitOrDebug() {.inline.} =
quit(1)
proc quitOrDebug() {.noreturn, importc: "abort", header: "<stdlib.h>", nodecl.}
proc raiseException(e: ref Exception, ename: cstring) {.compilerRtl.} =
sysFatal(ReraiseError, "exception handling is not available")

View file

@ -38,10 +38,15 @@ proc showErrorMessage(data: cstring) {.gcsafe.} =
writeToStdErr(data)
proc quitOrDebug() {.inline.} =
when not defined(endb):
quit(1)
else:
when defined(endb):
endbStep() # call the debugger
elif not defined(nodejs) and not defined(nimscript):
when nimvm:
quit(1)
else:
c_abort()
else:
quit(1)
proc chckIndx(i, a, b: int): int {.inline, compilerproc, benign.}
proc chckRange(i, a, b: int): int {.inline, compilerproc, benign.}