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

Merge pull request #4955 from cheatfate/debugcommit1

Browse source 
Generate `NimMainModule` name for main module.
This commit is contained in:
Andreas Rumpf 2016-10-26 14:38:44 +02:00 • committed by GitHub
commit b6807b547d
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/cgen.nim
View file

@ -870,7 +870,7 @@ proc genMainProc(m: BModule) =
NimMainInner = "N_CDECL(void, NimMainInner)(void) {$N" & NimMainInner = "N_CDECL(void, NimMainInner)(void) {$N" &
"$1" & "$1" &
"}$N$N" "}$N$N"
NimMainProc = NimMainProc =
"N_CDECL(void, NimMain)(void) {$N" & "N_CDECL(void, NimMain)(void) {$N" &
"\tvoid (*volatile inner)();$N" & "\tvoid (*volatile inner)();$N" &
@ -972,7 +972,13 @@ proc getSomeInitName(m: PSym, suffix: string): Rope =
result.add m.name.s result.add m.name.s
result.add suffix result.add suffix
proc getInitName(m: PSym): Rope = getSomeInitName(m, "Init000") proc getInitName(m: PSym): Rope =
if sfMainModule in m.flags:
# generate constant name for main module, for "easy" debugging.
result = rope"NimMainModule"
else:
result = getSomeInitName(m, "Init000")
proc getDatInitName(m: PSym): Rope = getSomeInitName(m, "DatInit000") proc getDatInitName(m: PSym): Rope = getSomeInitName(m, "DatInit000")
proc registerModuleToMain(m: PSym) = proc registerModuleToMain(m: PSym) =