Merge pull request #5063 from deech/nimeval-fix

Fix compilation error in nimeval.
This commit is contained in:
Andreas Rumpf 2016-11-28 10:14:53 +01:00 • committed by GitHub
commit c001d95606

View file

@ -8,10 +8,9 @@
# #
## exposes the Nim VM to clients. ## exposes the Nim VM to clients.
import import
ast, modules, passes, passaux, condsyms, ast, modules, passes, passaux, condsyms,
options, nimconf, lists, sem, semdata, llstream, vm options, nimconf, lists, sem, semdata, llstream, vm, modulegraphs, idents
proc execute*(program: string) = proc execute*(program: string) =
passes.gIncludeFile = includeModule passes.gIncludeFile = includeModule
@ -27,7 +26,9 @@ proc execute*(program: string) =
registerPass(evalPass) registerPass(evalPass)
appendStr(searchPaths, options.libpath) appendStr(searchPaths, options.libpath)
compileSystemModule() var graph = newModuleGraph()
var m = makeStdinModule() var cache = newIdentCache()
var m = makeStdinModule(graph)
incl(m.flags, sfMainModule) incl(m.flags, sfMainModule)
processModule(m, llStreamOpen(program), nil) compileSystemModule(graph,cache)
processModule(graph,m, llStreamOpen(program), nil, cache)