diff options
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/ccgcalls.nim | 12 | ||||
-rw-r--r-- | compiler/ccgexprs.nim | 2 | ||||
-rw-r--r-- | compiler/semstmts.nim | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/compiler/ccgcalls.nim b/compiler/ccgcalls.nim index 2ae56863b..4efd33d1e 100644 --- a/compiler/ccgcalls.nim +++ b/compiler/ccgcalls.nim @@ -79,9 +79,19 @@ proc genBoundsCheck(p: BProc; arr, a, b: TLoc) proc openArrayLoc(p: BProc, n: PNode): Rope = var a: TLoc - let q = skipConv(n) + var q = skipConv(n) + var skipped = false + while q.kind == nkStmtListExpr and q.len > 0: + skipped = true + q = q.lastSon if getMagic(q) == mSlice: # magic: pass slice to openArray: + if skipped: + q = skipConv(n) + while q.kind == nkStmtListExpr and q.len > 0: + for i in 0..q.len-2: + genStmts(p, q[i]) + q = q.lastSon var b, c: TLoc initLocExpr(p, q[1], a) initLocExpr(p, q[2], b) diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim index a882a3cee..ea4cd4aca 100644 --- a/compiler/ccgexprs.nim +++ b/compiler/ccgexprs.nim @@ -2268,7 +2268,7 @@ proc genMagicExpr(p: BProc, e: PNode, d: var TLoc, op: TMagic) = of mAccessEnv: unaryExpr(p, e, d, "$1.ClE_0") of mSlice: localError(p.config, e.info, "invalid context for 'toOpenArray'; " & - " 'toOpenArray' is only valid within a call expression") + "'toOpenArray' is only valid within a call expression") else: when defined(debugMagics): echo p.prc.name.s, " ", p.prc.id, " ", p.prc.flags, " ", p.prc.ast[genericParamsPos].kind diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim index b22dc7952..5a0aac40e 100644 --- a/compiler/semstmts.nim +++ b/compiler/semstmts.nim @@ -293,7 +293,7 @@ proc fitRemoveHiddenConv(c: PContext, typ: PType, n: PNode): PNode = result.info = n.info result.typ = typ if not floatRangeCheck(result.floatVal, typ): - localError(c.config, n.info, errFloatToString % [$n.floatVal, typeToString(typ)]) + localError(c.config, n.info, errFloatToString % [$result.floatVal, typeToString(typ)]) else: changeType(c, r1, typ, check=true) result = r1 |