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

rollback of nimsuggest improvement until we figured out the reasons

Browse source
This commit is contained in:
Andreas Rumpf 2016-07-15 11:44:02 +02:00
commit 3e72c98d49
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/modules.nim
View file

@ -105,10 +105,14 @@ proc checkDepMem(fileIdx: int32): TNeedRecompile =
resetModule(fileIdx) resetModule(fileIdx)
return Yes return Yes
# cycle detection: We claim that a cycle does no harm. when true:
if gMemCacheData[fileIdx].needsRecompile == Probing: if gMemCacheData[fileIdx].needsRecompile != Maybe:
return No return gMemCacheData[fileIdx].needsRecompile
#return gMemCacheData[fileIdx].needsRecompile else:
# cycle detection: We claim that a cycle does no harm.
if gMemCacheData[fileIdx].needsRecompile == Probing:
return No
#return gMemCacheData[fileIdx].needsRecompile
if optForceFullMake in gGlobalOptions or hashChanged(fileIdx): if optForceFullMake in gGlobalOptions or hashChanged(fileIdx):
markDirty() markDirty()

10
compiler/semexprs.nim
View file

@ -1635,8 +1635,8 @@ proc newAnonSym(kind: TSymKind, info: TLineInfo,
result.flags = {sfGenSym} result.flags = {sfGenSym}
proc semExpandToAst(c: PContext, n: PNode): PNode = proc semExpandToAst(c: PContext, n: PNode): PNode =
var macroCall = n[1] let macroCall = n[1]
var expandedSym = expectMacroOrTemplateCall(c, macroCall) let expandedSym = expectMacroOrTemplateCall(c, macroCall)
if expandedSym.kind == skError: return n if expandedSym.kind == skError: return n
macroCall.sons[0] = newSymNode(expandedSym, macroCall.info) macroCall.sons[0] = newSymNode(expandedSym, macroCall.info)
@ -1644,13 +1644,13 @@ proc semExpandToAst(c: PContext, n: PNode): PNode =
styleCheckUse(n.info, expandedSym) styleCheckUse(n.info, expandedSym)
for i in countup(1, macroCall.len-1): for i in countup(1, macroCall.len-1):
#if macroCall.sons[0].typ.sons[i].kind != tyExpr:
macroCall.sons[i] = semExprWithType(c, macroCall[i], {}) macroCall.sons[i] = semExprWithType(c, macroCall[i], {})
# Preserve the magic symbol in order to be handled in evals.nim # Preserve the magic symbol in order to be handled in evals.nim
internalAssert n.sons[0].sym.magic == mExpandToAst internalAssert n.sons[0].sym.magic == mExpandToAst
#n.typ = getSysSym("PNimrodNode").typ # expandedSym.getReturnType #n.typ = getSysSym("NimNode").typ # expandedSym.getReturnType
n.typ = if getCompilerProc("NimNode") != nil: sysTypeFromName"NimNode" n.typ = sysTypeFromName"NimNode"
else: sysTypeFromName"PNimrodNode"
result = n result = n
proc semExpandToAst(c: PContext, n: PNode, magicSym: PSym, proc semExpandToAst(c: PContext, n: PNode, magicSym: PSym,