mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-02-16 08:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up a previous merge conflict

Browse Source
This commit is contained in:
narimiran
2019-11-06 14:38:37 +01:00
parent 2a292c0e71
commit d61dd518d9
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/lambdalifting.nim
View File

@@ -261,12 +261,8 @@ proc liftIterSym*(g: ModuleGraph; n: PNode; owner: PSym): PNode =
result.add(v)
# add 'new' statement:
result.add newCall(getSysSym(g, n.info, "internalNew"), env)
<<<<<<< HEAD
createTypeBoundOpsLL(g, env.typ, n.info)
=======
if optOwnedRefs in g.config.globalOptions:
createTypeBoundOps(g, nil, env.typ, n.info)
>>>>>>> 61ea85687... refactoring: --newruntime consists of 3 different switches
result.add makeClosure(g, iter, env, n.info)
proc freshVarForClosureIter*(g: ModuleGraph; s, owner: PSym): PNode =
@@ -617,12 +613,8 @@ proc rawClosureCreation(owner: PSym;
localError(d.graph.config, env.info, "internal error: cannot create up reference")
# we are not in the sem'check phase anymore! so pass 'nil' for the PContext
# and hope for the best:
<<<<<<< HEAD
createTypeBoundOpsLL(d.graph, env.typ, owner.info)
=======
if optOwnedRefs in d.graph.config.globalOptions:
createTypeBoundOps(d.graph, nil, env.typ, owner.info)
>>>>>>> 61ea85687... refactoring: --newruntime consists of 3 different switches
proc finishClosureCreation(owner: PSym; d: DetectionPass; c: LiftingPass;
info: TLineInfo; res: PNode) =
@@ -650,12 +642,8 @@ proc closureCreationForIter(iter: PNode;
addVar(vs, vnode)
result.add(vs)
result.add(newCall(getSysSym(d.graph, iter.info, "internalNew"), vnode))
<<<<<<< HEAD
createTypeBoundOpsLL(d.graph, vnode.typ, iter.info)
=======
if optOwnedRefs in d.graph.config.globalOptions:
createTypeBoundOps(d.graph, nil, vnode.typ, iter.info)
>>>>>>> 61ea85687... refactoring: --newruntime consists of 3 different switches
let upField = lookupInRecord(v.typ.skipTypes({tyOwned, tyRef, tyPtr}).n, getIdent(d.graph.cache, upName))
if upField != nil: