From 2f2ccdb6964b2835f21288da73796378cb435224 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 11 Feb 2020 12:12:47 +1100 Subject: [PATCH] Add token_writer.write_token --- internal/cgen/builtin.go | 27 +++++++++++-- internal/cgen/var.go | 22 +++++++---- lang/token/list.go | 46 ++++++++++----------- release/c/wuffs-unsupported-snapshot.c | 55 ++++++++++++++++++++++++-- std/json/decode_json.wuffs | 4 ++ 5 files changed, 117 insertions(+), 37 deletions(-) diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index ac5f732a..4ed21a01 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -556,11 +556,12 @@ func (g *gen) writeBuiltinQuestionCall(b *buffer, n *a.Expr, depth uint32) error method := n.LHS().AsExpr() recv := method.LHS().AsExpr() recvTyp := recv.MType() - if !recvTyp.IsIOType() { + if !recvTyp.IsIOTokenType() { return errNoSuchBuiltin } - if recvTyp.QID()[1] == t.IDIOReader { + switch recvTyp.QID()[1] { + case t.IDIOReader: switch method.Ident() { case t.IDReadU8, t.IDReadU8AsU32, t.IDReadU8AsU64: if err := g.writeCoroSuspPoint(b, false); err != nil { @@ -630,7 +631,7 @@ func (g *gen) writeBuiltinQuestionCall(b *buffer, n *a.Expr, depth uint32) error } } - } else { + case t.IDIOWriter: switch method.Ident() { case t.IDWriteU8: if err := g.writeCoroSuspPoint(b, false); err != nil { @@ -646,6 +647,26 @@ func (g *gen) writeBuiltinQuestionCall(b *buffer, n *a.Expr, depth uint32) error b.writes(";\n") return nil } + + case t.IDTokenWriter: + switch method.Ident() { + case t.IDWriteToken: + if err := g.writeCoroSuspPoint(b, false); err != nil { + return err + } + b.writes("if (iop_a_dst == io2_a_dst) {\n" + + "status = wuffs_base__make_status(wuffs_base__suspension__short_write); goto suspend; }\n" + + "*iop_a_dst++ = wuffs_base__make_token(((") + if err := g.writeExpr(b, n.Args()[0].AsArg().Value(), depth); err != nil { + return err + } + b.writes(") << WUFFS_BASE__TOKEN__VALUE_SHIFT) | ((") + if err := g.writeExpr(b, n.Args()[1].AsArg().Value(), depth); err != nil { + return err + } + b.writes(") << WUFFS_BASE__TOKEN__LENGTH_SHIFT));\n") + return nil + } } return errNoSuchBuiltin } diff --git a/internal/cgen/var.go b/internal/cgen/var.go index bc6d7fdd..4828f525 100644 --- a/internal/cgen/var.go +++ b/internal/cgen/var.go @@ -84,9 +84,15 @@ func (g *gen) writeLoadDerivedVar(b *buffer, hack string, prefix string, name t. return nil } - if !typ.IsIOTokenType() { + elem := "" + if typ.IsIOType() { + elem = "uint8_t" + } else if typ.IsTokenType() { + elem = "wuffs_base__token" + } else { return nil } + if g.currFunk.derivedVars == nil { return nil } @@ -96,15 +102,15 @@ func (g *gen) writeLoadDerivedVar(b *buffer, hack string, prefix string, name t. preName := prefix + name.Str(g.tm) i1, i2 := "meta.ri", "meta.wi" - if typ.QID()[1] == t.IDIOWriter { + if q := typ.QID()[1]; (q == t.IDIOWriter) || (q == t.IDTokenWriter) { i1, i2 = "meta.wi", "data.len" } if header { - b.printf("uint8_t* %s%s = NULL;", iopPrefix, preName) - b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;", io0Prefix, preName) - b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;", io1Prefix, preName) - b.printf("uint8_t* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;", io2Prefix, preName) + b.printf("%s* %s%s = NULL;", elem, iopPrefix, preName) + b.printf("%s* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;", elem, io0Prefix, preName) + b.printf("%s* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;", elem, io1Prefix, preName) + b.printf("%s* %s%s WUFFS_BASE__POTENTIALLY_UNUSED = NULL;", elem, io2Prefix, preName) } b.printf("if (%s) {", preName) @@ -115,7 +121,7 @@ func (g *gen) writeLoadDerivedVar(b *buffer, hack string, prefix string, name t. b.printf("%s%s = %s%s;", iopPrefix, preName, io1Prefix, preName) b.printf("%s%s = %s%s + %s->%s;", io2Prefix, preName, io0Prefix, preName, preName, i2) - if typ.QID()[1] == t.IDIOWriter { + if q := typ.QID()[1]; (q == t.IDIOWriter) || (q == t.IDTokenWriter) { b.printf("if (%s->meta.closed) {", preName) b.printf("%s%s = %s%s;", io2Prefix, preName, iopPrefix, preName) b.printf("}\n") @@ -155,7 +161,7 @@ func (g *gen) writeSaveDerivedVar(b *buffer, hack string, prefix string, name t. preName := prefix + name.Str(g.tm) index := "ri" - if typ.QID()[1] == t.IDIOWriter { + if q := typ.QID()[1]; (q == t.IDIOWriter) || (q == t.IDTokenWriter) { index = "wi" } diff --git a/lang/token/list.go b/lang/token/list.go index c9797bce..61909f8d 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -625,17 +625,18 @@ const ( IDIsOK = ID(0x231) IDIsSuspension = ID(0x232) - IDAvailable = ID(0x240) - IDHeight = ID(0x241) - IDLength = ID(0x242) - IDPrefix = ID(0x243) - IDRow = ID(0x244) - IDStride = ID(0x245) - IDSuffix = ID(0x246) - IDWidth = ID(0x247) - IDIO = ID(0x248) - IDLimit = ID(0x249) - IDData = ID(0x24A) + IDAvailable = ID(0x240) + IDHeight = ID(0x241) + IDLength = ID(0x242) + IDPrefix = ID(0x243) + IDRow = ID(0x244) + IDStride = ID(0x245) + IDSuffix = ID(0x246) + IDWidth = ID(0x247) + IDIO = ID(0x248) + IDLimit = ID(0x249) + IDData = ID(0x24A) + IDWriteToken = ID(0x24B) ) var builtInsByID = [nBuiltInIDs]string{ @@ -966,17 +967,18 @@ var builtInsByID = [nBuiltInIDs]string{ IDIsOK: "is_ok", IDIsSuspension: "is_suspension", - IDAvailable: "available", - IDHeight: "height", - IDLength: "length", - IDPrefix: "prefix", - IDRow: "row", - IDStride: "stride", - IDSuffix: "suffix", - IDWidth: "width", - IDIO: "io", - IDLimit: "limit", - IDData: "data", + IDAvailable: "available", + IDHeight: "height", + IDLength: "length", + IDPrefix: "prefix", + IDRow: "row", + IDStride: "stride", + IDSuffix: "suffix", + IDWidth: "width", + IDIO: "io", + IDLimit: "limit", + IDData: "data", + IDWriteToken: "write_token", } var builtInsByName = map[string]ID{} diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 31853b85..a8e30633 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -5045,6 +5045,7 @@ struct wuffs_json__decoder__struct { uint32_t active_coroutine; wuffs_base__vtable null_vtable; + uint32_t p_decode_tokens[1]; } private_impl; #ifdef __cplusplus @@ -18111,12 +18112,58 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self, self->private_impl.active_coroutine = 0; wuffs_base__status status = wuffs_base__make_status(NULL); - status = wuffs_base__make_status(NULL); - goto ok; - goto ok; -ok: + uint64_t v_length = 0; + + wuffs_base__token* iop_a_dst = NULL; + wuffs_base__token* io0_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + wuffs_base__token* io1_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + wuffs_base__token* io2_a_dst WUFFS_BASE__POTENTIALLY_UNUSED = NULL; + if (a_dst) { + io0_a_dst = a_dst->data.ptr; + io1_a_dst = io0_a_dst + a_dst->meta.wi; + iop_a_dst = io1_a_dst; + io2_a_dst = io0_a_dst + a_dst->data.len; + if (a_dst->meta.closed) { + io2_a_dst = iop_a_dst; + } + } + + uint32_t coro_susp_point = self->private_impl.p_decode_tokens[0]; + if (coro_susp_point) { + } + switch (coro_susp_point) { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; + + v_length = 456; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); + if (iop_a_dst == io2_a_dst) { + status = wuffs_base__make_status(wuffs_base__suspension__short_write); + goto suspend; + } + *iop_a_dst++ = + wuffs_base__make_token(((123) << WUFFS_BASE__TOKEN__VALUE_SHIFT) | + ((v_length) << WUFFS_BASE__TOKEN__LENGTH_SHIFT)); + status = wuffs_base__make_status(NULL); + goto ok; + goto ok; + ok: + self->private_impl.p_decode_tokens[0] = 0; + goto exit; + } + + goto suspend; +suspend: + self->private_impl.p_decode_tokens[0] = + wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0; + self->private_impl.active_coroutine = + wuffs_base__status__is_suspension(&status) ? 1 : 0; + goto exit; exit: + if (a_dst) { + a_dst->meta.wi = ((size_t)(iop_a_dst - a_dst->data.ptr)); + } + if (wuffs_base__status__is_error(&status)) { self->private_impl.magic = WUFFS_BASE__DISABLED; } diff --git a/std/json/decode_json.wuffs b/std/json/decode_json.wuffs index db17fec2..967569ed 100644 --- a/std/json/decode_json.wuffs +++ b/std/json/decode_json.wuffs @@ -18,5 +18,9 @@ pub struct decoder?( ) pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) { + var length : base.u64[..= 0xFFFF] + + length = 456 + args.dst.write_token?(value: 123, length: length) return ok }