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

fixes #2039

Browse Source
This commit is contained in:
Araq
2015-01-31 11:31:59 +01:00
parent e9a197e704
commit ee4e95fefe
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/ccgexprs.nim
View File

@@ -1120,7 +1120,7 @@ proc genObjConstr(p: BProc, e: PNode, d: var TLoc) =
var r = rdLoc(tmp)
if isRef:
rawGenNew(p, tmp, nil)
t = t.sons[0].skipTypes(abstractInst)
t = t.lastSon.skipTypes(abstractInst)
r = ropef("(*$1)", r)
gcUsage(e)
else:
@@ -1201,9 +1201,9 @@ proc genNewFinalize(p: BProc, e: PNode) =
appf(p.module.s[cfsTypeInit3], "$1->finalizer = (void*)$2;$n", [ti, rdLoc(f)])
b.r = ropecg(p.module, "($1) #newObj($2, sizeof($3))", [
getTypeDesc(p.module, refType),
ti, getTypeDesc(p.module, skipTypes(refType.sons[0], abstractRange))])
ti, getTypeDesc(p.module, skipTypes(refType.lastSon, abstractRange))])
genAssignment(p, a, b, {needToKeepAlive}) # set the object type:
bt = skipTypes(refType.sons[0], abstractRange)
bt = skipTypes(refType.lastSon, abstractRange)
genObjectInit(p, cpsStmts, bt, a, false)
gcUsage(e)

5
compiler/semexprs.nim
View File

@@ -956,9 +956,10 @@ proc makeDeref(n: PNode): PNode =
t = skipTypes(t.sons[0], {tyGenericInst})
while t.kind in {tyPtr, tyRef}:
var a = result
result = newNodeIT(nkHiddenDeref, n.info, t.sons[0])
let baseTyp = t.lastSon
result = newNodeIT(nkHiddenDeref, n.info, baseTyp)
addSon(result, a)
t = skipTypes(t.lastSon, {tyGenericInst})
t = skipTypes(baseTyp, {tyGenericInst})
const
tyTypeParamsHolders = {tyGenericInst, tyCompositeTypeClass}