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

nimsuggest: dependencies are recalculated properly

Browse source
This commit is contained in:
Andreas Rumpf 2016-07-13 21:26:37 +02:00
commit 7df8b4bb43
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/modules.nim
View file

@ -105,12 +105,13 @@ proc checkDepMem(fileIdx: int32): TNeedRecompile =
resetModule(fileIdx) resetModule(fileIdx)
return Yes return Yes
if gMemCacheData[fileIdx].needsRecompile != Maybe: # cycle detection: We claim that a cycle does no harm.
return gMemCacheData[fileIdx].needsRecompile if gMemCacheData[fileIdx].needsRecompile == Probing:
return No
#return gMemCacheData[fileIdx].needsRecompile
if optForceFullMake in gGlobalOptions or if optForceFullMake in gGlobalOptions or hashChanged(fileIdx):
hashChanged(fileIdx): markDirty()
markDirty
if gMemCacheData[fileIdx].deps != nil: if gMemCacheData[fileIdx].deps != nil:
gMemCacheData[fileIdx].needsRecompile = Probing gMemCacheData[fileIdx].needsRecompile = Probing
@ -118,7 +119,7 @@ proc checkDepMem(fileIdx: int32): TNeedRecompile =
let d = checkDepMem(dep) let d = checkDepMem(dep)
if d in {Yes, Recompiled}: if d in {Yes, Recompiled}:
# echo fileIdx.toFilename, " depends on ", dep.toFilename, " ", d # echo fileIdx.toFilename, " depends on ", dep.toFilename, " ", d
markDirty markDirty()
gMemCacheData[fileIdx].needsRecompile = No gMemCacheData[fileIdx].needsRecompile = No
return No return No