diff options
| author | koranza <stflynn@hotmail.com> | 2018-05-18 16:20:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-18 16:20:13 -0500 |
| commit | 39988eb1cfae043271376bd21fa301ba2115b59c (patch) | |
| tree | 661b2410afde62935766ccdf1f1803a1e8e7715f /compiler/vmdef.nim | |
| parent | b75008292506d49f2641550457354267e11e1116 (diff) | |
| parent | 06bdf8392bd3e597dbe3ef12c7a819b60e32d7ac (diff) | |
| download | Nim-39988eb1cfae043271376bd21fa301ba2115b59c.tar.gz | |
Merge pull request #1 from nim-lang/devel
updating my fork with the head repo
Diffstat (limited to 'compiler/vmdef.nim')
| -rw-r--r-- | compiler/vmdef.nim | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/compiler/vmdef.nim b/compiler/vmdef.nim index 66bc8dfd2..e10a62006 100644 --- a/compiler/vmdef.nim +++ b/compiler/vmdef.nim @@ -10,7 +10,7 @@ ## This module contains the type definitions for the new evaluation engine. ## An instruction is 1-3 int32s in memory, it is a register based VM. -import ast, passes, msgs, idents, intsets +import ast, passes, msgs, idents, intsets, options, modulegraphs const byteExcess* = 128 # we use excess-K for immediates @@ -206,17 +206,20 @@ type callbacks*: seq[tuple[key: string, value: VmCallback]] errorFlag*: string cache*: IdentCache + config*: ConfigRef + graph*: ModuleGraph + oldErrorCount*: int TPosition* = distinct int PEvalContext* = PCtx -proc newCtx*(module: PSym; cache: IdentCache): PCtx = +proc newCtx*(module: PSym; cache: IdentCache; g: ModuleGraph): PCtx = PCtx(code: @[], debug: @[], globals: newNode(nkStmtListExpr), constants: newNode(nkStmtList), types: @[], prc: PProc(blocks: @[]), module: module, loopIterations: MaxLoopIterations, comesFromHeuristic: unknownLineInfo(), callbacks: @[], errorFlag: "", - cache: cache) + cache: cache, config: g.config, graph: g) proc refresh*(c: PCtx, module: PSym) = c.module = module |