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

No implicit quit for Genode (#6515)

Browse source
This commit is contained in:
Emery Hemingway 2017-10-25 06:50:55 -05:00 • committed by Andreas Rumpf
commit 2ca7b703fb
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/cgen.nim
View file

@ -1013,10 +1013,9 @@ proc genMainProc(m: BModule) =
ComponentConstruct = ComponentConstruct =
"void Libc::Component::construct(Libc::Env &env) {$N" & "void Libc::Component::construct(Libc::Env &env) {$N" &
"\tgenodeEnv = &env;$N" & "\tgenodeEnv = &env;$N" &
"\tLibc::with_libc([&] () {$n\t" & "\tLibc::with_libc([&] () {$N\t" &
MainProcs & MainProcs &
"\t});$N" & "\t});$N" &
"\tenv.parent().exit(0);$N" &
"}$N$N" "}$N$N"
var nimMain, otherMain: FormatStr var nimMain, otherMain: FormatStr

2
lib/pure/unittest.nim
View file

@ -312,7 +312,7 @@ proc ensureInitialized() =
if not testsToRun.isValid: if not testsToRun.isValid:
testsToRun.init() testsToRun.init()
when declared(os): when declared(paramCount):
# Read tests to run from the command line. # Read tests to run from the command line.
for i in 1 .. paramCount(): for i in 1 .. paramCount():
testsToRun.incl(paramStr(i)) testsToRun.incl(paramStr(i))

3
lib/system.nim
View file

@ -1436,7 +1436,8 @@ when defined(nimdoc):
## <#GC_fullCollect>`_. ## <#GC_fullCollect>`_.
## ##
## The proc ``quit(QuitSuccess)`` is called implicitly when your nim ## The proc ``quit(QuitSuccess)`` is called implicitly when your nim
## program finishes without incident. A raised unhandled exception is ## program finishes without incident for platforms where this is the
## expected behavior. A raised unhandled exception is
## equivalent to calling ``quit(QuitFailure)``. ## equivalent to calling ``quit(QuitFailure)``.
## ##
## Note that this is a *runtime* call and using ``quit`` inside a macro won't ## Note that this is a *runtime* call and using ``quit`` inside a macro won't