Skip to content

Commit b5c036b

Browse files
authored
nim 2.0.8 (#68)
1 parent cc25aad commit b5c036b

File tree

7 files changed

+700
-111
lines changed

7 files changed

+700
-111
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ all: $(NLVMC)
3131

3232
Nim/koch:
3333
cd Nim ;\
34-
[ -d csources_v1 ] || git clone -q --depth 1 -b master https://github.com/nim-lang/csources_v1.git ;\
35-
cd csources_v1 ;\
34+
[ -d csources_v2 ] || git clone -q --depth 1 -b master https://github.com/nim-lang/csources_v2.git ;\
35+
cd csources_v2 ;\
3636
git pull ;\
37-
make -f makefile -j4
37+
$(MAKE) -f makefile
3838
cd Nim ; bin/nim c koch
3939

4040
$(NIMC): Nim/koch Nim/compiler/*.nim

Nim

Submodule Nim updated 1609 files

nlvm-lib/nlvm_system.nim

+4-3
Original file line numberDiff line numberDiff line change
@@ -230,15 +230,16 @@ proc nlvmExceptionCleanup(
230230

231231
var ehGlobals {.threadvar.}: NlvmEhGlobals
232232

233+
include system/rawquits
233234
proc unhandledException() {.noreturn.} =
234235
c_fprintf(cstderr, "Error: unhandled exception: [foreign]\n")
235236

236-
quit(1) # TODO alternatively, quitOrDebug
237+
rawQuit(1) # TODO alternatively, quitOrDebug
237238

238239
proc unhandledException(e: ref Exception) {.noreturn.} =
239240
c_fprintf(cstderr, "Error: unhandled exception: %s [%s]\n", cstring(e.msg), e.name)
240241

241-
quit(1) # TODO alternatively, quitOrDebug
242+
rawQuit(1) # TODO alternatively, quitOrDebug
242243

243244
func getNimTypePtr(
244245
ttypeIndex: int, classInfo: pointer, ttypeEncoding: uint8, ctx: UnwindContext
@@ -292,7 +293,7 @@ when defined(nimV2):
292293

293294
if suffixLen <= sLen:
294295
result =
295-
memcmp(cstring(unsafeAddr s[sLen - suffixLen]), suffix, csize_t(suffixLen)) == 0
296+
memcmp(cast[cstring](addr s[sLen - suffixLen]), suffix, csize_t(suffixLen)) == 0
296297

297298
proc isObj(obj: PNimTypeV2, subclass: cstring): bool {.compilerRtl, inl.} =
298299
endsWith(obj.name, subclass)

0 commit comments

Comments
 (0)