Refactor cgen's writeStatementAssign

This commit is contained in:
Nigel Tao committed 2020-11-11 23:20:08 +11:00
1 parent 0566cb2a8e
commit 7ea23d56e3
1 file changed
+68 -70
+68 -70
View File
@@ -95,22 +95,23 @@ func (g *gen) writeStatementAssign(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr,
} }
} }
couldSuspend := false couldSuspend, skipRHS := false, false
if err := g.writeBuiltinQuestionCall(b, rhs, 0); err == nil { if rhs.Effect().Coroutine() {
// No-op. if err := g.writeBuiltinQuestionCall(b, rhs, 0); err == nil {
} else if err != errNoSuchBuiltin { skipRHS = true
return err } else if err != errNoSuchBuiltin {
} else {
if err := g.writeStatementAssign0(b, op, lhs, rhs); err != nil {
return err return err
} else if op != t.IDEqQuestion {
if err := g.writeCoroSuspPoint(b, false); err != nil {
return err
}
b.writes("status = ")
couldSuspend = true
} }
couldSuspend = (op != t.IDEqQuestion) && rhs.Effect().Coroutine()
} }
if lhs != nil { if err := g.writeStatementAssign1(b, op, lhs, rhs, skipRHS); err != nil {
if err := g.writeStatementAssign1(b, op, lhs, rhs); err != nil { return err
return err
}
} }
if needWriteLoadExprDerivedVars { if needWriteLoadExprDerivedVars {
if err := g.writeLoadExprDerivedVars(b, rhs); err != nil { if err := g.writeLoadExprDerivedVars(b, rhs); err != nil {
@@ -123,69 +124,61 @@ func (g *gen) writeStatementAssign(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr,
return nil return nil
} }
func (g *gen) writeStatementAssign0(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr) error { func (g *gen) writeStatementAssign1(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr, skipRHS bool) error {
if (lhs == nil) || rhs.Effect().Coroutine() { lhsBuf := buffer(nil)
if op == t.IDEqQuestion { opName, closer, disableWconversion := "", "", false
if g.currFunk.tempW > maxTemp {
return fmt.Errorf("too many temporary variables required")
}
temp := g.currFunk.tempW
g.currFunk.tempW++
b.printf("wuffs_base__status %s%d = ", tPrefix, temp) if lhs != nil {
} else if rhs.Effect().Coroutine() { if err := g.writeExpr(&lhsBuf, lhs, 0); err != nil {
if err := g.writeCoroSuspPoint(b, false); err != nil {
return err
}
b.writes("status = ")
}
if err := g.writeExpr(b, rhs, 0); err != nil {
return err return err
} }
b.writes(";\n")
}
return nil if lTyp := lhs.MType(); lTyp.IsArrayType() {
} b.writes("memcpy(")
opName, closer = ",", fmt.Sprintf(", sizeof(%s))", lhsBuf)
func (g *gen) writeStatementAssign1(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr) error { } else {
lhsBuf := buffer(nil) switch op {
if err := g.writeExpr(&lhsBuf, lhs, 0); err != nil { case t.IDEqQuestion:
return err opName = cOpName(t.IDEqQuestion)
} if g.currFunk.tempW > maxTemp {
return fmt.Errorf("too many temporary variables required")
opName, closer, disableWconversion := "", "", false
if lTyp := lhs.MType(); lTyp.IsArrayType() {
b.writes("memcpy(")
opName, closer = ",", fmt.Sprintf(", sizeof(%s))", lhsBuf)
} else {
switch op {
case t.IDTildeSatPlusEq, t.IDTildeSatMinusEq:
uBits := uintBits(lTyp.QID())
if uBits == 0 {
return fmt.Errorf("unsupported tilde-operator type %q", lTyp.Str(g.tm))
}
uOp := "add"
if op != t.IDTildeSatPlusEq {
uOp = "sub"
}
b.printf("wuffs_base__u%d__sat_%s_indirect(&", uBits, uOp)
opName, closer = ", ", ")"
case t.IDPlusEq, t.IDMinusEq:
if lTyp.IsNumType() {
if u := lTyp.QID()[1]; u == t.IDU8 || u == t.IDU16 {
disableWconversion = true
} }
} temp := g.currFunk.tempW
fallthrough g.currFunk.tempW++
default: b.printf("wuffs_base__status %s%d = ", tPrefix, temp)
opName = cOpName(op)
if opName == "" { if err := g.writeExpr(b, rhs, 0); err != nil {
return fmt.Errorf("unrecognized operator %q", op.AmbiguousForm().Str(g.tm)) return err
}
b.writes(";\n")
case t.IDTildeSatPlusEq, t.IDTildeSatMinusEq:
uBits := uintBits(lTyp.QID())
if uBits == 0 {
return fmt.Errorf("unsupported tilde-operator type %q", lTyp.Str(g.tm))
}
uOp := "add"
if op != t.IDTildeSatPlusEq {
uOp = "sub"
}
b.printf("wuffs_base__u%d__sat_%s_indirect(&", uBits, uOp)
opName, closer = ", ", ")"
case t.IDPlusEq, t.IDMinusEq:
if lTyp.IsNumType() {
if u := lTyp.QID()[1]; u == t.IDU8 || u == t.IDU16 {
disableWconversion = true
}
}
fallthrough
default:
opName = cOpName(op)
if opName == "" {
return fmt.Errorf("unrecognized operator %q", op.AmbiguousForm().Str(g.tm))
}
} }
} }
} }
@@ -200,19 +193,24 @@ func (g *gen) writeStatementAssign1(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr
b.writes("#endif\n") b.writes("#endif\n")
} }
n := len(*b)
b.writex(lhsBuf) b.writex(lhsBuf)
b.writes(opName) b.writes(opName)
if rhs.Effect().Coroutine() { if g.currFunk.tempR != g.currFunk.tempW {
if g.currFunk.tempR != (g.currFunk.tempW - 1) { if g.currFunk.tempR != (g.currFunk.tempW - 1) {
return fmt.Errorf("internal error: temporary variable count out of sync") return fmt.Errorf("internal error: temporary variable count out of sync")
} }
b.printf("%s%d", tPrefix, g.currFunk.tempR) b.printf("%s%d", tPrefix, g.currFunk.tempR)
g.currFunk.tempR++ g.currFunk.tempR++
} else if skipRHS {
// No-op.
} else if err := g.writeExpr(b, rhs, 0); err != nil { } else if err := g.writeExpr(b, rhs, 0); err != nil {
return err return err
} }
b.writes(closer) b.writes(closer)
b.writes(";\n") if n != len(*b) {
b.writes(";\n")
}
if disableWconversion { if disableWconversion {
b.writes("#if defined(__GNUC__)\n") b.writes("#if defined(__GNUC__)\n")