From eddeebeb37ee34452ace67589f498db27e6ae993 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 27 Dec 2018 16:18:07 +1100 Subject: [PATCH] Get "t0" temporary vars out of cgen's writeExpr --- cmd/wuffs-c/internal/cgen/expr.go | 9 --------- cmd/wuffs-c/internal/cgen/statement.go | 11 ++++++++--- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index 422ad636..4126dad9 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -27,15 +27,6 @@ func (g *gen) writeExpr(b *buffer, n *a.Expr, depth uint32) error { } depth++ - if n.Effect().Coroutine() { - if g.currFunk.tempR >= g.currFunk.tempW { - return fmt.Errorf("internal error: temporary variable count out of sync") - } - b.printf("%s%d", tPrefix, g.currFunk.tempR) - g.currFunk.tempR++ - return nil - } - if cv := n.ConstValue(); cv != nil { if typ := n.MType(); typ.IsNumTypeOrIdeal() { b.writes(cv.String()) diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index 12a5e6dd..0eb9fe5d 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -141,8 +141,7 @@ func (g *gen) writeStatementAssign0(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr b.writes("status = ") } - // TODO: drop the "Other" in writeExprOther. - if err := g.writeExprOther(b, rhs, 0); err != nil { + if err := g.writeExpr(b, rhs, 0); err != nil { return err } b.writes(";\n") @@ -198,7 +197,13 @@ func (g *gen) writeStatementAssign1(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr b.writex(lhsBuf) b.writes(opName) - if err := g.writeExpr(b, rhs, 0); err != nil { + if rhs.Effect().Coroutine() { + if g.currFunk.tempR != (g.currFunk.tempW - 1) { + return fmt.Errorf("internal error: temporary variable count out of sync") + } + b.printf("%s%d", tPrefix, g.currFunk.tempR) + g.currFunk.tempR++ + } else if err := g.writeExpr(b, rhs, 0); err != nil { return err } b.writes(closer)