mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-04-18 21:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #10889

Browse Source
This commit is contained in:
Andreas Rumpf
2019-05-29 08:00:52 +02:00
parent 950f2d7c2f
commit 8951680c05
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/ast.nim
View File

@@ -1753,20 +1753,6 @@ proc toObject*(typ: PType): PType =
if t.kind == tyRef: t.lastSon
else: typ
proc isException*(t: PType): bool =
# check if `y` is object type and it inherits from Exception
assert(t != nil)
if t.kind notin {tyObject, tyGenericInst}:
return false
var base = t
while base != nil and base.kind in {tyRef, tyObject, tyGenericInst}:
if base.sym != nil and base.sym.magic == mException:
return true
base = base.lastSon
return false
proc isImportedException*(t: PType; conf: ConfigRef): bool =
assert t != nil

11
compiler/types.nim
View File

@@ -1559,3 +1559,14 @@ proc isTupleRecursive(t: PType, cycleDetector: var IntSet): bool =
proc isTupleRecursive*(t: PType): bool =
var cycleDetector = initIntSet()
isTupleRecursive(t, cycleDetector)
proc isException*(t: PType): bool =
# check if `y` is object type and it inherits from Exception
assert(t != nil)
var t = t.skipTypes(abstractInst)
while t.kind == tyObject:
if t.sym != nil and t.sym.magic == mException: return true
if t.sons[0] == nil: break
t = skipTypes(t.sons[0], abstractPtrs)
return false