Merge branch 'devel' into araq-big-refactoring

This commit is contained in:
Andreas Rumpf 2018-05-27 13:38:09 +02:00
commit 9849808720
9 changed files with 115 additions and 41 deletions

View file

@ -33,22 +33,22 @@ when declared(echo):
template mdbg*: bool {.dirty.} =
when compiles(c.module):
c.module.fileIdx.int32 == gProjectMainIdx
c.module.fileIdx.int32 == c.config.projectMainIdx
elif compiles(c.c.module):
c.c.module.fileIdx.int32 == gProjectMainIdx
c.c.module.fileIdx.int32 == c.c.config.projectMainIdx
elif compiles(m.c.module):
m.c.module.fileIdx.int32 == gProjectMainIdx
m.c.module.fileIdx.int32 == m.c.config.projectMainIdx
elif compiles(cl.c.module):
cl.c.module.fileIdx.int32 == gProjectMainIdx
cl.c.module.fileIdx.int32 == cl.c.config.projectMainIdx
elif compiles(p):
when compiles(p.lex):
p.lex.fileIdx.int32 == gProjectMainIdx
p.lex.fileIdx.int32 == p.lex.config.projectMainIdx
else:
p.module.module.fileIdx.int32 == gProjectMainIdx
p.module.module.fileIdx.int32 == p.config.projectMainIdx
elif compiles(m.module.fileIdx):
m.module.fileIdx.int32 == gProjectMainIdx
m.module.fileIdx.int32 == m.config.projectMainIdx
elif compiles(L.fileIdx):
L.fileIdx.int32 == gProjectMainIdx
L.fileIdx.int32 == L.config.projectMainIdx
else:
error()