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

handle 'T&' properly for better C++ support

Browse source
This commit is contained in:
Araq 2015-01-13 22:30:56 +01:00
commit 8889fa9117
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/ccgcalls.nim
View file

@ -217,7 +217,7 @@ proc genClosureCall(p: BProc, le, ri: PNode, d: var TLoc) =
genAssignment(p, d, list, {}) # no need for deep copying genAssignment(p, d, list, {}) # no need for deep copying
else: else:
genCallPattern() genCallPattern()
proc genInfixCall(p: BProc, le, ri: PNode, d: var TLoc) = proc genInfixCall(p: BProc, le, ri: PNode, d: var TLoc) =
var op, a: TLoc var op, a: TLoc
initLocExpr(p, ri.sons[0], op) initLocExpr(p, ri.sons[0], op)
@ -229,7 +229,10 @@ proc genInfixCall(p: BProc, le, ri: PNode, d: var TLoc) =
assert(sonsLen(typ) == sonsLen(typ.n)) assert(sonsLen(typ) == sonsLen(typ.n))
var param = typ.n.sons[1].sym var param = typ.n.sons[1].sym
app(pl, genArg(p, ri.sons[1], param)) if typ.sons[1].kind == tyVar and ri.sons[1].kind == nkHiddenAddr:
app(pl, genArgNoParam(p, ri.sons[1][0]))
else:
app(pl, genArg(p, ri.sons[1], param))
if skipTypes(param.typ, {tyGenericInst}).kind == tyPtr: app(pl, ~"->") if skipTypes(param.typ, {tyGenericInst}).kind == tyPtr: app(pl, ~"->")
else: app(pl, ~".") else: app(pl, ~".")
@ -239,8 +242,13 @@ proc genInfixCall(p: BProc, le, ri: PNode, d: var TLoc) =
if params != nil: params.app(~", ") if params != nil: params.app(~", ")
assert(sonsLen(typ) == sonsLen(typ.n)) assert(sonsLen(typ) == sonsLen(typ.n))
if i < sonsLen(typ): if i < sonsLen(typ):
# 'var T' is 'T&' in C++. This means we ignore the request of
# any nkHiddenAddr when it's a 'var T'.
assert(typ.n.sons[i].kind == nkSym) assert(typ.n.sons[i].kind == nkSym)
app(params, genArg(p, ri.sons[i], typ.n.sons[i].sym)) if typ.sons[i].kind == tyVar and ri.sons[i].kind == nkHiddenAddr:
app(params, genArgNoParam(p, ri.sons[i][0]))
else:
app(params, genArg(p, ri.sons[i], typ.n.sons[i].sym))
else: else:
app(params, genArgNoParam(p, ri.sons[i])) app(params, genArgNoParam(p, ri.sons[i]))
fixupCall(p, le, ri, d, pl, params) fixupCall(p, le, ri, d, pl, params)