From c3ae0534df705d3fae20dfbd607fce8792fdd073 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 7 Oct 2017 16:15:17 +1100 Subject: [PATCH] Add a writer1.available method. --- cmd/puffs-c/internal/cgen/expr.go | 12 ++++++++++++ gen/c/std/flate.c | 9 +++++++-- lang/check/bounds.go | 2 +- lang/check/type.go | 3 ++- lang/token/list.go | 7 +++++-- std/flate/decode_flate.puffs | 7 +++++-- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/cmd/puffs-c/internal/cgen/expr.go b/cmd/puffs-c/internal/cgen/expr.go index 22eda183..2d90d597 100644 --- a/cmd/puffs-c/internal/cgen/expr.go +++ b/cmd/puffs-c/internal/cgen/expr.go @@ -213,6 +213,18 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare } return nil } + if isThatMethod(g.tm, n, t.KeyAvailable, 0) { + if pp == parenthesesMandatory { + b.writeb('(') + } + // TODO: don't hard-code dst. + const wName = "dst" + b.printf("(uint64_t)(%swend_%s - %swptr_%s)", bPrefix, wName, bPrefix, wName) + if pp == parenthesesMandatory { + b.writeb(')') + } + return nil + } if isThatMethod(g.tm, n, g.tm.ByName("set_literal_width").Key(), 1) { // TODO: don't hard-code lzw. b.printf("%slzw_decoder_set_literal_width(&self->private_impl.f_lzw, ", g.pkgPrefix) diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 179f2810..0b2ce6e5 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -1088,8 +1088,13 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed( goto exit; } v_length -= v_n; - status = PUFFS_FLATE_SUSPENSION_SHORT_READ; - PUFFS_COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3); + if (((uint64_t)(b_wend_dst - b_wptr_dst)) == 0) { + status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE; + PUFFS_COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3); + } else { + status = PUFFS_FLATE_SUSPENSION_SHORT_READ; + PUFFS_COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4); + } } label_0_break:; diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 17ae7867..88355027 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -739,7 +739,7 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int, return nil, nil, nil } // TODO: delete this hack that only matches "foo.length(etc)". - if isThatMethod(q.tm, n, t.KeyLength, 0) { + if isThatMethod(q.tm, n, t.KeyLength, 0) || isThatMethod(q.tm, n, t.KeyAvailable, 0) { break } return nil, nil, fmt.Errorf("check: unrecognized token.Key (0x%X) for bcheckExprOther", n.ID0().Key()) diff --git a/lang/check/type.go b/lang/check/type.go index 55aa9edf..25d0b634 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -462,7 +462,8 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error { return nil } // TODO: delete this hack that only matches "foo.length(etc)". - if isThatMethod(q.tm, n, t.KeyCopyFrom, 1) || isThatMethod(q.tm, n, t.KeyLength, 0) { + if isThatMethod(q.tm, n, t.KeyCopyFrom, 1) || isThatMethod(q.tm, n, t.KeyLength, 0) || + isThatMethod(q.tm, n, t.KeyAvailable, 0) { foo := n.LHS().Expr().LHS().Expr() if err := q.tcheckExpr(foo, depth); err != nil { return err diff --git a/lang/token/list.go b/lang/token/list.go index 3fe311e4..1dc718b9 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -282,6 +282,7 @@ const ( KeyCopyHistory32 = Key(IDCopyHistory32 >> KeyShift) KeySlice = Key(IDSlice >> KeyShift) KeyLength = Key(IDLength >> KeyShift) + KeyAvailable = Key(IDAvailable >> KeyShift) KeyPrefix = Key(IDPrefix >> KeyShift) KeySuffix = Key(IDSuffix >> KeyShift) @@ -460,8 +461,9 @@ const ( IDCopyHistory32 = ID(0xC8<