diff options
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/pure/strtabs.nim | 4 | ||||
| -rwxr-xr-x | lib/system/excpt.nim | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/pure/strtabs.nim b/lib/pure/strtabs.nim index 8be66dee9..f88560304 100755 --- a/lib/pure/strtabs.nim +++ b/lib/pure/strtabs.nim @@ -1,7 +1,7 @@ # # # Nimrod's Runtime Library -# (c) Copyright 2010 Andreas Rumpf +# (c) Copyright 2011 Andreas Rumpf # # See the file "copying.txt", included in this # distribution, for details about the copyright. @@ -210,7 +210,7 @@ proc `$`*(t: PStringTable): string {.rtl, extern: "nstDollar".} = result.add("}") when isMainModule: - var x = {"k": "v", "11": "22", "565": "67"}.newStringTable + const x = {"k": "v", "11": "22", "565": "67"}.newStringTable assert x["k"] == "v" assert x["11"] == "22" assert x["565"] == "67" diff --git a/lib/system/excpt.nim b/lib/system/excpt.nim index 4e8982691..0d318e23a 100755 --- a/lib/system/excpt.nim +++ b/lib/system/excpt.nim @@ -61,10 +61,10 @@ proc popCurrentException {.compilerRtl, inl.} = # some platforms have native support for stack traces: const - nativeStackTrace = (defined(macosx) or defined(linux)) and - not nimrodStackTrace + nativeStackTraceSupported = (defined(macosx) or defined(linux)) and + not nimrodStackTrace -when nativeStacktrace: +when nativeStacktrace and nativeStackTraceSupported: type TDl_info {.importc: "Dl_info", header: "<dlfcn.h>", final, pure.} = object @@ -165,7 +165,7 @@ proc rawWriteStackTrace(s: var string) = add(s, "Traceback (most recent call last)") add(s, stackTraceNewLine) auxWriteStackTrace(framePtr, s) - elif nativeStackTrace: + elif nativeStackTrace and nativeStackTraceSupported: add(s, "Traceback from system (most recent call last)") add(s, stackTraceNewLine) auxWriteStackTraceWithBacktrace(s) |