diff options
| -rw-r--r-- | changelog.md | 2 | ||||
| -rw-r--r-- | doc/nep1.rst | 4 | ||||
| -rw-r--r-- | lib/pure/net.nim | 1 | ||||
| -rw-r--r-- | lib/pure/os.nim | 3 | ||||
| -rw-r--r-- | lib/pure/unittest.nim | 10 | ||||
| -rw-r--r-- | lib/system/gc_regions.nim | 3 | ||||
| -rw-r--r-- | lib/system/mmdisp.nim | 15 | ||||
| -rw-r--r-- | tests/stdlib/tunittestexceptiontype.nim | 10 |
8 files changed, 36 insertions, 12 deletions
diff --git a/changelog.md b/changelog.md index 57b54c71e..813c4caf8 100644 --- a/changelog.md +++ b/changelog.md @@ -76,6 +76,8 @@ - The `terminal` module now exports additional procs for generating ANSI color codes as strings. - Added the parameter ``val`` for the ``CritBitTree[int].inc`` proc. +- An exception raised from ``test`` block of ``unittest`` now show its type in + error message ### Language additions diff --git a/doc/nep1.rst b/doc/nep1.rst index 6924a86f6..c4d445681 100644 --- a/doc/nep1.rst +++ b/doc/nep1.rst @@ -181,7 +181,7 @@ Conventions for multi-line statements and expressions LongTupleA = tuple[wordyTupleMemberOne: int, wordyTupleMemberTwo: string, wordyTupleMemberThree: float] -- Similarly, any procedure and procedure type declarations that are longer# +- Similarly, any procedure and procedure type declarations that are longer than one line should do the same thing. .. code-block:: nim @@ -198,4 +198,4 @@ Conventions for multi-line statements and expressions .. code-block:: nim startProcess(nimExecutable, currentDirectory, compilerArguments - environment, processOptions) \ No newline at end of file + environment, processOptions) diff --git a/lib/pure/net.nim b/lib/pure/net.nim index fc04ef1af..bf5f3f57e 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -803,6 +803,7 @@ proc acceptAddr*(server: Socket, client: var Socket, address: var string, else: address = ret[1] client.fd = sock + client.domain = getSockDomain(sock) client.isBuffered = server.isBuffered # Handle SSL. diff --git a/lib/pure/os.nim b/lib/pure/os.nim index 0d6690ebd..9681d97b3 100644 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -70,7 +70,8 @@ when defined(windows): proc existsFile*(filename: string): bool {.rtl, extern: "nos$1", tags: [ReadDirEffect].} = - ## Returns true if the file exists, false otherwise. + ## Returns true if `filename` exists and is a regular file or symlink. + ## (directories, device files, named pipes and sockets return false) when defined(windows): when useWinUnicode: wrapUnary(a, getFileAttributesW, filename) diff --git a/lib/pure/unittest.nim b/lib/pure/unittest.nim index 917251a6c..d804ba7c8 100644 --- a/lib/pure/unittest.nim +++ b/lib/pure/unittest.nim @@ -462,6 +462,8 @@ template suite*(name, body) {.dirty.} = finally: suiteEnded() +template exceptionTypeName(e: typed): string = $e.name + template test*(name, body) {.dirty.} = ## Define a single test case identified by `name`. ## @@ -476,7 +478,7 @@ template test*(name, body) {.dirty.} = ## .. code-block:: ## ## [OK] roses are red - bind shouldRun, checkpoints, formatters, ensureInitialized, testEnded + bind shouldRun, checkpoints, formatters, ensureInitialized, testEnded, exceptionTypeName ensureInitialized() @@ -495,8 +497,10 @@ template test*(name, body) {.dirty.} = except: when not defined(js): - checkpoint("Unhandled exception: " & getCurrentExceptionMsg()) - var stackTrace {.inject.} = getCurrentException().getStackTrace() + let e = getCurrentException() + let eTypeDesc = "[" & exceptionTypeName(e) & "]" + checkpoint("Unhandled exception: " & getCurrentExceptionMsg() & " " & eTypeDesc) + var stackTrace {.inject.} = e.getStackTrace() fail() finally: diff --git a/lib/system/gc_regions.nim b/lib/system/gc_regions.nim index 10df0a2cb..83c65e8ce 100644 --- a/lib/system/gc_regions.nim +++ b/lib/system/gc_regions.nim @@ -162,6 +162,7 @@ proc allocFast(r: var MemRegion; size: int): pointer = return pointer(it) prev = it it = it.next + let size = roundup(size, MemAlign) if size > r.remaining: allocSlowPath(r, size) sysAssert(size <= r.remaining, "size <= r.remaining") @@ -288,11 +289,13 @@ proc rawNewSeq(r: var MemRegion, typ: PNimType, size: int): pointer = result = res +! sizeof(SeqHeader) proc newObj(typ: PNimType, size: int): pointer {.compilerRtl.} = + sysAssert typ.kind notin {tySequence, tyString}, "newObj cannot be used to construct seqs" result = rawNewObj(tlRegion, typ, size) zeroMem(result, size) when defined(memProfiler): nimProfile(size) proc newObjNoInit(typ: PNimType, size: int): pointer {.compilerRtl.} = + sysAssert typ.kind notin {tySequence, tyString}, "newObj cannot be used to construct seqs" result = rawNewObj(tlRegion, typ, size) when defined(memProfiler): nimProfile(size) diff --git a/lib/system/mmdisp.nim b/lib/system/mmdisp.nim index 45e0c74c0..a156e9bb0 100644 --- a/lib/system/mmdisp.nim +++ b/lib/system/mmdisp.nim @@ -561,13 +561,16 @@ else: when not declared(nimNewSeqOfCap): proc nimNewSeqOfCap(typ: PNimType, cap: int): pointer {.compilerproc.} = - let s = addInt(mulInt(cap, typ.base.size), GenericSeqSize) - when declared(newObjNoInit): - result = if ntfNoRefs in typ.base.flags: newObjNoInit(typ, s) else: newObj(typ, s) + when defined(gcRegions): + result = newStr(typ, cap, ntfNoRefs notin typ.base.flags) else: - result = newObj(typ, s) - cast[PGenericSeq](result).len = 0 - cast[PGenericSeq](result).reserved = cap + let s = addInt(mulInt(cap, typ.base.size), GenericSeqSize) + when declared(newObjNoInit): + result = if ntfNoRefs in typ.base.flags: newObjNoInit(typ, s) else: newObj(typ, s) + else: + result = newObj(typ, s) + cast[PGenericSeq](result).len = 0 + cast[PGenericSeq](result).reserved = cap {.pop.} diff --git a/tests/stdlib/tunittestexceptiontype.nim b/tests/stdlib/tunittestexceptiontype.nim new file mode 100644 index 000000000..e05a25409 --- /dev/null +++ b/tests/stdlib/tunittestexceptiontype.nim @@ -0,0 +1,10 @@ +discard """ + exitcode: 1 + outputsub: '''exception type is [ValueError]''' +""" + +import unittest + +suite "exception from test": + test "show exception type": + raise newException(ValueError, "exception type is") |