diff options
author | Zahary Karadjov <zahary@gmail.com> | 2017-04-07 15:05:14 +0300 |
---|---|---|
committer | Zahary Karadjov <zahary@gmail.com> | 2017-04-07 15:05:14 +0300 |
commit | ee4b98ec17ba7221f864a40ba5d25f63821987cb (patch) | |
tree | e59483a9b14b4aae36801f29955970152b51579f | |
parent | cdfcc12529d716786683c997f1f673bd423432b6 (diff) | |
download | Nim-ee4b98ec17ba7221f864a40ba5d25f63821987cb.tar.gz |
wip fix #5640
-rw-r--r-- | compiler/astalgo.nim | 2 | ||||
-rw-r--r-- | compiler/semtypinst.nim | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/compiler/astalgo.nim b/compiler/astalgo.nim index 77108eb7b..f8435f359 100644 --- a/compiler/astalgo.nim +++ b/compiler/astalgo.nim @@ -70,6 +70,8 @@ proc debug*(n: PNode) {.deprecated.} template mdbg*: bool {.dirty.} = when compiles(c.module): c.module.fileIdx == gProjectMainIdx + elif compiles(c.c.module): + c.c.module.fileIdx == gProjectMainIdx elif compiles(m.c.module): m.c.module.fileIdx == gProjectMainIdx elif compiles(cl.c.module): diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim index 9ff0b7e78..27b154d62 100644 --- a/compiler/semtypinst.nim +++ b/compiler/semtypinst.nim @@ -12,7 +12,7 @@ import ast, astalgo, msgs, types, magicsys, semdata, renderer const - tfInstClearedFlags = {tfHasMeta} + tfInstClearedFlags = {tfHasMeta, tfUnresolved} proc checkPartialConstructedType(info: TLineInfo, t: PType) = if tfAcyclic in t.flags and skipTypes(t, abstractInst).kind != tyObject: |