diff --git a/cmd/wuffs-c/internal/cgen/builtin.go b/cmd/wuffs-c/internal/cgen/builtin.go index 74cb79b5..6b6d5628 100644 --- a/cmd/wuffs-c/internal/cgen/builtin.go +++ b/cmd/wuffs-c/internal/cgen/builtin.go @@ -71,8 +71,6 @@ func (g *gen) writeBuiltinCall(b *buffer, n *a.Expr, rp replacementPolicy, depth return g.writeBuiltinIOReader(b, recv, method.Ident(), n.Args(), rp, depth) case t.IDIOWriter: return g.writeBuiltinIOWriter(b, recv, method.Ident(), n.Args(), rp, depth) - case t.IDStatus: - return g.writeBuiltinStatus(b, recv, method.Ident(), n.Args(), rp, depth) } } return errNoSuchBuiltin @@ -343,25 +341,6 @@ func (g *gen) writeBuiltinSlice(b *buffer, recv *a.Expr, method t.ID, args []*a. return errNoSuchBuiltin } -func (g *gen) writeBuiltinStatus(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, rp replacementPolicy, depth uint32) error { - b.writeb('(') - if err := g.writeExpr(b, recv, rp, depth); err != nil { - return err - } - switch method { - case t.IDIsError: - b.writes(".code < 0") - case t.IDIsOK: - b.writes(".code == 0") - case t.IDIsSuspension: - b.writes(".code > 0") - default: - return fmt.Errorf("cgen: internal error for writeBuiltinStatus") - } - b.writeb(')') - return nil -} - func (g *gen) writeBuiltinTable(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, rp replacementPolicy, depth uint32) error { field := "" diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index 303c26a4..b4d12436 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -324,6 +324,8 @@ func (g *gen) writeExprUserDefinedCall(b *buffer, n *a.Expr, rp replacementPolic recvTyp, addr := recv.MType(), "&" if p := recvTyp.Decorator(); p == t.IDNptr || p == t.IDPtr { recvTyp, addr = recvTyp.Inner(), "" + } else if recvTyp.IsStatus() { + addr = "" } if recvTyp.Decorator() != 0 { return fmt.Errorf("cannot generate user-defined method call %q for receiver type %q", diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index e56349c6..b16f73ab 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -4854,7 +4854,7 @@ wuffs_deflate__decoder__decode(wuffs_deflate__decoder* self, } v_z = t_0; } - if (!(v_z.code > 0)) { + if (!wuffs_base__status__is_suspension(v_z)) { status = v_z; if (status.code == 0) { goto ok; @@ -8499,7 +8499,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, io1_v_w = o_0_io1_v_w; a_src = o_0_a_src; } - if ((v_z.code == 0) || + if (wuffs_base__status__is_ok(v_z) || (v_z.code == WUFFS_BASE__MAKE_STATUS(WUFFS_BASE__SUSPENSION_SHORT_WRITE) .code)) { @@ -9075,7 +9075,7 @@ wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, .len)) & 4294967295))); } - if (v_z.code == 0) { + if (wuffs_base__status__is_ok(v_z)) { goto label_2_break; } status = v_z; @@ -9803,7 +9803,7 @@ wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, .len = (size_t)(iop_a_dst - a_dst.private_impl.bounds[0]), })); } - if (v_z.code == 0) { + if (wuffs_base__status__is_ok(v_z)) { goto label_0_break; } status = v_z;