jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip fix #5640

Browse source
This commit is contained in:
Zahary Karadjov 2017-04-07 15:05:14 +03:00
commit ee4b98ec17
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/astalgo.nim
View file

@ -70,6 +70,8 @@ proc debug*(n: PNode) {.deprecated.}
template mdbg*: bool {.dirty.} = template mdbg*: bool {.dirty.} =
when compiles(c.module): when compiles(c.module):
c.module.fileIdx == gProjectMainIdx c.module.fileIdx == gProjectMainIdx
elif compiles(c.c.module):
c.c.module.fileIdx == gProjectMainIdx
elif compiles(m.c.module): elif compiles(m.c.module):
m.c.module.fileIdx == gProjectMainIdx m.c.module.fileIdx == gProjectMainIdx
elif compiles(cl.c.module): elif compiles(cl.c.module):

2
compiler/semtypinst.nim
View file

@ -12,7 +12,7 @@
import ast, astalgo, msgs, types, magicsys, semdata, renderer import ast, astalgo, msgs, types, magicsys, semdata, renderer
const const
tfInstClearedFlags = {tfHasMeta} tfInstClearedFlags = {tfHasMeta, tfUnresolved}
proc checkPartialConstructedType(info: TLineInfo, t: PType) = proc checkPartialConstructedType(info: TLineInfo, t: PType) =
if tfAcyclic in t.flags and skipTypes(t, abstractInst).kind != tyObject: if tfAcyclic in t.flags and skipTypes(t, abstractInst).kind != tyObject: