diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index 9231b286..4d16b3e1 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -168,7 +168,7 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args [] } switch method { - case t.IDAvailableValidUTF8: + case t.IDValidUTF8Length: name, err := g.ioRecvName(recv) if err != nil { return err diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 52802a5d..a1999fd3 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -388,13 +388,13 @@ var Funcs = []string{ "io_reader.peek_u64le_at(offset: u32[..= 0xFFF8]) u64", "io_reader.available() u64", - "io_reader.available_valid_utf_8(up_to: u64) u64", "io_reader.count_since(mark: u64) u64", "io_reader.is_closed() bool", "io_reader.mark() u64", "io_reader.match7(a: u64) u32[..= 2]", "io_reader.position() u64", "io_reader.since(mark: u64) slice u8", + "io_reader.valid_utf_8_length(up_to: u64) u64", "io_reader.limited_copy_u32_to_slice!(up_to: u32, s: slice u8) u32", diff --git a/lang/token/list.go b/lang/token/list.go index 5600ad2d..2a6debc6 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -651,19 +651,19 @@ const ( IDIsOK = ID(0x231) IDIsSuspension = ID(0x232) - IDAvailable = ID(0x240) - IDAvailableValidUTF8 = ID(0x241) + IDAvailable = ID(0x250) - IDData = ID(0x250) - IDHeight = ID(0x251) - IDIO = ID(0x252) - IDLength = ID(0x253) - IDLimit = ID(0x254) - IDPrefix = ID(0x255) - IDRow = ID(0x256) - IDStride = ID(0x257) - IDSuffix = ID(0x258) - IDWidth = ID(0x259) + IDData = ID(0x240) + IDHeight = ID(0x241) + IDIO = ID(0x242) + IDLength = ID(0x243) + IDLimit = ID(0x244) + IDPrefix = ID(0x245) + IDRow = ID(0x246) + IDStride = ID(0x247) + IDSuffix = ID(0x248) + IDValidUTF8Length = ID(0x249) + IDWidth = ID(0x24A) IDSwizzleInterleavedFromReader = ID(0x280) ) @@ -1016,19 +1016,19 @@ var builtInsByID = [nBuiltInIDs]string{ IDIsOK: "is_ok", IDIsSuspension: "is_suspension", - IDAvailable: "available", - IDAvailableValidUTF8: "available_valid_utf_8", + IDAvailable: "available", - IDData: "data", - IDHeight: "height", - IDIO: "io", - IDLength: "length", - IDLimit: "limit", - IDPrefix: "prefix", - IDRow: "row", - IDStride: "stride", - IDSuffix: "suffix", - IDWidth: "width", + IDData: "data", + IDHeight: "height", + IDIO: "io", + IDLength: "length", + IDLimit: "limit", + IDPrefix: "prefix", + IDRow: "row", + IDStride: "stride", + IDSuffix: "suffix", + IDValidUTF8Length: "valid_utf_8_length", + IDWidth: "width", IDSwizzleInterleavedFromReader: "swizzle_interleaved_from_reader", } diff --git a/std/cbor/decode_cbor.wuffs b/std/cbor/decode_cbor.wuffs index b2aaf244..911f1fd8 100644 --- a/std/cbor/decode_cbor.wuffs +++ b/std/cbor/decode_cbor.wuffs @@ -413,7 +413,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor continue } n64 = string_length.min(a: 0xFFFF) - n64 = args.src.available_valid_utf_8(up_to: n64) + n64 = args.src.valid_utf_8_length(up_to: n64) token_length = (n64 & 0xFFFF) as base.u32 if token_length <= 0 { // The longest UTF-8 code point is 4 bytes.