From 6523aad3efe6fe28b964cc00b76fe5ee8fd9f97f Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Mon, 26 Oct 2026 06:56:04 -0700 Subject: [PATCH 01/12] chore(quest): claim quest/m2/ts-mir-size.md Quest-Claim: da18cb1fbc3274b7 From aa799f7c0c5b0e31511f78e0f12f0b646c94a7c4 Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Mon, 26 Oct 2026 07:17:14 -0700 Subject: [PATCH 02/12] feat(ts): smaller coroutine classes and no else after a branch that leaves Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0115AT2ue6x9cT5e5J9SZtCn --- ts/fixtures/codec/expected/bench.ts | 217 +- .../expected/coding/decode.DecodeError.ts | 111 +- .../codec/expected/coding/decode.Decoder.ts | 38 +- .../expected/coding/encode.EncodeError.ts | 18 +- .../codec/expected/coding/encode.Encoder.ts | 6 +- .../codec/expected/coding/varint.Form.ts | 3 +- ts/fixtures/codec/expected/coding/varint.ts | 79 +- .../codec/expected/coding/version.Version.ts | 9 +- .../codec/expected/coding/version.Versions.ts | 41 +- ts/fixtures/codec/expected/harness.ts | 172 +- .../codec/expected/lib.SessionError.ts | 7 +- .../codec/expected/lite/group.Group.ts | 26 +- ts/fixtures/codec/expected/lite/message.ts | 21 +- .../codec/expected/lite/probe.Probe.ts | 88 +- ts/fixtures/lang/expected/collections.Pair.ts | 6 +- ts/fixtures/lang/expected/collections.Rank.ts | 27 +- ts/fixtures/lang/expected/collections.ts | 924 ++++----- ts/fixtures/lang/expected/fmt.Fails.ts | 6 +- ts/fixtures/lang/expected/fmt.Fault.ts | 28 +- ts/fixtures/lang/expected/fmt.Kind.ts | 22 +- ts/fixtures/lang/expected/fmt.Pair.ts | 3 +- ts/fixtures/lang/expected/fmt.Tup.ts | 5 +- ts/fixtures/lang/expected/generics.Either.ts | 33 +- ts/fixtures/lang/expected/generics.Wrap.ts | 3 +- ts/fixtures/lang/expected/harness.ts | 197 +- ts/fixtures/lang/expected/iters.Countdown.ts | 7 +- ts/fixtures/lang/expected/iters.Evens.ts | 6 +- ts/fixtures/lang/expected/iters.Gaps.ts | 6 +- ts/fixtures/lang/expected/iters.Halving.ts | 7 +- ts/fixtures/lang/expected/iters.ts | 132 +- ts/fixtures/lang/expected/shapes.Point.ts | 3 +- ts/fixtures/lang/expected/shapes.Shape.ts | 30 +- ts/fixtures/lang/expected/shapes.ts | 368 ++-- ts/fixtures/task/expected/kio.Consumer.ts | 9 +- ts/fixtures/task/expected/kio.WaiterList.ts | 31 +- ts/fixtures/task/expected/kio.ts | 41 +- ts/fixtures/task/expected/log.Log.ts | 7 +- ts/fixtures/task/expected/model.Channel.ts | 17 +- ts/fixtures/task/expected/model.Countdown.ts | 3 +- ts/fixtures/task/expected/model.ts | 1764 ++++++++--------- ts/runtime/rt/task.ts | 10 + ts/src/lower/body.rs | 6 +- ts/src/lower/mir/coroutine.rs | 53 +- ts/src/lower/mir/mod.rs | 26 +- ts/src/print.rs | 21 +- ts/src/program.rs | 5 +- 46 files changed, 2261 insertions(+), 2381 deletions(-) diff --git a/ts/fixtures/codec/expected/bench.ts b/ts/fixtures/codec/expected/bench.ts index 92515e2ed..5fca3fb3a 100644 --- a/ts/fixtures/codec/expected/bench.ts +++ b/ts/fixtures/codec/expected/bench.ts @@ -47,12 +47,10 @@ export function run(input: Uint8Array): rt.ByteVec { decoded(decodeGroup(_9[1], liteVersion(selector), out), out); } return out; - } else { - return out; } - } else { return out; } + return out; } export function encoded(result: rt.Result, out: rt.ByteVec): void { @@ -87,14 +85,12 @@ export function encodeVarints(data: Uint8Array, form_: Form.Form, out: rt.ByteVe l0: while (true) { if (!(iterStart++ < iterEnd)) { return rt.Ok(undefined); - } else { - _17 = Encoder.varint(w, value); - if (_17.ok) { - continue l0; - } else { - return _17; - } } + _17 = Encoder.varint(w, value); + if (_17.ok) { + continue l0; + } + return _17; } } @@ -114,14 +110,12 @@ export function decodeVarints(wire: Uint8Array, form_: Form.Form, out: rt.ByteVe last = _9.value; count = rt.usizeAdd(count, 1); continue l0; - } else { - return _9; } - } else { - putUsize(out, count); - putU64(out, last); - return rt.Ok(undefined); + return _9; } + putUsize(out, count); + putU64(out, last); + return rt.Ok(undefined); } } @@ -178,36 +172,33 @@ export function encodeFrames(data: Uint8Array, version: Version.Version, out: rt l0: while (true) { if (!((_32 = iterStart++) < iterEnd)) { return rt.Ok(undefined); - } else { - b2: { - n = _32; - if (n === 0) { - _38 = [0, first] as [rt.i64, rt.u64]; - } else { - if (keyEvery2 !== 0) { - if (rt.usizeRem(n, keyEvery2) === 0) { - _38 = [delta2, keySize] as [rt.i64, rt.u64]; - break b2; - } + } + b2: { + n = _32; + if (n === 0) { + _38 = [0, first] as [rt.i64, rt.u64]; + } else { + if (keyEvery2 !== 0) { + if (rt.usizeRem(n, keyEvery2) === 0) { + _38 = [delta2, keySize] as [rt.i64, rt.u64]; + break b2; } - _38 = [delta2, size] as [rt.i64, rt.u64]; } + _38 = [delta2, size] as [rt.i64, rt.u64]; } - delta3 = _38[0]; - size2 = _38[1]; - _48 = zigzag(delta3); - _45 = Encoder.varint(w, _48); - if (_45.ok) { - _51 = Encoder.varint(w, size2); - if (_51.ok) { - continue l0; - } else { - return _51; - } - } else { - return _45; + } + delta3 = _38[0]; + size2 = _38[1]; + _48 = zigzag(delta3); + _45 = Encoder.varint(w, _48); + if (_45.ok) { + _51 = Encoder.varint(w, size2); + if (_51.ok) { + continue l0; } + return _51; } + return _45; } } @@ -233,18 +224,15 @@ export function decodeFrames(wire: Uint8Array, version: Version.Version, out: rt total = rt.u64Add(total, _18.value); count = rt.usizeAdd(count, 1); continue l0; - } else { - return _18; } - } else { - return _12; + return _18; } - } else { - putUsize(out, count); - putU64(out, total); - putU64(out, rt.u64Cast(last)); - return rt.Ok(undefined); + return _12; } + putUsize(out, count); + putU64(out, total); + putU64(out, rt.u64Cast(last)); + return rt.Ok(undefined); } } @@ -285,32 +273,30 @@ export function decodeSplit(data: Uint8Array, version: Version.Version, out: rt. putU64(out, rt.u64Cast(last)); putUsize(out, short); return rt.Ok(undefined); - } else { - return rt.Err({ tag: "Short" } as DecodeError.DecodeError); } - } else { - end = rt.min(_6[1].length, rt.usizeAdd(end, read2)); - while (true) { - if (!(start < end)) { + return rt.Err({ tag: "Short" } as DecodeError.DecodeError); + } + end = rt.min(_6[1].length, rt.usizeAdd(end, read2)); + while (true) { + if (!(start < end)) { + continue l0; + } else { + const slice = _6[1]; + r = Decoder.new(rt.sliceRange(slice, start, end), Form.from$From_Version(version)); + _32 = frameHeader(r); + if (_32.ok) { + delta = _32.value[0]; + size = _32.value[1]; + start = rt.usizeSub(end, Decoder.remaining(r)); + last = delta; + total = rt.u64Add(total, size); + count = rt.usizeAdd(count, 1); + } else if (_32.error.tag === "Short") { + short = rt.usizeAdd(short, 1); continue l0; } else { - const slice = _6[1]; - r = Decoder.new(rt.sliceRange(slice, start, end), Form.from$From_Version(version)); - _32 = frameHeader(r); - if (_32.ok) { - delta = _32.value[0]; - size = _32.value[1]; - start = rt.usizeSub(end, Decoder.remaining(r)); - last = delta; - total = rt.u64Add(total, size); - count = rt.usizeAdd(count, 1); - } else if (_32.error.tag === "Short") { - short = rt.usizeAdd(short, 1); - continue l0; - } else { - _0 = rt.Err(_32.error); - return _0; - } + _0 = rt.Err(_32.error); + return _0; } } } @@ -328,12 +314,10 @@ export function frameHeader(r: Decoder.Decoder): rt.Result<[rt.i64, rt.u64], Dec _9 = Decoder.varint(r); if (_9.ok) { return rt.Ok([delta, _9.value] as [rt.i64, rt.u64]); - } else { - return _9; } - } else { - return _3; + return _9; } + return _3; } /** One size-prefixed GROUP header, starting at the first frame. */ @@ -400,14 +384,12 @@ export function ordered(data: Uint8Array, out: rt.ByteVec): void { if (!((_66 = iterStart3++) < iterEnd3)) { putU64(out, sum); return; - } else { - _73 = _10(_66); - rt.btreeRemove(map, _73); } + _73 = _10(_66); + rt.btreeRemove(map, _73); } - } else { - sum = rt.u64Add(sum, _57[1] as rt.u64); } + sum = rt.u64Add(sum, _57[1] as rt.u64); } } else { i2 = _28; @@ -417,11 +399,10 @@ export function ordered(data: Uint8Array, out: rt.ByteVec): void { sum = rt.u64Add(sum, rt.optionUnwrapOr(rt.btreeGet(map, _38), 0) as rt.u64); } } - } else { - i = _15; - _21 = _10(i); - rt.btreeInsert(map, _21, i); } + i = _15; + _21 = _10(i); + rt.btreeInsert(map, _21, i); } } @@ -469,11 +450,10 @@ export function iterate(chain: rt.u8, data: Uint8Array, out: rt.ByteVec): void { if (_33 === rt.DONE) { putUsize(out, last); break b0; - } else { - i = _33[0]; - if (_33[1] === 128) { - last = i; - } + } + i = _33[0]; + if (_33[1] === 128) { + last = i; } } } @@ -525,36 +505,35 @@ export function rescale(selector: rt.u8, data: Uint8Array, out: rt.ByteVec): voi putU64(out, overflowed); putU64(out, last); return; - } else { - b1: { - value = rt.u64Add(start, rt.u64Mul(_26 as rt.u64, step)); - if (selector === 0) { - _36 = rt.u128CheckedMul(rt.u128Cast(value), rt.u128Cast(to)); - if (_36 === undefined) { - scaled = undefined; - } else { - scaled = bounded(rt.u128Div(_36, rt.u128Cast(from))); - } - } else { - _44 = rt.optionMap(rt.u64CheckedMul(value, to), (scaled3: rt.u64): rt.u64 => { - return rt.u64Div(scaled3, from); - }); - if (_44 !== undefined) { - if (rt.u64Le(_44, rt.u64Of(2305843009213693951n))) { - scaled = _44; - break b1; - } - } + } + b1: { + value = rt.u64Add(start, rt.u64Mul(_26 as rt.u64, step)); + if (selector === 0) { + _36 = rt.u128CheckedMul(rt.u128Cast(value), rt.u128Cast(to)); + if (_36 === undefined) { scaled = undefined; + } else { + scaled = bounded(rt.u128Div(_36, rt.u128Cast(from))); } - } - if (scaled === undefined) { - overflowed = rt.u64Add(overflowed, 1); } else { - last = scaled; - converted = rt.u64Add(converted, 1); + _44 = rt.optionMap(rt.u64CheckedMul(value, to), (scaled3: rt.u64): rt.u64 => { + return rt.u64Div(scaled3, from); + }); + if (_44 !== undefined) { + if (rt.u64Le(_44, rt.u64Of(2305843009213693951n))) { + scaled = _44; + break b1; + } + } + scaled = undefined; } } + if (scaled === undefined) { + overflowed = rt.u64Add(overflowed, 1); + } else { + last = scaled; + converted = rt.u64Add(converted, 1); + } } } @@ -562,9 +541,8 @@ export function rescale(selector: rt.u8, data: Uint8Array, out: rt.ByteVec): voi export function bounded(value: rt.u128): rt.u64 | undefined { if (!rt.u128Le(value, rt.u128Cast(rt.u64Of(2305843009213693951n)))) { return undefined; - } else { - return rt.u64Cast(value); } + return rt.u64Cast(value); } export function decodeGroup(wire: Uint8Array, version: Version.Version, out: rt.ByteVec): rt.Result { @@ -582,9 +560,8 @@ export function decodeGroup(wire: Uint8Array, version: Version.Version, out: rt. putU64(out, group.frameStart); putUsize(out, used); return rt.Ok(undefined); - } else { - return _6; } + return _6; } //# sourceMappingURL=bench.ts.map diff --git a/ts/fixtures/codec/expected/coding/decode.DecodeError.ts b/ts/fixtures/codec/expected/coding/decode.DecodeError.ts index 80fad020f..ffa146198 100644 --- a/ts/fixtures/codec/expected/coding/decode.DecodeError.ts +++ b/ts/fixtures/codec/expected/coding/decode.DecodeError.ts @@ -9,46 +9,62 @@ export function fmt$Display(self: DecodeError, __formatter: rt.Formatter): rt.Re let args4!: rt.Fmt[]; if (self.tag === "Short") { return rt.fmtWriteStr(__formatter, "short buffer"); - } else if (self.tag === "Long") { + } + if (self.tag === "Long") { return rt.fmtWriteStr(__formatter, "long buffer"); - } else if (self.tag === "InvalidString") { + } + if (self.tag === "InvalidString") { return rt.fmtWriteStr(__formatter, "invalid string"); - } else if (self.tag === "InvalidMessage") { + } + if (self.tag === "InvalidMessage") { const arg = ([([self._0] as [rt.u64])[0]] as [rt.u64])[0]; args2 = [(f: rt.Formatter) => rt.u64Display(arg, f)]; return rt.fmtWriteFmt(__formatter, ["invalid message: ", args2[0]]); - } else if (self.tag === "InvalidSubscribeLocation") { + } + if (self.tag === "InvalidSubscribeLocation") { return rt.fmtWriteStr(__formatter, "invalid subscribe location"); - } else if (self.tag === "InvalidValue") { + } + if (self.tag === "InvalidValue") { return rt.fmtWriteStr(__formatter, "invalid value"); - } else if (self.tag === "TooMany") { + } + if (self.tag === "TooMany") { return rt.fmtWriteStr(__formatter, "too many"); - } else if (self.tag === "BoundsExceeded") { + } + if (self.tag === "BoundsExceeded") { return rt.fmtWriteStr(__formatter, "bounds exceeded"); - } else if (self.tag === "ExpectedEnd") { + } + if (self.tag === "ExpectedEnd") { return rt.fmtWriteStr(__formatter, "expected end"); - } else if (self.tag === "MessageTooLarge") { + } + if (self.tag === "MessageTooLarge") { args4 = [(f: rt.Formatter) => rt.usizeDisplay(self.size, f), (f: rt.Formatter) => rt.usizeDisplay(self.max, f)]; return rt.fmtWriteFmt(__formatter, ["message too large: ", args4[0], " bytes exceeds ", args4[1], " byte limit"]); - } else if (self.tag === "ExpectedData") { + } + if (self.tag === "ExpectedData") { return rt.fmtWriteStr(__formatter, "expected data"); - } else if (self.tag === "Duplicate") { + } + if (self.tag === "Duplicate") { return rt.fmtWriteStr(__formatter, "duplicate"); - } else if (self.tag === "Missing") { + } + if (self.tag === "Missing") { return rt.fmtWriteStr(__formatter, "missing"); - } else if (self.tag === "Unsupported") { + } + if (self.tag === "Unsupported") { return rt.fmtWriteStr(__formatter, "unsupported"); - } else if (self.tag === "TrailingBytes") { + } + if (self.tag === "TrailingBytes") { return rt.fmtWriteStr(__formatter, "trailing bytes"); - } else if (self.tag === "Version") { + } + if (self.tag === "Version") { return rt.fmtWriteStr(__formatter, "unsupported version"); - } else if (self.tag === "Session") { + } + if (self.tag === "Session") { return SessionError.fmt$Display(self._0, __formatter); - } else if (self.tag === "MalformedAuthToken") { + } + if (self.tag === "MalformedAuthToken") { return rt.fmtWriteStr(__formatter, "malformed authorization token"); - } else { - return rt.fmtWriteStr(__formatter, "multiple authorization tokens"); } + return rt.fmtWriteStr(__formatter, "multiple authorization tokens"); } export function from$From_FromUtf8Error(source: rt.FromUtf8Error): DecodeError { @@ -69,54 +85,70 @@ export function fmt$Debug(self: DecodeError, f: rt.Formatter): rt.Result rt.fmtFromUtf8ErrorDebug(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _7), _8)); - } else if (self.tag === "InvalidMessage") { + } + if (self.tag === "InvalidMessage") { _11 = "InvalidMessage"; _12 = (f: rt.Formatter) => rt.u64Display(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _11), _12)); - } else if (self.tag === "InvalidSubscribeLocation") { + } + if (self.tag === "InvalidSubscribeLocation") { return rt.fmtWriteStr(f, "InvalidSubscribeLocation"); - } else if (self.tag === "InvalidValue") { + } + if (self.tag === "InvalidValue") { return rt.fmtWriteStr(f, "InvalidValue"); - } else if (self.tag === "TooMany") { + } + if (self.tag === "TooMany") { return rt.fmtWriteStr(f, "TooMany"); - } else if (self.tag === "BoundsExceeded") { + } + if (self.tag === "BoundsExceeded") { return rt.fmtWriteStr(f, "BoundsExceeded"); - } else if (self.tag === "ExpectedEnd") { + } + if (self.tag === "ExpectedEnd") { return rt.fmtWriteStr(f, "ExpectedEnd"); - } else if (self.tag === "MessageTooLarge") { + } + if (self.tag === "MessageTooLarge") { _21 = "MessageTooLarge"; _22 = "size"; _23 = (f: rt.Formatter) => rt.usizeDisplay(self.size, f); _24 = "max"; _25 = (f: rt.Formatter) => rt.usizeDisplay(self.max, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _21), _22, _23), _24, _25)); - } else if (self.tag === "ExpectedData") { + } + if (self.tag === "ExpectedData") { return rt.fmtWriteStr(f, "ExpectedData"); - } else if (self.tag === "Duplicate") { + } + if (self.tag === "Duplicate") { return rt.fmtWriteStr(f, "Duplicate"); - } else if (self.tag === "Missing") { + } + if (self.tag === "Missing") { return rt.fmtWriteStr(f, "Missing"); - } else if (self.tag === "Unsupported") { + } + if (self.tag === "Unsupported") { return rt.fmtWriteStr(f, "Unsupported"); - } else if (self.tag === "TrailingBytes") { + } + if (self.tag === "TrailingBytes") { return rt.fmtWriteStr(f, "TrailingBytes"); - } else if (self.tag === "Version") { + } + if (self.tag === "Version") { return rt.fmtWriteStr(f, "Version"); - } else if (self.tag === "Session") { + } + if (self.tag === "Session") { _34 = "Session"; _35 = (f: rt.Formatter) => SessionError.fmt$Debug(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _34), _35)); - } else if (self.tag === "MalformedAuthToken") { + } + if (self.tag === "MalformedAuthToken") { return rt.fmtWriteStr(f, "MalformedAuthToken"); - } else { - return rt.fmtWriteStr(f, "MultipleAuthTokens"); } + return rt.fmtWriteStr(f, "MultipleAuthTokens"); } /** A decode error. */ @@ -145,9 +177,8 @@ export type DecodeError = export function complete(self: DecodeError): DecodeError { if (self.tag === "Short") { return { tag: "InvalidValue" } as DecodeError; - } else { - return self; } + return self; } export function from$From_BoundsExceeded(_1: BoundsExceeded.BoundsExceeded): DecodeError { diff --git a/ts/fixtures/codec/expected/coding/decode.Decoder.ts b/ts/fixtures/codec/expected/coding/decode.Decoder.ts index a317ff116..ae3a0e2e8 100644 --- a/ts/fixtures/codec/expected/coding/decode.Decoder.ts +++ b/ts/fixtures/codec/expected/coding/decode.Decoder.ts @@ -69,9 +69,8 @@ export function slice(self: Decoder, len: rt.usize): rt.Result { if (_3.ok) { rt.idx(_3.value, 0); return rt.Ok(_3.value[0]); - } else { - return _3; } + return _3; } /** Read a big-endian `u16`. */ @@ -114,9 +111,8 @@ export function u16(self: Decoder): rt.Result { _9 = _2.value[0]; rt.idx(_2.value, 1); return rt.Ok((_9 << 8) | _2.value[1]); - } else { - return _2; } + return _2; } /** Read a byte that must be 0 or 1. */ @@ -128,14 +124,13 @@ export function bool(self: Decoder): rt.Result val = _2.value; if (val === 0) { return rt.Ok(false); - } else if (val === 1) { + } + if (val === 1) { return rt.Ok(true); - } else { - return rt.Err({ tag: "InvalidValue" } as DecodeError.DecodeError); } - } else { - return _2; + return rt.Err({ tag: "InvalidValue" } as DecodeError.DecodeError); } + return _2; } /** Read a varint. */ @@ -166,9 +161,8 @@ export function varintOpt(self: Decoder): rt.Result { self.buf = start; }); - } else { - return _3; } - } else { - return _6; + return _3; } + return _6; } /** Read a varint length, then that many bytes of UTF-8. */ @@ -204,13 +196,11 @@ export function string(self: Decoder): rt.Result { if (self === "BoundsExceeded") { return rt.fmtWriteStr(__formatter, "bounds exceeded"); - } else if (self === "TooLarge") { + } + if (self === "TooLarge") { return rt.fmtWriteStr(__formatter, "too large"); - } else if (self === "Short") { + } + if (self === "Short") { return rt.fmtWriteStr(__formatter, "short buffer"); - } else if (self === "InvalidState") { + } + if (self === "InvalidState") { return rt.fmtWriteStr(__formatter, "invalid state"); - } else if (self === "TooMany") { + } + if (self === "TooMany") { return rt.fmtWriteStr(__formatter, "too many"); - } else if (self === "Version") { + } + if (self === "Version") { return rt.fmtWriteStr(__formatter, "unsupported version"); - } else { - return rt.fmtWriteStr(__formatter, "unsupported"); } + return rt.fmtWriteStr(__formatter, "unsupported"); } export function fmt$Debug(self: EncodeError, f: rt.Formatter): rt.Result { diff --git a/ts/fixtures/codec/expected/coding/encode.Encoder.ts b/ts/fixtures/codec/expected/coding/encode.Encoder.ts index e6acf2c51..8d2b941a4 100644 --- a/ts/fixtures/codec/expected/coding/encode.Encoder.ts +++ b/ts/fixtures/codec/expected/coding/encode.Encoder.ts @@ -51,9 +51,8 @@ export function varint(self: Encoder, v: rt.u64): rt.Result { if (form.tag === "Quic") { return writeQuic(value, out); - } else { - writeLeadingOnes(value, out); - return rt.Ok(undefined); } + writeLeadingOnes(value, out); + return rt.Ok(undefined); } export function writeQuic(value: rt.u64, out: rt.ByteVec): rt.Result { @@ -140,15 +138,14 @@ export function writeQuic(value: rt.u64, out: rt.ByteVec): rt.Result>> 0); - a = _42[0]; - b = _42[1]; - c = _42[2]; - d = _42[3]; - _48 = rt.u32ToBeBytes(lo); - rt.byteVecExtendFromSlice(out, Uint8Array.of(a, b, c, d, _48[0], _48[1], _48[2], _48[3])); } + _42 = rt.u32ToBeBytes((3221225472 | hi) >>> 0); + a = _42[0]; + b = _42[1]; + c = _42[2]; + d = _42[3]; + _48 = rt.u32ToBeBytes(lo); + rt.byteVecExtendFromSlice(out, Uint8Array.of(a, b, c, d, _48[0], _48[1], _48[2], _48[3])); } return rt.Ok(undefined); } @@ -219,9 +216,8 @@ export function writeLeadingOnes(value: rt.u64, out: rt.ByteVec): void { export function read(buf: Uint8Array, form: Form.Form): rt.Result<[rt.u64, Uint8Array], DecodeError.DecodeError> { if (form.tag === "Quic") { return readQuic(buf); - } else { - return readLeadingOnes(buf, form.seven); } + return readLeadingOnes(buf, form.seven); } export function readQuic(buf: Uint8Array): rt.Result<[rt.u64, Uint8Array], DecodeError.DecodeError> { @@ -244,33 +240,26 @@ export function readQuic(buf: Uint8Array): rt.Result<[rt.u64, Uint8Array], Decod val3 = _54.value; const slice = val3[0]; return rt.Ok([fromHalves((((val3[0][0] & 63) << 24) | (val3[0][1] << 16) | (val3[0][2] << 8) | val3[0][3]) >>> 0, rt.u32FromBeBytes(slice.subarray(4, 8))), val3[1]] as [rt.u64, Uint8Array]); - } else { - return _54; - } - } else { - _33 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 4), { tag: "Short" } as DecodeError.DecodeError); - if (_33.ok) { - val2 = _33.value; - return rt.Ok([(((val2[0][0] & 63) << 24) | (val2[0][1] << 16) | (val2[0][2] << 8) | val2[0][3]) >>> 0 as rt.u64, val2[1]] as [rt.u64, Uint8Array]); - } else { - return _33; } + return _54; } - } else { - _14 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 2), { tag: "Short" } as DecodeError.DecodeError); - if (_14.ok) { - val = _14.value; - return rt.Ok([(((val[0][0] & 63) << 8) | val[0][1]) as rt.u64, val[1]] as [rt.u64, Uint8Array]); - } else { - return _14; + _33 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 4), { tag: "Short" } as DecodeError.DecodeError); + if (_33.ok) { + val2 = _33.value; + return rt.Ok([(((val2[0][0] & 63) << 24) | (val2[0][1] << 16) | (val2[0][2] << 8) | val2[0][3]) >>> 0 as rt.u64, val2[1]] as [rt.u64, Uint8Array]); } + return _33; } - } else { - return rt.Ok([first as rt.u64, _5[1]] as [rt.u64, Uint8Array]); + _14 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 2), { tag: "Short" } as DecodeError.DecodeError); + if (_14.ok) { + val = _14.value; + return rt.Ok([(((val[0][0] & 63) << 8) | val[0][1]) as rt.u64, val[1]] as [rt.u64, Uint8Array]); + } + return _14; } - } else { - return rt.Err({ tag: "Short" } as DecodeError.DecodeError); + return rt.Ok([first as rt.u64, _5[1]] as [rt.u64, Uint8Array]); } + return rt.Err({ tag: "Short" } as DecodeError.DecodeError); } export function readLeadingOnes(buf: Uint8Array, seven: boolean): rt.Result<[rt.u64, Uint8Array], DecodeError.DecodeError> { @@ -345,15 +334,14 @@ export function readLeadingOnes(buf: Uint8Array, seven: boolean): rt.Result<[rt. } else if (_9 === 6) { if (!seven) { return rt.Err({ tag: "InvalidValue" } as DecodeError.DecodeError); + } + _101 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 7), { tag: "Short" } as DecodeError.DecodeError); + if (_101.ok) { + val6 = _101.value; + const slice3 = val6[0]; + _8 = [fromHalves(((val6[0][0] & 1) << 16) | (val6[0][1] << 8) | val6[0][2], rt.u32FromBeBytes(slice3.subarray(3, 7))), val6[1]] as [rt.u64, Uint8Array]; } else { - _101 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 7), { tag: "Short" } as DecodeError.DecodeError); - if (_101.ok) { - val6 = _101.value; - const slice3 = val6[0]; - _8 = [fromHalves(((val6[0][0] & 1) << 16) | (val6[0][1] << 8) | val6[0][2], rt.u32FromBeBytes(slice3.subarray(3, 7))), val6[1]] as [rt.u64, Uint8Array]; - } else { - return _101; - } + return _101; } } else if (_9 === 7) { _121 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 8), { tag: "Short" } as DecodeError.DecodeError); @@ -375,9 +363,8 @@ export function readLeadingOnes(buf: Uint8Array, seven: boolean): rt.Result<[rt. } } return rt.Ok(_8); - } else { - return rt.Err({ tag: "Short" } as DecodeError.DecodeError); } + return rt.Err({ tag: "Short" } as DecodeError.DecodeError); } /** diff --git a/ts/fixtures/codec/expected/coding/version.Version.ts b/ts/fixtures/codec/expected/coding/version.Version.ts index 092e3355a..1efd090c7 100644 --- a/ts/fixtures/codec/expected/coding/version.Version.ts +++ b/ts/fixtures/codec/expected/coding/version.Version.ts @@ -19,9 +19,8 @@ export function decode$Decode_Form(r: Decoder.Decoder, _2: Form.Form): rt.Result _4 = Decoder.varint(r); if (_4.ok) { return rt.Ok({ _0: _4.value }); - } else { - return _4; } + return _4; } /** Encode the value to the given encoder, which may hold partial output on error. */ @@ -30,9 +29,8 @@ export function encode$Encode_Form(self: Version, w: Encoder.Encoder, _3: Form.F _4 = Encoder.varint(w, self._0); if (_4.ok) { return rt.Ok(undefined); - } else { - return _4; } + return _4; } /** Encode the value to the given encoder, which may hold partial output on error. */ @@ -41,9 +39,8 @@ export function encode$Encode_Version(self: Version, w: Encoder.Encoder, _3: ver _4 = Encoder.varint(w, self._0); if (_4.ok) { return rt.Ok(undefined); - } else { - return _4; } + return _4; } //# sourceMappingURL=version.Version.ts.map diff --git a/ts/fixtures/codec/expected/coding/version.Versions.ts b/ts/fixtures/codec/expected/coding/version.Versions.ts index 5b129819d..84bf344f0 100644 --- a/ts/fixtures/codec/expected/coding/version.Versions.ts +++ b/ts/fixtures/codec/expected/coding/version.Versions.ts @@ -25,9 +25,8 @@ export function decodeSlice$Decode_Form(buf: Uint8Array, version: Form.Form): rt _13 = value; _0 = rt.Ok([_13, rt.usizeSub(buf.length, Decoder.remaining(r))] as [Versions, rt.usize]); return _0; - } else { - return _6; } + return _6; } /** A list of versions in preferred order. */ @@ -52,18 +51,16 @@ export function decode$Decode_Form(r: Decoder.Decoder, version: Form.Form): rt.R _12 = iter.next(); if (_12 === rt.DONE) { return rt.Ok({ _0: vs }); + } + _15 = Version.decode$Decode_Form(r, version); + if (_15.ok) { + vs.push(_15.value); } else { - _15 = Version.decode$Decode_Form(r, version); - if (_15.ok) { - vs.push(_15.value); - } else { - return _15; - } + return _15; } } - } else { - return _3; } + return _3; } /** Encode the version list. */ @@ -81,16 +78,14 @@ export function encode$Encode_Form(self: Versions, w: Encoder.Encoder, version: _14 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_14 === rt.DONE) { return rt.Ok(undefined); - } else { - _18 = Version.encode$Encode_Form(_14, w, version); - if (!_18.ok) { - return _18; - } + } + _18 = Version.encode$Encode_Form(_14, w, version); + if (!_18.ok) { + return _18; } } - } else { - return _4; } + return _4; } /** Encode the version list. */ @@ -108,16 +103,14 @@ export function encode$Encode_Version(self: Versions, w: Encoder.Encoder, versio _14 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_14 === rt.DONE) { return rt.Ok(undefined); - } else { - _18 = Version.encode$Encode_Version(_14, w, version); - if (!_18.ok) { - return _18; - } + } + _18 = Version.encode$Encode_Version(_14, w, version); + if (!_18.ok) { + return _18; } } - } else { - return _4; } + return _4; } export function from$From_Versions(vs: Version.Version[]): Versions { diff --git a/ts/fixtures/codec/expected/harness.ts b/ts/fixtures/codec/expected/harness.ts index ef3e0a9d2..58198ae52 100644 --- a/ts/fixtures/codec/expected/harness.ts +++ b/ts/fixtures/codec/expected/harness.ts @@ -44,9 +44,8 @@ export function run(input: Uint8Array): rt.ByteVec { errors(_5[1], out); } return out; - } else { - return out; } + return out; } export function form(selector: rt.u8): Form.Form { @@ -54,11 +53,11 @@ export function form(selector: rt.u8): Form.Form { _2 = rt.u8Rem(selector, 3); if (_2 === 0) { return { tag: "Quic" } as Form.Form; - } else if (_2 === 1) { + } + if (_2 === 1) { return { tag: "LeadingOnes", seven: false } as Form.Form; - } else { - return { tag: "LeadingOnes", seven: true } as Form.Form; } + return { tag: "LeadingOnes", seven: true } as Form.Form; } export function liteVersion(selector: rt.u8): Version.Version { @@ -66,19 +65,23 @@ export function liteVersion(selector: rt.u8): Version.Version { _2 = rt.u8Rem(selector, 7); if (_2 === 0) { return "Lite01" as Version.Version; - } else if (_2 === 1) { + } + if (_2 === 1) { return "Lite02" as Version.Version; - } else if (_2 === 2) { + } + if (_2 === 2) { return "Lite03" as Version.Version; - } else if (_2 === 3) { + } + if (_2 === 3) { return "Lite04" as Version.Version; - } else if (_2 === 4) { + } + if (_2 === 4) { return "Lite05" as Version.Version; - } else if (_2 === 5) { + } + if (_2 === 5) { return "Lite06" as Version.Version; - } else { - return "Lite07" as Version.Version; } + return "Lite07" as Version.Version; } export function putU64(out: rt.ByteVec, value: rt.u64): void { @@ -237,11 +240,10 @@ export function decodeScript(data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, 0); putUsize(out, Decoder.remaining(r)); continue l1; - } else { - err = _26.error; - decodeFailed(out, err); - putUsize(out, Decoder.need(r)); } + err = _26.error; + decodeFailed(out, err); + putUsize(out, Decoder.need(r)); } rt.byteVecPush(out, Decoder.isEmpty(r) ? 1 : 0); break b0; @@ -419,74 +421,73 @@ export function encodeScript(data: Uint8Array, out: rt.ByteVec): void { break b0; } } - } else { - step = _24; - _30 = takeU64(values); - value = _30[0]; - values = _30[1]; - _33 = rt.u8Rem(step, 10); - if (_33 === 0) { - Encoder.u8(w, rt.u64Low(value) & 0xff); - result = rt.Ok(undefined); - } else if (_33 === 1) { - Encoder.u16(w, rt.u64Low(value) & 0xffff); - result = rt.Ok(undefined); - } else if (_33 === 2) { - Encoder.bool(w, rt.u64And(value, 1) === 1); - result = rt.Ok(undefined); - } else if (_33 === 3) { - result = Encoder.varint(w, value); - } else if (_33 === 4) { - _48 = rt.u64Rem(value, 3); - if (_48 === 0) { - _47 = undefined; - } else if (_48 === 1) { - _47 = value; - } else { - _47 = rt.u64Of(18446744073709551615n); - } - result = Encoder.varintOpt(w, _47); - } else if (_33 === 5) { - const part = rt.u8Rem(rt.u8Div(step, 10), 9) as rt.usize; - _53 = rt.u64ToBeBytes(value); - _51 = rt.sliceRange(_53, 0, part); - result = Encoder.bytes(w, _51); - } else if (_33 === 6) { - _60 = rt.stringFromUtf8(rt.sliceToByteVec(rt.u64ToBeBytes(value))); - if (_60.ok) { - s = _60.value; - _68 = s; - result = Encoder.string(w, _68); - } else { - result = Encoder.string(w, "not utf-8"); - } - } else if (_33 === 7) { - if (rt.u64Rem(value, 2) === 0) { - _74 = Encoder.prefixVarint(w); - } else { - _74 = Encoder.prefixU16(w); - } - prefixes.push(_74); - result = rt.Ok(undefined); - } else if (_33 === 8) { - _79 = prefixes.pop(); - if (_79 === undefined) { - result = rt.Ok(undefined); - } else { - prefix = _79; - putUsize(out, Encoder.since(w, prefix)); - result = Encoder.fill(w, prefix); - } + } + step = _24; + _30 = takeU64(values); + value = _30[0]; + values = _30[1]; + _33 = rt.u8Rem(step, 10); + if (_33 === 0) { + Encoder.u8(w, rt.u64Low(value) & 0xff); + result = rt.Ok(undefined); + } else if (_33 === 1) { + Encoder.u16(w, rt.u64Low(value) & 0xffff); + result = rt.Ok(undefined); + } else if (_33 === 2) { + Encoder.bool(w, rt.u64And(value, 1) === 1); + result = rt.Ok(undefined); + } else if (_33 === 3) { + result = Encoder.varint(w, value); + } else if (_33 === 4) { + _48 = rt.u64Rem(value, 3); + if (_48 === 0) { + _47 = undefined; + } else if (_48 === 1) { + _47 = value; } else { - _88 = prefixes.pop(); - if (_88 !== undefined) { - Encoder.discard(w, _88); - } + _47 = rt.u64Of(18446744073709551615n); + } + result = Encoder.varintOpt(w, _47); + } else if (_33 === 5) { + const part = rt.u8Rem(rt.u8Div(step, 10), 9) as rt.usize; + _53 = rt.u64ToBeBytes(value); + _51 = rt.sliceRange(_53, 0, part); + result = Encoder.bytes(w, _51); + } else if (_33 === 6) { + _60 = rt.stringFromUtf8(rt.sliceToByteVec(rt.u64ToBeBytes(value))); + if (_60.ok) { + s = _60.value; + _68 = s; + result = Encoder.string(w, _68); + } else { + result = Encoder.string(w, "not utf-8"); + } + } else if (_33 === 7) { + if (rt.u64Rem(value, 2) === 0) { + _74 = Encoder.prefixVarint(w); + } else { + _74 = Encoder.prefixU16(w); + } + prefixes.push(_74); + result = rt.Ok(undefined); + } else if (_33 === 8) { + _79 = prefixes.pop(); + if (_79 === undefined) { result = rt.Ok(undefined); + } else { + prefix = _79; + putUsize(out, Encoder.since(w, prefix)); + result = Encoder.fill(w, prefix); } - if (!result.ok) { - encodeFailed(out, result.error); + } else { + _88 = prefixes.pop(); + if (_88 !== undefined) { + Encoder.discard(w, _88); } + result = rt.Ok(undefined); + } + if (!result.ok) { + encodeFailed(out, result.error); } } } @@ -516,13 +517,12 @@ export function sizes(data: Uint8Array, out: rt.ByteVec): void { while (true) { if (!((_9 = iterStart++) < iterEnd)) { return; + } + _13 = size(value, form(_9)); + if (_13.ok) { + putUsize(out, _13.value); } else { - _13 = size(value, form(_9)); - if (_13.ok) { - putUsize(out, _13.value); - } else { - rt.byteVecPush(out, 255); - } + rt.byteVecPush(out, 255); } } } diff --git a/ts/fixtures/codec/expected/lib.SessionError.ts b/ts/fixtures/codec/expected/lib.SessionError.ts index be9bbe845..9e4781205 100644 --- a/ts/fixtures/codec/expected/lib.SessionError.ts +++ b/ts/fixtures/codec/expected/lib.SessionError.ts @@ -18,11 +18,10 @@ export function fmt$Debug(self: SessionError, f: rt.Formatter): rt.Result rt.u16Display(self._0, f); - return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _6), _7)); } + _6 = "App"; + _7 = (f: rt.Formatter) => rt.u16Display(self._0, f); + return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _6), _7)); } /** moq-net's session error, trimmed to a few variants: the codec only carries it. */ diff --git a/ts/fixtures/codec/expected/lite/group.Group.ts b/ts/fixtures/codec/expected/lite/group.Group.ts index 7efaf484d..f3f365834 100644 --- a/ts/fixtures/codec/expected/lite/group.Group.ts +++ b/ts/fixtures/codec/expected/lite/group.Group.ts @@ -26,9 +26,8 @@ export function decodeSlice$Decode_Version(buf: Uint8Array, version: Version.Ver _13 = value; _0 = rt.Ok([_13, rt.usizeSub(buf.length, Decoder.remaining(r))] as [Group, rt.usize]); return _0; - } else { - return _6; } + return _6; } export interface Group { @@ -62,12 +61,10 @@ export function decodeMsg$Message(r: Decoder.Decoder, version: Version.Version): } } return rt.Ok({ subscribe, sequence, frameStart }); - } else { - return _8; } - } else { - return _3; + return _8; } + return _3; } /** Encode this message body (without size prefix). */ @@ -90,12 +87,10 @@ export function encodeMsg$Message(self: Group, w: Encoder.Encoder, version: Vers } } return rt.Ok(undefined); - } else { - return _9; } - } else { - return _4; + return _9; } + return _4; } /** Encode the value to the given encoder, which may hold partial output on error. */ @@ -111,16 +106,13 @@ export function encode$Encode_Version(self: Group, w: Encoder.Encoder, version: if (_49.ok) { w.control = undefined; return rt.Ok(undefined); - } else { - return _49; } - } else { - Encoder.discard(w, prefix); - return rt.Err("TooLarge" as EncodeError.EncodeError); + return _49; } - } else { - return _39; + Encoder.discard(w, prefix); + return rt.Err("TooLarge" as EncodeError.EncodeError); } + return _39; } /** Decode the value from the front of the decoder. */ diff --git a/ts/fixtures/codec/expected/lite/message.ts b/ts/fixtures/codec/expected/lite/message.ts index 3dd51d249..22dffae67 100644 --- a/ts/fixtures/codec/expected/lite/message.ts +++ b/ts/fixtures/codec/expected/lite/message.ts @@ -22,9 +22,8 @@ export function decodeSize(r: Decoder.Decoder, max: rt.usize): rt.Result => { if (!Decoder.isEmpty(body)) { return rt.Err({ tag: "Long" } as DecodeError.DecodeError); - } else { - return rt.Ok(msg); } + return rt.Ok(msg); }); if (result.ok) { r.control = undefined; } return result; - } else { - return _9; } - } else { - return _3; + return _9; } + return _3; } /** @@ -77,20 +73,17 @@ export function decodeWith$Probe_decode_closure0(r: Decoder.Decoder, decode: (a0 result = rt.resultAndThen(rt.resultMapErr(decode(body), DecodeError.complete), (msg: Probe.Probe): rt.Result => { if (!Decoder.isEmpty(body)) { return rt.Err({ tag: "Long" } as DecodeError.DecodeError); - } else { - return rt.Ok(msg); } + return rt.Ok(msg); }); if (result.ok) { r.control = "Probe" as Control.Control; } return result; - } else { - return _9; } - } else { - return _3; + return _9; } + return _3; } //# sourceMappingURL=message.ts.map diff --git a/ts/fixtures/codec/expected/lite/probe.Probe.ts b/ts/fixtures/codec/expected/lite/probe.Probe.ts index 304a8da52..40eaa484b 100644 --- a/ts/fixtures/codec/expected/lite/probe.Probe.ts +++ b/ts/fixtures/codec/expected/lite/probe.Probe.ts @@ -27,9 +27,8 @@ export function decodeSlice$Decode_Version(buf: Uint8Array, version: Version.Ver _13 = value; _0 = rt.Ok([_13, rt.usizeSub(buf.length, Decoder.remaining(r))] as [Probe, rt.usize]); return _0; - } else { - return _6; } + return _6; } /** Encode the value to the given encoder, which may hold partial output on error. */ @@ -45,16 +44,13 @@ export function encode$Encode_Version(self: Probe, w: Encoder.Encoder, version: if (_49.ok) { w.control = "Probe" as Control.Control; return rt.Ok(undefined); - } else { - return _49; } - } else { - Encoder.discard(w, prefix); - return rt.Err("TooLarge" as EncodeError.EncodeError); + return _49; } - } else { - return _39; + Encoder.discard(w, prefix); + return rt.Err("TooLarge" as EncodeError.EncodeError); } + return _39; } /** Decode the value from the front of the decoder. */ @@ -85,35 +81,33 @@ export function decodeMsg$Message(r: Decoder.Decoder, version: Version.Version): let val2!: rt.u64; if (version === "Lite01" || version === "Lite02") { return rt.Err({ tag: "Version" } as DecodeError.DecodeError); - } else { - _6 = Decoder.varint(r); - if (_6.ok) { - val = _6.value; - if (val === 0) { - bitrate = undefined; - } else { - bitrate = val; - } - if (!Version.hasProbeRtt(version)) { - rtt = undefined; - } else { - _13 = Decoder.varint(r); - if (_13.ok) { - val2 = _13.value; - if (val2 === 0) { - rtt = undefined; - } else { - rtt = val2; - } + } + _6 = Decoder.varint(r); + if (_6.ok) { + val = _6.value; + if (val === 0) { + bitrate = undefined; + } else { + bitrate = val; + } + if (!Version.hasProbeRtt(version)) { + rtt = undefined; + } else { + _13 = Decoder.varint(r); + if (_13.ok) { + val2 = _13.value; + if (val2 === 0) { + rtt = undefined; } else { - return _13; + rtt = val2; } + } else { + return _13; } - return rt.Ok({ bitrate, rtt }); - } else { - return _6; } + return rt.Ok({ bitrate, rtt }); } + return _6; } /** Encode this message body (without size prefix). */ @@ -122,24 +116,22 @@ export function encodeMsg$Message(self: Probe, w: Encoder.Encoder, version: Vers let _17!: rt.Result; if (version === "Lite01" || version === "Lite02") { return rt.Err("Version" as EncodeError.EncodeError); - } else { - _9 = Encoder.varint(w, rt.optionUnwrapOr(rt.optionMap(self.bitrate, (v: rt.u64): rt.u64 => { - return rt.u64Max(v, 1); - }), 0)); - if (_9.ok) { - if (Version.hasProbeRtt(version)) { - _17 = Encoder.varint(w, rt.optionUnwrapOr(rt.optionMap(self.rtt, (v2: rt.u64): rt.u64 => { - return rt.u64Max(v2, 1); - }), 0)); - if (!_17.ok) { - return _17; - } + } + _9 = Encoder.varint(w, rt.optionUnwrapOr(rt.optionMap(self.bitrate, (v: rt.u64): rt.u64 => { + return rt.u64Max(v, 1); + }), 0)); + if (_9.ok) { + if (Version.hasProbeRtt(version)) { + _17 = Encoder.varint(w, rt.optionUnwrapOr(rt.optionMap(self.rtt, (v2: rt.u64): rt.u64 => { + return rt.u64Max(v2, 1); + }), 0)); + if (!_17.ok) { + return _17; } - return rt.Ok(undefined); - } else { - return _9; } + return rt.Ok(undefined); } + return _9; } //# sourceMappingURL=probe.Probe.ts.map diff --git a/ts/fixtures/lang/expected/collections.Pair.ts b/ts/fixtures/lang/expected/collections.Pair.ts index 1cdfb7c1e..000ac8d7d 100644 --- a/ts/fixtures/lang/expected/collections.Pair.ts +++ b/ts/fixtures/lang/expected/collections.Pair.ts @@ -5,9 +5,8 @@ import * as rt from "./rt.ts"; export function eq$PartialEq(self: Pair, other: Pair): boolean { if (!(self.a === other.a)) { return false; - } else { - return self.b === other.b; } + return self.b === other.b; } export function hash$Hash_DefaultHasher(self: Pair, state: rt.Hasher): void { @@ -20,9 +19,8 @@ export function cmp$Ord(self: Pair, other: Pair): rt.Ordering { cmp = rt.cmp(self.a, other.a); if (cmp === 0) { return rt.cmp(self.b, other.b); - } else { - return cmp; } + return cmp; } export interface Pair { diff --git a/ts/fixtures/lang/expected/collections.Rank.ts b/ts/fixtures/lang/expected/collections.Rank.ts index 9291638f2..3c4194dfd 100644 --- a/ts/fixtures/lang/expected/collections.Rank.ts +++ b/ts/fixtures/lang/expected/collections.Rank.ts @@ -5,22 +5,20 @@ import * as rt from "./rt.ts"; export function eq$PartialEq(self: Rank, other: Rank): boolean { if (!({ Low: 0, Mid: 1, High: 2 }[self.tag] === { Low: 0, Mid: 1, High: 2 }[other.tag])) { return false; - } else { - if (self.tag === "Mid") { - if (other.tag === "Mid") { - return self._0 === other._0; - } - } else if (self.tag === "High") { - if (other.tag === "High") { - if (!((self.x === other.x))) { - return false; - } else { - return self.y === other.y; - } + } + if (self.tag === "Mid") { + if (other.tag === "Mid") { + return self._0 === other._0; + } + } else if (self.tag === "High") { + if (other.tag === "High") { + if (!((self.x === other.x))) { + return false; } + return self.y === other.y; } - return true; } + return true; } export function hash$Hash_DefaultHasher(self: Rank, state: rt.Hasher): void { @@ -44,9 +42,8 @@ export function cmp$Ord(self: Rank, other: Rank): rt.Ordering { cmp = rt.cmp(self.x, other.x); if (cmp === 0) { return rt.cmp(self.y, other.y); - } else { - return cmp; } + return cmp; } } return rt.cmp({ Low: 0, Mid: 1, High: 2 }[self.tag], { Low: 0, Mid: 1, High: 2 }[other.tag]); diff --git a/ts/fixtures/lang/expected/collections.ts b/ts/fixtures/lang/expected/collections.ts index d19e58acc..4f9b33f61 100644 --- a/ts/fixtures/lang/expected/collections.ts +++ b/ts/fixtures/lang/expected/collections.ts @@ -15,11 +15,11 @@ export function wide(b: rt.u8): rt.u64 { _2 = rt.u8Rem(b, 3); if (_2 === 0) { return b as rt.u64; - } else if (_2 === 1) { + } + if (_2 === 1) { return rt.u64Shl(b as rt.u64, 50); - } else { - return rt.u64Sub(rt.u64Of(18446744073709551615n), b as rt.u64); } + return rt.u64Sub(rt.u64Of(18446744073709551615n), b as rt.u64); } export function rank(b: rt.u8, c: rt.u8): Rank.Rank { @@ -27,11 +27,11 @@ export function rank(b: rt.u8, c: rt.u8): Rank.Rank { _3 = rt.u8Rem(b, 3); if (_3 === 0) { return { tag: "Low" } as Rank.Rank; - } else if (_3 === 1) { + } + if (_3 === 1) { return { tag: "Mid", _0: rt.u8Rem(c, 4) } as Rank.Rank; - } else { - return { tag: "High", x: rt.u8Rem(c, 2), y: rt.u8Rem(c, 3) } as Rank.Rank; } + return { tag: "High", x: rt.u8Rem(c, 2), y: rt.u8Rem(c, 3) } as Rank.Rank; } export function rankByte(r: Rank.Rank): rt.u8 { @@ -39,13 +39,13 @@ export function rankByte(r: Rank.Rank): rt.u8 { let y!: rt.u8; if (r.tag === "Low") { return 0; - } else if (r.tag === "Mid") { + } + if (r.tag === "Mid") { return 16 | r._0; - } else { - x = r.x; - y = r.y; - return 32 | ((x << 2) & 0xff) | y; } + x = r.x; + y = r.y; + return 32 | ((x << 2) & 0xff) | y; } /** A `HashMap` by each kind of key, through a script of inserts, lookups, and removals. */ @@ -215,37 +215,36 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.hashClear(map); rt.byteVecPush(out, rt.hashLen(map) & 0xff); break b0; - } else { - rt.byteVecPush(out, _73[0]); - rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(_73[1])); } + rt.byteVecPush(out, _73[0]); + rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(_73[1])); } + } + i = _13; + rt.idx(data, i); + _19 = [rt.u8Rem(data[i], 16), rt.optionUnwrapOr(rt.sliceGet(data, rt.usizeAdd(i, 1)), 0) as rt.u16] as [rt.u8, rt.u16]; + k = _19[0]; + v = _19[1]; + _31 = rt.u16Rem(v, 5); + if (_31 === 0) { + rt.byteVecPush(out, rt.optionMapOr(rt.hashRemove(map, k), 238, (old2: rt.u16): rt.u8 => { + return old2 & 0xff; + })); + } else if (_31 === 1) { + rt.byteVecPush(out, rt.hashContains(map, k) ? 1 : 0); + } else if (_31 === 2) { + rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(map, k), 221, (v4: rt.u16): rt.u8 => { + return v4 & 0xff; + })); } else { - i = _13; - rt.idx(data, i); - _19 = [rt.u8Rem(data[i], 16), rt.optionUnwrapOr(rt.sliceGet(data, rt.usizeAdd(i, 1)), 0) as rt.u16] as [rt.u8, rt.u16]; - k = _19[0]; - v = _19[1]; - _31 = rt.u16Rem(v, 5); - if (_31 === 0) { - rt.byteVecPush(out, rt.optionMapOr(rt.hashRemove(map, k), 238, (old2: rt.u16): rt.u8 => { - return old2 & 0xff; - })); - } else if (_31 === 1) { - rt.byteVecPush(out, rt.hashContains(map, k) ? 1 : 0); - } else if (_31 === 2) { - rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(map, k), 221, (v4: rt.u16): rt.u8 => { - return v4 & 0xff; - })); - } else { - _48 = rt.u16Mul(v, 3); - rt.byteVecPush(out, rt.optionMapOr(rt.hashInsert(map, k, _48), 204, (old: rt.u16): rt.u8 => { - return old & 0xff; - })); - } + _48 = rt.u16Mul(v, 3); + rt.byteVecPush(out, rt.optionMapOr(rt.hashInsert(map, k, _48), 204, (old: rt.u16): rt.u8 => { + return old & 0xff; + })); } } - } else if (_4 === 1) { + } + if (_4 === 1) { map2 = rt.hashNew(rt.hashing(rt.hashInt, rt.u64Eq)) as rt.HashMap; iter3 = rt.iterEnumerate(rt.iterSlice(data)); while (true) { @@ -263,26 +262,25 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, rt.hashIndex(map2, _150)); } break b0; - } else { - rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(_129)); - rt.byteVecPush(out, rt.hashIndex(map2, _129)); } + rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(_129)); + rt.byteVecPush(out, rt.hashIndex(map2, _129)); } + } + i2 = _97[0]; + b = _97[1]; + k2 = wide(rt.u8Rem(b, 12)); + _105 = rt.u8Rem(rt.u8Div(b, 12), 4); + if (_105 === 0) { + rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashRemove(map2, k2), 238)); + } else if (_105 === 1) { + rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashGet(map2, k2), 221)); } else { - i2 = _97[0]; - b = _97[1]; - k2 = wide(rt.u8Rem(b, 12)); - _105 = rt.u8Rem(rt.u8Div(b, 12), 4); - if (_105 === 0) { - rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashRemove(map2, k2), 238)); - } else if (_105 === 1) { - rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashGet(map2, k2), 221)); - } else { - rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashInsert(map2, k2, i2 & 0xff), 204)); - } + rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashInsert(map2, k2, i2 & 0xff), 204)); } } - } else if (_4 === 2) { + } + if (_4 === 2) { map3 = rt.hashNew(rt.hashing(Nibble.hash$Hash_DefaultHasher, Nibble.eq$PartialEq)) as rt.HashMap; pairs = rt.hashNew(rt.hashing(Pair.hash$Hash_DefaultHasher, Pair.eq$PartialEq)) as rt.HashMap; ranks = rt.hashNew(rt.hashing(Rank.hash$Hash_DefaultHasher, Rank.eq$PartialEq)) as rt.HashMap; @@ -385,9 +383,8 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.hashRetain(ranks, (r2: Rank.Rank, t17: Tally.Tally): boolean => { if (!(rt.u16Rem(t17.n, 2) === 0)) { return Rank.eq$PartialEq(r2, { tag: "Low" } as Rank.Rank); - } else { - return true; } + return true; }); _473 = rt.iterMap(rt.hashIter(ranks), (_224: [Rank.Rank, Tally.Tally]): [Rank.Rank, rt.u16] => { return [_224[0], _224[1].n] as [Rank.Rank, rt.u16]; @@ -399,204 +396,188 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { if (_479 === rt.DONE) { rt.byteVecPush(out, rt.hashLen(tuples) & 0xff); break b0; - } else { - rt.byteVecPush(out, rankByte(_479[0])); - rt.byteVecPush(out, _479[1] & 0xff); } + rt.byteVecPush(out, rankByte(_479[0])); + rt.byteVecPush(out, _479[1] & 0xff); } - } else { - k5 = _416; - rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(bytes, k5), 255, (t15: Tally.Tally): rt.u8 => { - return t15.n & 0xff; - })); - rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(extended, k5), 255, (t16: Tally.Tally): rt.u8 => { - return t16.n & 0xff; - })); } + k5 = _416; + rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(bytes, k5), 255, (t15: Tally.Tally): rt.u8 => { + return t15.n & 0xff; + })); + rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(extended, k5), 255, (t16: Tally.Tally): rt.u8 => { + return t16.n & 0xff; + })); } - } else { - _409.n = _409.n ^ 17; } + _409.n = _409.n ^ 17; } - } else { - b5 = _380; - _387 = rt.u8Rem(b5, 8); - _389 = b5 as rt.u16; - rt.byteVecPush(out, claim(copy2, _387, _389)); } + b5 = _380; + _387 = rt.u8Rem(b5, 8); + _389 = b5 as rt.u16; + rt.byteVecPush(out, claim(copy2, _387, _389)); } - } else { - k4 = _364; - rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(bytes, k4), 255, (t13: Tally.Tally): rt.u8 => { - return t13.n & 0xff; - })); - rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(copy2, k4), 255, (t14: Tally.Tally): rt.u8 => { - return t14.n & 0xff; - })); } + k4 = _364; + rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(bytes, k4), 255, (t13: Tally.Tally): rt.u8 => { + return t13.n & 0xff; + })); + rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(copy2, k4), 255, (t14: Tally.Tally): rt.u8 => { + return t14.n & 0xff; + })); } - } else { - _356.n = rt.u16Add(_356.n, 1); } + _356.n = rt.u16Add(_356.n, 1); } - } else { - i4 = _286; - _294 = rt.usizeSub(i4, 1); - rt.idx(data, _294); - _293 = data[_294]; - rt.idx(data, i4); - _292 = [_293, data[i4]] as [rt.u8, rt.u8]; - a2 = _293; - b4 = _292[1]; - _305 = rank(b4, a2); - t4 = rt.entryOrInsertWith(rt.entryAndModify(rt.entry(ranks, _305), (t9: Tally.Tally): void => { - t9.n = t9.n ^ 3; - }), (): Tally.Tally => { - return { n: b4 as rt.u16 }; - }); - t4.n = rt.u16WrappingAdd(t4.n, t4.n); - rt.idx(data, i4); - _313 = rank(data[i4], 0); - e = rt.entry(ranks, _313); - rt.byteVecPush(out, rankByte(rt.entryKey(e))); - rt.byteVecPush(out, rt.entryOrInsertWith(e, (k9: Rank.Rank): Tally.Tally => { - return { n: rankByte(k9) as rt.u16 }; - }).n & 0xff); } + i4 = _286; + _294 = rt.usizeSub(i4, 1); + rt.idx(data, _294); + _293 = data[_294]; + rt.idx(data, i4); + _292 = [_293, data[i4]] as [rt.u8, rt.u8]; + a2 = _293; + b4 = _292[1]; + _305 = rank(b4, a2); + t4 = rt.entryOrInsertWith(rt.entryAndModify(rt.entry(ranks, _305), (t9: Tally.Tally): void => { + t9.n = t9.n ^ 3; + }), (): Tally.Tally => { + return { n: b4 as rt.u16 }; + }); + t4.n = rt.u16WrappingAdd(t4.n, t4.n); + rt.idx(data, i4); + _313 = rank(data[i4], 0); + e = rt.entry(ranks, _313); + rt.byteVecPush(out, rankByte(rt.entryKey(e))); + rt.byteVecPush(out, rt.entryOrInsertWith(e, (k9: Rank.Rank): Tally.Tally => { + return { n: rankByte(k9) as rt.u16 }; + }).n & 0xff); } - } else { - p = _269[0]; - t3 = _269[1]; - rt.byteVecPush(out, p.a); - rt.byteVecPush(out, p.b & 0xff); - rt.byteVecPush(out, t3.n & 0xff); } + p = _269[0]; + t3 = _269[1]; + rt.byteVecPush(out, p.a); + rt.byteVecPush(out, p.b & 0xff); + rt.byteVecPush(out, t3.n & 0xff); } - } else { - k3 = _230[0]; - v2 = _230[1]; - rt.byteVecPush(out, k3); - rt.byteVecPush(out, v2); } + k3 = _230[0]; + v2 = _230[1]; + rt.byteVecPush(out, k3); + rt.byteVecPush(out, v2); } + } + i3 = _161; + _169 = rt.usizeSub(i3, 1); + rt.idx(data, _169); + _168 = data[_169]; + rt.idx(data, i3); + _167 = [_168, data[i3]] as [rt.u8, rt.u8]; + a = _168; + b3 = _167[1]; + rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashInsert(map3, { _0: a }, b3), 204)); + pair = { a: rt.u8Rem(a, 4), b: rt.u16Rem(b3 as rt.u16, 3) }; + t = rt.entryOrInsertWith(rt.entry(pairs, pair), Tally.default$Default); + t.n = rt.u16Add(t.n, 1); + r = rank(a, b3); + _192 = rt.hashGet(ranks, r); + if (_192 !== undefined) { + _192.n = rt.u16Add(_192.n, 1); } else { - i3 = _161; - _169 = rt.usizeSub(i3, 1); - rt.idx(data, _169); - _168 = data[_169]; - rt.idx(data, i3); - _167 = [_168, data[i3]] as [rt.u8, rt.u8]; - a = _168; - b3 = _167[1]; - rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashInsert(map3, { _0: a }, b3), 204)); - pair = { a: rt.u8Rem(a, 4), b: rt.u16Rem(b3 as rt.u16, 3) }; - t = rt.entryOrInsertWith(rt.entry(pairs, pair), Tally.default$Default); - t.n = rt.u16Add(t.n, 1); - r = rank(a, b3); - _192 = rt.hashGet(ranks, r); - if (_192 !== undefined) { - _192.n = rt.u16Add(_192.n, 1); - } else { - rt.hashInsert(ranks, r, { n: i3 & 0xffff }); - } - _203 = rt.u8Rem(a, 3); - _207 = rt.usizeRem(b3 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); - if (!(_207 < 8)) { - rt.panic("index out of bounds: the len is " + 8 + " but the index is " + _207); - } - t2 = [_203, ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_207]] as [rt.u8, string]; - rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashRemove(tuples, t2), 187)); - if (rt.u8Rem(a, 2) === 0) { - rt.hashInsert(tuples, t2, a); - } + rt.hashInsert(ranks, r, { n: i3 & 0xffff }); + } + _203 = rt.u8Rem(a, 3); + _207 = rt.usizeRem(b3 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); + if (!(_207 < 8)) { + rt.panic("index out of bounds: the len is " + 8 + " but the index is " + _207); + } + t2 = [_203, ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_207]] as [rt.u8, string]; + rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashRemove(tuples, t2), 187)); + if (rt.u8Rem(a, 2) === 0) { + rt.hashInsert(tuples, t2, a); } } - } else { - words = rt.hashNew() as rt.HashMap; - iterS2 = data; - iterI2 = 0; - while (true) { - _496 = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; - if (_496 === rt.DONE) { - lens = rt.btreeNew(rt.cmpStr) as rt.BTreeMap; - iter16 = rt.hashIter(words); - while (true) { - _517 = iter16.next(); - if (_517 === rt.DONE) { - iter17 = rt.btreeIter(lens); - while (true) { - _529 = iter17.next(); - if (_529 === rt.DONE) { - rt.byteVecPush(out, rt.iterSum(rt.iterMap(rt.hashDrain(words), (_2: [string, rt.ByteVec]): rt.usize => { - let v3!: rt.ByteVec; - v3 = _2[1]; - return v3.length; - }), rt.usizeAdd, 0) & 0xff); - rt.byteVecPush(out, rt.hashLen(words) === 0 ? 1 : 0); - clashes = rt.hashNew(rt.hashing(Clash.hash$Hash_DefaultHasher, Clash.eq$PartialEq)) as rt.HashMap; - iter18 = rt.iterEnumerate(rt.iterSlice(data)); - while (true) { - _555 = iter18.next(); - if (_555 === rt.DONE) { - rt.hashRetain(clashes, (k7: Clash.Clash, t8: Tally.Tally): boolean => { - if (!(rt.u8Rem(k7._0, 3) !== 0)) { - return rt.u16Rem(t8.n, 2) === 0; - } else { - return true; - } - }); - _583 = rt.iterMap(rt.hashKeys(clashes), (k8: Clash.Clash): rt.u8 => { - return k8._0; - }); - kept = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _583, true); - rt.iterExtendBytes(out, rt.btreeKeys(kept)); - copy3 = rt.hashClone(clashes, rt.copy, rt.copy); - rt.byteVecPush(out, rt.hashLen(copy3) & 0xff); - rt.byteVecPush(out, rt.hashContains(copy3, { _0: 1 }) ? 1 : 0); - break b0; - } else { - i5 = _555[0]; - b7 = _555[1]; - k6 = { _0: rt.u8Rem(b7, 8) }; - _563 = rt.u8Rem(rt.u8Div(b7, 8), 4); - if (_563 === 0) { - rt.byteVecPush(out, rt.optionMapOr(rt.hashRemove(clashes, k6), 238, (t7: Tally.Tally): rt.u8 => { - return t7.n & 0xff; - })); - } else if (_563 === 1) { - rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(clashes, k6), 221, (t6: Tally.Tally): rt.u8 => { - return t6.n & 0xff; - })); - } else { - rt.byteVecPush(out, rt.optionMapOr(rt.hashInsert(clashes, k6, { n: i5 & 0xffff }), 204, (t5: Tally.Tally): rt.u8 => { - return t5.n & 0xff; - })); + } + words = rt.hashNew() as rt.HashMap; + iterS2 = data; + iterI2 = 0; + while (true) { + _496 = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; + if (_496 === rt.DONE) { + lens = rt.btreeNew(rt.cmpStr) as rt.BTreeMap; + iter16 = rt.hashIter(words); + while (true) { + _517 = iter16.next(); + if (_517 === rt.DONE) { + iter17 = rt.btreeIter(lens); + while (true) { + _529 = iter17.next(); + if (_529 === rt.DONE) { + rt.byteVecPush(out, rt.iterSum(rt.iterMap(rt.hashDrain(words), (_2: [string, rt.ByteVec]): rt.usize => { + let v3!: rt.ByteVec; + v3 = _2[1]; + return v3.length; + }), rt.usizeAdd, 0) & 0xff); + rt.byteVecPush(out, rt.hashLen(words) === 0 ? 1 : 0); + clashes = rt.hashNew(rt.hashing(Clash.hash$Hash_DefaultHasher, Clash.eq$PartialEq)) as rt.HashMap; + iter18 = rt.iterEnumerate(rt.iterSlice(data)); + while (true) { + _555 = iter18.next(); + if (_555 === rt.DONE) { + rt.hashRetain(clashes, (k7: Clash.Clash, t8: Tally.Tally): boolean => { + if (!(rt.u8Rem(k7._0, 3) !== 0)) { + return rt.u16Rem(t8.n, 2) === 0; } - } + return true; + }); + _583 = rt.iterMap(rt.hashKeys(clashes), (k8: Clash.Clash): rt.u8 => { + return k8._0; + }); + kept = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _583, true); + rt.iterExtendBytes(out, rt.btreeKeys(kept)); + copy3 = rt.hashClone(clashes, rt.copy, rt.copy); + rt.byteVecPush(out, rt.hashLen(copy3) & 0xff); + rt.byteVecPush(out, rt.hashContains(copy3, { _0: 1 }) ? 1 : 0); + break b0; + } + i5 = _555[0]; + b7 = _555[1]; + k6 = { _0: rt.u8Rem(b7, 8) }; + _563 = rt.u8Rem(rt.u8Div(b7, 8), 4); + if (_563 === 0) { + rt.byteVecPush(out, rt.optionMapOr(rt.hashRemove(clashes, k6), 238, (t7: Tally.Tally): rt.u8 => { + return t7.n & 0xff; + })); + } else if (_563 === 1) { + rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(clashes, k6), 221, (t6: Tally.Tally): rt.u8 => { + return t6.n & 0xff; + })); + } else { + rt.byteVecPush(out, rt.optionMapOr(rt.hashInsert(clashes, k6, { n: i5 & 0xffff }), 204, (t5: Tally.Tally): rt.u8 => { + return t5.n & 0xff; + })); } - } else { - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_529[0])); - rt.byteVecPush(out, _529[1] & 0xff); } } - } else { - _524 = _517[0]; - _525 = _517[1].length; - rt.btreeInsert(lens, _524, _525); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_529[0])); + rt.byteVecPush(out, _529[1] & 0xff); } } - } else { - b6 = _496; - _502 = rt.usizeRem(b6 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); - if (!(_502 < 8)) { - rt.panic("index out of bounds: the len is " + 8 + " but the index is " + _502); - } - word = ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_502]; - rt.byteVecPush(rt.entryOrInsertWith(rt.entry(words, word), (): rt.ByteVec => { - return new rt.ByteVec(); - }), b6); + _524 = _517[0]; + _525 = _517[1].length; + rt.btreeInsert(lens, _524, _525); } } + b6 = _496; + _502 = rt.usizeRem(b6 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); + if (!(_502 < 8)) { + rt.panic("index out of bounds: the len is " + 8 + " but the index is " + _502); + } + word = ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_502]; + rt.byteVecPush(rt.entryOrInsertWith(rt.entry(words, word), (): rt.ByteVec => { + return new rt.ByteVec(); + }), b6); } } } @@ -624,16 +605,14 @@ export function claim(map: rt.HashMap, k: rt.u8, n: rt.u16): if (rt.entryOccupied(_4)) { if (!(rt.u16Rem(rt.entryGet(_4).n, 2) === 0)) { return rt.entryRemove(_4).n & 0xff; - } else { - e = _4; - t = rt.entryGet(e); - t.n = rt.u16Add(t.n, n); - return 1; } - } else { - rt.entryOrInsert(_4, { n }); - return 0; + e = _4; + t = rt.entryGet(e); + t.n = rt.u16Add(t.n, n); + return 1; } + rt.entryOrInsert(_4, { n }); + return 0; } /** `HashSet` and `BTreeSet`, each with the same script. */ @@ -708,27 +687,26 @@ export function sets(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { return v5 & 0xff; })); break b0; - } else { - rt.byteVecPush(out, _62 & 0xff); } + rt.byteVecPush(out, _62 & 0xff); } + } + b = _10; + v = rt.u16Rem(b as rt.u16, 24); + _17 = rt.u8Rem(b, 3); + if (_17 === 0) { + rt.byteVecPush(out, rt.hashDelete(hashed, v) ? 1 : 0); + rt.byteVecPush(out, rt.btreeDelete(sorted, v) ? 1 : 0); + } else if (_17 === 1) { + rt.byteVecPush(out, rt.hashContains(hashed, v) ? 1 : 0); + rt.byteVecPush(out, rt.btreeContains(sorted, v) ? 1 : 0); } else { - b = _10; - v = rt.u16Rem(b as rt.u16, 24); - _17 = rt.u8Rem(b, 3); - if (_17 === 0) { - rt.byteVecPush(out, rt.hashDelete(hashed, v) ? 1 : 0); - rt.byteVecPush(out, rt.btreeDelete(sorted, v) ? 1 : 0); - } else if (_17 === 1) { - rt.byteVecPush(out, rt.hashContains(hashed, v) ? 1 : 0); - rt.byteVecPush(out, rt.btreeContains(sorted, v) ? 1 : 0); - } else { - rt.byteVecPush(out, rt.hashAdd(hashed, v) ? 1 : 0); - rt.byteVecPush(out, rt.btreeAdd(sorted, v) ? 1 : 0); - } + rt.byteVecPush(out, rt.hashAdd(hashed, v) ? 1 : 0); + rt.byteVecPush(out, rt.btreeAdd(sorted, v) ? 1 : 0); } } - } else if (_4 === 1) { + } + if (_4 === 1) { nibbles = rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeSet; seen = rt.hashNew(rt.hashing(Nibble.hash$Hash_DefaultHasher, Nibble.eq$PartialEq)) as rt.HashSet; iterS2 = data; @@ -759,63 +737,56 @@ export function sets(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { if (_151 === rt.DONE) { rt.byteVecPush(out, rt.hashLen(dirs) & 0xff); break b0; - } else { - _160 = rt.usizeRem(_151 as rt.usize, 3); - if (!(_160 < 3)) { - rt.panic("index out of bounds: the len is " + 3 + " but the index is " + _160); - } - rt.byteVecPush(out, rt.hashAdd(dirs, ["Up" as Dir.Dir, "Top" as Dir.Dir, "Down" as Dir.Dir][_160]) ? 1 : 0); } + _160 = rt.usizeRem(_151 as rt.usize, 3); + if (!(_160 < 3)) { + rt.panic("index out of bounds: the len is " + 3 + " but the index is " + _160); + } + rt.byteVecPush(out, rt.hashAdd(dirs, ["Up" as Dir.Dir, "Top" as Dir.Dir, "Down" as Dir.Dir][_160]) ? 1 : 0); } } } - } else { - rt.byteVecPush(out, _123._0); } + rt.byteVecPush(out, _123._0); } - } else { - b2 = _106; - rt.byteVecPush(out, rt.btreeAdd(nibbles, { _0: b2 }) ? 1 : 0); - rt.byteVecPush(out, rt.hashAdd(seen, { _0: b2 }) ? 1 : 0); } + b2 = _106; + rt.byteVecPush(out, rt.btreeAdd(nibbles, { _0: b2 }) ? 1 : 0); + rt.byteVecPush(out, rt.hashAdd(seen, { _0: b2 }) ? 1 : 0); } - } else { - words = rt.btreeNew(rt.cmpStr) as rt.BTreeSet; - iterS4 = data; - iterI4 = 0; - while (true) { - _175 = iterI4 < iterS4.length ? iterS4[iterI4++] : rt.DONE; - if (_175 === rt.DONE) { - iter7 = rt.btreeKeys(words); - while (true) { - _192 = iter7.next(); - if (_192 === rt.DONE) { - _200 = rt.iterMap(rt.iterSlice(data), (_2: rt.u8): rt.u64 => { - return wide(_2); - }); - wides = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _200, true); - iter8 = rt.iterRev(rt.btreeKeys(wides)); - while (true) { - _207 = iter8.next(); - if (_207 === rt.DONE) { - break b0; - } else { - rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(_207)); - } + } + words = rt.btreeNew(rt.cmpStr) as rt.BTreeSet; + iterS4 = data; + iterI4 = 0; + while (true) { + _175 = iterI4 < iterS4.length ? iterS4[iterI4++] : rt.DONE; + if (_175 === rt.DONE) { + iter7 = rt.btreeKeys(words); + while (true) { + _192 = iter7.next(); + if (_192 === rt.DONE) { + _200 = rt.iterMap(rt.iterSlice(data), (_2: rt.u8): rt.u64 => { + return wide(_2); + }); + wides = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _200, true); + iter8 = rt.iterRev(rt.btreeKeys(wides)); + while (true) { + _207 = iter8.next(); + if (_207 === rt.DONE) { + break b0; } - } else { - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_192)); - rt.byteVecPush(out, 0); + rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(_207)); } } - } else { - _182 = rt.usizeRem(_175 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); - if (!(_182 < 8)) { - rt.panic("index out of bounds: the len is " + 8 + " but the index is " + _182); - } - rt.btreeAdd(words, ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_182]); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_192)); + rt.byteVecPush(out, 0); } } + _182 = rt.usizeRem(_175 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); + if (!(_182 < 8)) { + rt.panic("index out of bounds: the len is " + 8 + " but the index is " + _182); + } + rt.btreeAdd(words, ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_182]); } } } @@ -970,49 +941,46 @@ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void rt.byteVecExtendFromSlice(out, rt.byteVecView(within)); rt.iterExtendBytes(out, rt.btreeValues(map)); break b0; - } else { - rt.byteVecPush(out, _101); } + rt.byteVecPush(out, _101); } - } else { - rt.byteVecPush(out, _88[0] ^ _88[1]); } + rt.byteVecPush(out, _88[0] ^ _88[1]); } - } else { - rt.byteVecPush(out, _73[0]); - rt.byteVecPush(out, _73[1]); } + rt.byteVecPush(out, _73[0]); + rt.byteVecPush(out, _73[1]); } - } else { - i = _13; - rt.idx(data, i); - _19 = [rt.u8Rem(data[i], 32), rt.optionUnwrapOr(rt.sliceGet(data, rt.usizeAdd(i, 1)), 0)] as [rt.u8, rt.u8]; - k = _19[0]; - v = _19[1]; - _30 = rt.u8Rem(v, 6); - if (_30 === 0) { - rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeRemove(map, k), 238)); - } else if (_30 === 1) { - rt.byteVecPush(out, rt.optionMapOr(rt.btreePop(map), 221, (_219: [rt.u8, rt.u8]): rt.u8 => { - return _219[0] ^ _219[1]; - })); - } else if (_30 === 2) { - rt.byteVecPush(out, rt.optionMapOr(rt.btreePop(map, true), 220, (_216: [rt.u8, rt.u8]): rt.u8 => { - return _216[0] ^ _216[1]; - })); - } else if (_30 === 3) { - _42 = rt.btreeGet(map, k); - if (_42 !== undefined) { - _50 = rt.u8WrappingAdd(_42, 1); - rt.btreeInsert(map, k, _50); - } - rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeGet(map, k), 219)); - } else { - rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeInsert(map, k, v), 204)); + } + i = _13; + rt.idx(data, i); + _19 = [rt.u8Rem(data[i], 32), rt.optionUnwrapOr(rt.sliceGet(data, rt.usizeAdd(i, 1)), 0)] as [rt.u8, rt.u8]; + k = _19[0]; + v = _19[1]; + _30 = rt.u8Rem(v, 6); + if (_30 === 0) { + rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeRemove(map, k), 238)); + } else if (_30 === 1) { + rt.byteVecPush(out, rt.optionMapOr(rt.btreePop(map), 221, (_219: [rt.u8, rt.u8]): rt.u8 => { + return _219[0] ^ _219[1]; + })); + } else if (_30 === 2) { + rt.byteVecPush(out, rt.optionMapOr(rt.btreePop(map, true), 220, (_216: [rt.u8, rt.u8]): rt.u8 => { + return _216[0] ^ _216[1]; + })); + } else if (_30 === 3) { + _42 = rt.btreeGet(map, k); + if (_42 !== undefined) { + _50 = rt.u8WrappingAdd(_42, 1); + rt.btreeInsert(map, k, _50); } + rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeGet(map, k), 219)); + } else { + rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeInsert(map, k, v), 204)); } } - } else if (_4 === 1) { + } + if (_4 === 1) { ranks = rt.btreeNew(Rank.cmp$Ord) as rt.BTreeMap; pairs = rt.btreeNew(rt.cmpTuple([rt.cmp, rt.cmp])) as rt.BTreeMap<[rt.u8, rt.u8], rt.u8>; wides = rt.btreeNew(rt.cmp) as rt.BTreeMap; @@ -1043,57 +1011,53 @@ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void _274 = iter9.next(); if (_274 === rt.DONE) { break b0; - } else { - rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(_274[0])); - rt.byteVecPush(out, _274[1]); } + rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(_274[0])); + rt.byteVecPush(out, _274[1]); } - } else { - rt.byteVecPush(out, rt.u8Shl(_255[0][0], 4) | _255[0][1]); - rt.byteVecPush(out, _255[1]); } + rt.byteVecPush(out, rt.u8Shl(_255[0][0], 4) | _255[0][1]); + rt.byteVecPush(out, _255[1]); } - } else { - rt.byteVecPush(out, rankByte(_240[0])); - rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(_240[1].n)); } + rt.byteVecPush(out, rankByte(_240[0])); + rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(_240[1].n)); } + } + b2 = _205; + r = rank(b2, rt.u8Div(b2, 3)); + _212 = rt.entry(ranks, r); + if (!rt.entryOccupied(_212)) { + e = _212; + rt.byteVecPush(out, rankByte(rt.entryKey(e))); + rt.entryOrInsert(e, { n: b2 as rt.u16 }); + } else if (!(rt.entryGet(_212).n > 256)) { + e3 = _212; + rt.byteVecPush(out, rt.entryInsert(e3, { n: 512 }).n & 0xff); } else { - b2 = _205; - r = rank(b2, rt.u8Div(b2, 3)); - _212 = rt.entry(ranks, r); - if (!rt.entryOccupied(_212)) { - e = _212; - rt.byteVecPush(out, rankByte(rt.entryKey(e))); - rt.entryOrInsert(e, { n: b2 as rt.u16 }); - } else if (!(rt.entryGet(_212).n > 256)) { - e3 = _212; - rt.byteVecPush(out, rt.entryInsert(e3, { n: 512 }).n & 0xff); - } else { - _230 = rt.entryRemoveEntry(_212); - rt.byteVecPush(out, rankByte(_230[0])); - } + _230 = rt.entryRemoveEntry(_212); + rt.byteVecPush(out, rankByte(_230[0])); } } - } else { - i2 = _164; - _172 = rt.usizeSub(i2, 1); - rt.idx(data, _172); - _171 = data[_172]; - rt.idx(data, i2); - _170 = [_171, data[i2]] as [rt.u8, rt.u8]; - a = _171; - b = _170[1]; - _182 = rank(a, b); - t = rt.entryOrInsertWith(rt.entry(ranks, _182), Tally.default$Default); - t.n = rt.u16WrappingAdd(t.n, b as rt.u16); - _188 = [rt.u8Rem(a, 4), rt.u8Rem(b, 4)] as [rt.u8, rt.u8]; - rt.btreeInsert(pairs, _188, a); - _196 = wide(a); - rt.entryOrInsert(rt.entry(wides, _196), b); } + i2 = _164; + _172 = rt.usizeSub(i2, 1); + rt.idx(data, _172); + _171 = data[_172]; + rt.idx(data, i2); + _170 = [_171, data[i2]] as [rt.u8, rt.u8]; + a = _171; + b = _170[1]; + _182 = rank(a, b); + t = rt.entryOrInsertWith(rt.entry(ranks, _182), Tally.default$Default); + t.n = rt.u16WrappingAdd(t.n, b as rt.u16); + _188 = [rt.u8Rem(a, 4), rt.u8Rem(b, 4)] as [rt.u8, rt.u8]; + rt.btreeInsert(pairs, _188, a); + _196 = wide(a); + rt.entryOrInsert(rt.entry(wides, _196), b); } - } else if (_4 === 2) { + } + if (_4 === 2) { _287 = rt.iterMap(rt.iterSlice(data), (_215: rt.u8): [Fussy.Fussy, Fussy.Fussy] => { let b8!: rt.u8; b8 = _215; @@ -1106,114 +1070,106 @@ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void _294 = iter10.next(); if (_294 === rt.DONE) { break b0; - } else { - rt.byteVecPush(out, _294[0]._0 ^ _294[1]._0); } + rt.byteVecPush(out, _294[0]._0 ^ _294[1]._0); } - } else { - nibbles = rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeMap; - words = rt.btreeNew(rt.cmpStr) as rt.BTreeMap; - iterS2 = data; - iterI2 = 0; - while (true) { - _307 = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; - if (_307 === rt.DONE) { - iter12 = rt.btreeIter(nibbles); - while (true) { - _331 = iter12.next(); - if (_331 === rt.DONE) { - iterStart2 = 1; - iterEnd2 = data.length; - while (true) { - if (!((_344 = iterStart2++) < iterEnd2)) { - _409 = rt.iterMap(rt.iterSlice(data), (_2: rt.u8): [Nibble.Nibble, rt.u8] => { - let b5!: rt.u8; - b5 = _2; - return [{ _0: b5 }, b5] as [Nibble.Nibble, rt.u8]; - }); - collected = rt.btreeExtend(rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeMap, _409, true); - _412 = rt.iterMap(rt.iterSlice(data), (_213: rt.u8): Nibble.Nibble => { - return { _0: _213 }; - }); - keys = rt.btreeExtendKeys(rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeSet, _412, true); - _416 = rt.iterMap(rt.iterSlice(data), (_214: rt.u8): Nibble.Nibble => { - return { _0: _214 ^ 48 }; - }); - rt.btreeExtendKeys(keys, _416); - iter14 = rt.iterZip(rt.btreeIter(collected), rt.btreeKeys(keys)); - while (true) { - _425 = iter14.next(); - if (_425 === rt.DONE) { - rt.btreeRetain(words, (w: string, t3: Tally.Tally): boolean => { - if (!(rt.stringLen(w) > 1)) { - return t3.n > 1; - } else { - return true; - } - }); - iter15 = rt.btreeIter(words); - while (true) { - _442 = iter15.next(); - if (_442 === rt.DONE) { - break b0; - } else { - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_442[0])); - rt.byteVecPush(out, _442[1].n & 0xff); - } + } + nibbles = rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeMap; + words = rt.btreeNew(rt.cmpStr) as rt.BTreeMap; + iterS2 = data; + iterI2 = 0; + while (true) { + _307 = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; + if (_307 === rt.DONE) { + iter12 = rt.btreeIter(nibbles); + while (true) { + _331 = iter12.next(); + if (_331 === rt.DONE) { + iterStart2 = 1; + iterEnd2 = data.length; + while (true) { + if (!((_344 = iterStart2++) < iterEnd2)) { + _409 = rt.iterMap(rt.iterSlice(data), (_2: rt.u8): [Nibble.Nibble, rt.u8] => { + let b5!: rt.u8; + b5 = _2; + return [{ _0: b5 }, b5] as [Nibble.Nibble, rt.u8]; + }); + collected = rt.btreeExtend(rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeMap, _409, true); + _412 = rt.iterMap(rt.iterSlice(data), (_213: rt.u8): Nibble.Nibble => { + return { _0: _213 }; + }); + keys = rt.btreeExtendKeys(rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeSet, _412, true); + _416 = rt.iterMap(rt.iterSlice(data), (_214: rt.u8): Nibble.Nibble => { + return { _0: _214 ^ 48 }; + }); + rt.btreeExtendKeys(keys, _416); + iter14 = rt.iterZip(rt.btreeIter(collected), rt.btreeKeys(keys)); + while (true) { + _425 = iter14.next(); + if (_425 === rt.DONE) { + rt.btreeRetain(words, (w: string, t3: Tally.Tally): boolean => { + if (!(rt.stringLen(w) > 1)) { + return t3.n > 1; } - } else { - rt.byteVecPush(out, _425[0][0]._0); - rt.byteVecPush(out, _425[0][1]); - rt.byteVecPush(out, _425[1]._0); + return true; + }); + iter15 = rt.btreeIter(words); + while (true) { + _442 = iter15.next(); + if (_442 === rt.DONE) { + break b0; + } + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_442[0])); + rt.byteVecPush(out, _442[1].n & 0xff); } } - } else { - i3 = _344; - _353 = rt.usizeSub(i3, 1); - rt.idx(data, _353); - _351 = { _0: data[_353] }; - rt.idx(data, i3); - _350 = [_351, { _0: data[i3] }] as [Nibble.Nibble, Nibble.Nibble]; - a2 = _351; - b4 = _350[1]; - _365 = rt.usizeSub(i3, 1); - rt.idx(data, _365); - _364 = data[_365]; - rt.idx(data, i3); - _363 = [_364, data[i3]] as [rt.u8, rt.u8]; - x = _364; - y = _363[1]; - o = rt.orderingThen(rt.orderingReverse(Nibble.cmp$Ord(a2, b4)), (): rt.Ordering => { - return rt.cmp(y, x); - }, true); - rt.byteVecPush(out, (o < 0 ? 1 : 0) | (((o >= 0 ? 1 : 0) << 1) & 0xff) | (((rt.orderingThen(Nibble.cmp$Ord(a2, b4), -1) === 0 ? 1 : 0) << 2) & 0xff)); - if (o === -1) { - _401 = 1; - } else if (o === 0) { - _401 = 2; - } else { - _401 = 3; - } - rt.byteVecPush(out, _401); - rt.byteVecPush(out, rt.same(o, 1) ? 1 : 0); + rt.byteVecPush(out, _425[0][0]._0); + rt.byteVecPush(out, _425[0][1]); + rt.byteVecPush(out, _425[1]._0); } } - } else { - rt.byteVecPush(out, _331[0]._0); - rt.byteVecPush(out, _331[1]); + i3 = _344; + _353 = rt.usizeSub(i3, 1); + rt.idx(data, _353); + _351 = { _0: data[_353] }; + rt.idx(data, i3); + _350 = [_351, { _0: data[i3] }] as [Nibble.Nibble, Nibble.Nibble]; + a2 = _351; + b4 = _350[1]; + _365 = rt.usizeSub(i3, 1); + rt.idx(data, _365); + _364 = data[_365]; + rt.idx(data, i3); + _363 = [_364, data[i3]] as [rt.u8, rt.u8]; + x = _364; + y = _363[1]; + o = rt.orderingThen(rt.orderingReverse(Nibble.cmp$Ord(a2, b4)), (): rt.Ordering => { + return rt.cmp(y, x); + }, true); + rt.byteVecPush(out, (o < 0 ? 1 : 0) | (((o >= 0 ? 1 : 0) << 1) & 0xff) | (((rt.orderingThen(Nibble.cmp$Ord(a2, b4), -1) === 0 ? 1 : 0) << 2) & 0xff)); + if (o === -1) { + _401 = 1; + } else if (o === 0) { + _401 = 2; + } else { + _401 = 3; + } + rt.byteVecPush(out, _401); + rt.byteVecPush(out, rt.same(o, 1) ? 1 : 0); } } - } else { - b3 = _307; - rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeInsert(nibbles, { _0: b3 }, b3), 204)); - _320 = rt.usizeRem(b3 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); - if (!(_320 < 8)) { - rt.panic("index out of bounds: the len is " + 8 + " but the index is " + _320); - } - t2 = rt.entryOrInsertWith(rt.entry(words, ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_320]), Tally.default$Default); - t2.n = rt.u16Add(t2.n, 1); + rt.byteVecPush(out, _331[0]._0); + rt.byteVecPush(out, _331[1]); } } + b3 = _307; + rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeInsert(nibbles, { _0: b3 }, b3), 204)); + _320 = rt.usizeRem(b3 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); + if (!(_320 < 8)) { + rt.panic("index out of bounds: the len is " + 8 + " but the index is " + _320); + } + t2 = rt.entryOrInsertWith(rt.entry(words, ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_320]), Tally.default$Default); + t2.n = rt.u16Add(t2.n, 1); } } } @@ -1334,32 +1290,30 @@ export function deques(data: Uint8Array, out: rt.ByteVec): void { rt.iterExtendBytes(out, rt.dequeIter(q2)); rt.byteVecPush(out, rt.dequeIndex(q2, b2)); return; - } else { - rt.byteVecPush(out, _83[0] ^ _83[1]); } + rt.byteVecPush(out, _83[0] ^ _83[1]); } + } + b = _7; + _12 = rt.u8Rem(b, 7); + if (_12 === 0) { + rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequePopFront(q), 238)); + } else if (_12 === 1) { + rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequePopBack(q), 237)); + } else if (_12 === 2) { + rt.dequePushFront(q, b); + } else if (_12 === 3) { + rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequeEnd(q), 236)); + rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequeEnd(q, true), 235)); + _36 = rt.usizeRem(b as rt.usize, 5); + rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequeGet(q, _36), 234)); } else { - b = _7; - _12 = rt.u8Rem(b, 7); - if (_12 === 0) { - rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequePopFront(q), 238)); - } else if (_12 === 1) { - rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequePopBack(q), 237)); - } else if (_12 === 2) { - rt.dequePushFront(q, b); - } else if (_12 === 3) { - rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequeEnd(q), 236)); - rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequeEnd(q, true), 235)); - _36 = rt.usizeRem(b as rt.usize, 5); - rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequeGet(q, _36), 234)); - } else { - rt.dequePushBack(q, b); - } - _42 = [b, q.n & 0xff] as [rt.u8, rt.u8]; - rt.dequePushBack(pairs, _42); - if (pairs.n > 3) { - rt.dequePopFront(pairs); - } + rt.dequePushBack(q, b); + } + _42 = [b, q.n & 0xff] as [rt.u8, rt.u8]; + rt.dequePushBack(pairs, _42); + if (pairs.n > 3) { + rt.dequePopFront(pairs); } } } diff --git a/ts/fixtures/lang/expected/fmt.Fails.ts b/ts/fixtures/lang/expected/fmt.Fails.ts index 3df147af5..e50ae2db6 100644 --- a/ts/fixtures/lang/expected/fmt.Fails.ts +++ b/ts/fixtures/lang/expected/fmt.Fails.ts @@ -16,12 +16,10 @@ export function fmt$Display(self: Fails, f: rt.Formatter): rt.Result rt.u16Display(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _6), _7)); - } else if (self.tag === "TooLarge") { + } + if (self.tag === "TooLarge") { _11 = "TooLarge"; _12 = "size"; _13 = (f: rt.Formatter) => rt.usizeDisplay(self.size, f); _14 = "max"; _15 = (f: rt.Formatter) => rt.usizeDisplay(self.max, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _11), _12, _13), _14, _15)); - } else { - _18 = "At"; - _19 = (f: rt.Formatter) => Pair.fmt$Debug(self._0, f); - return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _18), _19)); } + _18 = "At"; + _19 = (f: rt.Formatter) => Pair.fmt$Debug(self._0, f); + return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _18), _19)); } /** @@ -50,11 +51,13 @@ export function fmt$Display(self: Fault, f: rt.Formatter): rt.Result rt.u16LowerHex(arg4, f)]; return rt.fmtWriteFmt(f, ["code=", rt.fmtSpec({ alternate: true, zero: true, width: 6 }, args2[0])]); - } else if (self.tag === "TooLarge") { + } + if (self.tag === "TooLarge") { const arg2 = self.size; _20 = (f: rt.Formatter) => rt.usizeDisplay(arg2, f); const arg3 = self.max; @@ -77,13 +80,14 @@ function new_(data: Uint8Array): Fault { _3 = rt.u8Rem(at(0), 4); if (_3 === 0) { return { tag: "Short" } as Fault; - } else if (_3 === 1) { + } + if (_3 === 1) { return { tag: "Code", _0: (at(1) << 8) | at(2) } as Fault; - } else if (_3 === 2) { + } + if (_3 === 2) { return { tag: "TooLarge", size: (((((at(1) as rt.usize)) << 24) >>> 0) | at(2) as rt.usize) >>> 0, max: at(3) as rt.usize } as Fault; - } else { - return { tag: "At", _0: { _0: at(1), _1: rt.i64Shl((at(2) << 24) >> 24 as rt.i64, 40) } } as Fault; } + return { tag: "At", _0: { _0: at(1), _1: rt.i64Shl((at(2) << 24) >> 24 as rt.i64, 40) } } as Fault; } export { new_ as new }; diff --git a/ts/fixtures/lang/expected/fmt.Kind.ts b/ts/fixtures/lang/expected/fmt.Kind.ts index c278f5d46..cdbc5ee04 100644 --- a/ts/fixtures/lang/expected/fmt.Kind.ts +++ b/ts/fixtures/lang/expected/fmt.Kind.ts @@ -12,22 +12,24 @@ export function fmt$Debug(self: Kind, f: rt.Formatter): rt.Result rt.u8Display(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _8), _9)); - } else { - _13 = "Many"; - _14 = "count"; - _15 = (f: rt.Formatter) => rt.u32Display(self.count, f); - _16 = "items"; - _17 = (f: rt.Formatter) => rt.fmtList(rt.byteVecView(self.items), f, rt.u8Display); - return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _13), _14, _15), _16, _17)); } + _13 = "Many"; + _14 = "count"; + _15 = (f: rt.Formatter) => rt.u32Display(self.count, f); + _16 = "items"; + _17 = (f: rt.Formatter) => rt.fmtList(rt.byteVecView(self.items), f, rt.u8Display); + return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _13), _14, _15), _16, _17)); } export type Kind = diff --git a/ts/fixtures/lang/expected/fmt.Pair.ts b/ts/fixtures/lang/expected/fmt.Pair.ts index 3aaea45a2..921d01ee7 100644 --- a/ts/fixtures/lang/expected/fmt.Pair.ts +++ b/ts/fixtures/lang/expected/fmt.Pair.ts @@ -15,9 +15,8 @@ export function fmt$Debug(self: Pair, f: rt.Formatter): rt.Result rt.u8Display(self._0, f))); - } else { - _7 = rt.fmtDebugTuple(f, "Tup"); - return rt.debugTupleFinish(rt.debugTupleField(rt.debugTupleField(_7, (f: rt.Formatter) => rt.u8Display(self._0, f)), (f: rt.Formatter) => rt.fmtOption(self._1, f, rt.u8Display))); } + _7 = rt.fmtDebugTuple(f, "Tup"); + return rt.debugTupleFinish(rt.debugTupleField(rt.debugTupleField(_7, (f: rt.Formatter) => rt.u8Display(self._0, f)), (f: rt.Formatter) => rt.fmtOption(self._1, f, rt.u8Display))); } //# sourceMappingURL=fmt.Tup.ts.map diff --git a/ts/fixtures/lang/expected/generics.Either.ts b/ts/fixtures/lang/expected/generics.Either.ts index d2315f509..45c81fcea 100644 --- a/ts/fixtures/lang/expected/generics.Either.ts +++ b/ts/fixtures/lang/expected/generics.Either.ts @@ -13,14 +13,14 @@ export function fmt$Debug_Point_u8(self: Either, f: rt.Forma _5 = "Left"; _6 = (f: rt.Formatter) => Point.fmt$Debug(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _5), _6)); - } else if (self.tag === "Right") { + } + if (self.tag === "Right") { _9 = "Right"; _10 = "value"; _11 = (f: rt.Formatter) => rt.u8Display(self.value, f); return rt.debugStructFinish(rt.debugStructField(rt.fmtDebugStruct(f, _9), _10, _11)); - } else { - return rt.fmtWriteStr(f, "Neither"); } + return rt.fmtWriteStr(f, "Neither"); } export function fmt$Debug_u8_Point(self: Either, f: rt.Formatter): rt.Result { @@ -33,14 +33,14 @@ export function fmt$Debug_u8_Point(self: Either, f: rt.Forma _5 = "Left"; _6 = (f: rt.Formatter) => rt.u8Display(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _5), _6)); - } else if (self.tag === "Right") { + } + if (self.tag === "Right") { _9 = "Right"; _10 = "value"; _11 = (f: rt.Formatter) => Point.fmt$Debug(self.value, f); return rt.debugStructFinish(rt.debugStructField(rt.fmtDebugStruct(f, _9), _10, _11)); - } else { - return rt.fmtWriteStr(f, "Neither"); } + return rt.fmtWriteStr(f, "Neither"); } export function fmt$Debug_u8_u16(self: Either, f: rt.Formatter): rt.Result { @@ -53,14 +53,14 @@ export function fmt$Debug_u8_u16(self: Either, f: rt.Formatter): _5 = "Left"; _6 = (f: rt.Formatter) => rt.u8Display(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _5), _6)); - } else if (self.tag === "Right") { + } + if (self.tag === "Right") { _9 = "Right"; _10 = "value"; _11 = (f: rt.Formatter) => rt.u16Display(self.value, f); return rt.debugStructFinish(rt.debugStructField(rt.fmtDebugStruct(f, _9), _10, _11)); - } else { - return rt.fmtWriteStr(f, "Neither"); } + return rt.fmtWriteStr(f, "Neither"); } /** A generic enum, with a companion function per instance. */ @@ -69,35 +69,32 @@ export type Either = { tag: "Left"; _0: L } | { tag: "Right"; value: R } | export function left$Point_u8(self: Either): Point.Point | undefined { if (self.tag === "Left") { return rt.copy(self._0); - } else { - return undefined; } + return undefined; } export function left$u8_Point(self: Either): rt.u8 | undefined { if (self.tag === "Left") { return self._0; - } else { - return undefined; } + return undefined; } export function left$u8_u16(self: Either): rt.u8 | undefined { if (self.tag === "Left") { return self._0; - } else { - return undefined; } + return undefined; } export function flip$u8_Point(self: Either): Either { if (self.tag === "Left") { return { tag: "Right", value: self._0 } as Either; - } else if (self.tag === "Right") { + } + if (self.tag === "Right") { return { tag: "Left", _0: self.value } as Either; - } else { - return { tag: "Neither" } as Either; } + return { tag: "Neither" } as Either; } //# sourceMappingURL=generics.Either.ts.map diff --git a/ts/fixtures/lang/expected/generics.Wrap.ts b/ts/fixtures/lang/expected/generics.Wrap.ts index bcaf4ed0d..a63722570 100644 --- a/ts/fixtures/lang/expected/generics.Wrap.ts +++ b/ts/fixtures/lang/expected/generics.Wrap.ts @@ -135,9 +135,8 @@ export function fmt$Debug_u8(self: Wrap, f: rt.Formatter): rt.Result, other: Wrap): boolean { if (!(self.count === other.count)) { return false; - } else { - return Pair.eq$PartialEq(self.value, other.value); } + return Pair.eq$PartialEq(self.value, other.value); } /** A generic struct, with methods on every instance, on some, and on one. */ diff --git a/ts/fixtures/lang/expected/harness.ts b/ts/fixtures/lang/expected/harness.ts index 14f96c4f4..78f0fb31c 100644 --- a/ts/fixtures/lang/expected/harness.ts +++ b/ts/fixtures/lang/expected/harness.ts @@ -20,108 +20,107 @@ export function run(input: Uint8Array): rt.ByteVec { out = new rt.ByteVec(); if (!(input.length >= 2)) { return out; - } else { - _10 = [input[0], input[1]] as [rt.u8, rt.u8]; - op = _10[0]; - kind = _10[1]; - _14 = rt.u8Rem(op, 38); - if (_14 === 0) { - u8Op(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 1) { - u16Op(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 2) { - u32Op(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 3) { - u64Op(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 4) { - u128Op(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 5) { - usizeOp(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 6) { - i8Op(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 7) { - i16Op(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 8) { - i32Op(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 9) { - i64Op(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 10) { - i128Op(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 11) { - isizeOp(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 12) { - _28 = rt.u8Rem(kind, 6); - if (_28 === 0) { - i8Neg(input.subarray(2, input.length - 0), out); - } else if (_28 === 1) { - i16Neg(input.subarray(2, input.length - 0), out); - } else if (_28 === 2) { - i32Neg(input.subarray(2, input.length - 0), out); - } else if (_28 === 3) { - i64Neg(input.subarray(2, input.length - 0), out); - } else if (_28 === 4) { - i128Neg(input.subarray(2, input.length - 0), out); - } else { - isizeNeg(input.subarray(2, input.length - 0), out); - } - } else if (_14 === 13) { - _36 = rt.sliceSplitFirst(input.subarray(2, input.length - 0)); - if (_36 === undefined) { - cast(kind, rt.u8Div(kind, 12), input.subarray(2, input.length - 0), out); - } else { - cast(kind, _36[0], _36[1], out); - } - } else if (_14 === 14) { - convert(input.subarray(2, input.length - 0), out); - } else if (_14 === 15) { - copies(input.subarray(2, input.length - 0), out); - } else if (_14 === 16) { - loops(input.subarray(2, input.length - 0), out); - } else if (_14 === 17) { - patterns(input.subarray(2, input.length - 0), out); - } else if (_14 === 18) { - closures(input.subarray(2, input.length - 0), out); - } else if (_14 === 19) { - discriminants(input.subarray(2, input.length - 0), out); - } else if (_14 === 20) { - library(input.subarray(2, input.length - 0), out); - } else if (_14 === 21) { - ints(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 22) { - strings(input.subarray(2, input.length - 0), out); - } else if (_14 === 23) { - derived(input.subarray(2, input.length - 0), out); - } else if (_14 === 24) { - written(input.subarray(2, input.length - 0), out); - } else if (_14 === 25) { - panics(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 26) { - methods(input.subarray(2, input.length - 0), out); - } else if (_14 === 27) { - adaptors(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 28) { - consumers(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 29) { - ranges(input.subarray(2, input.length - 0), out); - } else if (_14 === 30) { - options(input.subarray(2, input.length - 0), out); - } else if (_14 === 31) { - own(input.subarray(2, input.length - 0), out); - } else if (_14 === 32) { - values(input.subarray(2, input.length - 0), out); - } else if (_14 === 33) { - order(input.subarray(2, input.length - 0), out); - } else if (_14 === 34) { - hashMaps(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 35) { - sets(kind, input.subarray(2, input.length - 0), out); - } else if (_14 === 36) { - btreeMaps(kind, input.subarray(2, input.length - 0), out); + } + _10 = [input[0], input[1]] as [rt.u8, rt.u8]; + op = _10[0]; + kind = _10[1]; + _14 = rt.u8Rem(op, 38); + if (_14 === 0) { + u8Op(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 1) { + u16Op(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 2) { + u32Op(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 3) { + u64Op(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 4) { + u128Op(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 5) { + usizeOp(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 6) { + i8Op(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 7) { + i16Op(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 8) { + i32Op(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 9) { + i64Op(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 10) { + i128Op(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 11) { + isizeOp(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 12) { + _28 = rt.u8Rem(kind, 6); + if (_28 === 0) { + i8Neg(input.subarray(2, input.length - 0), out); + } else if (_28 === 1) { + i16Neg(input.subarray(2, input.length - 0), out); + } else if (_28 === 2) { + i32Neg(input.subarray(2, input.length - 0), out); + } else if (_28 === 3) { + i64Neg(input.subarray(2, input.length - 0), out); + } else if (_28 === 4) { + i128Neg(input.subarray(2, input.length - 0), out); } else { - deques(input.subarray(2, input.length - 0), out); + isizeNeg(input.subarray(2, input.length - 0), out); } - return out; + } else if (_14 === 13) { + _36 = rt.sliceSplitFirst(input.subarray(2, input.length - 0)); + if (_36 === undefined) { + cast(kind, rt.u8Div(kind, 12), input.subarray(2, input.length - 0), out); + } else { + cast(kind, _36[0], _36[1], out); + } + } else if (_14 === 14) { + convert(input.subarray(2, input.length - 0), out); + } else if (_14 === 15) { + copies(input.subarray(2, input.length - 0), out); + } else if (_14 === 16) { + loops(input.subarray(2, input.length - 0), out); + } else if (_14 === 17) { + patterns(input.subarray(2, input.length - 0), out); + } else if (_14 === 18) { + closures(input.subarray(2, input.length - 0), out); + } else if (_14 === 19) { + discriminants(input.subarray(2, input.length - 0), out); + } else if (_14 === 20) { + library(input.subarray(2, input.length - 0), out); + } else if (_14 === 21) { + ints(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 22) { + strings(input.subarray(2, input.length - 0), out); + } else if (_14 === 23) { + derived(input.subarray(2, input.length - 0), out); + } else if (_14 === 24) { + written(input.subarray(2, input.length - 0), out); + } else if (_14 === 25) { + panics(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 26) { + methods(input.subarray(2, input.length - 0), out); + } else if (_14 === 27) { + adaptors(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 28) { + consumers(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 29) { + ranges(input.subarray(2, input.length - 0), out); + } else if (_14 === 30) { + options(input.subarray(2, input.length - 0), out); + } else if (_14 === 31) { + own(input.subarray(2, input.length - 0), out); + } else if (_14 === 32) { + values(input.subarray(2, input.length - 0), out); + } else if (_14 === 33) { + order(input.subarray(2, input.length - 0), out); + } else if (_14 === 34) { + hashMaps(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 35) { + sets(kind, input.subarray(2, input.length - 0), out); + } else if (_14 === 36) { + btreeMaps(kind, input.subarray(2, input.length - 0), out); + } else { + deques(input.subarray(2, input.length - 0), out); } + return out; } //# sourceMappingURL=harness.ts.map diff --git a/ts/fixtures/lang/expected/iters.Countdown.ts b/ts/fixtures/lang/expected/iters.Countdown.ts index 0783a2862..960963125 100644 --- a/ts/fixtures/lang/expected/iters.Countdown.ts +++ b/ts/fixtures/lang/expected/iters.Countdown.ts @@ -12,11 +12,10 @@ export function next$Iterator(self: Countdown): rt.u8 | rt.Done { let left!: rt.u8; if (self.left === 0) { return rt.DONE; - } else { - left = self.left; - self.left = rt.u8SaturatingSub(left, self.step); - return left; } + left = self.left; + self.left = rt.u8SaturatingSub(left, self.step); + return left; } //# sourceMappingURL=iters.Countdown.ts.map diff --git a/ts/fixtures/lang/expected/iters.Evens.ts b/ts/fixtures/lang/expected/iters.Evens.ts index 636ae85e4..680945bac 100644 --- a/ts/fixtures/lang/expected/iters.Evens.ts +++ b/ts/fixtures/lang/expected/iters.Evens.ts @@ -16,12 +16,10 @@ export function next$Iterator(self: Evens): rt.u8 | rt.Done { b = _2; if (!(rt.u8Rem(b, 2) === 0)) { continue l0; - } else { - return b; } - } else { - return rt.DONE; + return b; } + return rt.DONE; } } diff --git a/ts/fixtures/lang/expected/iters.Gaps.ts b/ts/fixtures/lang/expected/iters.Gaps.ts index 995965c89..3146f3ac8 100644 --- a/ts/fixtures/lang/expected/iters.Gaps.ts +++ b/ts/fixtures/lang/expected/iters.Gaps.ts @@ -17,12 +17,10 @@ export function next$Iterator(self: Gaps): rt.u8 | undefined | rt.Done { self.at = rt.usizeAdd(self.at, 1); if (!(b === 0)) { return b; - } else { - return undefined; } - } else { - return rt.DONE; + return undefined; } + return rt.DONE; } //# sourceMappingURL=iters.Gaps.ts.map diff --git a/ts/fixtures/lang/expected/iters.Halving.ts b/ts/fixtures/lang/expected/iters.Halving.ts index 95fce4e88..bdbdc2a86 100644 --- a/ts/fixtures/lang/expected/iters.Halving.ts +++ b/ts/fixtures/lang/expected/iters.Halving.ts @@ -22,11 +22,10 @@ export function next$Iterator_u64(self: Halving): rt.u64 | rt.Done { let value!: rt.u64; if (self.value === 0) { return rt.DONE; - } else { - value = self.value; - self.value = rt.u64Shr(value, 1); - return value; } + value = self.value; + self.value = rt.u64Shr(value, 1); + return value; } //# sourceMappingURL=iters.Halving.ts.map diff --git a/ts/fixtures/lang/expected/iters.ts b/ts/fixtures/lang/expected/iters.ts index 8b17e10ec..115351fd7 100644 --- a/ts/fixtures/lang/expected/iters.ts +++ b/ts/fixtures/lang/expected/iters.ts @@ -66,11 +66,11 @@ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { _18 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_18 === rt.DONE) { break b0; - } else { - rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(_18)); } + rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(_18)); } - } else if (_4 === 1) { + } + if (_4 === 1) { iter2 = rt.iterStepBy(rt.iterSkip(rt.iterEnumerate(rt.iterSlice(data)), 1), 2); while (true) { _32 = iter2.next(); @@ -80,18 +80,17 @@ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { _46 = iter3.next(); if (_46 === rt.DONE) { break b0; - } else { - rt.byteVecPush(out, (_46[0] & 0xff) ^ _46[1]); } + rt.byteVecPush(out, (_46[0] & 0xff) ^ _46[1]); } - } else { - i = _32[0]; - b = _32[1]; - rt.byteVecPush(out, i & 0xff); - rt.byteVecPush(out, b); } + i = _32[0]; + b = _32[1]; + rt.byteVecPush(out, i & 0xff); + rt.byteVecPush(out, b); } - } else if (_4 === 2) { + } + if (_4 === 2) { _56 = rt.sliceSplitAt(data, rt.usizeDiv(data.length, 2)); zipped = rt.iterToByteVec(rt.iterMap(rt.iterZip(rt.iterSlice(_56[0]), rt.iterRev(rt.iterSlice(_56[1]))), (_215: [rt.u8, rt.u8]): rt.u8 => { return _215[0] ^ _215[1]; @@ -140,16 +139,13 @@ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { if (_133 !== undefined) { rt.byteVecPush(out, _133); continue l4; - } else { - continue l4; } - } else { - run = rt.u8Add(run, 1); + continue l4; } + run = rt.u8Add(run, 1); } - } else { - break b0; } + break b0; } } else if (_4 === 6) { it2 = rt.iterSlice(data); @@ -189,9 +185,8 @@ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { return _24 > 128; })); break b0; - } else { - rt.byteVecExtendFromSlice(out, _187); } + rt.byteVecExtendFromSlice(out, _187); } } } @@ -215,16 +210,15 @@ export function chunksByZero$ChunksByZero_u8s(self: Uint8Array): rt.ByteVec[] { if (_6 === rt.DONE) { words.push(word); return words; + } + b = _6; + if (!(b === 0)) { + rt.byteVecPush(word, b); } else { - b = _6; - if (!(b === 0)) { - rt.byteVecPush(word, b); - } else { - const taken = word; - word = new rt.ByteVec(); - _13 = taken; - words.push(_13); - } + const taken = word; + word = new rt.ByteVec(); + _13 = taken; + words.push(_13); } } } @@ -284,9 +278,8 @@ export function consumers(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void b14 = _222; if (!(b14 > 80)) { return undefined; - } else { - return rt.u8CheckedMul(b14, 3); } + return rt.u8CheckedMul(b14, 3); }), 0)); _45 = rt.iterSlice(data); rt.byteVecPush(out, rt.optionMapOr(rt.iterPosition(_45, (_223: rt.u8): boolean => { @@ -330,13 +323,11 @@ export function consumers(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void } rt.byteVecPush(out, back.len() & 0xff); break b0; - } else { - rt.byteVecPush(out, _85[0] ^ _85[1]); } + rt.byteVecPush(out, _85[0] ^ _85[1]); } - } else { - rt.byteVecPush(out, _69[0] ^ _69[1]); } + rt.byteVecPush(out, _69[0] ^ _69[1]); } } else if (_5 === 2) { rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterMax(rt.iterSlice(data)), 0)); @@ -382,9 +373,8 @@ export function consumers(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void b3 = _2; if (!(b3 < 240)) { return rt.Err(b3); - } else { - return rt.Ok(b3); } + return rt.Ok(b3); }), (values__: rt.Iter) => rt.iterToByteVec(values__)); if (parsed.ok) { v = parsed.value; @@ -536,17 +526,14 @@ export function ranges(data: Uint8Array, out: rt.ByteVec): void { if (_295 === rt.DONE) { updates(a, b, data, out); return; - } else { - rt.byteVecPush(out, _295 & 0xff); } + rt.byteVecPush(out, _295 & 0xff); } - } else { - rt.byteVecPush(out, _47); } + rt.byteVecPush(out, _47); } - } else { - rt.byteVecPush(out, _37); } + rt.byteVecPush(out, _37); } } @@ -606,12 +593,11 @@ export function updates(a: rt.u8, b: rt.u8, data: Uint8Array, out: rt.ByteVec): rt.sliceCopyWithin(_76, 0, to, 0); rt.byteVecExtendFromSlice(out, rt.byteVecView(copied)); return; - } else { - i = _29; - _33 = rt.u8WrappingAdd(base.end, 1); - base.end = _33; - rt.byteVecPush(out, i); } + i = _29; + _33 = rt.u8WrappingAdd(base.end, 1); + base.end = _33; + rt.byteVecPush(out, i); } } @@ -638,17 +624,15 @@ export function options(data: Uint8Array, out: rt.ByteVec): void { all = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (b2: rt.u8): rt.u8 | undefined => { if (!(rt.u8Rem(b2, 3) === 0)) { return b2; - } else { - return undefined; } + return undefined; })); rt.byteVecPush(out, all.length & 0xff); iter = rt.iterMap(rt.iterSlice(data), (b3: rt.u8): rt.u8 | undefined => { if (!(rt.u8Rem(b3, 3) === 0)) { return b3; - } else { - return undefined; } + return undefined; }); while (true) { _15 = iter.next(); @@ -656,9 +640,8 @@ export function options(data: Uint8Array, out: rt.ByteVec): void { flat = rt.iterToByteVec(rt.iterFlatten(rt.iterMap(rt.iterSlice(data), (b4: rt.u8): rt.u8 | undefined => { if (!(rt.u8Rem(b4, 3) === 0)) { return b4; - } else { - return undefined; } + return undefined; }), (value: rt.u8 | undefined) => rt.iterOption(value))); rt.byteVecExtendFromSlice(out, rt.byteVecView(flat)); rt.byteVecPush(out, rt.iterCount(rt.iterFilter(rt.iterSlice(all), (o: rt.u8 | undefined): boolean => { @@ -667,9 +650,8 @@ export function options(data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, rt.optionUnwrapOr(second$Map_Iter_u8_options_closure0(rt.iterMap(rt.iterSlice(data), (b5: rt.u8): rt.u8 | undefined => { if (!(rt.u8Rem(b5, 3) === 0)) { return b5; - } else { - return undefined; } + return undefined; })), 205)); first = rt.sliceFirst(data); iter2 = rt.iterChain(rt.iterOption(first), rt.iterOnce(153)); @@ -690,23 +672,20 @@ export function options(data: Uint8Array, out: rt.ByteVec): void { _70 = Gaps.next$Iterator(iter3); if (_70 === rt.DONE) { return; - } else { - rt.byteVecPush(out, rt.optionMapOr(_70, 170, (b6: rt.u8): rt.u8 => { - return b6; - })); } + rt.byteVecPush(out, rt.optionMapOr(_70, 170, (b6: rt.u8): rt.u8 => { + return b6; + })); } - } else { - rt.byteVecPush(out, _49); } + rt.byteVecPush(out, _49); } + } + item = _15; + if (item === undefined) { + rt.byteVecPush(out, 0); } else { - item = _15; - if (item === undefined) { - rt.byteVecPush(out, 0); - } else { - rt.byteVecPush(out, item); - } + rt.byteVecPush(out, item); } } } @@ -720,12 +699,10 @@ export function second$Map_Iter_u8_options_closure0(items: rt.Iter) => Halving.next$Iterator_u64(it)), rt.u64Add, 0))); return; } - } else { - rt.byteVecPush(out, _13); } + rt.byteVecPush(out, _13); } } @@ -855,21 +831,17 @@ export function values(data: Uint8Array, out: rt.ByteVec): void { return w._0._0; })); return; - } else { - rt.byteVecExtendFromSlice(out, rt.byteVecView(_74.bytes)); } + rt.byteVecExtendFromSlice(out, rt.byteVecView(_74.bytes)); } - } else { - rt.byteVecPush(_59.bytes, 119); } + rt.byteVecPush(_59.bytes, 119); } - } else { - rt.byteVecPush(out, _21); } + rt.byteVecPush(out, _21); } - } else { - rt.byteVecPush(out, _8); } + rt.byteVecPush(out, _8); } } diff --git a/ts/fixtures/lang/expected/shapes.Point.ts b/ts/fixtures/lang/expected/shapes.Point.ts index 795b24283..4443772d7 100644 --- a/ts/fixtures/lang/expected/shapes.Point.ts +++ b/ts/fixtures/lang/expected/shapes.Point.ts @@ -19,9 +19,8 @@ export function fmt$Debug(self: Point, f: rt.Formatter): rt.Result Point.fmt$Debug(self._0, f); _9 = (f: rt.Formatter) => Point.fmt$Debug(self._1, f); return rt.debugTupleFinish(rt.debugTupleField(rt.debugTupleField(rt.fmtDebugTuple(f, _7), _8), _9)); - } else { - _14 = "Rect"; - _15 = "corner"; - _16 = (f: rt.Formatter) => Point.fmt$Debug(self.corner, f); - _17 = "width"; - _18 = (f: rt.Formatter) => rt.u16Display(self.width, f); - _19 = "height"; - _20 = (f: rt.Formatter) => rt.u16Display(self.height, f); - return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _14), _15, _16), _17, _18), _19, _20)); } + _14 = "Rect"; + _15 = "corner"; + _16 = (f: rt.Formatter) => Point.fmt$Debug(self.corner, f); + _17 = "width"; + _18 = (f: rt.Formatter) => rt.u16Display(self.width, f); + _19 = "height"; + _20 = (f: rt.Formatter) => rt.u16Display(self.height, f); + return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _14), _15, _16), _17, _18), _19, _20)); } /** An enum with data, and one without. */ @@ -50,13 +50,13 @@ export function area$Area(self: Shape): rt.u64 { let height!: rt.u16; if (self.tag === "Dot") { return 0; - } else if (self.tag === "Line") { + } + if (self.tag === "Line") { return 0; - } else { - width = self.width; - height = self.height; - return rt.u64Mul(width as rt.u64, height as rt.u64); } + width = self.width; + height = self.height; + return rt.u64Mul(width as rt.u64, height as rt.u64); } //# sourceMappingURL=shapes.Shape.ts.map diff --git a/ts/fixtures/lang/expected/shapes.ts b/ts/fixtures/lang/expected/shapes.ts index 1ec7b3610..a1e59a467 100644 --- a/ts/fixtures/lang/expected/shapes.ts +++ b/ts/fixtures/lang/expected/shapes.ts @@ -23,10 +23,9 @@ export function total$Meters(items: Meters.Meters[], out: rt.ByteVec): rt.u64 { _6 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_6 === rt.DONE) { return sum; - } else { - Meters.describe$Area(_6, out); - sum = rt.u64SaturatingAdd(sum, Meters.area$Area(_6)); } + Meters.describe$Area(_6, out); + sum = rt.u64SaturatingAdd(sum, Meters.area$Area(_6)); } } @@ -42,10 +41,9 @@ export function total$Shape(items: Shape.Shape[], out: rt.ByteVec): rt.u64 { _6 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_6 === rt.DONE) { return sum; - } else { - Shape.describe$Area(_6, out); - sum = rt.u64SaturatingAdd(sum, Shape.area$Area(_6)); } + Shape.describe$Area(_6, out); + sum = rt.u64SaturatingAdd(sum, Shape.area$Area(_6)); } } @@ -58,15 +56,17 @@ export function dir(byte: rt.u8): Dir.Dir | undefined { _2 = rt.u8Rem(byte, 5); if (_2 === 0) { return "North" as Dir.Dir; - } else if (_2 === 1) { + } + if (_2 === 1) { return "East" as Dir.Dir; - } else if (_2 === 2) { + } + if (_2 === 2) { return "South" as Dir.Dir; - } else if (_2 === 3) { + } + if (_2 === 3) { return "West" as Dir.Dir; - } else { - return undefined; } + return undefined; } export function shape(data: Uint8Array): Shape.Shape { @@ -83,14 +83,13 @@ export function shape(data: Uint8Array): Shape.Shape { _7 = rt.u8Rem(kind, 3); if (_7 === 0) { return { tag: "Dot" } as Shape.Shape; - } else if (_7 === 1) { + } + if (_7 === 1) { return { tag: "Line", _0: Point.new(at(0), at(1)), _1: Point.new(at(2), at(3)) } as Shape.Shape; - } else { - return { tag: "Rect", corner: Point.new(at(0), at(1)), width: rt.u16Mul(rt.optionUnwrapOr(rt.sliceGet(_4[1], 2), 0) as rt.u16, 300), height: rt.optionUnwrapOr(rt.sliceGet(_4[1], 3), 0) as rt.u16 } as Shape.Shape; } - } else { - return { tag: "Dot" } as Shape.Shape; + return { tag: "Rect", corner: Point.new(at(0), at(1)), width: rt.u16Mul(rt.optionUnwrapOr(rt.sliceGet(_4[1], 2), 0) as rt.u16, 300), height: rt.optionUnwrapOr(rt.sliceGet(_4[1], 3), 0) as rt.u16 } as Shape.Shape; } + return { tag: "Dot" } as Shape.Shape; } /** `Copy` aggregates: a copy changes apart from its original. */ @@ -218,9 +217,8 @@ export function copies(data: Uint8Array, out: rt.ByteVec): void { err.y = 3; rt.byteVecExtendFromSlice(out, Uint8Array.of(first.x & 0xff, rt.resultUnwrap(res, rt.u8Display).x & 0xff, err.y & 0xff, rt.resultUnwrapErr(fail, rt.u8Display).y & 0xff)); return; - } else { - rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(_42)); } + rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(_42)); } } @@ -342,9 +340,8 @@ export function order(data: Uint8Array, out: rt.ByteVec): void { rt.byteVecExtendFromSlice(out, rt.stringAsBytes(text)); indexed(data, out); return; - } else { - sum = rt.usizeAdd(sum, _75); } + sum = rt.usizeAdd(sum, _75); } } @@ -462,34 +459,33 @@ export function discriminants(data: Uint8Array, out: rt.ByteVec): void { _5 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_5 === rt.DONE) { return; + } + b = _5; + _10 = rt.u8Rem(b, 3); + if (_10 === 0) { + wide = "Low" as Wide.Wide; + } else if (_10 === 1) { + wide = "High" as Wide.Wide; } else { - b = _5; - _10 = rt.u8Rem(b, 3); - if (_10 === 0) { - wide = "Low" as Wide.Wide; - } else if (_10 === 1) { - wide = "High" as Wide.Wide; - } else { - wide = "Top" as Wide.Wide; - } - _13 = rt.u8Rem(b, 3); - if (_13 === 0) { - signed = "Neg" as Signed.Signed; - } else if (_13 === 1) { - signed = "Min" as Signed.Signed; - } else { - signed = "Pos" as Signed.Signed; - } - rt.byteVecPush(out, { Low: 1, High: 300, Top: 65535 }[wide] & 0xff); - rt.byteVecPush(out, (({ Low: 1, High: 300, Top: 65535 }[wide] << 24) >> 24) & 0xff); - rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(({ Low: 1, High: 300, Top: 65535 }[wide] << 16) >> 16)); - rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes({ Low: 1, High: 300, Top: 65535 }[wide] as rt.u64)); - rt.byteVecPush(out, { Neg: -1, Min: -128, Pos: 100 }[signed] & 0xff); - rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes({ Neg: -1, Min: -128, Pos: 100 }[signed] & 0xffff)); - rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes({ Neg: -1, Min: -128, Pos: 100 }[signed] >>> 0)); - rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes({ Neg: -1, Min: -128, Pos: 100 }[signed] as rt.i64)); - rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(rt.u128Cast({ Neg: -1, Min: -128, Pos: 100 }[signed]))); + wide = "Top" as Wide.Wide; + } + _13 = rt.u8Rem(b, 3); + if (_13 === 0) { + signed = "Neg" as Signed.Signed; + } else if (_13 === 1) { + signed = "Min" as Signed.Signed; + } else { + signed = "Pos" as Signed.Signed; } + rt.byteVecPush(out, { Low: 1, High: 300, Top: 65535 }[wide] & 0xff); + rt.byteVecPush(out, (({ Low: 1, High: 300, Top: 65535 }[wide] << 24) >> 24) & 0xff); + rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(({ Low: 1, High: 300, Top: 65535 }[wide] << 16) >> 16)); + rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes({ Low: 1, High: 300, Top: 65535 }[wide] as rt.u64)); + rt.byteVecPush(out, { Neg: -1, Min: -128, Pos: 100 }[signed] & 0xff); + rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes({ Neg: -1, Min: -128, Pos: 100 }[signed] & 0xffff)); + rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes({ Neg: -1, Min: -128, Pos: 100 }[signed] >>> 0)); + rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes({ Neg: -1, Min: -128, Pos: 100 }[signed] as rt.i64)); + rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(rt.u128Cast({ Neg: -1, Min: -128, Pos: 100 }[signed]))); } } @@ -569,20 +565,19 @@ export function loops(data: Uint8Array, out: rt.ByteVec): void { while (true) { if (!((_34 = iterStart2++) < iterEnd2)) { continue l2; - } else { - j = _34; - rt.idx(data, i); - _39 = data[i]; + } + j = _34; + rt.idx(data, i); + _39 = data[i]; + rt.idx(data, j); + if (!(_39 === data[j])) { rt.idx(data, j); - if (!(_39 === data[j])) { - rt.idx(data, j); - if (data[j] === 0) { - continue l2; - } - } else { - found = [i, j] as [rt.usize, rt.usize]; - break b3; + if (data[j] === 0) { + continue l2; } + } else { + found = [i, j] as [rt.usize, rt.usize]; + break b3; } } } @@ -605,9 +600,8 @@ export function loops(data: Uint8Array, out: rt.ByteVec): void { n = _65; if (!rt.u64Gt(n, 100)) { continue l6; - } else { - steps = 1; } + steps = 1; } else { steps = 0; } @@ -650,22 +644,18 @@ export function loops(data: Uint8Array, out: rt.ByteVec): void { branchLoops(data, out); diverging(data, out); return; - } else { - rt.byteVecPush(out, _136 & 0xff); } + rt.byteVecPush(out, _136 & 0xff); } - } else { - rt.byteVecPush(out, _124 & 0xff); } + rt.byteVecPush(out, _124 & 0xff); } - } else { - i3 = rt.i8Sub(i3, 4); - count = rt.u8Add(count, 1); } + i3 = rt.i8Sub(i3, 4); + count = rt.u8Add(count, 1); } - } else { - count = rt.u8Add(count, 1); } + count = rt.u8Add(count, 1); } } } @@ -836,9 +826,8 @@ export function guardedReturn(data: Uint8Array): rt.u8 { } } return 2; - } else { - return 3; } + return 3; } /** A loop ending the function, left by `break` with values that never exist. */ @@ -859,20 +848,20 @@ export function brokenNever(data: Uint8Array): rt.u8 { args2 = [(f: rt.Formatter) => rt.usizeDisplay(arg, f)]; rt.panicFmt(["broken at ", args2[0]]); return _0; - } else if (value === 252) { + } + if (value === 252) { _19 = i; rt.idx(data, _19); bail(data[_19]); return _0; - } else if (value === 0) { + } + if (value === 0) { return i & 0xff; - } else { - i = rt.usizeAdd(i, 1); - continue l0; } - } else { - return 204; + i = rt.usizeAdd(i, 1); + continue l0; } + return 204; } } @@ -898,14 +887,17 @@ export function boundNever(data: Uint8Array, _out: rt.ByteVec): rt.u8 { args2 = [(f: rt.Formatter) => rt.usizeDisplay(arg, f)]; rt.panicFmt(["bound at ", args2[0]]); return _0; - } else if (value === 240) { + } + if (value === 240) { _22 = i; rt.idx(data, _22); bail(data[_22]); return _0; - } else if (value === 0) { + } + if (value === 0) { return i & 0xff; - } else if (value === 128) { + } + if (value === 128) { l2: while (true) { i = rt.usizeAdd(i, 1); if (!(i >= data.length)) { @@ -917,13 +909,11 @@ export function boundNever(data: Uint8Array, _out: rt.ByteVec): rt.u8 { } return i & 0xff; } - } else { - i = rt.usizeAdd(i, 1); - continue l0; } - } else { - return 187; + i = rt.usizeAdd(i, 1); + continue l0; } + return 187; } } @@ -939,43 +929,42 @@ export function branchLoops(data: Uint8Array, out: rt.ByteVec): void { l0: while (true) { if (!(rt.usizeAdd(i, 1) < data.length)) { return; - } else { - w = rt.sliceRange(data, i, rt.usizeAdd(i, 2)); - b1: { - i = rt.usizeAdd(i, 2); - if (w.length === 2) { - a = w[0]; - b = w[1]; - if (a > b) { - n = a; - while (true) { - if (!(n <= b)) { - n = rt.u8Sub(n, 1); - rt.byteVecPush(out, n); - } else { - break b1; - } + } + w = rt.sliceRange(data, i, rt.usizeAdd(i, 2)); + b1: { + i = rt.usizeAdd(i, 2); + if (w.length === 2) { + a = w[0]; + b = w[1]; + if (a > b) { + n = a; + while (true) { + if (!(n <= b)) { + n = rt.u8Sub(n, 1); + rt.byteVecPush(out, n); + } else { + break b1; } } } - if (w.length >= 1) { - rt.byteVecPush(out, w[0]); - } } - if (w.length === 2) { - if (rt.u8Rem(w[0], 3) === rt.u8Rem(w[1], 3)) { - n2 = w[0]; - while (true) { - n2 = rt.u8Div(n2, 2); - rt.byteVecPush(out, n2); - if (n2 < 4) { - continue l0; - } + if (w.length >= 1) { + rt.byteVecPush(out, w[0]); + } + } + if (w.length === 2) { + if (rt.u8Rem(w[0], 3) === rt.u8Rem(w[1], 3)) { + n2 = w[0]; + while (true) { + n2 = rt.u8Div(n2, 2); + rt.byteVecPush(out, n2); + if (n2 < 4) { + continue l0; } } } - rt.byteVecPush(out, 170); } + rt.byteVecPush(out, 170); } } @@ -998,17 +987,15 @@ export function returnedLoop(data: Uint8Array): rt.u8 { if (!(b === 0)) { if (!(b > 240)) { continue l2; - } else { - return b ^ (i & 0xff); } + return b ^ (i & 0xff); } } i = rt.usizeAdd(i, 1); continue l0; } - } else { - return 221; } + return 221; } } @@ -1029,31 +1016,29 @@ export function firstRepeat(data: Uint8Array): rt.u8 { if (!(j < data.length)) { i = rt.usizeAdd(i, 1); continue l0; - } else { - _14 = j; - rt.idx(data, _14); - if (!(data[_14] === 0)) { - _21 = i; - rt.idx(data, _21); - _20 = data[_21]; - _25 = j; - rt.idx(data, _25); - if (!(_20 === data[_25])) { - j = rt.usizeAdd(j, 1); - } else { - _29 = j; - rt.idx(data, _29); - return data[_29] ^ (i & 0xff); - } + } + _14 = j; + rt.idx(data, _14); + if (!(data[_14] === 0)) { + _21 = i; + rt.idx(data, _21); + _20 = data[_21]; + _25 = j; + rt.idx(data, _25); + if (!(_20 === data[_25])) { + j = rt.usizeAdd(j, 1); } else { - i = rt.usizeAdd(j, 1); - continue l0; + _29 = j; + rt.idx(data, _29); + return data[_29] ^ (i & 0xff); } + } else { + i = rt.usizeAdd(j, 1); + continue l0; } } - } else { - return 255; } + return 255; } } @@ -1078,21 +1063,22 @@ export function tailBreak(data: Uint8Array): rt.u16 { _11 = rt.u8Rem(b, 4); if (_11 === 0) { continue l0; - } else if (_11 === 1) { + } + if (_11 === 1) { iterS = rt.sliceRange(data, i); iterI = 0; while (true) { _18 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_18 === rt.DONE) { continue l0; - } else { - c = _18; - if (c === b) { - return rt.u16Mul(c as rt.u16, 2); - } + } + c = _18; + if (c === b) { + return rt.u16Mul(c as rt.u16, 2); } } - } else if (_11 === 2) { + } + if (_11 === 2) { if (b > 100) { return rt.u16Add(b as rt.u16, i & 0xffff); } @@ -1108,9 +1094,8 @@ export function tailBreak(data: Uint8Array): rt.u16 { continue l0; } } - } else { - return 256; } + return 256; } } @@ -1156,12 +1141,10 @@ export function position$u8(items: Uint8Array, want: rt.u8): rt.usize { if (!((items[_9] === want))) { i = rt.usizeAdd(i, 1); continue l0; - } else { - return i; } - } else { return i; } + return i; } } @@ -1249,18 +1232,18 @@ export function patterns(data: Uint8Array, out: rt.ByteVec): void { b2 = shape_._1; area = rt.i64Mul(rt.i32Sub(a.x, b2.x) as rt.i64, rt.i32Sub(a.y, b2.y) as rt.i64); break b7; - } else if (shape_.width !== 0) { + } + if (shape_.width !== 0) { if (!(shape_.corner.x > 0)) { width2 = shape_.width; height = shape_.height; area = rt.i64Neg(rt.i64Mul(width2 as rt.i64, height as rt.i64)); break b7; - } else { - x = shape_.corner.x; - _74 = shape_.width as rt.i64; - area = rt.i64Mul(_74, x as rt.i64); - break b7; } + x = shape_.corner.x; + _74 = shape_.width as rt.i64; + area = rt.i64Mul(_74, x as rt.i64); + break b7; } } area = 0; @@ -1291,37 +1274,36 @@ export function patterns(data: Uint8Array, out: rt.ByteVec): void { _166 = rt.fmtFormat([args2[0]]); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_166)); return; - } else { - b2: { - b = _33; - if (b === 0) { - class_ = 0; - } else if (b === 10 || b === 20 || b === 30) { - class_ = 2; - } else { - if (1 <= b) { - if (b <= 9) { - class_ = 1; - break b2; - } + } + b2: { + b = _33; + if (b === 0) { + class_ = 0; + } else if (b === 10 || b === 20 || b === 30) { + class_ = 2; + } else { + if (1 <= b) { + if (b <= 9) { + class_ = 1; + break b2; } - if (100 <= b) { - if (b < 200) { - if (rt.u8Rem(b, 2) === 0) { - class_ = 3; - break b2; - } + } + if (100 <= b) { + if (b < 200) { + if (rt.u8Rem(b, 2) === 0) { + class_ = 3; + break b2; } } - if (!(b >= 250)) { - class_ = 5; - } else { - class_ = 4; - } + } + if (!(b >= 250)) { + class_ = 5; + } else { + class_ = 4; } } - rt.byteVecPush(out, class_); } + rt.byteVecPush(out, class_); } } @@ -1388,19 +1370,16 @@ export function closures(data: Uint8Array, out: rt.ByteVec): void { if (_64 === rt.DONE) { rt.byteVecExtendFromSlice(out, rt.byteVecView(tags)); return; - } else { - _70 = rt.optionUnwrapOr(rt.optionMap(_64, from$From_Dir_u8), 0); - rt.byteVecPush(tags, _70); } + _70 = rt.optionUnwrapOr(rt.optionMap(_64, from$From_Dir_u8), 0); + rt.byteVecPush(tags, _70); } - } else { - _59 = dir(_53); - parsed.push(_59); } + _59 = dir(_53); + parsed.push(_59); } - } else { - add(_8); } + add(_8); } } @@ -1436,12 +1415,10 @@ export function library(data: Uint8Array, out: rt.ByteVec): void { _82 = rt.u8CheckedMul(_4, 2); if (_82 !== undefined) { return rt.u8Sub(_82, 1); - } else { - return undefined; } - } else { return undefined; } + return undefined; }; _30 = (a3: rt.u8): rt.Poll> => { let half!: rt.Result; @@ -1461,10 +1438,9 @@ export function library(data: Uint8Array, out: rt.ByteVec): void { _132 = half; if (_132.ok) { return rt.Ok(_132.value); - } else { - residual = _132; - return rt.Err(from$From_Dir_u8((residual as { ok: false; error: Dir.Dir }).error)); } + residual = _132; + return rt.Err(from$From_Dir_u8((residual as { ok: false; error: Dir.Dir }).error)); }; a = rt.optionUnwrapOr(rt.sliceFirst(data), 0); b = rt.optionUnwrapOr(rt.sliceGet(data, 1), 0); diff --git a/ts/fixtures/task/expected/kio.Consumer.ts b/ts/fixtures/task/expected/kio.Consumer.ts index 919f8870d..c57b699e0 100644 --- a/ts/fixtures/task/expected/kio.Consumer.ts +++ b/ts/fixtures/task/expected/kio.Consumer.ts @@ -1,7 +1,6 @@ // Generated by rust2-ts. Do not edit. import * as rt from "./rt.ts"; -import { recvFuture } from "./kio.ts"; import type * as State from "./kio.State.ts"; import * as Waiter from "./kio.Waiter.ts"; @@ -35,9 +34,8 @@ export function pollRecv(self: Consumer, waiter: Waiter.Waiter): rt.Poll { - return new recvFuture(self); -} - //# sourceMappingURL=kio.Consumer.ts.map diff --git a/ts/fixtures/task/expected/kio.WaiterList.ts b/ts/fixtures/task/expected/kio.WaiterList.ts index af8a17feb..8d7235123 100644 --- a/ts/fixtures/task/expected/kio.WaiterList.ts +++ b/ts/fixtures/task/expected/kio.WaiterList.ts @@ -54,11 +54,10 @@ export function register(self: WaiterList, waiter: Waiter.Waiter): void { self.entries = _53; self.cursor = 0; break b4; - } else { - entry = _43; - if (entry.arc.strong > 0) { - live.push(entry); - } + } + entry = _43; + if (entry.arc.strong > 0) { + live.push(entry); } } } @@ -80,7 +79,8 @@ export function register(self: WaiterList, waiter: Waiter.Waiter): void { } } } - } else if (!((_8.arc === weak.arc))) { + } + if (!((_8.arc === weak.arc))) { continue l0; } } @@ -116,16 +116,15 @@ export function wake(self: WaiterList): void { _6 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_6 === rt.DONE) { return; - } else { - entry = _6; - _10 = rt.weakUpgrade(entry); - if (_10 !== undefined) { - unwind = 15; - waker = _10; - waker.value.wakeByRef(); - unwind = 0; - rt.drop(waker); - } + } + entry = _6; + _10 = rt.weakUpgrade(entry); + if (_10 !== undefined) { + unwind = 15; + waker = _10; + waker.value.wakeByRef(); + unwind = 0; + rt.drop(waker); } } } catch (e) { diff --git a/ts/fixtures/task/expected/kio.ts b/ts/fixtures/task/expected/kio.ts index 57e6cbe09..6cfbafe5a 100644 --- a/ts/fixtures/task/expected/kio.ts +++ b/ts/fixtures/task/expected/kio.ts @@ -14,17 +14,17 @@ export function wait$recv_closure0_closure0_Option_u64(poll: (a0: Waiter.Waiter) } export class recvFuture { - state: number = 0; - self: Consumer.Consumer; - __awaitee_!: Pending.Pending<(a0: Waiter.Waiter) => rt.Poll>; + #state: number = 0; + #self: Consumer.Consumer; + #awaitee!: Pending.Pending<(a0: Waiter.Waiter) => rt.Poll>; constructor(self: Consumer.Consumer) { - this.self = self; + this.#self = self; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -33,36 +33,35 @@ export class recvFuture { let _7!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - self = this.self; - this.__awaitee_ = wait$recv_closure0_closure0_Option_u64((waiter: Waiter.Waiter): rt.Poll => { + self = this.#self; + this.#awaitee = wait$recv_closure0_closure0_Option_u64((waiter: Waiter.Waiter): rt.Poll => { return Consumer.pollRecv(self, waiter); }); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _7 = Pending.poll$Future_recv_closure0_closure0(this.__awaitee_, _2); + _7 = Pending.poll$Future_recv_closure0_closure0(this.#awaitee, _2); if (_7 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _7; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } diff --git a/ts/fixtures/task/expected/log.Log.ts b/ts/fixtures/task/expected/log.Log.ts index c910ec3bb..3420f67b3 100644 --- a/ts/fixtures/task/expected/log.Log.ts +++ b/ts/fixtures/task/expected/log.Log.ts @@ -46,11 +46,10 @@ export function text(self: Log): rt.ByteVec { _13 = iter.next(); if (_13 === rt.DONE) { return out; - } else { - _19 = rt.stringAsBytes(_13); - rt.byteVecExtendFromSlice(out, _19); - rt.byteVecPush(out, 10); } + _19 = rt.stringAsBytes(_13); + rt.byteVecExtendFromSlice(out, _19); + rt.byteVecPush(out, 10); } } diff --git a/ts/fixtures/task/expected/model.Channel.ts b/ts/fixtures/task/expected/model.Channel.ts index 6f1790ecb..caa448e84 100644 --- a/ts/fixtures/task/expected/model.Channel.ts +++ b/ts/fixtures/task/expected/model.Channel.ts @@ -71,10 +71,9 @@ export function send(self: Channel, value: rt.u64): boolean { _3 = rt.sliceFirst(self.producers); if (_3 === undefined) { return false; - } else { - Producer.send(_3, value); - return true; } + Producer.send(_3, value); + return true; } /** Drop the last producer, if one is open: the last closes the channel. */ @@ -83,10 +82,9 @@ export function close(self: Channel): boolean { _2 = self.producers.pop(); if (_2 === undefined) { return false; - } else { - rt.drop(_2); - return true; } + rt.drop(_2); + return true; } /** Open another producer, if one is open to clone. */ @@ -96,11 +94,10 @@ export function cloneProducer(self: Channel): boolean { _3 = rt.sliceFirst(self.producers); if (_3 === undefined) { return false; - } else { - clone = Producer.clone$Clone(_3); - self.producers.push(clone); - return true; } + clone = Producer.clone$Clone(_3); + self.producers.push(clone); + return true; } //# sourceMappingURL=model.Channel.ts.map diff --git a/ts/fixtures/task/expected/model.Countdown.ts b/ts/fixtures/task/expected/model.Countdown.ts index c07d605f4..d788fbde0 100644 --- a/ts/fixtures/task/expected/model.Countdown.ts +++ b/ts/fixtures/task/expected/model.Countdown.ts @@ -23,9 +23,8 @@ export function next$Iterator(self: Countdown): rt.u32 | rt.Done { self.left = rt.u32Sub(self.left, 1); Guard.note(self.guard, "count"); return self.left; - } else { - return rt.DONE; } + return rt.DONE; } //# sourceMappingURL=model.Countdown.ts.map diff --git a/ts/fixtures/task/expected/model.ts b/ts/fixtures/task/expected/model.ts index 38ce177be..f1c1c3019 100644 --- a/ts/fixtures/task/expected/model.ts +++ b/ts/fixtures/task/expected/model.ts @@ -1,7 +1,8 @@ // Generated by rust2-ts. Do not edit. import * as rt from "./rt.ts"; -import * as Consumer from "./kio.Consumer.ts"; +import { recvFuture } from "./kio.ts"; +import type * as Consumer from "./kio.Consumer.ts"; import * as Log from "./log.Log.ts"; import * as Countdown from "./model.Countdown.ts"; import * as Guard from "./model.Guard.ts"; @@ -19,37 +20,37 @@ export function sum(rx: Consumer.Consumer, guard: Guard.Guard): rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #guard: Guard.Guard; + #rx$2!: Consumer.Consumer; + #guard$2!: Guard.Guard; + #inner!: Guard.Guard; + #total!: rt.u64; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer, guard: Guard.Guard) { - this.rx = rx; - this.guard = guard; + this.#rx = rx; + this.#guard = guard; } [Symbol.dispose](): void { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 17; - rt.drop(this.rx); + rt.drop(this.#rx); unwind = 0; - rt.drop(this.guard); - } else if (this.state === 3) { + rt.drop(this.#guard); + } else if (this.#state === 3) { unwind = 10; - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); unwind = 12; - rt.drop(this.inner_); + rt.drop(this.#inner); unwind = 13; - rt.drop(this.guard_); + rt.drop(this.#guard$2); unwind = 0; - rt.drop(this.rx_); + rt.drop(this.#rx$2); } } catch (e) { b0: { @@ -58,18 +59,17 @@ export class sumFuture { throw e; } if (unwind === 10) { - rt.drop(this.inner_); + rt.drop(this.#inner); } else if (unwind !== 12) { if (unwind === 13) { break b1; - } else { - rt.drop(this.guard); - break b0; } + rt.drop(this.#guard); + break b0; } - rt.drop(this.guard_); + rt.drop(this.#guard$2); } - rt.drop(this.rx_); + rt.drop(this.#rx$2); } throw e; } @@ -89,62 +89,63 @@ export class sumFuture { l0: while (true) { switch (bb0) { case 0: - if (this.state === 0) { + if (this.#state === 0) { unwind = 33; - this.rx_ = this.rx; - this.guard_ = this.guard; - this.inner_ = Guard.new(rt.u32Add(this.guard_.id, 100), Log.clone$Clone(this.guard_.log)); - this.total_ = 0; + this.#rx$2 = this.#rx; + this.#guard$2 = this.#guard; + this.#inner = Guard.new(rt.u32Add(this.#guard$2.id, 100), Log.clone$Clone(this.#guard$2.log)); + this.#total = 0; bb0 = 4; continue l0; - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + } + if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } else { bb0 = 7; continue l0; } case 4: unwind = 32; - this.__awaitee_ = Consumer.recv(this.rx_); + this.#awaitee = new recvFuture(this.#rx$2); bb0 = 7; continue l0; case 7: unwind = 31; - _11 = this.__awaitee_.poll(_2); + _11 = this.#awaitee.poll(_2); if (_11 !== rt.Pending) { unwind = 32; result = _11; - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); if (result !== undefined) { value = result; if (!(value !== 99)) { - const arg2 = ([this.guard_.id] as [rt.u32])[0]; + const arg2 = ([this.#guard$2.id] as [rt.u32])[0]; args2 = [(f: rt.Formatter) => rt.u32Display(arg2, f)]; rt.panicFmt(["g", args2[0], " poisoned"]); } else { - const arg = this.guard_.id; + const arg = this.#guard$2.id; args4 = [(f: rt.Formatter) => rt.u32Display(arg, f), (f: rt.Formatter) => rt.u64Display(value, f)]; _32 = rt.fmtFormat(["g", args4[0], " got ", args4[1]]); - Log.note(this.inner_.log, _32); - this.total_ = rt.u64Add(this.total_, value); + Log.note(this.#inner.log, _32); + this.#total = rt.u64Add(this.#total, value); bb0 = 4; continue l0; } } else { unwind = 33; - _47 = this.total_; - rt.drop(this.inner_); + _47 = this.#total; + rt.drop(this.#inner); unwind = 34; - rt.drop(this.guard_); + rt.drop(this.#guard$2); unwind = 35; - rt.drop(this.rx_); - this.state = 1; + rt.drop(this.#rx$2); + this.#state = 1; return _47; } } else { - this.state = 3; + this.#state = 3; return rt.Pending; } } @@ -157,23 +158,23 @@ export class sumFuture { throw e; } if (unwind === 31) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } else if (unwind !== 32) { if (unwind === 33) { break b3; - } else if (unwind === 34) { + } + if (unwind === 34) { break b2; - } else { - break b1; } + break b1; } - rt.drop(this.inner_); + rt.drop(this.#inner); } - rt.drop(this.guard_); + rt.drop(this.#guard$2); } - rt.drop(this.rx_); + rt.drop(this.#rx$2); } - this.state = 2; + this.#state = 2; throw e; } } @@ -192,43 +193,43 @@ export function blocks(rx: Consumer.Consumer, guard: Guard.Guard, moves: boolean } export class blocksFuture { - state: number = 0; - rx: Consumer.Consumer; - guard: Guard.Guard; - moves: boolean; - rx_!: Consumer.Consumer; - guard_!: Guard.Guard; - moves_!: boolean; - first_!: Guard.Guard; - second_!: Guard.Guard; - waited_!: rt.u64; - saved!: Guard.Guard; - __awaitee_!: rt.Future; - slots_!: Guard.Guard[]; - _saved!: Guard.Guard; - ___awaitee_!: rt.Future; - tally_!: Tally.Tally; - _saved$2!: Guard.Guard; - _saved$3!: rt.u32; - ___awaitee_$2!: rt.Future; - mark_!: Mark.Mark; - replaced_!: rt.u32; - ___awaitee_$3!: rt.Future; - _nested_!: Inner.Inner; - chosen_!: Guard.Guard; - ___awaitee_$4!: rt.Future; - _saved$4!: boolean; - _saved$5!: boolean; - _saved$6!: boolean; - _saved$7!: boolean; - _saved$8!: boolean; - _saved$9!: boolean; - _saved$10!: boolean; + #state: number = 0; + #rx: Consumer.Consumer; + #guard: Guard.Guard; + #moves: boolean; + #rx$2!: Consumer.Consumer; + #guard$2!: Guard.Guard; + #moves$2!: boolean; + #first!: Guard.Guard; + #second!: Guard.Guard; + #waited!: rt.u64; + #saved!: Guard.Guard; + #awaitee!: rt.Future; + #slots!: Guard.Guard[]; + #saved$2!: Guard.Guard; + #awaitee$2!: rt.Future; + #tally!: Tally.Tally; + #saved$3!: Guard.Guard; + #saved$4!: rt.u32; + #awaitee$3!: rt.Future; + #mark!: Mark.Mark; + #replaced!: rt.u32; + #awaitee$4!: rt.Future; + #nested!: Inner.Inner; + #chosen!: Guard.Guard; + #awaitee$5!: rt.Future; + #saved$5!: boolean; + #saved$6!: boolean; + #saved$7!: boolean; + #saved$8!: boolean; + #saved$9!: boolean; + #saved$10!: boolean; + #saved$11!: boolean; constructor(rx: Consumer.Consumer, guard: Guard.Guard, moves: boolean) { - this.rx = rx; - this.guard = guard; - this.moves = moves; + this.#rx = rx; + this.#guard = guard; + this.#moves = moves; } [Symbol.dispose](): void { @@ -236,67 +237,70 @@ export class blocksFuture { try { b0: { b1: { - if (this.state === 0) { + if (this.#state === 0) { unwind = 82; - rt.drop(this.rx); + rt.drop(this.#rx); unwind = 0; - rt.drop(this.guard); + rt.drop(this.#guard); return; - } else if (this.state === 3) { + } + if (this.#state === 3) { unwind = 56; - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); unwind = 57; - rt.drop(this.saved); - this._saved$10 = false; + rt.drop(this.#saved); + this.#saved$11 = false; break b0; - } else if (this.state === 4) { + } + if (this.#state === 4) { unwind = 51; - rt.drop(this.___awaitee_); + rt.drop(this.#awaitee$2); unwind = 52; - rt.drop(this._saved); - this._saved$9 = false; + rt.drop(this.#saved$2); + this.#saved$10 = false; break b1; - } else if (this.state === 5) { + } + if (this.#state === 5) { unwind = 47; - rt.drop(this.___awaitee_$2); - } else if (this.state === 6) { + rt.drop(this.#awaitee$3); + } else if (this.#state === 6) { unwind = 44; - rt.drop(this.___awaitee_$3); - } else if (this.state === 7) { + rt.drop(this.#awaitee$4); + } else if (this.#state === 7) { unwind = 37; - rt.drop(this.___awaitee_$4); + rt.drop(this.#awaitee$5); unwind = 40; - rt.drop(this.chosen_); + rt.drop(this.#chosen); unwind = 42; - rt.drop(this._nested_); + rt.drop(this.#nested); } else { return; } - this._saved$8 = false; + this.#saved$9 = false; } unwind = 55; - rt.dropAll(this.slots_); + rt.dropAll(this.#slots); } - if (this._saved$5) { + if (this.#saved$6) { unwind = 60; - rt.drop(this.second_); + rt.drop(this.#second); } - this._saved$5 = false; - if (this._saved$6) { + this.#saved$6 = false; + if (this.#saved$7) { unwind = 61; - rt.drop(this.first_); + rt.drop(this.#first); } - this._saved$6 = false; - if (this._saved$4) { + this.#saved$7 = false; + if (this.#saved$5) { unwind = 62; - rt.drop(this.guard_); + rt.drop(this.#guard$2); } - this._saved$4 = false; - if (this._saved$7) { + this.#saved$5 = false; + if (this.#saved$8) { unwind = 0; - rt.drop(this.rx_); + rt.drop(this.#rx$2); } - this._saved$7 = false; + this.#saved$8 = false; } catch (e) { b8: { b9: { @@ -314,71 +318,80 @@ export class blocksFuture { throw e; } if (unwind === 37) { - rt.drop(this.chosen_); + rt.drop(this.#chosen); break b18; - } else if (unwind === 40) { + } + if (unwind === 40) { break b18; - } else if (unwind === 42) { + } + if (unwind === 42) { break b17; - } else if (unwind === 44) { + } + if (unwind === 44) { break b16; - } else if (unwind === 47) { + } + if (unwind === 47) { break b15; - } else if (unwind === 51) { - rt.drop(this._saved); + } + if (unwind === 51) { + rt.drop(this.#saved$2); break b19; - } else if (unwind === 52) { + } + if (unwind === 52) { break b19; - } else if (unwind === 55) { + } + if (unwind === 55) { break b13; - } else if (unwind === 56) { - rt.drop(this.saved); + } + if (unwind === 56) { + rt.drop(this.#saved); } else if (unwind !== 57) { if (unwind === 60) { break b11; - } else if (unwind === 61) { + } + if (unwind === 61) { break b10; - } else if (unwind === 62) { + } + if (unwind === 62) { break b9; - } else { - rt.drop(this.guard); - break b8; } + rt.drop(this.#guard); + break b8; } - this._saved$10 = false; + this.#saved$11 = false; break b12; } - this._saved$9 = false; + this.#saved$10 = false; break b14; } - rt.drop(this._nested_); + rt.drop(this.#nested); } } } - this._saved$8 = false; + this.#saved$9 = false; } - rt.dropAll(this.slots_); + rt.dropAll(this.#slots); } } - if (this._saved$5) { - rt.drop(this.second_); + if (this.#saved$6) { + rt.drop(this.#second); } } - this._saved$5 = false; - if (this._saved$6) { - rt.drop(this.first_); + this.#saved$6 = false; + if (this.#saved$7) { + rt.drop(this.#first); } } - this._saved$6 = false; - if (this._saved$4) { - rt.drop(this.guard_); + this.#saved$7 = false; + if (this.#saved$5) { + rt.drop(this.#guard$2); } } - this._saved$4 = false; - if (this._saved$7) { - rt.drop(this.rx_); + this.#saved$5 = false; + if (this.#saved$8) { + rt.drop(this.#rx$2); } - this._saved$7 = false; + this.#saved$8 = false; } throw e; } @@ -419,200 +432,200 @@ export class blocksFuture { b1: { b2: { b3: { - if (this.state === 0) { + if (this.#state === 0) { unwind = 132; - this._saved$7 = false; - this._saved$4 = false; - this._saved$6 = false; - this._saved$5 = false; - this._saved$10 = false; - this._saved$9 = false; - this._saved$8 = false; - this._saved$7 = true; - this.rx_ = this.rx; - this._saved$4 = true; - this.guard_ = this.guard; - this.moves_ = this.moves; - this.first_ = Guard.new(rt.u32Add(this.guard_.id, 200), Log.clone$Clone(this.guard_.log)); + this.#saved$8 = false; + this.#saved$5 = false; + this.#saved$7 = false; + this.#saved$6 = false; + this.#saved$11 = false; + this.#saved$10 = false; + this.#saved$9 = false; + this.#saved$8 = true; + this.#rx$2 = this.#rx; + this.#saved$5 = true; + this.#guard$2 = this.#guard; + this.#moves$2 = this.#moves; + this.#first = Guard.new(rt.u32Add(this.#guard$2.id, 200), Log.clone$Clone(this.#guard$2.log)); unwind = 131; - this._saved$6 = true; - this.second_ = Guard.new(rt.u32Add(this.guard_.id, 300), Log.clone$Clone(this.guard_.log)); + this.#saved$7 = true; + this.#second = Guard.new(rt.u32Add(this.#guard$2.id, 300), Log.clone$Clone(this.#guard$2.log)); unwind = 142; - this._saved$5 = true; - rt.drop(new blocksFuture$2(this.first_)); - _18 = rt.u32Rem(this.guard_.id, 5); - turns(this.guard_.log, _18); - temporaries(this.guard_.log, this.guard_.id); + this.#saved$6 = true; + rt.drop(new blocksFuture$2(this.#first)); + _18 = rt.u32Rem(this.#guard$2.id, 5); + turns(this.#guard$2.log, _18); + temporaries(this.#guard$2.log, this.#guard$2.id); unwind = 130; - this.saved = Guard.new(rt.u32Add(this.guard_.id, 900), Log.clone$Clone(this.guard_.log)); + this.#saved = Guard.new(rt.u32Add(this.#guard$2.id, 900), Log.clone$Clone(this.#guard$2.log)); unwind = 128; - this._saved$10 = true; - this.__awaitee_ = Consumer.recv(this.rx_); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); - } else if (this.state !== 3) { - if (this.state === 4) { + this.#saved$11 = true; + this.#awaitee = new recvFuture(this.#rx$2); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); + } else if (this.#state !== 3) { + if (this.#state === 4) { break b3; - } else if (this.state === 5) { + } + if (this.#state === 5) { break b2; - } else if (this.state === 6) { + } + if (this.#state === 6) { break b1; - } else { - break b0; } + break b0; } unwind = 125; - _32 = this.__awaitee_.poll(_2); + _32 = this.#awaitee.poll(_2); if (_32 !== rt.Pending) { unwind = 126; result = _32; - rt.drop(this.__awaitee_); - this._saved$10 = false; - this.waited_ = consume(this.saved, result); + rt.drop(this.#awaitee); + this.#saved$11 = false; + this.#waited = consume(this.#saved, result); unwind = 142; - this._saved$10 = false; - _40 = Guard.new(rt.u32Add(this.guard_.id, 910), Log.clone$Clone(this.guard_.log)); + this.#saved$11 = false; + _40 = Guard.new(rt.u32Add(this.#guard$2.id, 910), Log.clone$Clone(this.#guard$2.log)); unwind = 124; - _46 = Guard.new(rt.u32Add(this.guard_.id, 920), Log.clone$Clone(this.guard_.log)); + _46 = Guard.new(rt.u32Add(this.#guard$2.id, 920), Log.clone$Clone(this.#guard$2.log)); unwind = 122; - this.slots_ = [_40, _46]; - this._saved = Guard.new(rt.u32Add(this.guard_.id, 930), Log.clone$Clone(this.guard_.log)); + this.#slots = [_40, _46]; + this.#saved$2 = Guard.new(rt.u32Add(this.#guard$2.id, 930), Log.clone$Clone(this.#guard$2.log)); unwind = 120; - this._saved$9 = true; - this.___awaitee_ = slot(this.rx_); + this.#saved$10 = true; + this.#awaitee$2 = new slotFuture(this.#rx$2); } else { - this.state = 3; + this.#state = 3; return rt.Pending; } } unwind = 118; - _60 = this.___awaitee_.poll(_2); + _60 = this.#awaitee$2.poll(_2); if (_60 !== rt.Pending) { unwind = 139; result2 = _60; - rt.drop(this.___awaitee_); + rt.drop(this.#awaitee$2); if (!(result2 < 2)) { rt.panic("index out of bounds: the len is " + 2 + " but the index is " + result2); } unwind = 44; - rt.drop(this.slots_[result2]); + rt.drop(this.#slots[result2]); unwind = 123; - this._saved$9 = false; - this.slots_[result2] = this._saved; - this._saved$9 = false; - const arg = ([this.waited_] as [rt.u64])[0]; + this.#saved$10 = false; + this.#slots[result2] = this.#saved$2; + this.#saved$10 = false; + const arg = ([this.#waited] as [rt.u64])[0]; args2 = [(f: rt.Formatter) => rt.u64Display(arg, f)]; _75 = rt.fmtFormat(["slot after ", args2[0]]); unwind = 117; _73 = _75; - Guard.note(this.slots_[0], _73); + Guard.note(this.#slots[0], _73); unwind = 137; - this.tally_ = { n: this.guard_.id }; - this._saved$8 = true; - seen = new blocksFuture$3(rt.copy(this.tally_)); - _86 = rt.u32Add(this.tally_.n, 1000); - this.tally_.n = _86; - this._saved$2 = this.guard_; - this._saved$3 = this.tally_.n; - this._saved$8 = false; - this.___awaitee_$2 = seen; + this.#tally = { n: this.#guard$2.id }; + this.#saved$9 = true; + seen = new blocksFuture$3(rt.copy(this.#tally)); + _86 = rt.u32Add(this.#tally.n, 1000); + this.#tally.n = _86; + this.#saved$3 = this.#guard$2; + this.#saved$4 = this.#tally.n; + this.#saved$9 = false; + this.#awaitee$3 = seen; } else { - this.state = 4; + this.#state = 4; return rt.Pending; } } unwind = 115; - _98 = this.___awaitee_$2.poll(_2); + _98 = this.#awaitee$3.poll(_2); if (_98 !== rt.Pending) { unwind = 137; _95 = _98; - rt.drop(this.___awaitee_$2); - const arg2 = this._saved$3; + rt.drop(this.#awaitee$3); + const arg2 = this.#saved$4; args4 = [(f: rt.Formatter) => rt.u32Display(arg2, f), (f: rt.Formatter) => rt.u32Display(_95, f)]; _90 = rt.fmtFormat(["tally ", args4[0], " then ", args4[1]]); unwind = 114; _88 = _90; - Guard.note(this._saved$2, _88); + Guard.note(this.#saved$3, _88); unwind = 137; - this.mark_ = { n: 1 }; - this.___awaitee_$3 = new blocksFuture$4(this.mark_); + this.#mark = { n: 1 }; + this.#awaitee$4 = new blocksFuture$4(this.#mark); } else { - this.state = 5; + this.#state = 5; return rt.Pending; } } unwind = 113; - _114 = this.___awaitee_$3.poll(_2); + _114 = this.#awaitee$4.poll(_2); if (_114 !== rt.Pending) { unwind = 137; - this.replaced_ = _114; - rt.drop(this.___awaitee_$3); - const arg3 = this.replaced_; + this.#replaced = _114; + rt.drop(this.#awaitee$4); + const arg3 = this.#replaced; _133 = (f: rt.Formatter) => rt.u32Display(arg3, f); - const arg4 = this.mark_.n; + const arg4 = this.#mark.n; args6 = [_133, (f: rt.Formatter) => rt.u32Display(arg4, f)]; _126 = rt.fmtFormat(["mark ", args6[0], " ", args6[1]]); unwind = 112; _124 = _126; - Guard.note(this.guard_, _124); + Guard.note(this.#guard$2, _124); unwind = 111; _138 = undefined; - _139 = Guard.new(rt.u32Add(this.guard_.id, 800), Log.clone$Clone(this.guard_.log)); + _139 = Guard.new(rt.u32Add(this.#guard$2.id, 800), Log.clone$Clone(this.#guard$2.log)); unwind = 137; _146 = new Outer.Outer({ inner: _138, guard: _139 }); unwind = 110; - this._nested_ = new Inner.Inner({ outer: _146 }); - third = Guard.new(rt.u32Add(this.guard_.id, 400), Log.clone$Clone(this.guard_.log)); - if (!this.moves_) { - this.chosen_ = third; + this.#nested = new Inner.Inner({ outer: _146 }); + third = Guard.new(rt.u32Add(this.#guard$2.id, 400), Log.clone$Clone(this.#guard$2.log)); + if (!this.#moves$2) { + this.#chosen = third; } else { - this.chosen_ = third; + this.#chosen = third; } unwind = 109; - Guard.note(this.chosen_, "chosen"); - if (this.moves_) { - this._saved$4 = false; - rt.drop(new blocksFuture$5(this.guard_)); + Guard.note(this.#chosen, "chosen"); + if (this.#moves$2) { + this.#saved$5 = false; + rt.drop(new blocksFuture$5(this.#guard$2)); } unwind = 109; - this._saved$6 = false; - this._saved$5 = false; - this._saved$7 = false; - this.___awaitee_$4 = new blocksFuture$6(this.first_, this.second_, this.rx_); + this.#saved$7 = false; + this.#saved$6 = false; + this.#saved$8 = false; + this.#awaitee$5 = new blocksFuture$6(this.#first, this.#second, this.#rx$2); } else { - this.state = 6; + this.#state = 6; return rt.Pending; } } unwind = 108; - _161 = this.___awaitee_$4.poll(_2); + _161 = this.#awaitee$5.poll(_2); if (_161 !== rt.Pending) { unwind = 109; result5 = _161; - rt.drop(this.___awaitee_$4); + rt.drop(this.#awaitee$5); unwind = 110; - rt.drop(this.chosen_); + rt.drop(this.#chosen); unwind = 137; - rt.drop(this._nested_); + rt.drop(this.#nested); unwind = 142; - this._saved$8 = false; - rt.dropAll(this.slots_); - this._saved$5 = false; - this._saved$6 = false; - if (this._saved$4) { + this.#saved$9 = false; + rt.dropAll(this.#slots); + this.#saved$6 = false; + this.#saved$7 = false; + if (this.#saved$5) { unwind = 133; - rt.drop(this.guard_); + rt.drop(this.#guard$2); } - this._saved$4 = false; - this._saved$7 = false; - this.state = 1; + this.#saved$5 = false; + this.#saved$8 = false; + this.#state = 1; return result5; - } else { - this.state = 7; - return rt.Pending; } + this.#state = 7; + return rt.Pending; } catch (e) { b8: { b9: { @@ -627,124 +640,144 @@ export class blocksFuture { throw e; } if (unwind === 44) { - this._saved$9 = false; - this.slots_[result2] = this._saved; + this.#saved$10 = false; + this.#slots[result2] = this.#saved$2; break b13; - } else if (unwind === 108) { - rt.drop(this.___awaitee_$4); + } + if (unwind === 108) { + rt.drop(this.#awaitee$5); break b16; - } else if (unwind === 109) { + } + if (unwind === 109) { break b16; - } else if (unwind === 110) { + } + if (unwind === 110) { break b15; - } else if (unwind === 111) { + } + if (unwind === 111) { rt.drop(_138); break b14; - } else if (unwind === 112) { + } + if (unwind === 112) { break b14; - } else if (unwind === 113) { - rt.drop(this.___awaitee_$3); + } + if (unwind === 113) { + rt.drop(this.#awaitee$4); break b14; - } else if (unwind === 114) { + } + if (unwind === 114) { break b14; - } else if (unwind === 115) { - rt.drop(this.___awaitee_$2); + } + if (unwind === 115) { + rt.drop(this.#awaitee$3); break b14; - } else if (unwind === 117) { + } + if (unwind === 117) { break b12; - } else if (unwind === 118) { - rt.drop(this.___awaitee_); + } + if (unwind === 118) { + rt.drop(this.#awaitee$2); break b13; - } else if (unwind === 120) { - rt.drop(this._saved); - this._saved$9 = false; + } + if (unwind === 120) { + rt.drop(this.#saved$2); + this.#saved$10 = false; break b12; - } else if (unwind === 122) { - this._saved$9 = false; + } + if (unwind === 122) { + this.#saved$10 = false; break b12; - } else if (unwind === 123) { + } + if (unwind === 123) { break b12; - } else if (unwind === 124) { + } + if (unwind === 124) { rt.drop(_40); break b11; - } else if (unwind === 125) { - rt.drop(this.__awaitee_); + } + if (unwind === 125) { + rt.drop(this.#awaitee); } else if (unwind !== 126) { if (unwind === 128) { - rt.drop(this.saved); - this._saved$10 = false; + rt.drop(this.#saved); + this.#saved$11 = false; break b11; - } else if (unwind === 130) { - this._saved$10 = false; + } + if (unwind === 130) { + this.#saved$11 = false; break b11; - } else if (unwind === 131) { + } + if (unwind === 131) { break b10; - } else if (unwind === 132) { + } + if (unwind === 132) { break b9; - } else if (unwind === 133) { + } + if (unwind === 133) { break b8; - } else if (unwind === 137) { + } + if (unwind === 137) { break b14; - } else if (unwind === 139) { + } + if (unwind === 139) { break b13; - } else { - break b11; } + break b11; } - if (this._saved$10) { - rt.drop(this.saved); + if (this.#saved$11) { + rt.drop(this.#saved); } - this._saved$10 = false; + this.#saved$11 = false; break b11; } - rt.drop(this.chosen_); + rt.drop(this.#chosen); } - rt.drop(this._nested_); + rt.drop(this.#nested); } - if (this._saved$8) { + if (this.#saved$9) { rt.drop(seen); } - this._saved$8 = false; + this.#saved$9 = false; break b12; } - if (this._saved$9) { - rt.drop(this._saved); + if (this.#saved$10) { + rt.drop(this.#saved$2); } - this._saved$9 = false; + this.#saved$10 = false; } - rt.dropAll(this.slots_); + rt.dropAll(this.#slots); } - if (this._saved$5) { - rt.drop(this.second_); + if (this.#saved$6) { + rt.drop(this.#second); } } - this._saved$5 = false; - if (this._saved$6) { - rt.drop(this.first_); + this.#saved$6 = false; + if (this.#saved$7) { + rt.drop(this.#first); } } - this._saved$6 = false; - if (this._saved$4) { - rt.drop(this.guard_); + this.#saved$7 = false; + if (this.#saved$5) { + rt.drop(this.#guard$2); } } - this._saved$4 = false; - if (this._saved$7) { - rt.drop(this.rx_); + this.#saved$5 = false; + if (this.#saved$8) { + rt.drop(this.#rx$2); } - this._saved$7 = false; - this.state = 2; + this.#saved$8 = false; + this.#state = 2; throw e; } } } export class blocksFuture$2 { - state: number = 0; - first: Guard.Guard; + #state: number = 0; + #first: Guard.Guard; constructor(first: Guard.Guard) { - this.first = first; + this.#first = first; } [Symbol.dispose](): void { @@ -753,32 +786,33 @@ export class blocksFuture$2 { poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 3; - Guard.note(this.first, "borrowed"); - this.state = 1; + Guard.note(this.#first, "borrowed"); + this.#state = 1; return undefined; - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); + } + if (this.#state === 1) { + rt.asyncFnResumed(); } else { - rt.panic("`async fn` resumed after panicking"); + rt.asyncFnResumedPanic(); } } catch (e) { if (unwind === 0) { throw e; } - this.state = 2; + this.#state = 2; throw e; } } } export class blocksFuture$3 { - state: number = 0; - tally: Tally.Tally; + #state: number = 0; + #tally: Tally.Tally; constructor(tally: Tally.Tally) { - this.tally = tally; + this.#tally = tally; } [Symbol.dispose](): void { @@ -788,32 +822,33 @@ export class blocksFuture$3 { let _0!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 3; - _0 = read(this.tally); - this.state = 1; + _0 = read(this.#tally); + this.#state = 1; return _0; - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); + } + if (this.#state === 1) { + rt.asyncFnResumed(); } else { - rt.panic("`async fn` resumed after panicking"); + rt.asyncFnResumedPanic(); } } catch (e) { if (unwind === 0) { throw e; } - this.state = 2; + this.#state = 2; throw e; } } } export class blocksFuture$4 { - state: number = 0; - mark: Mark.Mark; + #state: number = 0; + #mark: Mark.Mark; constructor(mark: Mark.Mark) { - this.mark = mark; + this.#mark = mark; } [Symbol.dispose](): void { @@ -823,96 +858,96 @@ export class blocksFuture$4 { let _0!: rt.Poll; let _3!: Mark.Mark; let _4!: Mark.Mark; - if (this.state === 0) { + if (this.#state === 0) { _3 = { n: 2 }; - _4 = this.mark; + _4 = this.#mark; Object.assign(_4, _3); - _0 = this.mark.n; - this.state = 1; + _0 = this.#mark.n; + this.#state = 1; return _0; - } else { - rt.panic("`async fn` resumed after completion"); } + rt.asyncFnResumed(); } } export class blocksFuture$5 { - state: number = 0; - guard: Guard.Guard; + #state: number = 0; + #guard: Guard.Guard; constructor(guard: Guard.Guard) { - this.guard = guard; + this.#guard = guard; } [Symbol.dispose](): void { - if (this.state === 0) { - rt.drop(this.guard); + if (this.#state === 0) { + rt.drop(this.#guard); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 4; - Guard.note(this.guard, "moved"); + Guard.note(this.#guard, "moved"); unwind = 5; - rt.drop(this.guard); - this.state = 1; + rt.drop(this.#guard); + this.#state = 1; return undefined; - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); + } + if (this.#state === 1) { + rt.asyncFnResumed(); } else { - rt.panic("`async fn` resumed after panicking"); + rt.asyncFnResumedPanic(); } } catch (e) { if (unwind === 0) { throw e; } if (unwind === 4) { - rt.drop(this.guard); + rt.drop(this.#guard); } - this.state = 2; + this.#state = 2; throw e; } } } export class blocksFuture$6 { - state: number = 0; - first: Guard.Guard; - second: Guard.Guard; - rx: Consumer.Consumer; - _held_!: Guard.Guard; - __awaitee_!: rt.Future; + #state: number = 0; + #first: Guard.Guard; + #second: Guard.Guard; + #rx: Consumer.Consumer; + #held!: Guard.Guard; + #awaitee!: rt.Future; constructor(first: Guard.Guard, second: Guard.Guard, rx: Consumer.Consumer) { - this.first = first; - this.second = second; - this.rx = rx; + this.#first = first; + this.#second = second; + this.#rx = rx; } [Symbol.dispose](): void { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 22; - rt.drop(this.first); + rt.drop(this.#first); unwind = 21; - rt.drop(this.second); + rt.drop(this.#second); unwind = 0; - rt.drop(this.rx); - } else if (this.state === 3) { + rt.drop(this.#rx); + } else if (this.#state === 3) { unwind = 8; - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); unwind = 10; - rt.drop(this._held_); + rt.drop(this.#held); unwind = 14; - rt.drop(this.first); + rt.drop(this.#first); unwind = 13; - rt.drop(this.second); + rt.drop(this.#second); unwind = 0; - rt.drop(this.rx); + rt.drop(this.#rx); } } catch (e) { b0: { @@ -922,27 +957,31 @@ export class blocksFuture$6 { throw e; } if (unwind === 8) { - rt.drop(this._held_); + rt.drop(this.#held); break b1; - } else if (unwind === 10) { + } + if (unwind === 10) { break b1; - } else if (unwind === 13) { + } + if (unwind === 13) { break b2; - } else if (unwind === 14) { - rt.drop(this.second); + } + if (unwind === 14) { + rt.drop(this.#second); break b2; - } else if (unwind !== 21) { - rt.drop(this.second); } - rt.drop(this.rx); + if (unwind !== 21) { + rt.drop(this.#second); + } + rt.drop(this.#rx); break b0; } - rt.drop(this.rx); + rt.drop(this.#rx); break b0; } - rt.drop(this.first); - rt.drop(this.second); - rt.drop(this.rx); + rt.drop(this.#first); + rt.drop(this.#second); + rt.drop(this.#rx); } throw e; } @@ -954,43 +993,42 @@ export class blocksFuture$6 { let _27!: rt.u64; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 30; - Guard.note(this.first, "reads"); - Guard.note(this.second, "reads"); - this._held_ = Guard.new(rt.u32Add(this.second.id, 100), Log.clone$Clone(this.second.log)); + Guard.note(this.#first, "reads"); + Guard.note(this.#second, "reads"); + this.#held = Guard.new(rt.u32Add(this.#second.id, 100), Log.clone$Clone(this.#second.log)); unwind = 21; - this.__awaitee_ = Consumer.recv(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new recvFuture(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 20; - _17 = this.__awaitee_.poll(_2); + _17 = this.#awaitee.poll(_2); if (_17 !== rt.Pending) { unwind = 21; result = _17; - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); if (result === undefined) { _27 = 0; } else { _27 = result; } unwind = 30; - rt.drop(this._held_); + rt.drop(this.#held); unwind = 24; - rt.drop(this.first); + rt.drop(this.#first); unwind = 23; - rt.drop(this.second); + rt.drop(this.#second); unwind = 22; - rt.drop(this.rx); - this.state = 1; + rt.drop(this.#rx); + this.#state = 1; return _27; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { b2: { b3: { @@ -999,29 +1037,32 @@ export class blocksFuture$6 { throw e; } if (unwind === 20) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); break b4; - } else if (unwind === 21) { + } + if (unwind === 21) { break b4; - } else if (unwind === 22) { + } + if (unwind === 22) { break b2; - } else if (unwind !== 23) { + } + if (unwind !== 23) { if (unwind === 24) { - rt.drop(this.second); + rt.drop(this.#second); } else { break b3; } } - rt.drop(this.rx); + rt.drop(this.#rx); break b2; } - rt.drop(this._held_); + rt.drop(this.#held); } - rt.drop(this.first); - rt.drop(this.second); - rt.drop(this.rx); + rt.drop(this.#first); + rt.drop(this.#second); + rt.drop(this.#rx); } - this.state = 2; + this.#state = 2; throw e; } } @@ -1032,23 +1073,18 @@ export function consume(guard: Guard.Guard, v: rt.u64 | undefined): rt.u64 { return rt.u64Add(Guard.finish(guard, "consumed") as rt.u64, rt.optionUnwrapOr(v, 0)); } -/** The slot the next value picks. */ -export function slot(rx: Consumer.Consumer): rt.Future { - return new slotFuture(rx); -} - export class slotFuture { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -1058,39 +1094,38 @@ export class slotFuture { let _18!: rt.usize; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 16; - this.__awaitee_ = Consumer.recv(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new recvFuture(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 15; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 16; result = _6; - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); if (result === undefined) { _18 = 0; } else { _18 = rt.usizeRem(rt.u64Low(result), 2); } - this.state = 1; + this.#state = 1; return _18; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 15) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } @@ -1212,9 +1247,8 @@ export function temporaries(log: Log.Log, id: rt.u32): void { unwind = 0; rt.drop(head); return; - } else { - sum_ = rt.u32Add(sum_, _126); } + sum_ = rt.u32Add(sum_, _126); } } catch (e) { b3: { @@ -1226,26 +1260,30 @@ export function temporaries(log: Log.Log, id: rt.u32): void { if (unwind === 75) { rt.drop(iter); break b5; - } else if (unwind === 76) { + } + if (unwind === 76) { break b5; - } else if (unwind === 77) { + } + if (unwind === 77) { break b4; - } else if (unwind === 78) { + } + if (unwind === 78) { rt.drop(_73); } else if (unwind !== 79) { if (unwind === 80) { rt.drop(_57); break b3; - } else if (unwind === 81) { + } + if (unwind === 81) { rt.drop(_39); break b3; - } else if (unwind === 82) { + } + if (unwind === 82) { rt.drop(_24); break b3; - } else { - rt.drop(_11); - break b3; } + rt.drop(_11); + break b3; } rt.drop(_70); break b3; @@ -1418,22 +1456,27 @@ export function turns(log: Log.Log, count: rt.u32): void { if (unwind === 88) { rt.drop(_91); break b8; - } else if (unwind === 89) { + } + if (unwind === 89) { break b8; - } else if (unwind === 90) { + } + if (unwind === 90) { break b7; - } else if (unwind === 91) { + } + if (unwind === 91) { break b6; - } else if (unwind === 92) { + } + if (unwind === 92) { break b5; - } else if (unwind === 93) { + } + if (unwind === 93) { break b4; - } else if (unwind === 94) { + } + if (unwind === 94) { rt.drop(_4); break b2; - } else { - break b3; } + break b3; } rt.dropAll(spares); } @@ -1462,47 +1505,48 @@ export function drain(rx: Consumer.Consumer, depth: rt.u32): rt.Future { } export class drainFuture { - state: number = 0; - rx: Consumer.Consumer; - depth: rt.u32; - rx_!: Consumer.Consumer; - depth_!: rt.u32; - total_!: rt.u64; - __awaitee_!: rt.Future; - ___awaitee_!: rt.Future; - ___awaitee_$2!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #depth: rt.u32; + #rx$2!: Consumer.Consumer; + #depth$2!: rt.u32; + #total!: rt.u64; + #awaitee!: rt.Future; + #awaitee$2!: rt.Future; + #awaitee$3!: rt.Future; constructor(rx: Consumer.Consumer, depth: rt.u32) { - this.rx = rx; - this.depth = depth; + this.#rx = rx; + this.#depth = depth; } [Symbol.dispose](): void { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 0; - rt.drop(this.rx); + rt.drop(this.#rx); return; - } else if (this.state === 3) { + } + if (this.#state === 3) { unwind = 19; - rt.drop(this.__awaitee_); - } else if (this.state === 4) { + rt.drop(this.#awaitee); + } else if (this.#state === 4) { unwind = 17; - rt.drop(this.___awaitee_); - } else if (this.state === 5) { + rt.drop(this.#awaitee$2); + } else if (this.#state === 5) { unwind = 15; - rt.drop(this.___awaitee_$2); + rt.drop(this.#awaitee$3); } else { return; } unwind = 0; - rt.drop(this.rx_); + rt.drop(this.#rx$2); } catch (e) { if (unwind === 0) { throw e; } - rt.drop(this.rx_); + rt.drop(this.#rx$2); throw e; } } @@ -1519,20 +1563,21 @@ export class drainFuture { l0: while (true) { switch (bb0) { case 0: - if (this.state === 0) { - this.rx_ = this.rx; - this.depth_ = this.depth; - this.total_ = 0; + if (this.#state === 0) { + this.#rx$2 = this.#rx; + this.#depth$2 = this.#depth; + this.#total = 0; bb0 = 1; continue l0; - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); - } else if (this.state === 3) { + } + if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); + } else if (this.#state === 3) { bb0 = 7; continue l0; - } else if (this.state === 4) { + } else if (this.#state === 4) { bb0 = 15; continue l0; } else { @@ -1540,74 +1585,70 @@ export class drainFuture { continue l0; } case 1: - if (this.depth_ === 1) { + if (this.#depth$2 === 1) { unwind = 36; - this.__awaitee_ = Consumer.recv(this.rx_); + this.#awaitee = new recvFuture(this.#rx$2); bb0 = 7; continue l0; - } else if (this.depth_ === 4) { + } + if (this.#depth$2 === 4) { unwind = 36; - this.___awaitee_ = level3(this.rx_); + this.#awaitee$2 = new level3Future(this.#rx$2); bb0 = 15; continue l0; - } else { - unwind = 36; - this.___awaitee_$2 = level15(this.rx_); - bb0 = 22; - continue l0; } + unwind = 36; + this.#awaitee$3 = new level15Future(this.#rx$2); + bb0 = 22; + continue l0; case 22: unwind = 33; - _29 = this.___awaitee_$2.poll(_2); + _29 = this.#awaitee$3.poll(_2); if (_29 !== rt.Pending) { unwind = 36; next = _29; - rt.drop(this.___awaitee_$2); + rt.drop(this.#awaitee$3); bb0 = 27; continue l0; - } else { - this.state = 5; - return rt.Pending; } + this.#state = 5; + return rt.Pending; case 15: unwind = 34; - _18 = this.___awaitee_.poll(_2); + _18 = this.#awaitee$2.poll(_2); if (_18 !== rt.Pending) { unwind = 36; next = _18; - rt.drop(this.___awaitee_); + rt.drop(this.#awaitee$2); bb0 = 27; continue l0; - } else { - this.state = 4; - return rt.Pending; } + this.#state = 4; + return rt.Pending; case 7: unwind = 35; - _7 = this.__awaitee_.poll(_2); + _7 = this.#awaitee.poll(_2); if (_7 !== rt.Pending) { unwind = 36; next = _7; - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); bb0 = 27; continue l0; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; case 27: if (next === undefined) { unwind = 37; - _40 = this.total_; - rt.drop(this.rx_); - this.state = 1; + _40 = this.#total; + rt.drop(this.#rx$2); + this.#state = 1; return _40; - } else { - unwind = 36; - this.total_ = rt.u64Add(this.total_, next); - bb0 = 1; - continue l0; } + unwind = 36; + this.#total = rt.u64Add(this.#total, next); + bb0 = 1; + continue l0; } } } catch (e) { @@ -1616,38 +1657,34 @@ export class drainFuture { throw e; } if (unwind === 33) { - rt.drop(this.___awaitee_$2); + rt.drop(this.#awaitee$3); } else if (unwind === 34) { - rt.drop(this.___awaitee_); + rt.drop(this.#awaitee$2); } else if (unwind === 35) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } else if (unwind !== 36) { break b1; } - rt.drop(this.rx_); + rt.drop(this.#rx$2); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level1(rx: Consumer.Consumer): rt.Future { - return new level1Future(rx); -} - export class level1Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -1655,54 +1692,49 @@ export class level1Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = Consumer.recv(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new recvFuture(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level10(rx: Consumer.Consumer): rt.Future { - return new level10Future(rx); -} - export class level10Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -1710,54 +1742,49 @@ export class level10Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level9(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level9Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level11(rx: Consumer.Consumer): rt.Future { - return new level11Future(rx); -} - export class level11Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -1765,54 +1792,49 @@ export class level11Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level10(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level10Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level12(rx: Consumer.Consumer): rt.Future { - return new level12Future(rx); -} - export class level12Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -1820,54 +1842,49 @@ export class level12Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level11(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level11Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level13(rx: Consumer.Consumer): rt.Future { - return new level13Future(rx); -} - export class level13Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -1875,54 +1892,49 @@ export class level13Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level12(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level12Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level14(rx: Consumer.Consumer): rt.Future { - return new level14Future(rx); -} - export class level14Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -1930,54 +1942,49 @@ export class level14Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level13(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level13Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level15(rx: Consumer.Consumer): rt.Future { - return new level15Future(rx); -} - export class level15Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -1985,54 +1992,49 @@ export class level15Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level14(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level14Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level2(rx: Consumer.Consumer): rt.Future { - return new level2Future(rx); -} - export class level2Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -2040,54 +2042,49 @@ export class level2Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level1(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level1Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level3(rx: Consumer.Consumer): rt.Future { - return new level3Future(rx); -} - export class level3Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -2095,54 +2092,49 @@ export class level3Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level2(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level2Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level4(rx: Consumer.Consumer): rt.Future { - return new level4Future(rx); -} - export class level4Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -2150,54 +2142,49 @@ export class level4Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level3(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level3Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level5(rx: Consumer.Consumer): rt.Future { - return new level5Future(rx); -} - export class level5Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -2205,54 +2192,49 @@ export class level5Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level4(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level4Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level6(rx: Consumer.Consumer): rt.Future { - return new level6Future(rx); -} - export class level6Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -2260,54 +2242,49 @@ export class level6Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level5(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level5Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level7(rx: Consumer.Consumer): rt.Future { - return new level7Future(rx); -} - export class level7Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -2315,54 +2292,49 @@ export class level7Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level6(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level6Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level8(rx: Consumer.Consumer): rt.Future { - return new level8Future(rx); -} - export class level8Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -2370,54 +2342,49 @@ export class level8Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level7(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level7Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } -export function level9(rx: Consumer.Consumer): rt.Future { - return new level9Future(rx); -} - export class level9Future { - state: number = 0; - rx: Consumer.Consumer; - __awaitee_!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.__awaitee_); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -2425,33 +2392,32 @@ export class level9Future { let _6!: rt.Poll; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.__awaitee_ = level8(this.rx); - } else if (this.state === 1) { - rt.panic("`async fn` resumed after completion"); - } else if (this.state === 2) { - rt.panic("`async fn` resumed after panicking"); + this.#awaitee = new level8Future(this.#rx); + } else if (this.#state === 1) { + rt.asyncFnResumed(); + } else if (this.#state === 2) { + rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.__awaitee_.poll(_2); + _6 = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.__awaitee_); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; - } else { - this.state = 3; - return rt.Pending; } + this.#state = 3; + return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.__awaitee_); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } diff --git a/ts/runtime/rt/task.ts b/ts/runtime/rt/task.ts index 026498b78..1207539d6 100644 --- a/ts/runtime/rt/task.ts +++ b/ts/runtime/rt/task.ts @@ -101,6 +101,16 @@ export interface Future extends Disposable { poll(cx: Context): Poll; } +/** An `async fn` polled again after it returned. */ +export function asyncFnResumed(): never { + throw new Panic("`async fn` resumed after completion"); +} + +/** An `async fn` polled again after it panicked. */ +export function asyncFnResumedPanic(): never { + throw new Panic("`async fn` resumed after panicking"); +} + // Executor /** diff --git a/ts/src/lower/body.rs b/ts/src/lower/body.rs index 46f5e8799..d972be3ea 100644 --- a/ts/src/lower/body.rs +++ b/ts/src/lower/body.rs @@ -137,8 +137,12 @@ impl<'b, 'a, 'tcx> Body<'b, 'a, 'tcx> { if let ty::InstanceKind::Item(did) = instance.def && did.is_local() { - let sym = self.t.instance(instance); let values: Vec = args.into_iter().map(Expr::typed).collect(); + // An `async fn` that only makes its future: the future, made here. + if let Some(class) = super::mir::coroutine::of_async_fn(self.t, instance, span) { + return Expr::New(Box::new(Expr::Sym(class)), values); + } + let sym = self.t.instance(instance); let call = Expr::Sym(sym).call(values); // The crate's own `next` returns an item or `rt.DONE`, and its caller an `Option`. if super::iter::is_next(tcx, did) { diff --git a/ts/src/lower/mir/coroutine.rs b/ts/src/lower/mir/coroutine.rs index f1b1acbb7..5ec28fd4b 100644 --- a/ts/src/lower/mir/coroutine.rs +++ b/ts/src/lower/mir/coroutine.rs @@ -61,7 +61,9 @@ pub fn info<'tcx>(t: &mut Translator<'_, 'tcx>, def_id: DefId, args: GenericArgs alias: None, }); let mut fields = Vec::new(); - let state = t.program.field(sym, "state".into()); + // Private, as only the class's own methods read its fields, which a minifier can then + // rename. + let state = t.program.field(sym, "#state".into()); fields.push(ts::Field { id: state, ty: Type::Builtin("number"), @@ -79,7 +81,7 @@ pub fn info<'tcx>(t: &mut Translator<'_, 'tcx>, def_id: DefId, args: GenericArgs }; let mut upvars = Vec::new(); for (i, ty) in coroutine.upvar_tys().iter().enumerate() { - let name = names.get(i).cloned().unwrap_or_else(|| format!("u{i}")); + let name = format!("#{}", names.get(i).cloned().unwrap_or_else(|| format!("u{i}"))); let id = t.program.field(sym, name); upvars.push(id); let ty = t.ty(ty, span); @@ -106,9 +108,10 @@ pub fn info<'tcx>(t: &mut Translator<'_, 'tcx>, def_id: DefId, args: GenericArgs }; let mut saved = IndexVec::new(); for field in layout.field_tys.iter() { - let name = match field.debuginfo_name { - Some(name) => format!("{}_", crate::lower::camel(name.as_str())), - None => "saved".into(), + // rustc's own locals, such as `__awaitee`, start with `_`. + let name = match field.debuginfo_name.map(|n| n.as_str().trim_start_matches('_').to_string()) { + Some(name) if !name.is_empty() => format!("#{}", crate::lower::camel(&name)), + _ => "#saved".into(), }; let id = t.program.field(sym, name); saved.push(id); @@ -206,6 +209,46 @@ pub fn info<'tcx>(t: &mut Translator<'_, 'tcx>, def_id: DefId, args: GenericArgs info } +/// The class of the future the `async fn` `instance` returns, if its body only moves its +/// arguments, in order, into it: a call can then make the future itself. +pub fn of_async_fn<'tcx>(t: &mut Translator<'_, 'tcx>, instance: Instance<'tcx>, span: Span) -> Option { + use rustc_middle::mir::{AggregateKind, Rvalue, StatementKind, TerminatorKind}; + if !t.tcx.asyncness(instance.def_id()).is_async() { + return None; + } + let mir = super::instance_mir(t, instance, span)?; + if mir.basic_blocks.len() != 1 { + return None; + } + let block = &mir.basic_blocks[rustc_middle::mir::START_BLOCK]; + if !matches!(block.terminator().kind, TerminatorKind::Return) { + return None; + } + let mut made = None; + for stmt in &block.statements { + match &stmt.kind { + StatementKind::StorageLive(_) | StatementKind::StorageDead(_) | StatementKind::Nop => {} + StatementKind::Assign(assign) if made.is_none() => made = Some(&**assign), + _ => return None, + } + } + let (place, Rvalue::Aggregate(kind, ops)) = made? else { + return None; + }; + let AggregateKind::Coroutine(def_id, args) = **kind else { + return None; + }; + let moved_args = ops.len() == mir.arg_count + && ops.iter().zip(mir.args_iter()).all(|(op, arg)| match op { + Operand::Move(p) | Operand::Copy(p) => p.as_local() == Some(arg), + Operand::Constant(_) | Operand::RuntimeChecks(_) => false, + }); + if place.as_local() != Some(rustc_middle::mir::RETURN_PLACE) || !moved_args { + return None; + } + Some(info(t, def_id, args, span).sym) +} + /// A coroutine made in place: `new Class(...captures)`. pub fn construct<'tcx>( fx: &mut Fx<'_, '_, '_, 'tcx>, diff --git a/ts/src/lower/mir/mod.rs b/ts/src/lower/mir/mod.rs index 184fb279c..8c7bbed77 100644 --- a/ts/src/lower/mir/mod.rs +++ b/ts/src/lower/mir/mod.rs @@ -2041,20 +2041,20 @@ impl<'m, 'b, 'a, 'tcx> Fx<'m, 'b, 'a, 'tcx> { if matches!(&failed, Expr::Lit(t) if t == "false") { return; } - let message = match self.assert_message(msg, operands, span) { - Some(message) => message, + let panic = match self.assert_panic(msg, operands, span) { + Some(panic) => panic, None => return, }; // An assert that always fails, such as a coroutine's after it returned. if matches!(&failed, Expr::Lit(t) if t == "true") { - pre.push(StmtKind::Expr(Expr::rt("panic", vec![message])).at(self.b.t.loc(span))); + pre.push(StmtKind::Expr(panic).at(self.b.t.loc(span))); self.emit(pre, None, false, out); return; } pre.push( StmtKind::If { cond: failed, - then: vec![StmtKind::Expr(Expr::rt("panic", vec![message])).at(None)], + then: vec![StmtKind::Expr(panic).at(None)], els: Vec::new(), } .at(self.b.t.loc(span)), @@ -2062,6 +2062,22 @@ impl<'m, 'b, 'a, 'tcx> Fx<'m, 'b, 'a, 'tcx> { self.emit(pre, None, false, out); } + /// The panic of an assert that fails: the runtime's own function for a coroutine + /// resumed out of turn, as rustc calls a lang item, else `rt.panic`. + fn assert_panic(&mut self, msg: &mir::AssertMessage<'tcx>, operands: Vec, span: Span) -> Option { + use mir::AssertKind; + use rustc_hir::{CoroutineDesugaring, CoroutineKind}; + let async_fn = |kind: &CoroutineKind| matches!(kind, CoroutineKind::Desugared(CoroutineDesugaring::Async, _)); + match msg { + AssertKind::ResumedAfterReturn(kind) if async_fn(kind) => Some(Expr::rt("asyncFnResumed", Vec::new())), + AssertKind::ResumedAfterPanic(kind) if async_fn(kind) => Some(Expr::rt("asyncFnResumedPanic", Vec::new())), + _ => { + let message = self.assert_message(msg, operands, span)?; + Some(Expr::rt("panic", vec![message])) + } + } + } + /// The message an assert panics with, as the runtime spells it. fn assert_message(&mut self, msg: &mir::AssertMessage<'tcx>, operands: Vec, span: Span) -> Option { use mir::AssertKind; @@ -2093,8 +2109,6 @@ impl<'m, 'b, 'a, 'tcx> Fx<'m, 'b, 'a, 'tcx> { AssertKind::OverflowNeg(_) => text("attempt to negate with overflow"), AssertKind::DivisionByZero(_) => text("attempt to divide by zero"), AssertKind::RemainderByZero(_) => text("attempt to calculate the remainder with a divisor of zero"), - AssertKind::ResumedAfterReturn(_) => text("`async fn` resumed after completion"), - AssertKind::ResumedAfterPanic(_) => text("`async fn` resumed after panicking"), _ => { self.err(span, format!("an assert of `{msg:?}`")); None diff --git a/ts/src/print.rs b/ts/src/print.rs index c2a6e8216..66f95bef9 100644 --- a/ts/src/print.rs +++ b/ts/src/print.rs @@ -513,15 +513,17 @@ impl Printer<'_> { match ctor { Ctor::Unit => {} Ctor::Positional => { + // A private field's parameter is its name without the `#`. + let param = |name: &str| name.trim_start_matches('#').to_string(); let params: Vec = (names.iter().zip(fields)) - .map(|(name, field)| format!("{name}: {}", self.ty(&field.ty))) + .map(|(name, field)| format!("{}: {}", param(name), self.ty(&field.ty))) .collect(); self.newline(); self.start(); self.write(&format!("constructor({}) {{\n", params.join(", "))); for name in &names { self.start(); - self.write(&format!("{INDENT}this.{name} = {name};\n")); + self.write(&format!("{INDENT}this.{name} = {};\n", param(name))); } self.start(); self.write("}\n"); @@ -700,6 +702,21 @@ impl Printer<'_> { self.expr(cond, 0); self.write(") {\n"); self.block_body(then); + // After a `then` that never falls through, the `else` is the code that follows, + // unless it declares what the code after the `if` could clash with. + if crate::ts::diverges(then) + && !els.is_empty() + && !els + .iter() + .any(|s| matches!(s.kind, StmtKind::Decl { .. } | StmtKind::Declare { .. })) + { + self.start(); + self.write("}\n"); + for stmt in els { + self.stmt(stmt); + } + return; + } let mut els = els; loop { match els.as_slice() { diff --git a/ts/src/program.rs b/ts/src/program.rs index 7b773a3a9..0a64ba56c 100644 --- a/ts/src/program.rs +++ b/ts/src/program.rs @@ -156,8 +156,9 @@ impl Program { } if let Scope::Owner(owner) = scope { for field in self.fields.iter_mut().filter(|f| f.owner == owner) { - let base = match taken.contains(&field.base) { - // A name a class already defines: the field gives way. + let base = match taken.contains(&field.base) && !field.base.starts_with('#') { + // A name a class already defines: the field gives way. A private name + // can only clash with another field's, which `unique` numbers. true => format!("_{}", field.base), false => field.base.clone(), }; From 37c50524a98f1b4e4e9e4d44ea90cd12c58b8c51 Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Mon, 26 Oct 2026 07:25:01 -0700 Subject: [PATCH 03/12] feat(ts): declare locals where first assigned, hoist else after a branch that leaves Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0115AT2ue6x9cT5e5J9SZtCn --- ts/fixtures/codec/expected/bench.ts | 359 ++-- .../expected/coding/decode.DecodeError.ts | 39 +- .../codec/expected/coding/decode.Decoder.ts | 60 +- .../codec/expected/coding/encode.Encoder.ts | 54 +- ts/fixtures/codec/expected/coding/varint.ts | 147 +- .../codec/expected/coding/version.Version.ts | 9 +- .../codec/expected/coding/version.Versions.ts | 66 +- ts/fixtures/codec/expected/harness.ts | 422 ++--- .../codec/expected/lib.SessionError.ts | 14 +- .../codec/expected/lite/group.Group.ts | 51 +- ts/fixtures/codec/expected/lite/message.ts | 33 +- .../codec/expected/lite/probe.Probe.ts | 45 +- .../lang/expected/collections.Fussy.ts | 8 +- ts/fixtures/lang/expected/collections.Pair.ts | 3 +- ts/fixtures/lang/expected/collections.Rank.ts | 3 +- ts/fixtures/lang/expected/collections.ts | 900 +++------ ts/fixtures/lang/expected/fmt.Fails.ts | 6 +- ts/fixtures/lang/expected/fmt.Fault.ts | 50 +- ts/fixtures/lang/expected/fmt.Hex.ts | 11 +- ts/fixtures/lang/expected/fmt.Kind.ts | 21 +- ts/fixtures/lang/expected/fmt.Manual.ts | 3 +- ts/fixtures/lang/expected/fmt.Nested.ts | 9 +- ts/fixtures/lang/expected/fmt.Padded.ts | 3 +- ts/fixtures/lang/expected/fmt.Pair.ts | 9 +- ts/fixtures/lang/expected/fmt.Seq.ts | 6 +- ts/fixtures/lang/expected/fmt.Six.ts | 6 +- ts/fixtures/lang/expected/fmt.Tup.ts | 6 +- ts/fixtures/lang/expected/fmt.Wide.ts | 9 +- ts/fixtures/lang/expected/fmt.ts | 702 +++---- ts/fixtures/lang/expected/generics.Either.ts | 45 +- ts/fixtures/lang/expected/generics.Tagged.ts | 21 +- ts/fixtures/lang/expected/generics.Wrap.ts | 135 +- ts/fixtures/lang/expected/generics.ts | 117 +- ts/fixtures/lang/expected/harness.ts | 21 +- ts/fixtures/lang/expected/ints.ts | 1680 ++++++----------- ts/fixtures/lang/expected/iters.Countdown.ts | 3 +- ts/fixtures/lang/expected/iters.Doubled.ts | 6 +- ts/fixtures/lang/expected/iters.Evens.ts | 6 +- ts/fixtures/lang/expected/iters.Gaps.ts | 6 +- ts/fixtures/lang/expected/iters.Halving.ts | 6 +- ts/fixtures/lang/expected/iters.ts | 749 +++----- ts/fixtures/lang/expected/shapes.Moved.ts | 9 +- ts/fixtures/lang/expected/shapes.Point.ts | 15 +- ts/fixtures/lang/expected/shapes.Shape.ts | 36 +- ts/fixtures/lang/expected/shapes.ts | 772 +++----- ts/fixtures/task/expected/kio.Consumer.ts | 19 +- ts/fixtures/task/expected/kio.Park.ts | 3 +- ts/fixtures/task/expected/kio.Pending.ts | 3 +- ts/fixtures/task/expected/kio.Producer.ts | 24 +- ts/fixtures/task/expected/kio.Waiter.ts | 6 +- ts/fixtures/task/expected/kio.WaiterList.ts | 74 +- ts/fixtures/task/expected/kio.ts | 9 +- ts/fixtures/task/expected/log.Log.ts | 21 +- ts/fixtures/task/expected/model.Channel.ts | 15 +- ts/fixtures/task/expected/model.Guard.ts | 15 +- ts/fixtures/task/expected/model.ts | 277 +-- ts/src/lower/mir/cfg.rs | 30 + ts/src/lower/mir/coroutine.rs | 5 +- ts/src/lower/mir/mod.rs | 185 +- ts/src/print.rs | 15 - 60 files changed, 2651 insertions(+), 4731 deletions(-) diff --git a/ts/fixtures/codec/expected/bench.ts b/ts/fixtures/codec/expected/bench.ts index 5fca3fb3a..edc381038 100644 --- a/ts/fixtures/codec/expected/bench.ts +++ b/ts/fixtures/codec/expected/bench.ts @@ -13,18 +13,13 @@ import type * as Version from "./lite/version.Version.ts"; /** Run one workload. */ export function run(input: Uint8Array): rt.ByteVec { - let out!: rt.ByteVec; - let op!: rt.u8; - let _5!: [rt.u8, Uint8Array] | undefined; - let selector!: rt.u8; - let _9!: [rt.u8, Uint8Array] | undefined; - out = new rt.ByteVec(); - _5 = rt.sliceSplitFirst(input); + const out: rt.ByteVec = new rt.ByteVec(); + const _5: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(input); if (_5 !== undefined) { - op = _5[0]; - _9 = rt.sliceSplitFirst(_5[1]); + const op: rt.u8 = _5[0]; + const _9: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(_5[1]); if (_9 !== undefined) { - selector = _9[0]; + const selector: rt.u8 = _9[0]; if (op === 0) { encoded(encodeVarints(_9[1], form(selector), out), out); } else if (op === 1) { @@ -60,33 +55,25 @@ export function encoded(result: rt.Result, o } export function decoded(result: rt.Result, out: rt.ByteVec): void { - let err!: DecodeError.DecodeError; if (!result.ok) { - err = result.error; + const err: DecodeError.DecodeError = result.error; decodeError(out, err); } } /** The same value, `count` times. */ export function encodeVarints(data: Uint8Array, form_: Form.Form, out: rt.ByteVec): rt.Result { - let count!: rt.u64; - let _6!: [rt.u64, Uint8Array]; - let value!: rt.u64; - let w!: Encoder.Encoder; - let iterStart!: rt.usize; - let iterEnd!: rt.usize; - let _17!: rt.Result; - _6 = takeU64(data); - count = _6[0]; - value = takeU64(_6[1])[0]; - w = Encoder.new(out, form_); - iterStart = 0; - iterEnd = rt.u64Low(count); + const _6: [rt.u64, Uint8Array] = takeU64(data); + const count: rt.u64 = _6[0]; + const value: rt.u64 = takeU64(_6[1])[0]; + const w: Encoder.Encoder = Encoder.new(out, form_); + let iterStart: rt.usize = 0; + const iterEnd: rt.usize = rt.u64Low(count); l0: while (true) { if (!(iterStart++ < iterEnd)) { return rt.Ok(undefined); } - _17 = Encoder.varint(w, value); + const _17: rt.Result = Encoder.varint(w, value); if (_17.ok) { continue l0; } @@ -96,16 +83,12 @@ export function encodeVarints(data: Uint8Array, form_: Form.Form, out: rt.ByteVe /** Every varint on the wire: how many, and the last. */ export function decodeVarints(wire: Uint8Array, form_: Form.Form, out: rt.ByteVec): rt.Result { - let r!: Decoder.Decoder; - let count!: rt.usize; - let last!: rt.u64; - let _9!: rt.Result; - r = Decoder.new(wire, form_); - count = 0; - last = 0; + const r: Decoder.Decoder = Decoder.new(wire, form_); + let count: rt.usize = 0; + let last: rt.u64 = 0; l0: while (true) { if (!Decoder.isEmpty(r)) { - _9 = Decoder.varint(r); + const _9: rt.Result = Decoder.varint(r); if (_9.ok) { last = _9.value; count = rt.usizeAdd(count, 1); @@ -125,56 +108,32 @@ export function decodeVarints(wire: Uint8Array, form_: Form.Form, out: rt.ByteVe * and every `key_every`th frame after it is `key_size`, as moq's benchmark samples are. */ export function encodeFrames(data: Uint8Array, version: Version.Version, out: rt.ByteVec): rt.Result { - let count!: rt.u64; - let _6!: [rt.u64, Uint8Array]; - let delta!: rt.u64; - let _9!: [rt.u64, Uint8Array]; - let first!: rt.u64; - let _12!: [rt.u64, Uint8Array]; - let size!: rt.u64; - let _15!: [rt.u64, Uint8Array]; - let keyEvery!: rt.u64; - let _18!: [rt.u64, Uint8Array]; - let keySize!: rt.u64; - let delta2!: rt.i64; - let keyEvery2!: rt.usize; - let _23!: [rt.i64, rt.usize]; - let _24!: rt.i64; - let w!: Encoder.Encoder; - let iterStart!: rt.usize; - let iterEnd!: rt.usize; let _32!: rt.usize; - let n!: rt.usize; - let delta3!: rt.i64; - let size2!: rt.u64; let _38!: [rt.i64, rt.u64]; - let _45!: rt.Result; - let _48!: rt.u64; - let _51!: rt.Result; - _6 = takeU64(data); - count = _6[0]; - _9 = takeU64(_6[1]); - delta = _9[0]; - _12 = takeU64(_9[1]); - first = _12[0]; - _15 = takeU64(_12[1]); - size = _15[0]; - _18 = takeU64(_15[1]); - keyEvery = _18[0]; - keySize = takeU64(_18[1])[0]; - _24 = rt.i64Cast(delta); - _23 = [_24, rt.u64Low(keyEvery)] as [rt.i64, rt.usize]; - delta2 = _24; - keyEvery2 = _23[1]; - w = Encoder.new(out, Form.from$From_Version(version)); - iterStart = 0; - iterEnd = rt.u64Low(count); + const _6: [rt.u64, Uint8Array] = takeU64(data); + const count: rt.u64 = _6[0]; + const _9: [rt.u64, Uint8Array] = takeU64(_6[1]); + const delta: rt.u64 = _9[0]; + const _12: [rt.u64, Uint8Array] = takeU64(_9[1]); + const first: rt.u64 = _12[0]; + const _15: [rt.u64, Uint8Array] = takeU64(_12[1]); + const size: rt.u64 = _15[0]; + const _18: [rt.u64, Uint8Array] = takeU64(_15[1]); + const keyEvery: rt.u64 = _18[0]; + const keySize: rt.u64 = takeU64(_18[1])[0]; + const _24: rt.i64 = rt.i64Cast(delta); + const _23: [rt.i64, rt.usize] = [_24, rt.u64Low(keyEvery)]; + const delta2: rt.i64 = _24; + const keyEvery2: rt.usize = _23[1]; + const w: Encoder.Encoder = Encoder.new(out, Form.from$From_Version(version)); + let iterStart: rt.usize = 0; + const iterEnd: rt.usize = rt.u64Low(count); l0: while (true) { if (!((_32 = iterStart++) < iterEnd)) { return rt.Ok(undefined); } b2: { - n = _32; + const n: rt.usize = _32; if (n === 0) { _38 = [0, first] as [rt.i64, rt.u64]; } else { @@ -187,12 +146,12 @@ export function encodeFrames(data: Uint8Array, version: Version.Version, out: rt _38 = [delta2, size] as [rt.i64, rt.u64]; } } - delta3 = _38[0]; - size2 = _38[1]; - _48 = zigzag(delta3); - _45 = Encoder.varint(w, _48); + const delta3: rt.i64 = _38[0]; + const size2: rt.u64 = _38[1]; + const _48: rt.u64 = zigzag(delta3); + const _45: rt.Result = Encoder.varint(w, _48); if (_45.ok) { - _51 = Encoder.varint(w, size2); + const _51: rt.Result = Encoder.varint(w, size2); if (_51.ok) { continue l0; } @@ -204,22 +163,16 @@ export function encodeFrames(data: Uint8Array, version: Version.Version, out: rt /** Every FRAME header on the wire: how many, their total size, and the last delta. */ export function decodeFrames(wire: Uint8Array, version: Version.Version, out: rt.ByteVec): rt.Result { - let r!: Decoder.Decoder; - let count!: rt.usize; - let total!: rt.u64; - let last!: rt.i64; - let _12!: rt.Result; - let _18!: rt.Result; - r = Decoder.new(wire, Form.from$From_Version(version)); - count = 0; - total = 0; - last = 0; + const r: Decoder.Decoder = Decoder.new(wire, Form.from$From_Version(version)); + let count: rt.usize = 0; + let total: rt.u64 = 0; + let last: rt.i64 = 0; l0: while (true) { if (!Decoder.isEmpty(r)) { - _12 = Decoder.varint(r); + const _12: rt.Result = Decoder.varint(r); if (_12.ok) { last = unzigzag(_12.value); - _18 = Decoder.varint(r); + const _18: rt.Result = Decoder.varint(r); if (_18.ok) { total = rt.u64Add(total, _18.value); count = rt.usizeAdd(count, 1); @@ -244,27 +197,14 @@ export function decodeFrames(wire: Uint8Array, version: Version.Version, out: rt * and how many decodes came up short. */ export function decodeSplit(data: Uint8Array, version: Version.Version, out: rt.ByteVec): rt.Result { - let _0!: rt.Result; - let _6!: [rt.u64, Uint8Array]; - let read2!: rt.usize; - let start!: rt.usize; - let end!: rt.usize; - let count!: rt.usize; - let total!: rt.u64; - let last!: rt.i64; - let short!: rt.usize; - let r!: Decoder.Decoder; - let _32!: rt.Result<[rt.i64, rt.u64], DecodeError.DecodeError>; - let delta!: rt.i64; - let size!: rt.u64; - _6 = takeU64(data); - read2 = rt.max(rt.u64Low(_6[0]), 1); - start = 0; - end = 0; - count = 0; - total = 0; - last = 0; - short = 0; + const _6: [rt.u64, Uint8Array] = takeU64(data); + const read2: rt.usize = rt.max(rt.u64Low(_6[0]), 1); + let start: rt.usize = 0; + let end: rt.usize = 0; + let count: rt.usize = 0; + let total: rt.u64 = 0; + let last: rt.i64 = 0; + let short: rt.usize = 0; l0: while (true) { if (!(end < _6[1].length)) { if (!(start < end)) { @@ -280,24 +220,24 @@ export function decodeSplit(data: Uint8Array, version: Version.Version, out: rt. while (true) { if (!(start < end)) { continue l0; + } + const slice = _6[1]; + const r: Decoder.Decoder = Decoder.new(rt.sliceRange(slice, start, end), Form.from$From_Version(version)); + const _32: rt.Result<[rt.i64, rt.u64], DecodeError.DecodeError> = frameHeader(r); + if (_32.ok) { + const delta: rt.i64 = _32.value[0]; + const size: rt.u64 = _32.value[1]; + start = rt.usizeSub(end, Decoder.remaining(r)); + last = delta; + total = rt.u64Add(total, size); + count = rt.usizeAdd(count, 1); } else { - const slice = _6[1]; - r = Decoder.new(rt.sliceRange(slice, start, end), Form.from$From_Version(version)); - _32 = frameHeader(r); - if (_32.ok) { - delta = _32.value[0]; - size = _32.value[1]; - start = rt.usizeSub(end, Decoder.remaining(r)); - last = delta; - total = rt.u64Add(total, size); - count = rt.usizeAdd(count, 1); - } else if (_32.error.tag === "Short") { + if (_32.error.tag === "Short") { short = rt.usizeAdd(short, 1); continue l0; - } else { - _0 = rt.Err(_32.error); - return _0; } + const _0: rt.Result = rt.Err(_32.error); + return _0; } } } @@ -305,13 +245,10 @@ export function decodeSplit(data: Uint8Array, version: Version.Version, out: rt. /** One FRAME header: the zigzag timestamp delta, then the size. */ export function frameHeader(r: Decoder.Decoder): rt.Result<[rt.i64, rt.u64], DecodeError.DecodeError> { - let delta!: rt.i64; - let _3!: rt.Result; - let _9!: rt.Result; - _3 = Decoder.varint(r); + const _3: rt.Result = Decoder.varint(r); if (_3.ok) { - delta = unzigzag(_3.value); - _9 = Decoder.varint(r); + const delta: rt.i64 = unzigzag(_3.value); + const _9: rt.Result = Decoder.varint(r); if (_9.ok) { return rt.Ok([delta, _9.value] as [rt.i64, rt.u64]); } @@ -322,12 +259,9 @@ export function frameHeader(r: Decoder.Decoder): rt.Result<[rt.i64, rt.u64], Dec /** One size-prefixed GROUP header, starting at the first frame. */ export function encodeGroup(data: Uint8Array, version: Version.Version, out: rt.ByteVec): rt.Result { - let _6!: [rt.u64, Uint8Array]; - let group!: Group.Group; - let _12!: Encoder.Encoder; - _6 = takeU64(data); - group = { subscribe: _6[0], sequence: takeU64(_6[1])[0], frameStart: 0 }; - _12 = Encoder.new(out, Form.from$From_Version(version)); + const _6: [rt.u64, Uint8Array] = takeU64(data); + const group: Group.Group = { subscribe: _6[0], sequence: takeU64(_6[1])[0], frameStart: 0 }; + const _12: Encoder.Encoder = Encoder.new(out, Form.from$From_Version(version)); return Group.encode$Encode_Version(group, _12, version); } @@ -337,71 +271,51 @@ export function encodeGroup(data: Uint8Array, version: Version.Version, out: rt. * found. */ export function ordered(data: Uint8Array, out: rt.ByteVec): void { - let count2!: rt.u32; - let _10!: (a0: rt.u32) => rt.u32; - let map!: rt.BTreeMap; - let iterStart!: rt.u32; - let iterEnd!: rt.u32; let _15!: rt.u32; - let i!: rt.u32; - let _21!: rt.u32; - let sum!: rt.u64; - let iterStart2!: rt.u32; - let iterEnd2!: rt.u32; let _28!: rt.u32; - let i2!: rt.u32; - let _38!: rt.u32; - let _42!: rt.u32; - let _49!: rt.Range; - let iter3!: rt.Iter<[rt.u32, rt.u32]>; - let _57!: [rt.u32, rt.u32] | rt.Done; - let iterStart3!: rt.u32; - let iterEnd3!: rt.u32; let _66!: rt.u32; - let _73!: rt.u32; - _10 = (i4: rt.u32): rt.u32 => { + const _10: (a0: rt.u32) => rt.u32 = (i4: rt.u32): rt.u32 => { return rt.u32Rem(rt.u32Mul(i4, 40503), 1 << 16); }; - count2 = rt.u64Low(rt.u64Min(takeU64(data)[0], 65536)); - map = rt.btreeNew(rt.cmp) as rt.BTreeMap; - iterStart = 0; - iterEnd = count2; + const count2: rt.u32 = rt.u64Low(rt.u64Min(takeU64(data)[0], 65536)); + const map: rt.BTreeMap = rt.btreeNew(rt.cmp) as rt.BTreeMap; + let iterStart: rt.u32 = 0; + const iterEnd: rt.u32 = count2; while (true) { if (!((_15 = iterStart++) < iterEnd)) { - sum = 0; - iterStart2 = 0; - iterEnd2 = count2; + let sum: rt.u64 = 0; + let iterStart2: rt.u32 = 0; + const iterEnd2: rt.u32 = count2; while (true) { if (!((_28 = iterStart2++) < iterEnd2)) { - _49 = new rt.Range(1 << 14, 2 << 14); - iter3 = rt.btreeRange(map, _49); + const _49: rt.Range = new rt.Range(1 << 14, 2 << 14); + const iter3: rt.Iter<[rt.u32, rt.u32]> = rt.btreeRange(map, _49); while (true) { - _57 = iter3.next(); + const _57: [rt.u32, rt.u32] | rt.Done = iter3.next(); if (_57 === rt.DONE) { - iterStart3 = 0; - iterEnd3 = count2; + let iterStart3: rt.u32 = 0; + const iterEnd3: rt.u32 = count2; while (true) { if (!((_66 = iterStart3++) < iterEnd3)) { putU64(out, sum); return; } - _73 = _10(_66); + const _73: rt.u32 = _10(_66); rt.btreeRemove(map, _73); } } sum = rt.u64Add(sum, _57[1] as rt.u64); } - } else { - i2 = _28; - _42 = rt.u32Sub(count2, 1); - const part = rt.u32Sub(_42, i2); - _38 = _10(part); - sum = rt.u64Add(sum, rt.optionUnwrapOr(rt.btreeGet(map, _38), 0) as rt.u64); } + const i2: rt.u32 = _28; + const _42: rt.u32 = rt.u32Sub(count2, 1); + const part = rt.u32Sub(_42, i2); + const _38: rt.u32 = _10(part); + sum = rt.u64Add(sum, rt.optionUnwrapOr(rt.btreeGet(map, _38), 0) as rt.u64); } } - i = _15; - _21 = _10(i); + const i: rt.u32 = _15; + const _21: rt.u32 = _10(i); rt.btreeInsert(map, _21, i); } } @@ -411,12 +325,6 @@ export function ordered(data: Uint8Array, out: rt.ByteVec): void { * next to the iterator protocol they run through. */ export function iterate(chain: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let _11!: rt.Iter; - let odd!: rt.ByteVec; - let last!: rt.usize; - let iter!: rt.Iter<[rt.usize, rt.u8]>; - let _33!: [rt.usize, rt.u8] | rt.Done; - let i!: rt.usize; b0: { if (chain === 0) { putUsize(out, rt.iterCount(rt.iterFilter(rt.iterMap(rt.iterSlice(data), (_211: rt.u8): rt.u8 => { @@ -425,12 +333,12 @@ export function iterate(chain: rt.u8, data: Uint8Array, out: rt.ByteVec): void { return (_212 & 1) === 0; }))); } else if (chain === 1) { - _11 = rt.iterSlice(data); + const _11: rt.Iter = rt.iterSlice(data); rt.byteVecPush(out, rt.iterAny(_11, (_210: rt.u8): boolean => { return _210 === 255; }) ? 1 : 0); } else if (chain === 2) { - odd = rt.iterToByteVec(rt.iterFilter(rt.iterSlice(data), (_28: rt.u8): boolean => { + const odd: rt.ByteVec = rt.iterToByteVec(rt.iterFilter(rt.iterSlice(data), (_28: rt.u8): boolean => { return (_28 & 1) === 1; })); putUsize(out, odd.length); @@ -443,15 +351,15 @@ export function iterate(chain: rt.u8, data: Uint8Array, out: rt.ByteVec): void { return (acc ^ _3 as rt.u32) >>> 0; }) as rt.u64); } else { - last = 0; - iter = rt.iterEnumerate(rt.iterSlice(data)); + let last: rt.usize = 0; + const iter: rt.Iter<[rt.usize, rt.u8]> = rt.iterEnumerate(rt.iterSlice(data)); while (true) { - _33 = iter.next(); + const _33: [rt.usize, rt.u8] | rt.Done = iter.next(); if (_33 === rt.DONE) { putUsize(out, last); break b0; } - i = _33[0]; + const i: rt.usize = _33[0]; if (_33[1] === 128) { last = i; } @@ -466,39 +374,22 @@ export function iterate(chain: rt.u8, data: Uint8Array, out: rt.ByteVec): void { * sooner. How many converted, how many overflowed, and the last converted. */ export function rescale(selector: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let count!: rt.u64; - let _6!: [rt.u64, Uint8Array]; - let start!: rt.u64; - let _9!: [rt.u64, Uint8Array]; - let step!: rt.u64; - let _12!: [rt.u64, Uint8Array]; - let from!: rt.u64; - let _15!: [rt.u64, Uint8Array]; - let to!: rt.u64; - let converted!: rt.u64; - let overflowed!: rt.u64; - let last!: rt.u64; - let iterStart!: rt.usize; - let iterEnd!: rt.usize; let _26!: rt.usize; - let value!: rt.u64; let scaled!: rt.u64 | undefined; - let _36!: rt.u128 | undefined; - let _44!: rt.u64 | undefined; - _6 = takeU64(data); - count = _6[0]; - _9 = takeU64(_6[1]); - start = _9[0]; - _12 = takeU64(_9[1]); - step = _12[0]; - _15 = takeU64(_12[1]); - from = _15[0]; - to = takeU64(_15[1])[0]; - converted = 0; - overflowed = 0; - last = 0; - iterStart = 0; - iterEnd = rt.u64Low(count); + const _6: [rt.u64, Uint8Array] = takeU64(data); + const count: rt.u64 = _6[0]; + const _9: [rt.u64, Uint8Array] = takeU64(_6[1]); + const start: rt.u64 = _9[0]; + const _12: [rt.u64, Uint8Array] = takeU64(_9[1]); + const step: rt.u64 = _12[0]; + const _15: [rt.u64, Uint8Array] = takeU64(_12[1]); + const from: rt.u64 = _15[0]; + const to: rt.u64 = takeU64(_15[1])[0]; + let converted: rt.u64 = 0; + let overflowed: rt.u64 = 0; + let last: rt.u64 = 0; + let iterStart: rt.usize = 0; + const iterEnd: rt.usize = rt.u64Low(count); while (true) { if (!((_26 = iterStart++) < iterEnd)) { putU64(out, converted); @@ -507,16 +398,16 @@ export function rescale(selector: rt.u8, data: Uint8Array, out: rt.ByteVec): voi return; } b1: { - value = rt.u64Add(start, rt.u64Mul(_26 as rt.u64, step)); + const value: rt.u64 = rt.u64Add(start, rt.u64Mul(_26 as rt.u64, step)); if (selector === 0) { - _36 = rt.u128CheckedMul(rt.u128Cast(value), rt.u128Cast(to)); + const _36: rt.u128 | undefined = rt.u128CheckedMul(rt.u128Cast(value), rt.u128Cast(to)); if (_36 === undefined) { scaled = undefined; } else { scaled = bounded(rt.u128Div(_36, rt.u128Cast(from))); } } else { - _44 = rt.optionMap(rt.u64CheckedMul(value, to), (scaled3: rt.u64): rt.u64 => { + const _44: rt.u64 | undefined = rt.optionMap(rt.u64CheckedMul(value, to), (scaled3: rt.u64): rt.u64 => { return rt.u64Div(scaled3, from); }); if (_44 !== undefined) { @@ -546,15 +437,11 @@ export function bounded(value: rt.u128): rt.u64 | undefined { } export function decodeGroup(wire: Uint8Array, version: Version.Version, out: rt.ByteVec): rt.Result { - let group!: Group.Group; - let used!: rt.usize; - let _6!: rt.Result<[Group.Group, rt.usize], DecodeError.DecodeError>; - let val!: [Group.Group, rt.usize]; - _6 = Group.decodeSlice$Decode_Version(wire, version); + const _6: rt.Result<[Group.Group, rt.usize], DecodeError.DecodeError> = Group.decodeSlice$Decode_Version(wire, version); if (_6.ok) { - val = _6.value; - group = val[0]; - used = val[1]; + const val: [Group.Group, rt.usize] = _6.value; + const group: Group.Group = val[0]; + const used: rt.usize = val[1]; putU64(out, group.subscribe); putU64(out, group.sequence); putU64(out, group.frameStart); diff --git a/ts/fixtures/codec/expected/coding/decode.DecodeError.ts b/ts/fixtures/codec/expected/coding/decode.DecodeError.ts index ffa146198..6f85b3d4b 100644 --- a/ts/fixtures/codec/expected/coding/decode.DecodeError.ts +++ b/ts/fixtures/codec/expected/coding/decode.DecodeError.ts @@ -5,8 +5,6 @@ import type * as BoundsExceeded from "../coding/varint.BoundsExceeded.ts"; import * as SessionError from "../lib.SessionError.ts"; export function fmt$Display(self: DecodeError, __formatter: rt.Formatter): rt.Result { - let args2!: rt.Fmt[]; - let args4!: rt.Fmt[]; if (self.tag === "Short") { return rt.fmtWriteStr(__formatter, "short buffer"); } @@ -18,7 +16,7 @@ export function fmt$Display(self: DecodeError, __formatter: rt.Formatter): rt.Re } if (self.tag === "InvalidMessage") { const arg = ([([self._0] as [rt.u64])[0]] as [rt.u64])[0]; - args2 = [(f: rt.Formatter) => rt.u64Display(arg, f)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u64Display(arg, f)]; return rt.fmtWriteFmt(__formatter, ["invalid message: ", args2[0]]); } if (self.tag === "InvalidSubscribeLocation") { @@ -37,7 +35,7 @@ export function fmt$Display(self: DecodeError, __formatter: rt.Formatter): rt.Re return rt.fmtWriteStr(__formatter, "expected end"); } if (self.tag === "MessageTooLarge") { - args4 = [(f: rt.Formatter) => rt.usizeDisplay(self.size, f), (f: rt.Formatter) => rt.usizeDisplay(self.max, f)]; + const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.usizeDisplay(self.size, f), (f: rt.Formatter) => rt.usizeDisplay(self.max, f)]; return rt.fmtWriteFmt(__formatter, ["message too large: ", args4[0], " bytes exceeds ", args4[1], " byte limit"]); } if (self.tag === "ExpectedData") { @@ -72,17 +70,6 @@ export function from$From_FromUtf8Error(source: rt.FromUtf8Error): DecodeError { } export function fmt$Debug(self: DecodeError, f: rt.Formatter): rt.Result { - let _7!: string; - let _8!: rt.Fmt; - let _11!: string; - let _12!: rt.Fmt; - let _21!: string; - let _22!: string; - let _23!: rt.Fmt; - let _24!: string; - let _25!: rt.Fmt; - let _34!: string; - let _35!: rt.Fmt; if (self.tag === "Short") { return rt.fmtWriteStr(f, "Short"); } @@ -90,13 +77,13 @@ export function fmt$Debug(self: DecodeError, f: rt.Formatter): rt.Result rt.fmtFromUtf8ErrorDebug(self._0, f); + const _7: string = "InvalidString"; + const _8: rt.Fmt = (f: rt.Formatter) => rt.fmtFromUtf8ErrorDebug(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _7), _8)); } if (self.tag === "InvalidMessage") { - _11 = "InvalidMessage"; - _12 = (f: rt.Formatter) => rt.u64Display(self._0, f); + const _11: string = "InvalidMessage"; + const _12: rt.Fmt = (f: rt.Formatter) => rt.u64Display(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _11), _12)); } if (self.tag === "InvalidSubscribeLocation") { @@ -115,11 +102,11 @@ export function fmt$Debug(self: DecodeError, f: rt.Formatter): rt.Result rt.usizeDisplay(self.size, f); - _24 = "max"; - _25 = (f: rt.Formatter) => rt.usizeDisplay(self.max, f); + const _21: string = "MessageTooLarge"; + const _22: string = "size"; + const _23: rt.Fmt = (f: rt.Formatter) => rt.usizeDisplay(self.size, f); + const _24: string = "max"; + const _25: rt.Fmt = (f: rt.Formatter) => rt.usizeDisplay(self.max, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _21), _22, _23), _24, _25)); } if (self.tag === "ExpectedData") { @@ -141,8 +128,8 @@ export function fmt$Debug(self: DecodeError, f: rt.Formatter): rt.Result SessionError.fmt$Debug(self._0, f); + const _34: string = "Session"; + const _35: rt.Fmt = (f: rt.Formatter) => SessionError.fmt$Debug(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _34), _35)); } if (self.tag === "MalformedAuthToken") { diff --git a/ts/fixtures/codec/expected/coding/decode.Decoder.ts b/ts/fixtures/codec/expected/coding/decode.Decoder.ts index ae3a0e2e8..d56652df5 100644 --- a/ts/fixtures/codec/expected/coding/decode.Decoder.ts +++ b/ts/fixtures/codec/expected/coding/decode.Decoder.ts @@ -44,10 +44,8 @@ export function need(self: Decoder): rt.usize { /** Record that a read wanted `more` bytes past the current position. */ export function short(self: Decoder, more: rt.usize): DecodeError.DecodeError { - let need_!: rt.usize; - let _9!: rt.usize; - need_ = rt.usizeSaturatingAdd(rt.usizeSub(self.len, self.buf.length), more); - _9 = self.need; + const need_: rt.usize = rt.usizeSaturatingAdd(rt.usizeSub(self.len, self.buf.length), more); + const _9: rt.usize = self.need; self.need = rt.max(_9, need_); return { tag: "Short" } as DecodeError.DecodeError; } @@ -64,8 +62,7 @@ export function isEmpty(self: Decoder): boolean { /** Read `len` raw bytes. */ export function slice(self: Decoder, len: rt.usize): rt.Result { - let _6!: [Uint8Array, Uint8Array] | undefined; - _6 = rt.sliceSplitAtChecked(self.buf, len); + const _6: [Uint8Array, Uint8Array] | undefined = rt.sliceSplitAtChecked(self.buf, len); if (_6 !== undefined) { self.buf = _6[1]; return rt.Ok(_6[0]); @@ -82,8 +79,7 @@ export function rest(self: Decoder): Uint8Array { /** Split off the next `len` bytes as their own decoder, e.g. a size-prefixed body. */ export function sub(self: Decoder, len: rt.usize): rt.Result { - let _4!: rt.Result; - _4 = slice(self, len); + const _4: rt.Result = slice(self, len); if (_4.ok) { return rt.Ok(new_(_4.value, self.form)); } @@ -92,8 +88,7 @@ export function sub(self: Decoder, len: rt.usize): rt.Result { - let _3!: rt.Result; - _3 = slice(self, 1); + const _3: rt.Result = slice(self, 1); if (_3.ok) { rt.idx(_3.value, 0); return rt.Ok(_3.value[0]); @@ -103,12 +98,10 @@ export function u8(self: Decoder): rt.Result { /** Read a big-endian `u16`. */ export function u16(self: Decoder): rt.Result { - let _2!: rt.Result; - let _9!: rt.u8; - _2 = slice(self, 2); + const _2: rt.Result = slice(self, 2); if (_2.ok) { rt.idx(_2.value, 0); - _9 = _2.value[0]; + const _9: rt.u8 = _2.value[0]; rt.idx(_2.value, 1); return rt.Ok((_9 << 8) | _2.value[1]); } @@ -117,11 +110,9 @@ export function u16(self: Decoder): rt.Result { /** Read a byte that must be 0 or 1. */ export function bool(self: Decoder): rt.Result { - let _2!: rt.Result; - let val!: rt.u8; - _2 = u8(self); + const _2: rt.Result = u8(self); if (_2.ok) { - val = _2.value; + const val: rt.u8 = _2.value; if (val === 0) { return rt.Ok(false); } @@ -136,15 +127,11 @@ export function bool(self: Decoder): rt.Result /** Read a varint. */ export function varint(self: Decoder): rt.Result { let _0!: rt.Result; - let _2!: rt.Result<[rt.u64, Uint8Array], DecodeError.DecodeError>; - let _3!: Form.Form; - let value!: rt.u64; - let _13!: Uint8Array; - _13 = self.buf; - _3 = self.form; - _2 = read(_13, _3); + const _13: Uint8Array = self.buf; + const _3: Form.Form = self.form; + const _2: rt.Result<[rt.u64, Uint8Array], DecodeError.DecodeError> = read(_13, _3); if (_2.ok) { - value = _2.value[0]; + const value: rt.u64 = _2.value[0]; self.buf = _2.value[1]; _0 = rt.Ok(value); } else if (_2.error.tag === "Short") { @@ -157,8 +144,7 @@ export function varint(self: Decoder): rt.Result { - let _3!: rt.Result; - _3 = varint(self); + const _3: rt.Result = varint(self); if (_3.ok) { return rt.Ok(rt.u64CheckedSub(_3.value, 1)); } @@ -167,13 +153,10 @@ export function varintOpt(self: Decoder): rt.Result { - let start!: Uint8Array; - let _3!: rt.Result; - let _6!: rt.Result; - start = self.buf; - _6 = varint(self); + const start: Uint8Array = self.buf; + const _6: rt.Result = varint(self); if (_6.ok) { - _3 = rt.resultMapErr(rt.usizeTryFrom(_6.value), (_2: rt.TryFromIntError): DecodeError.DecodeError => { + const _3: rt.Result = rt.resultMapErr(rt.usizeTryFrom(_6.value), (_2: rt.TryFromIntError): DecodeError.DecodeError => { return { tag: "BoundsExceeded" } as DecodeError.DecodeError; }); if (_3.ok) { @@ -188,16 +171,13 @@ export function bytes(self: Decoder): rt.Result { - let _2!: rt.Result; - let _5!: rt.Result; - let residual2!: rt.Result; - _5 = bytes(self); + const _5: rt.Result = bytes(self); if (_5.ok) { - _2 = rt.stringFromUtf8(rt.sliceToByteVec(_5.value)); + const _2: rt.Result = rt.stringFromUtf8(rt.sliceToByteVec(_5.value)); if (_2.ok) { return rt.Ok(_2.value); } - residual2 = _2; + const residual2: rt.Result = _2; return rt.Err(DecodeError.from$From_FromUtf8Error((residual2 as { ok: false; error: rt.FromUtf8Error }).error)); } return _5; diff --git a/ts/fixtures/codec/expected/coding/encode.Encoder.ts b/ts/fixtures/codec/expected/coding/encode.Encoder.ts index 8d2b941a4..553371c0f 100644 --- a/ts/fixtures/codec/expected/coding/encode.Encoder.ts +++ b/ts/fixtures/codec/expected/coding/encode.Encoder.ts @@ -47,8 +47,7 @@ export function bool(self: Encoder, v: boolean): void { /** Write a varint, or fail with [`EncodeError::BoundsExceeded`] if the form cannot carry it. */ export function varint(self: Encoder, v: rt.u64): rt.Result { - let _3!: rt.Result; - _3 = write(v, self.form, self.buf); + const _3: rt.Result = write(v, self.form, self.buf); if (_3.ok) { return rt.Ok(undefined); } @@ -58,11 +57,10 @@ export function varint(self: Encoder, v: rt.u64): rt.Result { let v2!: rt.u64; - let _6!: rt.Result; if (v === undefined) { v2 = 0; } else { - _6 = rt.optionOkOr(rt.u64CheckedAdd(v, 1), "TooLarge" as EncodeError.EncodeError); + const _6: rt.Result = rt.optionOkOr(rt.u64CheckedAdd(v, 1), "TooLarge" as EncodeError.EncodeError); if (_6.ok) { v2 = _6.value; } else { @@ -74,8 +72,7 @@ export function varintOpt(self: Encoder, v: rt.u64 | undefined): rt.Result { - let _3!: rt.Result; - _3 = varint(self, v.length as rt.u64); + const _3: rt.Result = varint(self, v.length as rt.u64); if (_3.ok) { slice(self, v); return rt.Ok(undefined); @@ -122,37 +119,22 @@ export function discard(self: Encoder, prefix: Prefix.Prefix): void { /** Size a reserved prefix to everything written since. */ export function fill(self: Encoder, prefix: Prefix.Prefix): rt.Result { - let body!: rt.usize; - let end!: rt.usize; - let _7!: rt.Result; - let size!: rt.u16; - let _23!: rt.Result; - let len!: rt.usize; - let _35!: rt.u8; - let _39!: rt.usize; - let size2!: Uint8Array; - let _44!: Uint8Array; - let _56!: Uint8Array; - let _58!: rt.usize; - let _75!: rt.ByteVec; - let _79!: rt.ByteVec; - let _84!: rt.ByteVec; - body = prefix.body; - end = self.buf.length; + const body: rt.usize = prefix.body; + const end: rt.usize = self.buf.length; if (prefix.kind === "Varint") { - _23 = write(rt.usizeSub(end, body) as rt.u64, self.form, self.buf); + const _23: rt.Result = write(rt.usizeSub(end, body) as rt.u64, self.form, self.buf); if (_23.ok) { - len = rt.usizeSub(self.buf.length, end); + const len: rt.usize = rt.usizeSub(self.buf.length, end); if (!(len === 1)) { - size2 = rt.bytes(9); - _44 = rt.sliceRange(size2, 0, len); + const size2: Uint8Array = rt.bytes(9); + const _44: Uint8Array = rt.sliceRange(size2, 0, len); const slice4 = rt.byteVecView(self.buf); rt.sliceCopyFromSlice(_44, rt.sliceRange(slice4, end)); rt.byteVecTruncate(self.buf, rt.usizeSub(rt.usizeAdd(end, len), 1)); - _58 = rt.usizeSub(rt.usizeAdd(body, len), 1); - _56 = rt.byteVecView(self.buf); + const _58: rt.usize = rt.usizeSub(rt.usizeAdd(body, len), 1); + const _56: Uint8Array = rt.byteVecView(self.buf); rt.sliceCopyWithin(_56, body, end, _58); - _84 = self.buf; + const _84: rt.ByteVec = self.buf; const part2 = rt.usizeSub(body, 1); const part3 = rt.usizeAdd(rt.usizeSub(body, 1), len); const slice5 = rt.byteVecView(_84); @@ -160,9 +142,9 @@ export function fill(self: Encoder, prefix: Prefix.Prefix): rt.Result { + const _7: rt.Result = rt.resultMapErr(rt.u16TryFrom(rt.usizeSub(end, body)), (_2: rt.TryFromIntError): EncodeError.EncodeError => { return "TooLarge" as EncodeError.EncodeError; }); if (_7.ok) { - size = _7.value; - _75 = self.buf; + const size: rt.u16 = _7.value; + const _75: rt.ByteVec = self.buf; const part = rt.usizeSub(body, 2); const slice_ = rt.byteVecView(_75); rt.sliceCopyFromSlice(rt.sliceRange(slice_, part, body), rt.u16ToBeBytes(size)); diff --git a/ts/fixtures/codec/expected/coding/varint.ts b/ts/fixtures/codec/expected/coding/varint.ts index 9bda960b8..18c6b1f34 100644 --- a/ts/fixtures/codec/expected/coding/varint.ts +++ b/ts/fixtures/codec/expected/coding/varint.ts @@ -17,14 +17,11 @@ export function fromHalves(hi: rt.u32, lo: rt.u32): rt.u64 { /** The bytes `value` takes on the wire in `form`, or [`BoundsExceeded`] if it does not fit. */ export function size(value: rt.u64, form: Form.Form): rt.Result { - let hi!: rt.u32; - let lo!: rt.u32; - let _5!: [rt.u32, rt.u32]; let _6!: rt.usize; - _5 = toHalves(value); + const _5: [rt.u32, rt.u32] = toHalves(value); b1: { - hi = _5[0]; - lo = _5[1]; + const hi: rt.u32 = _5[0]; + const lo: rt.u32 = _5[1]; if (form.tag === "Quic") { if (hi === 0) { if (lo < 64) { @@ -105,19 +102,10 @@ export function write(value: rt.u64, form: Form.Form, out: rt.ByteVec): rt.Resul } export function writeQuic(value: rt.u64, out: rt.ByteVec): rt.Result { - let hi!: rt.u32; - let lo!: rt.u32; - let _5!: [rt.u32, rt.u32]; - let a!: rt.u8; - let b!: rt.u8; - let c!: rt.u8; - let d!: rt.u8; - let _42!: Uint8Array; - let _48!: Uint8Array; - _5 = toHalves(value); + const _5: [rt.u32, rt.u32] = toHalves(value); b1: { - hi = _5[0]; - lo = _5[1]; + const hi: rt.u32 = _5[0]; + const lo: rt.u32 = _5[1]; if (hi === 0) { if (lo < 64) { rt.byteVecPush(out, lo & 0xff); @@ -139,37 +127,27 @@ export function writeQuic(value: rt.u64, out: rt.ByteVec): rt.Result>> 0); - a = _42[0]; - b = _42[1]; - c = _42[2]; - d = _42[3]; - _48 = rt.u32ToBeBytes(lo); + const _42: Uint8Array = rt.u32ToBeBytes((3221225472 | hi) >>> 0); + const a: rt.u8 = _42[0]; + const b: rt.u8 = _42[1]; + const c: rt.u8 = _42[2]; + const d: rt.u8 = _42[3]; + const _48: Uint8Array = rt.u32ToBeBytes(lo); rt.byteVecExtendFromSlice(out, Uint8Array.of(a, b, c, d, _48[0], _48[1], _48[2], _48[3])); } return rt.Ok(undefined); } export function writeLeadingOnes(value: rt.u64, out: rt.ByteVec): void { - let hi!: rt.u32; - let lo!: rt.u32; - let _5!: [rt.u32, rt.u32]; - let a!: rt.u8; - let b!: rt.u8; - let c!: rt.u8; - let d!: rt.u8; - let _10!: Uint8Array; - let _78!: Uint8Array; - let _87!: Uint8Array; - _5 = toHalves(value); - hi = _5[0]; - lo = _5[1]; - _10 = rt.u32ToBeBytes(lo); + const _5: [rt.u32, rt.u32] = toHalves(value); + const hi: rt.u32 = _5[0]; + const lo: rt.u32 = _5[1]; + const _10: Uint8Array = rt.u32ToBeBytes(lo); b0: { - a = _10[0]; - b = _10[1]; - c = _10[2]; - d = _10[3]; + const a: rt.u8 = _10[0]; + const b: rt.u8 = _10[1]; + const c: rt.u8 = _10[2]; + const d: rt.u8 = _10[3]; if (hi === 0) { if (lo < 128) { rt.byteVecPush(out, d); @@ -197,10 +175,10 @@ export function writeLeadingOnes(value: rt.u64, out: rt.ByteVec): void { if (!(hi < 8)) { if (!(hi < 1024)) { if (!(hi < 16777216)) { - _87 = rt.u32ToBeBytes(hi); + const _87: Uint8Array = rt.u32ToBeBytes(hi); rt.byteVecExtendFromSlice(out, Uint8Array.of(255, _87[0], _87[1], _87[2], _87[3], a, b, c, d)); } else { - _78 = rt.u32ToBeBytes(hi); + const _78: Uint8Array = rt.u32ToBeBytes(hi); rt.byteVecExtendFromSlice(out, Uint8Array.of(254, _78[1], _78[2], _78[3], a, b, c, d)); } } else { @@ -221,38 +199,30 @@ export function read(buf: Uint8Array, form: Form.Form): rt.Result<[rt.u64, Uint8 } export function readQuic(buf: Uint8Array): rt.Result<[rt.u64, Uint8Array], DecodeError.DecodeError> { - let first!: rt.u8; - let _5!: [rt.u8, Uint8Array] | undefined; - let _14!: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError>; - let val!: [Uint8Array, Uint8Array]; - let _33!: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError>; - let val2!: [Uint8Array, Uint8Array]; - let _54!: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError>; - let val3!: [Uint8Array, Uint8Array]; - _5 = rt.sliceSplitFirst(buf); + const _5: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(buf); if (_5 !== undefined) { - first = _5[0]; + const first: rt.u8 = _5[0]; if (!(first < 64)) { if (!(first < 128)) { if (!(first < 192)) { - _54 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 8), { tag: "Short" } as DecodeError.DecodeError); + const _54: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError> = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 8), { tag: "Short" } as DecodeError.DecodeError); if (_54.ok) { - val3 = _54.value; + const val3: [Uint8Array, Uint8Array] = _54.value; const slice = val3[0]; return rt.Ok([fromHalves((((val3[0][0] & 63) << 24) | (val3[0][1] << 16) | (val3[0][2] << 8) | val3[0][3]) >>> 0, rt.u32FromBeBytes(slice.subarray(4, 8))), val3[1]] as [rt.u64, Uint8Array]); } return _54; } - _33 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 4), { tag: "Short" } as DecodeError.DecodeError); + const _33: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError> = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 4), { tag: "Short" } as DecodeError.DecodeError); if (_33.ok) { - val2 = _33.value; + const val2: [Uint8Array, Uint8Array] = _33.value; return rt.Ok([(((val2[0][0] & 63) << 24) | (val2[0][1] << 16) | (val2[0][2] << 8) | val2[0][3]) >>> 0 as rt.u64, val2[1]] as [rt.u64, Uint8Array]); } return _33; } - _14 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 2), { tag: "Short" } as DecodeError.DecodeError); + const _14: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError> = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 2), { tag: "Short" } as DecodeError.DecodeError); if (_14.ok) { - val = _14.value; + const val: [Uint8Array, Uint8Array] = _14.value; return rt.Ok([(((val[0][0] & 63) << 8) | val[0][1]) as rt.u64, val[1]] as [rt.u64, Uint8Array]); } return _14; @@ -263,69 +233,50 @@ export function readQuic(buf: Uint8Array): rt.Result<[rt.u64, Uint8Array], Decod } export function readLeadingOnes(buf: Uint8Array, seven: boolean): rt.Result<[rt.u64, Uint8Array], DecodeError.DecodeError> { - let first!: rt.u8; - let _6!: [rt.u8, Uint8Array] | undefined; let _8!: [rt.u64, Uint8Array]; - let _9!: rt.u32; - let _14!: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError>; - let val!: [Uint8Array, Uint8Array]; - let _30!: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError>; - let val2!: [Uint8Array, Uint8Array]; - let _48!: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError>; - let val3!: [Uint8Array, Uint8Array]; - let _65!: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError>; - let val4!: [Uint8Array, Uint8Array]; - let _81!: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError>; - let val5!: [Uint8Array, Uint8Array]; - let _101!: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError>; - let val6!: [Uint8Array, Uint8Array]; - let _121!: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError>; - let val7!: [Uint8Array, Uint8Array]; - let _142!: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError>; - let val8!: [Uint8Array, Uint8Array]; - _6 = rt.sliceSplitFirst(buf); + const _6: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(buf); if (_6 !== undefined) { - first = _6[0]; - _9 = rt.u8LeadingOnes(first); + const first: rt.u8 = _6[0]; + const _9: rt.u32 = rt.u8LeadingOnes(first); if (_9 === 0) { _8 = [first as rt.u64, _6[1]] as [rt.u64, Uint8Array]; } else if (_9 === 1) { - _14 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 2), { tag: "Short" } as DecodeError.DecodeError); + const _14: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError> = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 2), { tag: "Short" } as DecodeError.DecodeError); if (_14.ok) { - val = _14.value; + const val: [Uint8Array, Uint8Array] = _14.value; _8 = [(((val[0][0] & 63) << 8) | val[0][1]) as rt.u64, val[1]] as [rt.u64, Uint8Array]; } else { return _14; } } else if (_9 === 2) { - _30 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 3), { tag: "Short" } as DecodeError.DecodeError); + const _30: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError> = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 3), { tag: "Short" } as DecodeError.DecodeError); if (_30.ok) { - val2 = _30.value; + const val2: [Uint8Array, Uint8Array] = _30.value; _8 = [(((val2[0][0] & 31) << 16) | (val2[0][1] << 8) | val2[0][2]) as rt.u64, val2[1]] as [rt.u64, Uint8Array]; } else { return _30; } } else if (_9 === 3) { - _48 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 4), { tag: "Short" } as DecodeError.DecodeError); + const _48: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError> = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 4), { tag: "Short" } as DecodeError.DecodeError); if (_48.ok) { - val3 = _48.value; + const val3: [Uint8Array, Uint8Array] = _48.value; _8 = [(((val3[0][0] & 15) << 24) | (val3[0][1] << 16) | (val3[0][2] << 8) | val3[0][3]) >>> 0 as rt.u64, val3[1]] as [rt.u64, Uint8Array]; } else { return _48; } } else if (_9 === 4) { - _65 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 5), { tag: "Short" } as DecodeError.DecodeError); + const _65: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError> = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 5), { tag: "Short" } as DecodeError.DecodeError); if (_65.ok) { - val4 = _65.value; + const val4: [Uint8Array, Uint8Array] = _65.value; const slice5 = val4[0]; _8 = [fromHalves(((val4[0][0] & 7)) as rt.u32, rt.u32FromBeBytes(slice5.subarray(1, 5))), val4[1]] as [rt.u64, Uint8Array]; } else { return _65; } } else if (_9 === 5) { - _81 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 6), { tag: "Short" } as DecodeError.DecodeError); + const _81: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError> = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 6), { tag: "Short" } as DecodeError.DecodeError); if (_81.ok) { - val5 = _81.value; + const val5: [Uint8Array, Uint8Array] = _81.value; const slice4 = val5[0]; _8 = [fromHalves(((val5[0][0] & 3) << 8) | val5[0][1], rt.u32FromBeBytes(slice4.subarray(2, 6))), val5[1]] as [rt.u64, Uint8Array]; } else { @@ -335,27 +286,27 @@ export function readLeadingOnes(buf: Uint8Array, seven: boolean): rt.Result<[rt. if (!seven) { return rt.Err({ tag: "InvalidValue" } as DecodeError.DecodeError); } - _101 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 7), { tag: "Short" } as DecodeError.DecodeError); + const _101: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError> = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 7), { tag: "Short" } as DecodeError.DecodeError); if (_101.ok) { - val6 = _101.value; + const val6: [Uint8Array, Uint8Array] = _101.value; const slice3 = val6[0]; _8 = [fromHalves(((val6[0][0] & 1) << 16) | (val6[0][1] << 8) | val6[0][2], rt.u32FromBeBytes(slice3.subarray(3, 7))), val6[1]] as [rt.u64, Uint8Array]; } else { return _101; } } else if (_9 === 7) { - _121 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 8), { tag: "Short" } as DecodeError.DecodeError); + const _121: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError> = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 8), { tag: "Short" } as DecodeError.DecodeError); if (_121.ok) { - val7 = _121.value; + const val7: [Uint8Array, Uint8Array] = _121.value; const slice2 = val7[0]; _8 = [fromHalves((val7[0][1] << 16) | (val7[0][2] << 8) | val7[0][3], rt.u32FromBeBytes(slice2.subarray(4, 8))), val7[1]] as [rt.u64, Uint8Array]; } else { return _121; } } else { - _142 = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 9), { tag: "Short" } as DecodeError.DecodeError); + const _142: rt.Result<[Uint8Array, Uint8Array], DecodeError.DecodeError> = rt.optionOkOr(rt.sliceSplitFirstChunk(buf, 9), { tag: "Short" } as DecodeError.DecodeError); if (_142.ok) { - val8 = _142.value; + const val8: [Uint8Array, Uint8Array] = _142.value; const slice = val8[0]; _8 = [fromHalves(rt.u32FromBeBytes(slice.subarray(1, 5)), ((val8[0][5] << 24) | (val8[0][6] << 16) | (val8[0][7] << 8) | val8[0][8]) >>> 0), val8[1]] as [rt.u64, Uint8Array]; } else { diff --git a/ts/fixtures/codec/expected/coding/version.Version.ts b/ts/fixtures/codec/expected/coding/version.Version.ts index 1efd090c7..49ceaf515 100644 --- a/ts/fixtures/codec/expected/coding/version.Version.ts +++ b/ts/fixtures/codec/expected/coding/version.Version.ts @@ -15,8 +15,7 @@ export interface Version { /** Decode the version number. */ export function decode$Decode_Form(r: Decoder.Decoder, _2: Form.Form): rt.Result { - let _4!: rt.Result; - _4 = Decoder.varint(r); + const _4: rt.Result = Decoder.varint(r); if (_4.ok) { return rt.Ok({ _0: _4.value }); } @@ -25,8 +24,7 @@ export function decode$Decode_Form(r: Decoder.Decoder, _2: Form.Form): rt.Result /** Encode the value to the given encoder, which may hold partial output on error. */ export function encode$Encode_Form(self: Version, w: Encoder.Encoder, _3: Form.Form): rt.Result { - let _4!: rt.Result; - _4 = Encoder.varint(w, self._0); + const _4: rt.Result = Encoder.varint(w, self._0); if (_4.ok) { return rt.Ok(undefined); } @@ -35,8 +33,7 @@ export function encode$Encode_Form(self: Version, w: Encoder.Encoder, _3: Form.F /** Encode the value to the given encoder, which may hold partial output on error. */ export function encode$Encode_Version(self: Version, w: Encoder.Encoder, _3: version_Version.Version): rt.Result { - let _4!: rt.Result; - _4 = Encoder.varint(w, self._0); + const _4: rt.Result = Encoder.varint(w, self._0); if (_4.ok) { return rt.Ok(undefined); } diff --git a/ts/fixtures/codec/expected/coding/version.Versions.ts b/ts/fixtures/codec/expected/coding/version.Versions.ts index 84bf344f0..897318397 100644 --- a/ts/fixtures/codec/expected/coding/version.Versions.ts +++ b/ts/fixtures/codec/expected/coding/version.Versions.ts @@ -11,19 +11,13 @@ import type * as version_Version from "../lite/version.Version.ts"; /** Decode the value from the front of `buf`, returning it and the bytes it took. */ export function decodeSlice$Decode_Form(buf: Uint8Array, version: Form.Form): rt.Result<[Versions, rt.usize], DecodeError.DecodeError> { - let _0!: rt.Result<[Versions, rt.usize], DecodeError.DecodeError>; - let r!: Decoder.Decoder; - let value!: Versions; - let _6!: rt.Result; - let val!: Versions; - let _13!: Versions; - r = Decoder.new(buf, version); - _6 = decode$Decode_Form(r, version); + const r: Decoder.Decoder = Decoder.new(buf, version); + const _6: rt.Result = decode$Decode_Form(r, version); if (_6.ok) { - val = _6.value; - value = val; - _13 = value; - _0 = rt.Ok([_13, rt.usizeSub(buf.length, Decoder.remaining(r))] as [Versions, rt.usize]); + const val: Versions = _6.value; + const value: Versions = val; + const _13: Versions = value; + const _0: rt.Result<[Versions, rt.usize], DecodeError.DecodeError> = rt.Ok([_13, rt.usizeSub(buf.length, Decoder.remaining(r))]); return _0; } return _6; @@ -36,23 +30,17 @@ export interface Versions { /** Decode the version list. */ export function decode$Decode_Form(r: Decoder.Decoder, version: Form.Form): rt.Result { - let _3!: rt.Result; - let count!: rt.u64; - let vs!: Version.Version[]; - let iter!: rt.Range; - let _12!: rt.u64 | rt.Done; - let _15!: rt.Result; - _3 = Decoder.varint(r); + const _3: rt.Result = Decoder.varint(r); if (_3.ok) { - count = _3.value; - vs = []; - iter = new rt.Range(0, count, rt.u64Step); + const count: rt.u64 = _3.value; + const vs: Version.Version[] = []; + const iter: rt.Range = new rt.Range(0, count, rt.u64Step); while (true) { - _12 = iter.next(); + const _12: rt.u64 | rt.Done = iter.next(); if (_12 === rt.DONE) { return rt.Ok({ _0: vs }); } - _15 = Version.decode$Decode_Form(r, version); + const _15: rt.Result = Version.decode$Decode_Form(r, version); if (_15.ok) { vs.push(_15.value); } else { @@ -65,21 +53,16 @@ export function decode$Decode_Form(r: Decoder.Decoder, version: Form.Form): rt.R /** Encode the version list. */ export function encode$Encode_Form(self: Versions, w: Encoder.Encoder, version: Form.Form): rt.Result { - let _4!: rt.Result; - let iterS!: Version.Version[]; - let iterI!: number; - let _14!: Version.Version | rt.Done; - let _18!: rt.Result; - _4 = Encoder.varint(w, self._0.length as rt.u64); + const _4: rt.Result = Encoder.varint(w, self._0.length as rt.u64); if (_4.ok) { - iterS = self._0; - iterI = 0; + const iterS: Version.Version[] = self._0; + let iterI: number = 0; while (true) { - _14 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _14: Version.Version | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_14 === rt.DONE) { return rt.Ok(undefined); } - _18 = Version.encode$Encode_Form(_14, w, version); + const _18: rt.Result = Version.encode$Encode_Form(_14, w, version); if (!_18.ok) { return _18; } @@ -90,21 +73,16 @@ export function encode$Encode_Form(self: Versions, w: Encoder.Encoder, version: /** Encode the version list. */ export function encode$Encode_Version(self: Versions, w: Encoder.Encoder, version: version_Version.Version): rt.Result { - let _4!: rt.Result; - let iterS!: Version.Version[]; - let iterI!: number; - let _14!: Version.Version | rt.Done; - let _18!: rt.Result; - _4 = Encoder.varint(w, self._0.length as rt.u64); + const _4: rt.Result = Encoder.varint(w, self._0.length as rt.u64); if (_4.ok) { - iterS = self._0; - iterI = 0; + const iterS: Version.Version[] = self._0; + let iterI: number = 0; while (true) { - _14 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _14: Version.Version | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_14 === rt.DONE) { return rt.Ok(undefined); } - _18 = Version.encode$Encode_Version(_14, w, version); + const _18: rt.Result = Version.encode$Encode_Version(_14, w, version); if (!_18.ok) { return _18; } diff --git a/ts/fixtures/codec/expected/harness.ts b/ts/fixtures/codec/expected/harness.ts index 58198ae52..89d5d1eb1 100644 --- a/ts/fixtures/codec/expected/harness.ts +++ b/ts/fixtures/codec/expected/harness.ts @@ -17,13 +17,10 @@ import type * as Version from "./lite/version.Version.ts"; /** Run one case. */ export function run(input: Uint8Array): rt.ByteVec { - let out!: rt.ByteVec; - let _5!: [rt.u8, Uint8Array] | undefined; - let _8!: rt.u8; - out = new rt.ByteVec(); - _5 = rt.sliceSplitFirst(input); + const out: rt.ByteVec = new rt.ByteVec(); + const _5: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(input); if (_5 !== undefined) { - _8 = rt.u8Rem(_5[0], 9); + const _8: rt.u8 = rt.u8Rem(_5[0], 9); if (_8 === 0) { decodeScript(_5[1], out); } else if (_8 === 1) { @@ -49,8 +46,7 @@ export function run(input: Uint8Array): rt.ByteVec { } export function form(selector: rt.u8): Form.Form { - let _2!: rt.u8; - _2 = rt.u8Rem(selector, 3); + const _2: rt.u8 = rt.u8Rem(selector, 3); if (_2 === 0) { return { tag: "Quic" } as Form.Form; } @@ -61,8 +57,7 @@ export function form(selector: rt.u8): Form.Form { } export function liteVersion(selector: rt.u8): Version.Version { - let _2!: rt.u8; - _2 = rt.u8Rem(selector, 7); + const _2: rt.u8 = rt.u8Rem(selector, 7); if (_2 === 0) { return "Lite01" as Version.Version; } @@ -94,37 +89,29 @@ export function putUsize(out: rt.ByteVec, value: rt.usize): void { /** Take up to 8 big-endian bytes as a `u64`, zero-padded on the right. */ export function takeU64(data: Uint8Array): [rt.u64, Uint8Array] { - let buf!: Uint8Array; - let n!: rt.usize; - buf = rt.bytes(8); - n = rt.min(data.length, 8); + const buf: Uint8Array = rt.bytes(8); + const n: rt.usize = rt.min(data.length, 8); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); return [rt.u64FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.u64, Uint8Array]; } /** A decode error's code, then its text. */ export function decodeFailed(out: rt.ByteVec, err: DecodeError.DecodeError): void { - let _5!: string; - let _6!: string; - let args2!: rt.Fmt[]; decodeError(out, err); - _5 = rt.fmtToString((f: rt.Formatter) => DecodeError.fmt$Display(err, f)); + const _5: string = rt.fmtToString((f: rt.Formatter) => DecodeError.fmt$Display(err, f)); const arg = ([err] as [DecodeError.DecodeError])[0]; - args2 = [(f: rt.Formatter) => DecodeError.fmt$Debug(arg, f)]; - _6 = rt.fmtFormat([args2[0]]); + const args2: rt.Fmt[] = [(f: rt.Formatter) => DecodeError.fmt$Debug(arg, f)]; + const _6: string = rt.fmtFormat([args2[0]]); putText(out, _5, _6); } /** An encode error's code, then its text. */ export function encodeFailed(out: rt.ByteVec, err: EncodeError.EncodeError): void { - let _5!: string; - let _6!: string; - let args2!: rt.Fmt[]; encodeError(out, err); - _5 = rt.fmtToString((f: rt.Formatter) => EncodeError.fmt$Display(err, f)); + const _5: string = rt.fmtToString((f: rt.Formatter) => EncodeError.fmt$Display(err, f)); const arg = ([err] as [EncodeError.EncodeError])[0]; - args2 = [(f: rt.Formatter) => EncodeError.fmt$Debug(arg, f)]; - _6 = rt.fmtFormat([args2[0]]); + const args2: rt.Fmt[] = [(f: rt.Formatter) => EncodeError.fmt$Debug(arg, f)]; + const _6: string = rt.fmtFormat([args2[0]]); putText(out, _5, _6); } @@ -208,40 +195,28 @@ export function encodeError(out: rt.ByteVec, err: EncodeError.EncodeError): void * `data[1]` bytes after the form selector, and the wire is everything after it. */ export function decodeScript(data: Uint8Array, out: rt.ByteVec): void { - let selector!: rt.u8; - let _5!: [rt.u8, Uint8Array] | undefined; - let len!: rt.u8; - let _9!: [rt.u8, Uint8Array] | undefined; - let _13!: [Uint8Array, Uint8Array]; - let _15!: rt.usize; - let r!: Decoder.Decoder; - let iterS!: Uint8Array; - let iterI!: number; - let _21!: rt.u8 | rt.Done; - let _26!: rt.Result; - let err!: DecodeError.DecodeError; - _5 = rt.sliceSplitFirst(data); + const _5: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(data); b0: { if (_5 !== undefined) { - selector = _5[0]; - _9 = rt.sliceSplitFirst(_5[1]); + const selector: rt.u8 = _5[0]; + const _9: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(_5[1]); if (_9 !== undefined) { - len = _9[0]; - _15 = _9[1].length; - _13 = rt.sliceSplitAt(_9[1], rt.min(_15, len as rt.usize)); - r = Decoder.new(_13[1], form(selector)); - iterS = _13[0]; - iterI = 0; + const len: rt.u8 = _9[0]; + const _15: rt.usize = _9[1].length; + const _13: [Uint8Array, Uint8Array] = rt.sliceSplitAt(_9[1], rt.min(_15, len as rt.usize)); + const r: Decoder.Decoder = Decoder.new(_13[1], form(selector)); + const iterS: Uint8Array = _13[0]; + let iterI: number = 0; l1: while (true) { - _21 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _21: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_21 !== rt.DONE) { - _26 = decodeStep(r, _21, out); + const _26: rt.Result = decodeStep(r, _21, out); if (_26.ok) { rt.byteVecPush(out, 0); putUsize(out, Decoder.remaining(r)); continue l1; } - err = _26.error; + const err: DecodeError.DecodeError = _26.error; decodeFailed(out, err); putUsize(out, Decoder.need(r)); } @@ -254,58 +229,43 @@ export function decodeScript(data: Uint8Array, out: rt.ByteVec): void { } export function decodeStep(r: Decoder.Decoder, step: rt.u8, out: rt.ByteVec): rt.Result { - let _5!: rt.u8; - let _7!: rt.Result; - let _15!: rt.Result; - let _21!: rt.Result; - let _26!: rt.Result; - let _31!: rt.Result; - let val5!: rt.u64 | undefined; - let v!: rt.u64; - let _40!: rt.Result; - let s!: string; - let _49!: rt.Result; - let _57!: rt.Result; - let sub!: Decoder.Decoder; - let _67!: rt.Result; - let _76!: rt.Result; - _5 = rt.u8Rem(step, 10); + const _5: rt.u8 = rt.u8Rem(step, 10); if (_5 === 0) { - _7 = Decoder.u8(r); + const _7: rt.Result = Decoder.u8(r); if (_7.ok) { rt.byteVecPush(out, _7.value); } else { return _7; } } else if (_5 === 1) { - _15 = Decoder.u16(r); + const _15: rt.Result = Decoder.u16(r); if (_15.ok) { rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(_15.value)); } else { return _15; } } else if (_5 === 2) { - _21 = Decoder.bool(r); + const _21: rt.Result = Decoder.bool(r); if (_21.ok) { rt.byteVecPush(out, _21.value ? 1 : 0); } else { return _21; } } else if (_5 === 3) { - _26 = Decoder.varint(r); + const _26: rt.Result = Decoder.varint(r); if (_26.ok) { putU64(out, _26.value); } else { return _26; } } else if (_5 === 4) { - _31 = Decoder.varintOpt(r); + const _31: rt.Result = Decoder.varintOpt(r); if (_31.ok) { - val5 = _31.value; + const val5: rt.u64 | undefined = _31.value; if (val5 === undefined) { rt.byteVecPush(out, 0); } else { - v = val5; + const v: rt.u64 = val5; rt.byteVecPush(out, 1); putU64(out, v); } @@ -313,7 +273,7 @@ export function decodeStep(r: Decoder.Decoder, step: rt.u8, out: rt.ByteVec): rt return _31; } } else if (_5 === 5) { - _40 = Decoder.bytes(r); + const _40: rt.Result = Decoder.bytes(r); if (_40.ok) { putUsize(out, _40.value.length); rt.byteVecExtendFromSlice(out, _40.value); @@ -321,25 +281,25 @@ export function decodeStep(r: Decoder.Decoder, step: rt.u8, out: rt.ByteVec): rt return _40; } } else if (_5 === 6) { - _49 = Decoder.string(r); + const _49: rt.Result = Decoder.string(r); if (_49.ok) { - s = _49.value; + const s: string = _49.value; rt.byteVecExtendFromSlice(out, rt.stringAsBytes(s)); } else { return _49; } } else if (_5 === 7) { - _57 = Decoder.slice(r, rt.u8Div(step, 10) as rt.usize); + const _57: rt.Result = Decoder.slice(r, rt.u8Div(step, 10) as rt.usize); if (_57.ok) { rt.byteVecExtendFromSlice(out, _57.value); } else { return _57; } } else if (_5 === 8) { - _67 = Decoder.sub(r, rt.u8Div(step, 10) as rt.usize); + const _67: rt.Result = Decoder.sub(r, rt.u8Div(step, 10) as rt.usize); if (_67.ok) { - sub = _67.value; - _76 = Decoder.varint(sub); + const sub: Decoder.Decoder = _67.value; + const _76: rt.Result = Decoder.varint(sub); if (_76.ok) { putU64(out, _76.value); putUsize(out, Decoder.rest(sub).length); @@ -357,61 +317,32 @@ export function decodeStep(r: Decoder.Decoder, step: rt.u8, out: rt.ByteVec): rt /** Write primitives as a script says, taking each value from the data that follows. */ export function encodeScript(data: Uint8Array, out: rt.ByteVec): void { - let selector!: rt.u8; - let _5!: [rt.u8, Uint8Array] | undefined; - let len!: rt.u8; - let _9!: [rt.u8, Uint8Array] | undefined; - let values!: Uint8Array; - let _13!: [Uint8Array, Uint8Array]; - let _15!: rt.usize; - let buf!: rt.ByteVec; - let w!: Encoder.Encoder; - let _20!: Form.Form; - let prefixes!: Prefix.Prefix[]; - let iterS!: Uint8Array; - let iterI!: number; - let _24!: rt.u8 | rt.Done; - let step!: rt.u8; - let value!: rt.u64; - let _30!: [rt.u64, Uint8Array]; let result!: rt.Result; - let _33!: rt.u8; let _47!: rt.u64 | undefined; - let _48!: rt.u64; - let _51!: Uint8Array; - let _53!: Uint8Array; - let _60!: rt.Result; - let s!: string; - let _68!: string; let _74!: Prefix.Prefix; - let _79!: Prefix.Prefix | undefined; - let prefix!: Prefix.Prefix; - let _88!: Prefix.Prefix | undefined; - let _98!: Prefix.Prefix | undefined; - let _102!: rt.Result; - _5 = rt.sliceSplitFirst(data); + const _5: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(data); b0: { if (_5 !== undefined) { - selector = _5[0]; - _9 = rt.sliceSplitFirst(_5[1]); + const selector: rt.u8 = _5[0]; + const _9: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(_5[1]); if (_9 !== undefined) { - len = _9[0]; - _15 = _9[1].length; - _13 = rt.sliceSplitAt(_9[1], rt.min(_15, len as rt.usize)); - values = _13[1]; - buf = new rt.ByteVec(); - _20 = form(selector); - w = Encoder.new(buf, _20); - prefixes = []; - iterS = _13[0]; - iterI = 0; + const len: rt.u8 = _9[0]; + const _15: rt.usize = _9[1].length; + const _13: [Uint8Array, Uint8Array] = rt.sliceSplitAt(_9[1], rt.min(_15, len as rt.usize)); + let values: Uint8Array = _13[1]; + const buf: rt.ByteVec = new rt.ByteVec(); + const _20: Form.Form = form(selector); + const w: Encoder.Encoder = Encoder.new(buf, _20); + const prefixes: Prefix.Prefix[] = []; + const iterS: Uint8Array = _13[0]; + let iterI: number = 0; while (true) { - _24 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _24: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_24 === rt.DONE) { while (true) { - _98 = prefixes.pop(); + const _98: Prefix.Prefix | undefined = prefixes.pop(); if (_98 !== undefined) { - _102 = Encoder.fill(w, _98); + const _102: rt.Result = Encoder.fill(w, _98); if (!_102.ok) { encodeFailed(out, _102.error); } @@ -422,11 +353,11 @@ export function encodeScript(data: Uint8Array, out: rt.ByteVec): void { } } } - step = _24; - _30 = takeU64(values); - value = _30[0]; + const step: rt.u8 = _24; + const _30: [rt.u64, Uint8Array] = takeU64(values); + const value: rt.u64 = _30[0]; values = _30[1]; - _33 = rt.u8Rem(step, 10); + const _33: rt.u8 = rt.u8Rem(step, 10); if (_33 === 0) { Encoder.u8(w, rt.u64Low(value) & 0xff); result = rt.Ok(undefined); @@ -439,7 +370,7 @@ export function encodeScript(data: Uint8Array, out: rt.ByteVec): void { } else if (_33 === 3) { result = Encoder.varint(w, value); } else if (_33 === 4) { - _48 = rt.u64Rem(value, 3); + const _48: rt.u64 = rt.u64Rem(value, 3); if (_48 === 0) { _47 = undefined; } else if (_48 === 1) { @@ -450,14 +381,14 @@ export function encodeScript(data: Uint8Array, out: rt.ByteVec): void { result = Encoder.varintOpt(w, _47); } else if (_33 === 5) { const part = rt.u8Rem(rt.u8Div(step, 10), 9) as rt.usize; - _53 = rt.u64ToBeBytes(value); - _51 = rt.sliceRange(_53, 0, part); + const _53: Uint8Array = rt.u64ToBeBytes(value); + const _51: Uint8Array = rt.sliceRange(_53, 0, part); result = Encoder.bytes(w, _51); } else if (_33 === 6) { - _60 = rt.stringFromUtf8(rt.sliceToByteVec(rt.u64ToBeBytes(value))); + const _60: rt.Result = rt.stringFromUtf8(rt.sliceToByteVec(rt.u64ToBeBytes(value))); if (_60.ok) { - s = _60.value; - _68 = s; + const s: string = _60.value; + const _68: string = s; result = Encoder.string(w, _68); } else { result = Encoder.string(w, "not utf-8"); @@ -471,16 +402,16 @@ export function encodeScript(data: Uint8Array, out: rt.ByteVec): void { prefixes.push(_74); result = rt.Ok(undefined); } else if (_33 === 8) { - _79 = prefixes.pop(); + const _79: Prefix.Prefix | undefined = prefixes.pop(); if (_79 === undefined) { result = rt.Ok(undefined); } else { - prefix = _79; + const prefix: Prefix.Prefix = _79; putUsize(out, Encoder.since(w, prefix)); result = Encoder.fill(w, prefix); } } else { - _88 = prefixes.pop(); + const _88: Prefix.Prefix | undefined = prefixes.pop(); if (_88 !== undefined) { Encoder.discard(w, _88); } @@ -496,29 +427,23 @@ export function encodeScript(data: Uint8Array, out: rt.ByteVec): void { } export function zigzag(data: Uint8Array, out: rt.ByteVec): void { - let value!: rt.u64; - let signed!: rt.i64; - value = takeU64(data)[0]; - signed = rt.i64Cast(value); + const value: rt.u64 = takeU64(data)[0]; + const signed: rt.i64 = rt.i64Cast(value); putU64(out, varint_zigzag(signed)); putU64(out, rt.u64Cast(unzigzag(value))); putU64(out, rt.u64Cast(unzigzag(varint_zigzag(signed)))); } export function sizes(data: Uint8Array, out: rt.ByteVec): void { - let value!: rt.u64; - let iterStart!: rt.u8; - let iterEnd!: rt.u8; let _9!: rt.u8; - let _13!: rt.Result; - value = takeU64(data)[0]; - iterStart = 0; - iterEnd = 3; + const value: rt.u64 = takeU64(data)[0]; + let iterStart: rt.u8 = 0; + const iterEnd: rt.u8 = 3; while (true) { if (!((_9 = iterStart++) < iterEnd)) { return; } - _13 = size(value, form(_9)); + const _13: rt.Result = size(value, form(_9)); if (_13.ok) { putUsize(out, _13.value); } else { @@ -529,31 +454,23 @@ export function sizes(data: Uint8Array, out: rt.ByteVec): void { /** Decode a `T` from the wire, then encode what came out. */ export function roundtrip$Versions(data: Uint8Array, out: rt.ByteVec): void { - let _5!: [rt.u8, Uint8Array] | undefined; - let form_!: Form.Form; - let _8!: rt.Result<[Versions.Versions, rt.usize], DecodeError.DecodeError>; - let value!: Versions.Versions; - let buf!: rt.ByteVec; - let _14!: rt.Result; - let _17!: Encoder.Encoder; - let err2!: DecodeError.DecodeError; - _5 = rt.sliceSplitFirst(data); + const _5: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(data); if (_5 !== undefined) { - form_ = form(_5[0]); - _8 = Versions.decodeSlice$Decode_Form(_5[1], form_); + const form_: Form.Form = form(_5[0]); + const _8: rt.Result<[Versions.Versions, rt.usize], DecodeError.DecodeError> = Versions.decodeSlice$Decode_Form(_5[1], form_); if (_8.ok) { - value = _8.value[0]; + const value: Versions.Versions = _8.value[0]; putUsize(out, _8.value[1]); - buf = new rt.ByteVec(); - _17 = Encoder.new(buf, form_); - _14 = Versions.encode$Encode_Form(value, _17, form_); + const buf: rt.ByteVec = new rt.ByteVec(); + const _17: Encoder.Encoder = Encoder.new(buf, form_); + const _14: rt.Result = Versions.encode$Encode_Form(value, _17, form_); if (_14.ok) { rt.byteVecExtendFromSlice(out, rt.byteVecView(buf)); } else { encodeFailed(out, _14.error); } } else { - err2 = _8.error; + const err2: DecodeError.DecodeError = _8.error; decodeFailed(out, err2); } } @@ -561,33 +478,24 @@ export function roundtrip$Versions(data: Uint8Array, out: rt.ByteVec): void { /** [`roundtrip`] for a lite message, size-prefixed at a lite version. */ export function roundtripLite$Group(data: Uint8Array, out: rt.ByteVec): void { - let _5!: [rt.u8, Uint8Array] | undefined; - let version!: Version.Version; - let _8!: rt.Result<[Group.Group, rt.usize], DecodeError.DecodeError>; - let value!: Group.Group; - let buf!: rt.ByteVec; - let _14!: rt.Result; - let _17!: Encoder.Encoder; - let _19!: Form.Form; - let err2!: DecodeError.DecodeError; - _5 = rt.sliceSplitFirst(data); + const _5: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(data); if (_5 !== undefined) { - version = liteVersion(_5[0]); - _8 = Group.decodeSlice$Decode_Version(_5[1], version); + const version: Version.Version = liteVersion(_5[0]); + const _8: rt.Result<[Group.Group, rt.usize], DecodeError.DecodeError> = Group.decodeSlice$Decode_Version(_5[1], version); if (_8.ok) { - value = _8.value[0]; + const value: Group.Group = _8.value[0]; putUsize(out, _8.value[1]); - buf = new rt.ByteVec(); - _19 = Form.from$From_Version(version); - _17 = Encoder.new(buf, _19); - _14 = Group.encode$Encode_Version(value, _17, version); + const buf: rt.ByteVec = new rt.ByteVec(); + const _19: Form.Form = Form.from$From_Version(version); + const _17: Encoder.Encoder = Encoder.new(buf, _19); + const _14: rt.Result = Group.encode$Encode_Version(value, _17, version); if (_14.ok) { rt.byteVecExtendFromSlice(out, rt.byteVecView(buf)); } else { encodeFailed(out, _14.error); } } else { - err2 = _8.error; + const err2: DecodeError.DecodeError = _8.error; decodeFailed(out, err2); } } @@ -595,33 +503,24 @@ export function roundtripLite$Group(data: Uint8Array, out: rt.ByteVec): void { /** [`roundtrip`] for a lite message, size-prefixed at a lite version. */ export function roundtripLite$Probe(data: Uint8Array, out: rt.ByteVec): void { - let _5!: [rt.u8, Uint8Array] | undefined; - let version!: Version.Version; - let _8!: rt.Result<[Probe.Probe, rt.usize], DecodeError.DecodeError>; - let value!: Probe.Probe; - let buf!: rt.ByteVec; - let _14!: rt.Result; - let _17!: Encoder.Encoder; - let _19!: Form.Form; - let err2!: DecodeError.DecodeError; - _5 = rt.sliceSplitFirst(data); + const _5: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(data); if (_5 !== undefined) { - version = liteVersion(_5[0]); - _8 = Probe.decodeSlice$Decode_Version(_5[1], version); + const version: Version.Version = liteVersion(_5[0]); + const _8: rt.Result<[Probe.Probe, rt.usize], DecodeError.DecodeError> = Probe.decodeSlice$Decode_Version(_5[1], version); if (_8.ok) { - value = _8.value[0]; + const value: Probe.Probe = _8.value[0]; putUsize(out, _8.value[1]); - buf = new rt.ByteVec(); - _19 = Form.from$From_Version(version); - _17 = Encoder.new(buf, _19); - _14 = Probe.encode$Encode_Version(value, _17, version); + const buf: rt.ByteVec = new rt.ByteVec(); + const _19: Form.Form = Form.from$From_Version(version); + const _17: Encoder.Encoder = Encoder.new(buf, _19); + const _14: rt.Result = Probe.encode$Encode_Version(value, _17, version); if (_14.ok) { rt.byteVecExtendFromSlice(out, rt.byteVecView(buf)); } else { encodeFailed(out, _14.error); } } else { - err2 = _8.error; + const err2: DecodeError.DecodeError = _8.error; decodeFailed(out, err2); } } @@ -629,41 +528,25 @@ export function roundtripLite$Probe(data: Uint8Array, out: rt.ByteVec): void { /** Encode messages built from the data, at a lite version. */ export function encodeMessages(data: Uint8Array, out: rt.ByteVec): void { - let _5!: [rt.u8, Uint8Array] | undefined; - let version!: Version.Version; - let subscribe!: rt.u64; - let _10!: [rt.u64, Uint8Array]; - let sequence!: rt.u64; - let _13!: [rt.u64, Uint8Array]; - let frameStart!: rt.u64; - let _16!: [rt.u64, Uint8Array]; - let bitrate!: rt.u64; - let _19!: [rt.u64, Uint8Array]; - let rtt!: rt.u64; - let versions!: Versions.Versions; - let buf!: rt.ByteVec; - let _40!: rt.Result; - let _43!: Encoder.Encoder; - let _45!: Form.Form; - _5 = rt.sliceSplitFirst(data); + const _5: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(data); if (_5 !== undefined) { - version = liteVersion(_5[0]); - _10 = takeU64(_5[1]); - subscribe = _10[0]; - _13 = takeU64(_10[1]); - sequence = _13[0]; - _16 = takeU64(_13[1]); - frameStart = _16[0]; - _19 = takeU64(_16[1]); - bitrate = _19[0]; - rtt = takeU64(_19[1])[0]; + const version: Version.Version = liteVersion(_5[0]); + const _10: [rt.u64, Uint8Array] = takeU64(_5[1]); + const subscribe: rt.u64 = _10[0]; + const _13: [rt.u64, Uint8Array] = takeU64(_10[1]); + const sequence: rt.u64 = _13[0]; + const _16: [rt.u64, Uint8Array] = takeU64(_13[1]); + const frameStart: rt.u64 = _16[0]; + const _19: [rt.u64, Uint8Array] = takeU64(_16[1]); + const bitrate: rt.u64 = _19[0]; + const rtt: rt.u64 = takeU64(_19[1])[0]; encodeMessage$Group({ subscribe, sequence, frameStart: rt.u64Rem(frameStart, 4) }, version, out); encodeMessage$Probe({ bitrate: rt.u64CheckedSub(bitrate, 1), rtt: rt.thenSome(rt.u64Rem(rtt, 3) !== 0, rtt) }, version, out); - versions = Versions.from$From_Versions([{ _0: subscribe }, { _0: sequence }]); - buf = new rt.ByteVec(); - _45 = Form.from$From_Version(version); - _43 = Encoder.new(buf, _45); - _40 = Versions.encode$Encode_Version(versions, _43, version); + const versions: Versions.Versions = Versions.from$From_Versions([{ _0: subscribe }, { _0: sequence }]); + const buf: rt.ByteVec = new rt.ByteVec(); + const _45: Form.Form = Form.from$From_Version(version); + const _43: Encoder.Encoder = Encoder.new(buf, _45); + const _40: rt.Result = Versions.encode$Encode_Version(versions, _43, version); if (_40.ok) { rt.byteVecExtendFromSlice(out, rt.byteVecView(buf)); } else { @@ -673,14 +556,10 @@ export function encodeMessages(data: Uint8Array, out: rt.ByteVec): void { } export function encodeMessage$Group(msg: Group.Group, version: Version.Version, out: rt.ByteVec): void { - let buf!: rt.ByteVec; - let w!: Encoder.Encoder; - let _7!: Form.Form; - let _8!: rt.Result; - buf = new rt.ByteVec(); - _7 = Form.from$From_Version(version); - w = Encoder.new(buf, _7); - _8 = Group.encode$Encode_Version(msg, w, version); + const buf: rt.ByteVec = new rt.ByteVec(); + const _7: Form.Form = Form.from$From_Version(version); + const w: Encoder.Encoder = Encoder.new(buf, _7); + const _8: rt.Result = Group.encode$Encode_Version(msg, w, version); if (_8.ok) { rt.byteVecPush(out, w.control !== undefined ? 1 : 0); putUsize(out, buf.length); @@ -691,14 +570,10 @@ export function encodeMessage$Group(msg: Group.Group, version: Version.Version, } export function encodeMessage$Probe(msg: Probe.Probe, version: Version.Version, out: rt.ByteVec): void { - let buf!: rt.ByteVec; - let w!: Encoder.Encoder; - let _7!: Form.Form; - let _8!: rt.Result; - buf = new rt.ByteVec(); - _7 = Form.from$From_Version(version); - w = Encoder.new(buf, _7); - _8 = Probe.encode$Encode_Version(msg, w, version); + const buf: rt.ByteVec = new rt.ByteVec(); + const _7: Form.Form = Form.from$From_Version(version); + const w: Encoder.Encoder = Encoder.new(buf, _7); + const _8: rt.Result = Probe.encode$Encode_Version(msg, w, version); if (_8.ok) { rt.byteVecPush(out, w.control !== undefined ? 1 : 0); putUsize(out, buf.length); @@ -710,25 +585,13 @@ export function encodeMessage$Probe(msg: Probe.Probe, version: Version.Version, /** Each error the codec can return, built from the data, as callers see it. */ export function errors(data: Uint8Array, out: rt.ByteVec): void { - let selector!: rt.u8; - let _5!: [rt.u8, Uint8Array] | undefined; - let value!: rt.u64; let err!: DecodeError.DecodeError; - let _10!: rt.u8; - let _20!: rt.Result; - let _26!: string; - let _28!: string; - let args2!: rt.Fmt[]; - let _38!: string; - let args4!: rt.Fmt[]; - let _47!: string; - let args6!: rt.Fmt[]; - _5 = rt.sliceSplitFirst(data); + const _5: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(data); b0: { if (_5 !== undefined) { - selector = _5[0]; - value = takeU64(_5[1])[0]; - _10 = rt.u8Rem(selector, 8); + const selector: rt.u8 = _5[0]; + const value: rt.u64 = takeU64(_5[1])[0]; + const _10: rt.u8 = rt.u8Rem(selector, 8); if (_10 === 0) { err = { tag: "InvalidMessage", _0: value } as DecodeError.DecodeError; } else if (_10 === 1) { @@ -738,7 +601,7 @@ export function errors(data: Uint8Array, out: rt.ByteVec): void { } else if (_10 === 3) { err = { tag: "Session", _0: { tag: "ProtocolViolation" } as SessionError.SessionError } as DecodeError.DecodeError; } else if (_10 === 4) { - _20 = rt.stringFromUtf8(rt.sliceToByteVec(_5[1])); + const _20: rt.Result = rt.stringFromUtf8(rt.sliceToByteVec(_5[1])); if (_20.ok) { err = { tag: "Missing" } as DecodeError.DecodeError; } else { @@ -746,23 +609,24 @@ export function errors(data: Uint8Array, out: rt.ByteVec): void { } } else if (_10 === 5) { err = DecodeError.from$From_BoundsExceeded({}); - } else if (_10 === 6) { - const arg = {}; - _26 = rt.fmtToString((f: rt.Formatter) => BoundsExceeded.fmt$Display(arg, f)); - const arg2 = ([{}] as [BoundsExceeded.BoundsExceeded])[0]; - args2 = [(f: rt.Formatter) => BoundsExceeded.fmt$Debug(arg2, f)]; - _28 = rt.fmtFormat([args2[0], " ", rt.fmtSpec({ alternate: true }, args2[0])]); - putText(out, _26, _28); - break b0; } else { + if (_10 === 6) { + const arg = {}; + const _26: string = rt.fmtToString((f: rt.Formatter) => BoundsExceeded.fmt$Display(arg, f)); + const arg2 = ([{}] as [BoundsExceeded.BoundsExceeded])[0]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => BoundsExceeded.fmt$Debug(arg2, f)]; + const _28: string = rt.fmtFormat([args2[0], " ", rt.fmtSpec({ alternate: true }, args2[0])]); + putText(out, _26, _28); + break b0; + } err = { tag: "MalformedAuthToken" } as DecodeError.DecodeError; } const arg3 = ([err] as [DecodeError.DecodeError])[0]; - args4 = [(f: rt.Formatter) => DecodeError.fmt$Display(arg3, f)]; - _38 = rt.fmtFormat([args4[0], " ", rt.fmtSpec({ align: ">", width: 30 }, args4[0]), "|"]); + const args4: rt.Fmt[] = [(f: rt.Formatter) => DecodeError.fmt$Display(arg3, f)]; + const _38: string = rt.fmtFormat([args4[0], " ", rt.fmtSpec({ align: ">", width: 30 }, args4[0]), "|"]); const arg4 = ([err] as [DecodeError.DecodeError])[0]; - args6 = [(f: rt.Formatter) => DecodeError.fmt$Debug(arg4, f)]; - _47 = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args6[0])]); + const args6: rt.Fmt[] = [(f: rt.Formatter) => DecodeError.fmt$Debug(arg4, f)]; + const _47: string = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args6[0])]); putText(out, _38, _47); decodeFailed(out, err); } diff --git a/ts/fixtures/codec/expected/lib.SessionError.ts b/ts/fixtures/codec/expected/lib.SessionError.ts index 9e4781205..74ca6673d 100644 --- a/ts/fixtures/codec/expected/lib.SessionError.ts +++ b/ts/fixtures/codec/expected/lib.SessionError.ts @@ -3,24 +3,20 @@ import * as rt from "./rt.ts"; export function fmt$Display(self: SessionError, __formatter: rt.Formatter): rt.Result { - let args2!: rt.Fmt[]; if (self.tag === "ProtocolViolation") { return rt.fmtWriteStr(__formatter, "protocol violation"); - } else { - const arg = ([([self._0] as [rt.u16])[0]] as [rt.u16])[0]; - args2 = [(f: rt.Formatter) => rt.u16Display(arg, f)]; - return rt.fmtWriteFmt(__formatter, ["app code=", args2[0]]); } + const arg = ([([self._0] as [rt.u16])[0]] as [rt.u16])[0]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u16Display(arg, f)]; + return rt.fmtWriteFmt(__formatter, ["app code=", args2[0]]); } export function fmt$Debug(self: SessionError, f: rt.Formatter): rt.Result { - let _6!: string; - let _7!: rt.Fmt; if (self.tag === "ProtocolViolation") { return rt.fmtWriteStr(f, "ProtocolViolation"); } - _6 = "App"; - _7 = (f: rt.Formatter) => rt.u16Display(self._0, f); + const _6: string = "App"; + const _7: rt.Fmt = (f: rt.Formatter) => rt.u16Display(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _6), _7)); } diff --git a/ts/fixtures/codec/expected/lite/group.Group.ts b/ts/fixtures/codec/expected/lite/group.Group.ts index f3f365834..87d3ed087 100644 --- a/ts/fixtures/codec/expected/lite/group.Group.ts +++ b/ts/fixtures/codec/expected/lite/group.Group.ts @@ -12,19 +12,13 @@ import * as Version from "../lite/version.Version.ts"; /** Decode the value from the front of `buf`, returning it and the bytes it took. */ export function decodeSlice$Decode_Version(buf: Uint8Array, version: Version.Version): rt.Result<[Group, rt.usize], DecodeError.DecodeError> { - let _0!: rt.Result<[Group, rt.usize], DecodeError.DecodeError>; - let r!: Decoder.Decoder; - let value!: Group; - let _6!: rt.Result; - let val!: Group; - let _13!: Group; - r = Decoder.new(buf, Form.from$From_Version(version)); - _6 = decode$Decode_Version(r, version); + const r: Decoder.Decoder = Decoder.new(buf, Form.from$From_Version(version)); + const _6: rt.Result = decode$Decode_Version(r, version); if (_6.ok) { - val = _6.value; - value = val; - _13 = value; - _0 = rt.Ok([_13, rt.usizeSub(buf.length, Decoder.remaining(r))] as [Group, rt.usize]); + const val: Group = _6.value; + const value: Group = val; + const _13: Group = value; + const _0: rt.Result<[Group, rt.usize], DecodeError.DecodeError> = rt.Ok([_13, rt.usizeSub(buf.length, Decoder.remaining(r))]); return _0; } return _6; @@ -38,22 +32,17 @@ export interface Group { /** Decode a message body (without size prefix). */ export function decodeMsg$Message(r: Decoder.Decoder, version: Version.Version): rt.Result { - let _3!: rt.Result; - let subscribe!: rt.u64; - let _8!: rt.Result; - let sequence!: rt.u64; let frameStart!: rt.u64; - let _15!: rt.Result; - _3 = Decoder.varint(r); + const _3: rt.Result = Decoder.varint(r); if (_3.ok) { - subscribe = _3.value; - _8 = Decoder.varint(r); + const subscribe: rt.u64 = _3.value; + const _8: rt.Result = Decoder.varint(r); if (_8.ok) { - sequence = _8.value; + const sequence: rt.u64 = _8.value; if (!Version.hasFrameBounds(version)) { frameStart = 0; } else { - _15 = Decoder.varint(r); + const _15: rt.Result = Decoder.varint(r); if (_15.ok) { frameStart = _15.value; } else { @@ -69,19 +58,16 @@ export function decodeMsg$Message(r: Decoder.Decoder, version: Version.Version): /** Encode this message body (without size prefix). */ export function encodeMsg$Message(self: Group, w: Encoder.Encoder, version: Version.Version): rt.Result { - let _4!: rt.Result; - let _9!: rt.Result; - let _15!: rt.Result; - _4 = Encoder.varint(w, self.subscribe); + const _4: rt.Result = Encoder.varint(w, self.subscribe); if (_4.ok) { - _9 = Encoder.varint(w, self.sequence); + const _9: rt.Result = Encoder.varint(w, self.sequence); if (_9.ok) { if (!Version.hasFrameBounds(version)) { if (self.frameStart !== 0) { return rt.Err("Version" as EncodeError.EncodeError); } } else { - _15 = Encoder.varint(w, self.frameStart); + const _15: rt.Result = Encoder.varint(w, self.frameStart); if (!_15.ok) { return _15; } @@ -95,14 +81,11 @@ export function encodeMsg$Message(self: Group, w: Encoder.Encoder, version: Vers /** Encode the value to the given encoder, which may hold partial output on error. */ export function encode$Encode_Version(self: Group, w: Encoder.Encoder, version: Version.Version): rt.Result { - let prefix!: Prefix.Prefix; - let _39!: rt.Result; - let _49!: rt.Result; - prefix = Encoder.prefixVarint(w); - _39 = encodeMsg$Message(self, w, version); + const prefix: Prefix.Prefix = Encoder.prefixVarint(w); + const _39: rt.Result = encodeMsg$Message(self, w, version); if (_39.ok) { if (!(Encoder.since(w, prefix) > 65535)) { - _49 = Encoder.fill(w, prefix); + const _49: rt.Result = Encoder.fill(w, prefix); if (_49.ok) { w.control = undefined; return rt.Ok(undefined); diff --git a/ts/fixtures/codec/expected/lite/message.ts b/ts/fixtures/codec/expected/lite/message.ts index 22dffae67..69b00de5c 100644 --- a/ts/fixtures/codec/expected/lite/message.ts +++ b/ts/fixtures/codec/expected/lite/message.ts @@ -9,13 +9,10 @@ import type * as Control from "../stats.Control.ts"; /** Read a lite message's varint size prefix, refusing one past `max`. */ export function decodeSize(r: Decoder.Decoder, max: rt.usize): rt.Result { - let _3!: rt.Result; - let size!: rt.u64; - let _8!: rt.Result; - _3 = Decoder.varint(r); + const _3: rt.Result = Decoder.varint(r); if (_3.ok) { - size = _3.value; - _8 = rt.usizeTryFrom(size); + const size: rt.u64 = _3.value; + const _8: rt.Result = rt.usizeTryFrom(size); if (_8.ok) { if (_8.value <= max) { return rt.Ok(_8.value); @@ -31,16 +28,12 @@ export function decodeSize(r: Decoder.Decoder, max: rt.usize): rt.Result rt.Result): rt.Result { - let _3!: rt.Result; - let body!: Decoder.Decoder; - let _9!: rt.Result; - let result!: rt.Result; - _3 = decodeSize(r, 65535); + const _3: rt.Result = decodeSize(r, 65535); if (_3.ok) { - _9 = Decoder.sub(r, _3.value); + const _9: rt.Result = Decoder.sub(r, _3.value); if (_9.ok) { - body = _9.value; - result = rt.resultAndThen(rt.resultMapErr(decode(body), DecodeError.complete), (msg: Group.Group): rt.Result => { + const body: Decoder.Decoder = _9.value; + const result: rt.Result = rt.resultAndThen(rt.resultMapErr(decode(body), DecodeError.complete), (msg: Group.Group): rt.Result => { if (!Decoder.isEmpty(body)) { return rt.Err({ tag: "Long" } as DecodeError.DecodeError); } @@ -61,16 +54,12 @@ export function decodeWith$Group_decode_closure0(r: Decoder.Decoder, decode: (a0 * [`Message::decode_msg`], for a body whose bounds come from the session. */ export function decodeWith$Probe_decode_closure0(r: Decoder.Decoder, decode: (a0: Decoder.Decoder) => rt.Result): rt.Result { - let _3!: rt.Result; - let body!: Decoder.Decoder; - let _9!: rt.Result; - let result!: rt.Result; - _3 = decodeSize(r, 65535); + const _3: rt.Result = decodeSize(r, 65535); if (_3.ok) { - _9 = Decoder.sub(r, _3.value); + const _9: rt.Result = Decoder.sub(r, _3.value); if (_9.ok) { - body = _9.value; - result = rt.resultAndThen(rt.resultMapErr(decode(body), DecodeError.complete), (msg: Probe.Probe): rt.Result => { + const body: Decoder.Decoder = _9.value; + const result: rt.Result = rt.resultAndThen(rt.resultMapErr(decode(body), DecodeError.complete), (msg: Probe.Probe): rt.Result => { if (!Decoder.isEmpty(body)) { return rt.Err({ tag: "Long" } as DecodeError.DecodeError); } diff --git a/ts/fixtures/codec/expected/lite/probe.Probe.ts b/ts/fixtures/codec/expected/lite/probe.Probe.ts index 40eaa484b..745354421 100644 --- a/ts/fixtures/codec/expected/lite/probe.Probe.ts +++ b/ts/fixtures/codec/expected/lite/probe.Probe.ts @@ -13,19 +13,13 @@ import type * as Control from "../stats.Control.ts"; /** Decode the value from the front of `buf`, returning it and the bytes it took. */ export function decodeSlice$Decode_Version(buf: Uint8Array, version: Version.Version): rt.Result<[Probe, rt.usize], DecodeError.DecodeError> { - let _0!: rt.Result<[Probe, rt.usize], DecodeError.DecodeError>; - let r!: Decoder.Decoder; - let value!: Probe; - let _6!: rt.Result; - let val!: Probe; - let _13!: Probe; - r = Decoder.new(buf, Form.from$From_Version(version)); - _6 = decode$Decode_Version(r, version); + const r: Decoder.Decoder = Decoder.new(buf, Form.from$From_Version(version)); + const _6: rt.Result = decode$Decode_Version(r, version); if (_6.ok) { - val = _6.value; - value = val; - _13 = value; - _0 = rt.Ok([_13, rt.usizeSub(buf.length, Decoder.remaining(r))] as [Probe, rt.usize]); + const val: Probe = _6.value; + const value: Probe = val; + const _13: Probe = value; + const _0: rt.Result<[Probe, rt.usize], DecodeError.DecodeError> = rt.Ok([_13, rt.usizeSub(buf.length, Decoder.remaining(r))]); return _0; } return _6; @@ -33,14 +27,11 @@ export function decodeSlice$Decode_Version(buf: Uint8Array, version: Version.Ver /** Encode the value to the given encoder, which may hold partial output on error. */ export function encode$Encode_Version(self: Probe, w: Encoder.Encoder, version: Version.Version): rt.Result { - let prefix!: Prefix.Prefix; - let _39!: rt.Result; - let _49!: rt.Result; - prefix = Encoder.prefixVarint(w); - _39 = encodeMsg$Message(self, w, version); + const prefix: Prefix.Prefix = Encoder.prefixVarint(w); + const _39: rt.Result = encodeMsg$Message(self, w, version); if (_39.ok) { if (!(Encoder.since(w, prefix) > 65535)) { - _49 = Encoder.fill(w, prefix); + const _49: rt.Result = Encoder.fill(w, prefix); if (_49.ok) { w.control = "Probe" as Control.Control; return rt.Ok(undefined); @@ -74,17 +65,13 @@ export interface Probe { /** Decode a message body (without size prefix). */ export function decodeMsg$Message(r: Decoder.Decoder, version: Version.Version): rt.Result { let bitrate!: rt.u64 | undefined; - let _6!: rt.Result; - let val!: rt.u64; let rtt!: rt.u64 | undefined; - let _13!: rt.Result; - let val2!: rt.u64; if (version === "Lite01" || version === "Lite02") { return rt.Err({ tag: "Version" } as DecodeError.DecodeError); } - _6 = Decoder.varint(r); + const _6: rt.Result = Decoder.varint(r); if (_6.ok) { - val = _6.value; + const val: rt.u64 = _6.value; if (val === 0) { bitrate = undefined; } else { @@ -93,9 +80,9 @@ export function decodeMsg$Message(r: Decoder.Decoder, version: Version.Version): if (!Version.hasProbeRtt(version)) { rtt = undefined; } else { - _13 = Decoder.varint(r); + const _13: rt.Result = Decoder.varint(r); if (_13.ok) { - val2 = _13.value; + const val2: rt.u64 = _13.value; if (val2 === 0) { rtt = undefined; } else { @@ -112,17 +99,15 @@ export function decodeMsg$Message(r: Decoder.Decoder, version: Version.Version): /** Encode this message body (without size prefix). */ export function encodeMsg$Message(self: Probe, w: Encoder.Encoder, version: Version.Version): rt.Result { - let _9!: rt.Result; - let _17!: rt.Result; if (version === "Lite01" || version === "Lite02") { return rt.Err("Version" as EncodeError.EncodeError); } - _9 = Encoder.varint(w, rt.optionUnwrapOr(rt.optionMap(self.bitrate, (v: rt.u64): rt.u64 => { + const _9: rt.Result = Encoder.varint(w, rt.optionUnwrapOr(rt.optionMap(self.bitrate, (v: rt.u64): rt.u64 => { return rt.u64Max(v, 1); }), 0)); if (_9.ok) { if (Version.hasProbeRtt(version)) { - _17 = Encoder.varint(w, rt.optionUnwrapOr(rt.optionMap(self.rtt, (v2: rt.u64): rt.u64 => { + const _17: rt.Result = Encoder.varint(w, rt.optionUnwrapOr(rt.optionMap(self.rtt, (v2: rt.u64): rt.u64 => { return rt.u64Max(v2, 1); }), 0)); if (!_17.ok) { diff --git a/ts/fixtures/lang/expected/collections.Fussy.ts b/ts/fixtures/lang/expected/collections.Fussy.ts index 42be78ffd..800e2dc6a 100644 --- a/ts/fixtures/lang/expected/collections.Fussy.ts +++ b/ts/fixtures/lang/expected/collections.Fussy.ts @@ -12,14 +12,12 @@ export interface Fussy { } export function clone$Clone(self: Fussy): Fussy { - let args2!: rt.Fmt[]; if (!(rt.u8Rem(self._0, 7) === 0)) { return { _0: self._0 }; - } else { - const arg = ([self._0] as [rt.u8])[0]; - args2 = [(f: rt.Formatter) => rt.u8Display(arg, f)]; - rt.panicFmt(["cloning ", args2[0]]); } + const arg = ([self._0] as [rt.u8])[0]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg, f)]; + rt.panicFmt(["cloning ", args2[0]]); } //# sourceMappingURL=collections.Fussy.ts.map diff --git a/ts/fixtures/lang/expected/collections.Pair.ts b/ts/fixtures/lang/expected/collections.Pair.ts index 000ac8d7d..e0188c928 100644 --- a/ts/fixtures/lang/expected/collections.Pair.ts +++ b/ts/fixtures/lang/expected/collections.Pair.ts @@ -15,8 +15,7 @@ export function hash$Hash_DefaultHasher(self: Pair, state: rt.Hasher): void { } export function cmp$Ord(self: Pair, other: Pair): rt.Ordering { - let cmp!: rt.Ordering; - cmp = rt.cmp(self.a, other.a); + const cmp: rt.Ordering = rt.cmp(self.a, other.a); if (cmp === 0) { return rt.cmp(self.b, other.b); } diff --git a/ts/fixtures/lang/expected/collections.Rank.ts b/ts/fixtures/lang/expected/collections.Rank.ts index 3c4194dfd..a41a9c139 100644 --- a/ts/fixtures/lang/expected/collections.Rank.ts +++ b/ts/fixtures/lang/expected/collections.Rank.ts @@ -32,14 +32,13 @@ export function hash$Hash_DefaultHasher(self: Rank, state: rt.Hasher): void { } export function cmp$Ord(self: Rank, other: Rank): rt.Ordering { - let cmp!: rt.Ordering; if (self.tag === "Mid") { if (other.tag === "Mid") { return rt.cmp(self._0, other._0); } } else if (self.tag === "High") { if (other.tag === "High") { - cmp = rt.cmp(self.x, other.x); + const cmp: rt.Ordering = rt.cmp(self.x, other.x); if (cmp === 0) { return rt.cmp(self.y, other.y); } diff --git a/ts/fixtures/lang/expected/collections.ts b/ts/fixtures/lang/expected/collections.ts index 4f9b33f61..1d10e9b10 100644 --- a/ts/fixtures/lang/expected/collections.ts +++ b/ts/fixtures/lang/expected/collections.ts @@ -11,8 +11,7 @@ import * as Tally from "./collections.Tally.ts"; /** A 64-bit key: small, or past 2^53, where it is no longer a JS number. */ export function wide(b: rt.u8): rt.u64 { - let _2!: rt.u8; - _2 = rt.u8Rem(b, 3); + const _2: rt.u8 = rt.u8Rem(b, 3); if (_2 === 0) { return b as rt.u64; } @@ -23,8 +22,7 @@ export function wide(b: rt.u8): rt.u64 { } export function rank(b: rt.u8, c: rt.u8): Rank.Rank { - let _3!: rt.u8; - _3 = rt.u8Rem(b, 3); + const _3: rt.u8 = rt.u8Rem(b, 3); if (_3 === 0) { return { tag: "Low" } as Rank.Rank; } @@ -35,182 +33,48 @@ export function rank(b: rt.u8, c: rt.u8): Rank.Rank { } export function rankByte(r: Rank.Rank): rt.u8 { - let x!: rt.u8; - let y!: rt.u8; if (r.tag === "Low") { return 0; } if (r.tag === "Mid") { return 16 | r._0; } - x = r.x; - y = r.y; + const x: rt.u8 = r.x; + const y: rt.u8 = r.y; return 32 | ((x << 2) & 0xff) | y; } /** A `HashMap` by each kind of key, through a script of inserts, lookups, and removals. */ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let _4!: rt.u8; - let map!: rt.HashMap; - let iter!: rt.Iter; - let _13!: rt.usize | rt.Done; - let i!: rt.usize; - let k!: rt.u8; - let v!: rt.u16; - let _19!: [rt.u8, rt.u16]; - let _31!: rt.u16; - let _48!: rt.u16; - let sorted!: rt.BTreeMap; - let _67!: rt.Iter<[rt.u8, rt.u16]>; - let iter2!: rt.Iter<[rt.u8, rt.u16]>; - let _73!: [rt.u8, rt.u16] | rt.Done; - let map2!: rt.HashMap; - let iter3!: rt.Iter<[rt.usize, rt.u8]>; - let _97!: [rt.usize, rt.u8] | rt.Done; - let i2!: rt.usize; - let b!: rt.u8; - let k2!: rt.u64; - let _105!: rt.u8; - let keys!: rt.BTreeSet; - let _123!: rt.Iter; - let iter4!: rt.Iter; - let _129!: rt.u64 | rt.Done; - let _142!: rt.u8 | undefined; - let _150!: rt.u64; - let map3!: rt.HashMap; - let pairs!: rt.HashMap; - let ranks!: rt.HashMap; - let tuples!: rt.HashMap<[rt.u8, string], rt.u8>; - let iterStart!: rt.usize; - let iterEnd!: rt.usize; let _161!: rt.usize; - let i3!: rt.usize; - let a!: rt.u8; - let b3!: rt.u8; - let _167!: [rt.u8, rt.u8]; - let _168!: rt.u8; - let _169!: rt.usize; - let pair!: Pair.Pair; - let t!: Tally.Tally; - let r!: Rank.Rank; - let _192!: Tally.Tally | undefined; - let t2!: [rt.u8, string]; - let _203!: rt.u8; - let _207!: rt.usize; - let _225!: rt.Iter<[rt.u8, rt.u8]>; - let iter6!: rt.Iter<[rt.u8, rt.u8]>; - let _230!: [rt.u8, rt.u8] | rt.Done; - let k3!: rt.u8; - let v2!: rt.u8; - let key!: Pair.Pair; - let local!: Tally.Tally; - let before!: Tally.Tally; - let _246!: Tally.Tally | undefined; - let _265!: rt.Iter<[Pair.Pair, Tally.Tally]>; - let iter7!: rt.Iter<[Pair.Pair, Tally.Tally]>; - let _269!: [Pair.Pair, Tally.Tally] | rt.Done; - let p!: Pair.Pair; - let t3!: Tally.Tally; - let iterStart2!: rt.usize; - let iterEnd2!: rt.usize; let _286!: rt.usize; - let i4!: rt.usize; - let a2!: rt.u8; - let b4!: rt.u8; - let _292!: [rt.u8, rt.u8]; - let _293!: rt.u8; - let _294!: rt.usize; - let t4!: Tally.Tally; - let _305!: Rank.Rank; - let e!: rt.Entry; - let _313!: Rank.Rank; - let copy!: rt.HashMap; - let _327!: Tally.Tally | undefined; - let bytes!: rt.HashMap; - let _348!: rt.Iter<[rt.u8, Tally.Tally]>; - let copy2!: rt.HashMap; - let iter9!: rt.Iter; - let _356!: Tally.Tally | rt.Done; - let iterStart3!: rt.u8; - let iterEnd3!: rt.u8; let _364!: rt.u8; - let k4!: rt.u8; - let iterS!: Uint8Array; - let iterI!: number; - let _380!: rt.u8 | rt.Done; - let b5!: rt.u8; - let _387!: rt.u8; - let _389!: rt.u16; - let stamped!: rt.HashMap; - let extended!: rt.HashMap; - let iter12!: rt.Iter; - let _409!: Tally.Tally | rt.Done; - let iterStart4!: rt.u8; - let iterEnd4!: rt.u8; let _416!: rt.u8; - let k5!: rt.u8; - let _430!: (a0: Nibble.Nibble) => rt.u64; - let first!: rt.u8; - let h!: rt.Hasher; - let counted!: Tally.Tally; - let _448!: [rt.Hasher, Tally.Tally]; - let _453!: rt.Hasher; - let _456!: rt.u16; - let want!: rt.Hasher; - let ranks2!: rt.BTreeMap; - let _473!: rt.Iter<[Rank.Rank, rt.u16]>; - let iter14!: rt.Iter<[Rank.Rank, rt.u16]>; - let _479!: [Rank.Rank, rt.u16] | rt.Done; - let words!: rt.HashMap; - let iterS2!: Uint8Array; - let iterI2!: number; - let _496!: rt.u8 | rt.Done; - let b6!: rt.u8; - let word!: string; - let _502!: rt.usize; - let lens!: rt.BTreeMap; - let iter16!: rt.Iter<[string, rt.ByteVec]>; - let _517!: [string, rt.ByteVec] | rt.Done; - let _524!: string; - let _525!: rt.usize; - let iter17!: rt.Iter<[string, rt.usize]>; - let _529!: [string, rt.usize] | rt.Done; - let clashes!: rt.HashMap; - let iter18!: rt.Iter<[rt.usize, rt.u8]>; - let _555!: [rt.usize, rt.u8] | rt.Done; - let i5!: rt.usize; - let b7!: rt.u8; - let k6!: Clash.Clash; - let _563!: rt.u8; - let kept!: rt.BTreeSet; - let _583!: rt.Iter; - let copy3!: rt.HashMap; - _430 = (n: Nibble.Nibble): rt.u64 => { - let h2!: rt.Hasher; - h2 = rt.hasher(); + const _430: (a0: Nibble.Nibble) => rt.u64 = (n: Nibble.Nibble): rt.u64 => { + const h2: rt.Hasher = rt.hasher(); Nibble.hash$Hash_DefaultHasher(n, h2); return rt.hashFinish(h2); }; b0: { - _4 = rt.u8Rem(kind, 4); + const _4: rt.u8 = rt.u8Rem(kind, 4); if (_4 === 0) { - map = rt.hashNew() as rt.HashMap; - iter = rt.iterStepBy(new rt.Range(0, data.length), 2); + const map: rt.HashMap = rt.hashNew() as rt.HashMap; + const iter: rt.Iter = rt.iterStepBy(new rt.Range(0, data.length), 2); while (true) { - _13 = iter.next(); + const _13: rt.usize | rt.Done = iter.next(); if (_13 === rt.DONE) { rt.byteVecPush(out, rt.hashLen(map) & 0xff); rt.byteVecPush(out, rt.hashLen(map) === 0 ? 1 : 0); rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(rt.iterSum(rt.iterMap(rt.hashValues(map), (v5: rt.u16): rt.u16 => { return rt.u16Rem(v5, 256); }), rt.u16Add, 0))); - _67 = rt.iterMap(rt.hashIter(map), (_227: [rt.u8, rt.u16]): [rt.u8, rt.u16] => { + const _67: rt.Iter<[rt.u8, rt.u16]> = rt.iterMap(rt.hashIter(map), (_227: [rt.u8, rt.u16]): [rt.u8, rt.u16] => { return [_227[0], _227[1]] as [rt.u8, rt.u16]; }); - sorted = rt.btreeExtend(rt.btreeNew(rt.cmp) as rt.BTreeMap, _67, true); - iter2 = rt.btreeIter(sorted); + const sorted: rt.BTreeMap = rt.btreeExtend(rt.btreeNew(rt.cmp) as rt.BTreeMap, _67, true); + const iter2: rt.Iter<[rt.u8, rt.u16]> = rt.btreeIter(sorted); while (true) { - _73 = iter2.next(); + const _73: [rt.u8, rt.u16] | rt.Done = iter2.next(); if (_73 === rt.DONE) { rt.hashClear(map); rt.byteVecPush(out, rt.hashLen(map) & 0xff); @@ -220,12 +84,12 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(_73[1])); } } - i = _13; + const i: rt.usize = _13; rt.idx(data, i); - _19 = [rt.u8Rem(data[i], 16), rt.optionUnwrapOr(rt.sliceGet(data, rt.usizeAdd(i, 1)), 0) as rt.u16] as [rt.u8, rt.u16]; - k = _19[0]; - v = _19[1]; - _31 = rt.u16Rem(v, 5); + const _19: [rt.u8, rt.u16] = [rt.u8Rem(data[i], 16), rt.optionUnwrapOr(rt.sliceGet(data, rt.usizeAdd(i, 1)), 0) as rt.u16]; + const k: rt.u8 = _19[0]; + const v: rt.u16 = _19[1]; + const _31: rt.u16 = rt.u16Rem(v, 5); if (_31 === 0) { rt.byteVecPush(out, rt.optionMapOr(rt.hashRemove(map, k), 238, (old2: rt.u16): rt.u8 => { return old2 & 0xff; @@ -237,7 +101,7 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { return v4 & 0xff; })); } else { - _48 = rt.u16Mul(v, 3); + const _48: rt.u16 = rt.u16Mul(v, 3); rt.byteVecPush(out, rt.optionMapOr(rt.hashInsert(map, k, _48), 204, (old: rt.u16): rt.u8 => { return old & 0xff; })); @@ -245,20 +109,20 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { } } if (_4 === 1) { - map2 = rt.hashNew(rt.hashing(rt.hashInt, rt.u64Eq)) as rt.HashMap; - iter3 = rt.iterEnumerate(rt.iterSlice(data)); + const map2: rt.HashMap = rt.hashNew(rt.hashing(rt.hashInt, rt.u64Eq)) as rt.HashMap; + const iter3: rt.Iter<[rt.usize, rt.u8]> = rt.iterEnumerate(rt.iterSlice(data)); while (true) { - _97 = iter3.next(); + const _97: [rt.usize, rt.u8] | rt.Done = iter3.next(); if (_97 === rt.DONE) { - _123 = rt.hashKeys(map2); - keys = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _123, true); - iter4 = rt.btreeKeys(keys); + const _123: rt.Iter = rt.hashKeys(map2); + const keys: rt.BTreeSet = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _123, true); + const iter4: rt.Iter = rt.btreeKeys(keys); while (true) { - _129 = iter4.next(); + const _129: rt.u64 | rt.Done = iter4.next(); if (_129 === rt.DONE) { - _142 = rt.sliceFirst(data); + const _142: rt.u8 | undefined = rt.sliceFirst(data); if (_142 !== undefined) { - _150 = wide(rt.u8Rem(_142, 13)); + const _150: rt.u64 = wide(rt.u8Rem(_142, 13)); rt.byteVecPush(out, rt.hashIndex(map2, _150)); } break b0; @@ -267,10 +131,10 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, rt.hashIndex(map2, _129)); } } - i2 = _97[0]; - b = _97[1]; - k2 = wide(rt.u8Rem(b, 12)); - _105 = rt.u8Rem(rt.u8Div(b, 12), 4); + const i2: rt.usize = _97[0]; + const b: rt.u8 = _97[1]; + const k2: rt.u64 = wide(rt.u8Rem(b, 12)); + const _105: rt.u8 = rt.u8Rem(rt.u8Div(b, 12), 4); if (_105 === 0) { rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashRemove(map2, k2), 238)); } else if (_105 === 1) { @@ -281,44 +145,44 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { } } if (_4 === 2) { - map3 = rt.hashNew(rt.hashing(Nibble.hash$Hash_DefaultHasher, Nibble.eq$PartialEq)) as rt.HashMap; - pairs = rt.hashNew(rt.hashing(Pair.hash$Hash_DefaultHasher, Pair.eq$PartialEq)) as rt.HashMap; - ranks = rt.hashNew(rt.hashing(Rank.hash$Hash_DefaultHasher, Rank.eq$PartialEq)) as rt.HashMap; - tuples = rt.hashNew(rt.hashing(rt.hashTuple([rt.hashInt, rt.hashStr]), rt.eqTuple([rt.same, rt.same]))) as rt.HashMap<[rt.u8, string], rt.u8>; - iterStart = 1; - iterEnd = data.length; + const map3: rt.HashMap = rt.hashNew(rt.hashing(Nibble.hash$Hash_DefaultHasher, Nibble.eq$PartialEq)) as rt.HashMap; + const pairs: rt.HashMap = rt.hashNew(rt.hashing(Pair.hash$Hash_DefaultHasher, Pair.eq$PartialEq)) as rt.HashMap; + const ranks: rt.HashMap = rt.hashNew(rt.hashing(Rank.hash$Hash_DefaultHasher, Rank.eq$PartialEq)) as rt.HashMap; + const tuples: rt.HashMap<[rt.u8, string], rt.u8> = rt.hashNew(rt.hashing(rt.hashTuple([rt.hashInt, rt.hashStr]), rt.eqTuple([rt.same, rt.same]))) as rt.HashMap<[rt.u8, string], rt.u8>; + let iterStart: rt.usize = 1; + const iterEnd: rt.usize = data.length; while (true) { if (!((_161 = iterStart++) < iterEnd)) { - _225 = rt.iterMap(rt.hashIter(map3), (_214: [Nibble.Nibble, rt.u8]): [rt.u8, rt.u8] => { + const _225: rt.Iter<[rt.u8, rt.u8]> = rt.iterMap(rt.hashIter(map3), (_214: [Nibble.Nibble, rt.u8]): [rt.u8, rt.u8] => { return [_214[0]._0, _214[1]] as [rt.u8, rt.u8]; }); - iter6 = rt.btreeIter(rt.btreeExtend(rt.btreeNew(rt.cmp) as rt.BTreeMap, _225, true)); + const iter6: rt.Iter<[rt.u8, rt.u8]> = rt.btreeIter(rt.btreeExtend(rt.btreeNew(rt.cmp) as rt.BTreeMap, _225, true)); while (true) { - _230 = iter6.next(); + const _230: [rt.u8, rt.u8] | rt.Done = iter6.next(); if (_230 === rt.DONE) { - key = { a: 9, b: 9 }; - local = { n: 7 }; + const key: Pair.Pair = { a: 9, b: 9 }; + const local: Tally.Tally = { n: 7 }; rt.hashInsert(pairs, key, rt.copy(local)); local.n = 8; - before = rt.copy(rt.hashIndex(pairs, key)); - _246 = rt.hashGet(pairs, key); + const before: Tally.Tally = rt.copy(rt.hashIndex(pairs, key)); + const _246: Tally.Tally | undefined = rt.hashGet(pairs, key); if (_246 !== undefined) { _246.n = rt.u16Add(_246.n, 2); } rt.byteVecPush(out, local.n & 0xff); rt.byteVecPush(out, before.n & 0xff); rt.byteVecPush(out, rt.hashIndex(pairs, key).n & 0xff); - _265 = rt.hashIter(pairs); - iter7 = rt.btreeIter(rt.btreeExtend(rt.btreeNew(Pair.cmp$Ord) as rt.BTreeMap, _265, true)); + const _265: rt.Iter<[Pair.Pair, Tally.Tally]> = rt.hashIter(pairs); + const iter7: rt.Iter<[Pair.Pair, Tally.Tally]> = rt.btreeIter(rt.btreeExtend(rt.btreeNew(Pair.cmp$Ord) as rt.BTreeMap, _265, true)); while (true) { - _269 = iter7.next(); + const _269: [Pair.Pair, Tally.Tally] | rt.Done = iter7.next(); if (_269 === rt.DONE) { - iterStart2 = 1; - iterEnd2 = data.length; + let iterStart2: rt.usize = 1; + const iterEnd2: rt.usize = data.length; while (true) { if (!((_286 = iterStart2++) < iterEnd2)) { - copy = rt.hashClone(ranks, undefined, rt.copy); - _327 = rt.hashGet(copy, { tag: "Low" } as Rank.Rank); + const copy: rt.HashMap = rt.hashClone(ranks, undefined, rt.copy); + const _327: Tally.Tally | undefined = rt.hashGet(copy, { tag: "Low" } as Rank.Rank); if (_327 !== undefined) { _327.n = 119; } @@ -329,55 +193,52 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { return t11.n & 0xff; })); rt.byteVecPush(out, rt.optionMapOr(rt.hashRemoveEntry(copy, { tag: "Mid", _0: 1 } as Rank.Rank), 255, (_218: [Rank.Rank, Tally.Tally]): rt.u8 => { - let k10!: Rank.Rank; - let t12!: Tally.Tally; - k10 = _218[0]; - t12 = _218[1]; + const k10: Rank.Rank = _218[0]; + const t12: Tally.Tally = _218[1]; return rankByte(k10) ^ (t12.n & 0xff); })); - _348 = rt.iterMap(rt.iterSlice(data), (_223: rt.u8): [rt.u8, Tally.Tally] => { - let b8!: rt.u8; - b8 = _223; + const _348: rt.Iter<[rt.u8, Tally.Tally]> = rt.iterMap(rt.iterSlice(data), (_223: rt.u8): [rt.u8, Tally.Tally] => { + const b8: rt.u8 = _223; return [rt.u8Rem(b8, 8), { n: b8 as rt.u16 }] as [rt.u8, Tally.Tally]; }); - bytes = rt.hashExtend(rt.hashNew() as rt.HashMap, _348); - copy2 = rt.hashClone(bytes, undefined, rt.copy); - iter9 = rt.hashValues(copy2); + const bytes: rt.HashMap = rt.hashExtend(rt.hashNew() as rt.HashMap, _348); + const copy2: rt.HashMap = rt.hashClone(bytes, undefined, rt.copy); + const iter9: rt.Iter = rt.hashValues(copy2); while (true) { - _356 = iter9.next(); + const _356: Tally.Tally | rt.Done = iter9.next(); if (_356 === rt.DONE) { - iterStart3 = 0; - iterEnd3 = 8; + let iterStart3: rt.u8 = 0; + const iterEnd3: rt.u8 = 8; while (true) { if (!((_364 = iterStart3++) < iterEnd3)) { - iterS = data; - iterI = 0; + const iterS: Uint8Array = data; + let iterI: number = 0; while (true) { - _380 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _380: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_380 === rt.DONE) { - stamped = rt.hashNew() as rt.HashMap; + const stamped: rt.HashMap = rt.hashNew() as rt.HashMap; stamp(stamped); stamp(stamped); rt.byteVecPush(out, rt.hashLen(stamped) & 0xff); - extended = rt.hashNew() as rt.HashMap; + const extended: rt.HashMap = rt.hashNew() as rt.HashMap; rt.hashExtend(extended, rt.iterMap(rt.hashIter(bytes), rt.copy)); - iter12 = rt.hashValues(extended); + const iter12: rt.Iter = rt.hashValues(extended); while (true) { - _409 = iter12.next(); + const _409: Tally.Tally | rt.Done = iter12.next(); if (_409 === rt.DONE) { - iterStart4 = 0; - iterEnd4 = 8; + let iterStart4: rt.u8 = 0; + const iterEnd4: rt.u8 = 8; while (true) { if (!((_416 = iterStart4++) < iterEnd4)) { - first = rt.optionUnwrapOr(rt.sliceFirst(data), 0); + const first: rt.u8 = rt.optionUnwrapOr(rt.sliceFirst(data), 0); rt.byteVecPush(out, rt.u64Eq(_430({ _0: first }), _430({ _0: first ^ 240 })) ? 1 : 0); - _448 = [rt.hasher(), { n: first as rt.u16 }] as [rt.Hasher, Tally.Tally]; - h = _448[0]; - counted = rt.copy(_448[1]); - _453 = countedHasher(h, counted); - _456 = counted.n; + const _448: [rt.Hasher, Tally.Tally] = [rt.hasher(), { n: first as rt.u16 }]; + const h: rt.Hasher = _448[0]; + const counted: Tally.Tally = rt.copy(_448[1]); + const _453: rt.Hasher = countedHasher(h, counted); + const _456: rt.u16 = counted.n; rt.hashInt(_456, _453); - want = rt.hasher(); + const want: rt.Hasher = rt.hasher(); rt.hashInt(rt.u16Add(first as rt.u16, 1), want); rt.byteVecPush(out, rt.u64Eq(rt.hashFinish(h), rt.hashFinish(want)) ? 1 : 0); rt.hashRetain(ranks, (r2: Rank.Rank, t17: Tally.Tally): boolean => { @@ -386,13 +247,13 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { } return true; }); - _473 = rt.iterMap(rt.hashIter(ranks), (_224: [Rank.Rank, Tally.Tally]): [Rank.Rank, rt.u16] => { + const _473: rt.Iter<[Rank.Rank, rt.u16]> = rt.iterMap(rt.hashIter(ranks), (_224: [Rank.Rank, Tally.Tally]): [Rank.Rank, rt.u16] => { return [_224[0], _224[1].n] as [Rank.Rank, rt.u16]; }); - ranks2 = rt.btreeExtend(rt.btreeNew(Rank.cmp$Ord) as rt.BTreeMap, _473, true); - iter14 = rt.btreeIter(ranks2); + const ranks2: rt.BTreeMap = rt.btreeExtend(rt.btreeNew(Rank.cmp$Ord) as rt.BTreeMap, _473, true); + const iter14: rt.Iter<[Rank.Rank, rt.u16]> = rt.btreeIter(ranks2); while (true) { - _479 = iter14.next(); + const _479: [Rank.Rank, rt.u16] | rt.Done = iter14.next(); if (_479 === rt.DONE) { rt.byteVecPush(out, rt.hashLen(tuples) & 0xff); break b0; @@ -401,7 +262,7 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, _479[1] & 0xff); } } - k5 = _416; + const k5: rt.u8 = _416; rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(bytes, k5), 255, (t15: Tally.Tally): rt.u8 => { return t15.n & 0xff; })); @@ -413,13 +274,13 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { _409.n = _409.n ^ 17; } } - b5 = _380; - _387 = rt.u8Rem(b5, 8); - _389 = b5 as rt.u16; + const b5: rt.u8 = _380; + const _387: rt.u8 = rt.u8Rem(b5, 8); + const _389: rt.u16 = b5 as rt.u16; rt.byteVecPush(out, claim(copy2, _387, _389)); } } - k4 = _364; + const k4: rt.u8 = _364; rt.byteVecPush(out, rt.optionMapOr(rt.hashGet(bytes, k4), 255, (t13: Tally.Tally): rt.u8 => { return t13.n & 0xff; })); @@ -431,99 +292,98 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { _356.n = rt.u16Add(_356.n, 1); } } - i4 = _286; - _294 = rt.usizeSub(i4, 1); + const i4: rt.usize = _286; + const _294: rt.usize = rt.usizeSub(i4, 1); rt.idx(data, _294); - _293 = data[_294]; + const _293: rt.u8 = data[_294]; rt.idx(data, i4); - _292 = [_293, data[i4]] as [rt.u8, rt.u8]; - a2 = _293; - b4 = _292[1]; - _305 = rank(b4, a2); - t4 = rt.entryOrInsertWith(rt.entryAndModify(rt.entry(ranks, _305), (t9: Tally.Tally): void => { + const _292: [rt.u8, rt.u8] = [_293, data[i4]]; + const a2: rt.u8 = _293; + const b4: rt.u8 = _292[1]; + const _305: Rank.Rank = rank(b4, a2); + const t4: Tally.Tally = rt.entryOrInsertWith(rt.entryAndModify(rt.entry(ranks, _305), (t9: Tally.Tally): void => { t9.n = t9.n ^ 3; }), (): Tally.Tally => { return { n: b4 as rt.u16 }; }); t4.n = rt.u16WrappingAdd(t4.n, t4.n); rt.idx(data, i4); - _313 = rank(data[i4], 0); - e = rt.entry(ranks, _313); + const _313: Rank.Rank = rank(data[i4], 0); + const e: rt.Entry = rt.entry(ranks, _313); rt.byteVecPush(out, rankByte(rt.entryKey(e))); rt.byteVecPush(out, rt.entryOrInsertWith(e, (k9: Rank.Rank): Tally.Tally => { return { n: rankByte(k9) as rt.u16 }; }).n & 0xff); } } - p = _269[0]; - t3 = _269[1]; + const p: Pair.Pair = _269[0]; + const t3: Tally.Tally = _269[1]; rt.byteVecPush(out, p.a); rt.byteVecPush(out, p.b & 0xff); rt.byteVecPush(out, t3.n & 0xff); } } - k3 = _230[0]; - v2 = _230[1]; + const k3: rt.u8 = _230[0]; + const v2: rt.u8 = _230[1]; rt.byteVecPush(out, k3); rt.byteVecPush(out, v2); } } - i3 = _161; - _169 = rt.usizeSub(i3, 1); + const i3: rt.usize = _161; + const _169: rt.usize = rt.usizeSub(i3, 1); rt.idx(data, _169); - _168 = data[_169]; + const _168: rt.u8 = data[_169]; rt.idx(data, i3); - _167 = [_168, data[i3]] as [rt.u8, rt.u8]; - a = _168; - b3 = _167[1]; + const _167: [rt.u8, rt.u8] = [_168, data[i3]]; + const a: rt.u8 = _168; + const b3: rt.u8 = _167[1]; rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashInsert(map3, { _0: a }, b3), 204)); - pair = { a: rt.u8Rem(a, 4), b: rt.u16Rem(b3 as rt.u16, 3) }; - t = rt.entryOrInsertWith(rt.entry(pairs, pair), Tally.default$Default); + const pair: Pair.Pair = { a: rt.u8Rem(a, 4), b: rt.u16Rem(b3 as rt.u16, 3) }; + const t: Tally.Tally = rt.entryOrInsertWith(rt.entry(pairs, pair), Tally.default$Default); t.n = rt.u16Add(t.n, 1); - r = rank(a, b3); - _192 = rt.hashGet(ranks, r); + const r: Rank.Rank = rank(a, b3); + const _192: Tally.Tally | undefined = rt.hashGet(ranks, r); if (_192 !== undefined) { _192.n = rt.u16Add(_192.n, 1); } else { rt.hashInsert(ranks, r, { n: i3 & 0xffff }); } - _203 = rt.u8Rem(a, 3); - _207 = rt.usizeRem(b3 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); + const _203: rt.u8 = rt.u8Rem(a, 3); + const _207: rt.usize = rt.usizeRem(b3 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); if (!(_207 < 8)) { rt.panic("index out of bounds: the len is " + 8 + " but the index is " + _207); } - t2 = [_203, ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_207]] as [rt.u8, string]; + const t2: [rt.u8, string] = [_203, ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_207]]; rt.byteVecPush(out, rt.optionUnwrapOr(rt.hashRemove(tuples, t2), 187)); if (rt.u8Rem(a, 2) === 0) { rt.hashInsert(tuples, t2, a); } } } - words = rt.hashNew() as rt.HashMap; - iterS2 = data; - iterI2 = 0; + const words: rt.HashMap = rt.hashNew() as rt.HashMap; + const iterS2: Uint8Array = data; + let iterI2: number = 0; while (true) { - _496 = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; + const _496: rt.u8 | rt.Done = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; if (_496 === rt.DONE) { - lens = rt.btreeNew(rt.cmpStr) as rt.BTreeMap; - iter16 = rt.hashIter(words); + const lens: rt.BTreeMap = rt.btreeNew(rt.cmpStr) as rt.BTreeMap; + const iter16: rt.Iter<[string, rt.ByteVec]> = rt.hashIter(words); while (true) { - _517 = iter16.next(); + const _517: [string, rt.ByteVec] | rt.Done = iter16.next(); if (_517 === rt.DONE) { - iter17 = rt.btreeIter(lens); + const iter17: rt.Iter<[string, rt.usize]> = rt.btreeIter(lens); while (true) { - _529 = iter17.next(); + const _529: [string, rt.usize] | rt.Done = iter17.next(); if (_529 === rt.DONE) { rt.byteVecPush(out, rt.iterSum(rt.iterMap(rt.hashDrain(words), (_2: [string, rt.ByteVec]): rt.usize => { - let v3!: rt.ByteVec; - v3 = _2[1]; + const v3: rt.ByteVec = _2[1]; return v3.length; }), rt.usizeAdd, 0) & 0xff); rt.byteVecPush(out, rt.hashLen(words) === 0 ? 1 : 0); - clashes = rt.hashNew(rt.hashing(Clash.hash$Hash_DefaultHasher, Clash.eq$PartialEq)) as rt.HashMap; - iter18 = rt.iterEnumerate(rt.iterSlice(data)); + const clashes: rt.HashMap = rt.hashNew(rt.hashing(Clash.hash$Hash_DefaultHasher, Clash.eq$PartialEq)) as rt.HashMap; + const iter18: rt.Iter<[rt.usize, rt.u8]> = rt.iterEnumerate(rt.iterSlice(data)); while (true) { - _555 = iter18.next(); + const _555: [rt.usize, rt.u8] | rt.Done = iter18.next(); if (_555 === rt.DONE) { rt.hashRetain(clashes, (k7: Clash.Clash, t8: Tally.Tally): boolean => { if (!(rt.u8Rem(k7._0, 3) !== 0)) { @@ -531,20 +391,20 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { } return true; }); - _583 = rt.iterMap(rt.hashKeys(clashes), (k8: Clash.Clash): rt.u8 => { + const _583: rt.Iter = rt.iterMap(rt.hashKeys(clashes), (k8: Clash.Clash): rt.u8 => { return k8._0; }); - kept = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _583, true); + const kept: rt.BTreeSet = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _583, true); rt.iterExtendBytes(out, rt.btreeKeys(kept)); - copy3 = rt.hashClone(clashes, rt.copy, rt.copy); + const copy3: rt.HashMap = rt.hashClone(clashes, rt.copy, rt.copy); rt.byteVecPush(out, rt.hashLen(copy3) & 0xff); rt.byteVecPush(out, rt.hashContains(copy3, { _0: 1 }) ? 1 : 0); break b0; } - i5 = _555[0]; - b7 = _555[1]; - k6 = { _0: rt.u8Rem(b7, 8) }; - _563 = rt.u8Rem(rt.u8Div(b7, 8), 4); + const i5: rt.usize = _555[0]; + const b7: rt.u8 = _555[1]; + const k6: Clash.Clash = { _0: rt.u8Rem(b7, 8) }; + const _563: rt.u8 = rt.u8Rem(rt.u8Div(b7, 8), 4); if (_563 === 0) { rt.byteVecPush(out, rt.optionMapOr(rt.hashRemove(clashes, k6), 238, (t7: Tally.Tally): rt.u8 => { return t7.n & 0xff; @@ -564,17 +424,17 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, _529[1] & 0xff); } } - _524 = _517[0]; - _525 = _517[1].length; + const _524: string = _517[0]; + const _525: rt.usize = _517[1].length; rt.btreeInsert(lens, _524, _525); } } - b6 = _496; - _502 = rt.usizeRem(b6 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); + const b6: rt.u8 = _496; + const _502: rt.usize = rt.usizeRem(b6 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); if (!(_502 < 8)) { rt.panic("index out of bounds: the len is " + 8 + " but the index is " + _502); } - word = ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_502]; + const word: string = ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_502]; rt.byteVecPush(rt.entryOrInsertWith(rt.entry(words, word), (): rt.ByteVec => { return new rt.ByteVec(); }), b6); @@ -598,16 +458,13 @@ export function stamp(map: rt.HashMap): rt.HashMap, k: rt.u8, n: rt.u16): rt.u8 { - let _4!: rt.Entry; - let e!: rt.Entry; - let t!: Tally.Tally; - _4 = rt.entry(map, k); + const _4: rt.Entry = rt.entry(map, k); if (rt.entryOccupied(_4)) { if (!(rt.u16Rem(rt.entryGet(_4).n, 2) === 0)) { return rt.entryRemove(_4).n & 0xff; } - e = _4; - t = rt.entryGet(e); + const e: rt.Entry = _4; + const t: Tally.Tally = rt.entryGet(e); t.n = rt.u16Add(t.n, n); return 1; } @@ -617,64 +474,27 @@ export function claim(map: rt.HashMap, k: rt.u8, n: rt.u16): /** `HashSet` and `BTreeSet`, each with the same script. */ export function sets(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let _4!: rt.u8; - let hashed!: rt.HashSet; - let sorted!: rt.BTreeSet; - let iterS!: Uint8Array; - let iterI!: number; - let _10!: rt.u8 | rt.Done; - let b!: rt.u8; - let v!: rt.u16; - let _17!: rt.u8; - let iter2!: rt.Iter; - let _62!: rt.u16 | rt.Done; - let firsts!: rt.u16[]; - let nibbles!: rt.BTreeSet; - let seen!: rt.HashSet; - let iterS2!: Uint8Array; - let iterI2!: number; - let _106!: rt.u8 | rt.Done; - let b2!: rt.u8; - let iter4!: rt.Iter; - let _123!: Nibble.Nibble | rt.Done; - let _129!: Nibble.Nibble | undefined; - let dirs!: rt.HashSet; - let iterS3!: Uint8Array; - let iterI3!: number; - let _151!: rt.u8 | rt.Done; - let _160!: rt.usize; - let words!: rt.BTreeSet; - let iterS4!: Uint8Array; - let iterI4!: number; - let _175!: rt.u8 | rt.Done; - let _182!: rt.usize; - let iter7!: rt.Iter; - let _192!: string | rt.Done; - let wides!: rt.BTreeSet; - let _200!: rt.Iter; - let iter8!: rt.Iter; - let _207!: rt.u64 | rt.Done; b0: { - _4 = rt.u8Rem(kind, 3); + const _4: rt.u8 = rt.u8Rem(kind, 3); if (_4 === 0) { - hashed = rt.hashNew() as rt.HashSet; - sorted = rt.btreeNew(rt.cmp) as rt.BTreeSet; - iterS = data; - iterI = 0; + const hashed: rt.HashSet = rt.hashNew() as rt.HashSet; + const sorted: rt.BTreeSet = rt.btreeNew(rt.cmp) as rt.BTreeSet; + const iterS: Uint8Array = data; + let iterI: number = 0; while (true) { - _10 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _10: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_10 === rt.DONE) { rt.byteVecPush(out, rt.hashLen(hashed) & 0xff); rt.byteVecPush(out, rt.iterCount(rt.iterFilter(rt.hashKeys(hashed), (v2: rt.u16): boolean => { return rt.u16Rem(v2, 2) === 1; })) & 0xff); - iter2 = rt.iterRev(rt.btreeKeys(sorted)); + const iter2: rt.Iter = rt.iterRev(rt.btreeKeys(sorted)); while (true) { - _62 = iter2.next(); + const _62: rt.u16 | rt.Done = iter2.next(); if (_62 === rt.DONE) { rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeFirstKey(sorted), 255) & 0xff); rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeFirstKey(sorted, true), 255) & 0xff); - firsts = rt.iterToArray(rt.btreeRangeKeys(sorted, new rt.Range(4, 12))); + const firsts: rt.u16[] = rt.iterToArray(rt.btreeRangeKeys(sorted, new rt.Range(4, 12))); rt.byteVecPush(out, firsts.length & 0xff); rt.hashRetain(hashed, (v3: rt.u16): boolean => { return rt.u16Rem(v3, 3) !== 0; @@ -691,9 +511,9 @@ export function sets(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, _62 & 0xff); } } - b = _10; - v = rt.u16Rem(b as rt.u16, 24); - _17 = rt.u8Rem(b, 3); + const b: rt.u8 = _10; + const v: rt.u16 = rt.u16Rem(b as rt.u16, 24); + const _17: rt.u8 = rt.u8Rem(b, 3); if (_17 === 0) { rt.byteVecPush(out, rt.hashDelete(hashed, v) ? 1 : 0); rt.byteVecPush(out, rt.btreeDelete(sorted, v) ? 1 : 0); @@ -707,19 +527,19 @@ export function sets(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { } } if (_4 === 1) { - nibbles = rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeSet; - seen = rt.hashNew(rt.hashing(Nibble.hash$Hash_DefaultHasher, Nibble.eq$PartialEq)) as rt.HashSet; - iterS2 = data; - iterI2 = 0; + const nibbles: rt.BTreeSet = rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeSet; + const seen: rt.HashSet = rt.hashNew(rt.hashing(Nibble.hash$Hash_DefaultHasher, Nibble.eq$PartialEq)) as rt.HashSet; + const iterS2: Uint8Array = data; + let iterI2: number = 0; while (true) { - _106 = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; + const _106: rt.u8 | rt.Done = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; if (_106 === rt.DONE) { - iter4 = rt.btreeKeys(nibbles); + const iter4: rt.Iter = rt.btreeKeys(nibbles); while (true) { - _123 = iter4.next(); + const _123: Nibble.Nibble | rt.Done = iter4.next(); if (_123 === rt.DONE) { while (true) { - _129 = rt.btreePopKey(nibbles, true); + const _129: Nibble.Nibble | undefined = rt.btreePopKey(nibbles, true); if (_129 !== undefined) { rt.byteVecPush(out, _129._0); if (rt.usizeRem(rt.btreeLen(nibbles), 2) === 0) { @@ -729,16 +549,16 @@ export function sets(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { } } else { rt.byteVecPush(out, rt.hashLen(seen) & 0xff); - dirs = rt.hashNew(rt.hashing(Dir.hash$Hash_DefaultHasher, Dir.eq$PartialEq, true)) as rt.HashSet; - iterS3 = data; - iterI3 = 0; + const dirs: rt.HashSet = rt.hashNew(rt.hashing(Dir.hash$Hash_DefaultHasher, Dir.eq$PartialEq, true)) as rt.HashSet; + const iterS3: Uint8Array = data; + let iterI3: number = 0; while (true) { - _151 = iterI3 < iterS3.length ? iterS3[iterI3++] : rt.DONE; + const _151: rt.u8 | rt.Done = iterI3 < iterS3.length ? iterS3[iterI3++] : rt.DONE; if (_151 === rt.DONE) { rt.byteVecPush(out, rt.hashLen(dirs) & 0xff); break b0; } - _160 = rt.usizeRem(_151 as rt.usize, 3); + const _160: rt.usize = rt.usizeRem(_151 as rt.usize, 3); if (!(_160 < 3)) { rt.panic("index out of bounds: the len is " + 3 + " but the index is " + _160); } @@ -750,28 +570,28 @@ export function sets(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, _123._0); } } - b2 = _106; + const b2: rt.u8 = _106; rt.byteVecPush(out, rt.btreeAdd(nibbles, { _0: b2 }) ? 1 : 0); rt.byteVecPush(out, rt.hashAdd(seen, { _0: b2 }) ? 1 : 0); } } - words = rt.btreeNew(rt.cmpStr) as rt.BTreeSet; - iterS4 = data; - iterI4 = 0; + const words: rt.BTreeSet = rt.btreeNew(rt.cmpStr) as rt.BTreeSet; + const iterS4: Uint8Array = data; + let iterI4: number = 0; while (true) { - _175 = iterI4 < iterS4.length ? iterS4[iterI4++] : rt.DONE; + const _175: rt.u8 | rt.Done = iterI4 < iterS4.length ? iterS4[iterI4++] : rt.DONE; if (_175 === rt.DONE) { - iter7 = rt.btreeKeys(words); + const iter7: rt.Iter = rt.btreeKeys(words); while (true) { - _192 = iter7.next(); + const _192: string | rt.Done = iter7.next(); if (_192 === rt.DONE) { - _200 = rt.iterMap(rt.iterSlice(data), (_2: rt.u8): rt.u64 => { + const _200: rt.Iter = rt.iterMap(rt.iterSlice(data), (_2: rt.u8): rt.u64 => { return wide(_2); }); - wides = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _200, true); - iter8 = rt.iterRev(rt.btreeKeys(wides)); + const wides: rt.BTreeSet = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _200, true); + const iter8: rt.Iter = rt.iterRev(rt.btreeKeys(wides)); while (true) { - _207 = iter8.next(); + const _207: rt.u64 | rt.Done = iter8.next(); if (_207 === rt.DONE) { break b0; } @@ -782,7 +602,7 @@ export function sets(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, 0); } } - _182 = rt.usizeRem(_175 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); + const _182: rt.usize = rt.usizeRem(_175 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); if (!(_182 < 8)) { rt.panic("index out of bounds: the len is " + 8 + " but the index is " + _182); } @@ -793,108 +613,17 @@ export function sets(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** `BTreeMap`: ordered by the key's `Ord`, through inserts, removals, and ranges. */ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let _4!: rt.u8; - let map!: rt.BTreeMap; - let iter!: rt.Iter; - let _13!: rt.usize | rt.Done; - let i!: rt.usize; - let k!: rt.u8; - let v!: rt.u8; - let _19!: [rt.u8, rt.u8]; - let _30!: rt.u8; - let _42!: rt.u8 | undefined; - let _50!: rt.u8; - let iter2!: rt.Iter<[rt.u8, rt.u8]>; - let _73!: [rt.u8, rt.u8] | rt.Done; - let iter3!: rt.Iter<[rt.u8, rt.u8]>; - let _88!: [rt.u8, rt.u8] | rt.Done; - let iter4!: rt.Iter; - let _101!: rt.u8 | rt.Done; - let lo!: rt.u8; - let hi!: rt.u8; let within!: rt.ByteVec; - let _137!: rt.u8; - let _146!: rt.RangeInclusive; - let ranks!: rt.BTreeMap; - let pairs!: rt.BTreeMap<[rt.u8, rt.u8], rt.u8>; - let wides!: rt.BTreeMap; - let iterStart!: rt.usize; - let iterEnd!: rt.usize; let _164!: rt.usize; - let i2!: rt.usize; - let a!: rt.u8; - let b!: rt.u8; - let _170!: [rt.u8, rt.u8]; - let _171!: rt.u8; - let _172!: rt.usize; - let t!: Tally.Tally; - let _182!: Rank.Rank; - let _188!: [rt.u8, rt.u8]; - let _196!: rt.u64; - let _197!: Tally.Tally | undefined; - let iterS!: Uint8Array; - let iterI!: number; - let _205!: rt.u8 | rt.Done; - let b2!: rt.u8; - let r!: Rank.Rank; - let _212!: rt.Entry; - let e!: rt.Entry; - let _230!: [Rank.Rank, Tally.Tally]; - let e3!: rt.Entry; - let iter7!: rt.Iter<[Rank.Rank, Tally.Tally]>; - let _240!: [Rank.Rank, Tally.Tally] | rt.Done; - let iter8!: rt.Iter<[[rt.u8, rt.u8], rt.u8]>; - let _255!: [[rt.u8, rt.u8], rt.u8] | rt.Done; - let _269!: { start: rt.u64 }; - let iter9!: rt.Iter<[rt.u64, rt.u8]>; - let _274!: [rt.u64, rt.u8] | rt.Done; - let map2!: rt.BTreeMap; - let _287!: rt.Iter<[Fussy.Fussy, Fussy.Fussy]>; - let copy!: rt.BTreeMap; - let iter10!: rt.Iter<[Fussy.Fussy, Fussy.Fussy]>; - let _294!: [Fussy.Fussy, Fussy.Fussy] | rt.Done; - let nibbles!: rt.BTreeMap; - let words!: rt.BTreeMap; - let iterS2!: Uint8Array; - let iterI2!: number; - let _307!: rt.u8 | rt.Done; - let b3!: rt.u8; - let t2!: Tally.Tally; - let _320!: rt.usize; - let iter12!: rt.Iter<[Nibble.Nibble, rt.u8]>; - let _331!: [Nibble.Nibble, rt.u8] | rt.Done; - let iterStart2!: rt.usize; - let iterEnd2!: rt.usize; let _344!: rt.usize; - let i3!: rt.usize; - let a2!: Nibble.Nibble; - let b4!: Nibble.Nibble; - let _350!: [Nibble.Nibble, Nibble.Nibble]; - let _351!: Nibble.Nibble; - let _353!: rt.usize; - let x!: rt.u8; - let y!: rt.u8; - let _363!: [rt.u8, rt.u8]; - let _364!: rt.u8; - let _365!: rt.usize; - let o!: rt.Ordering; let _401!: rt.u8; - let collected!: rt.BTreeMap; - let _409!: rt.Iter<[Nibble.Nibble, rt.u8]>; - let keys!: rt.BTreeSet; - let _412!: rt.Iter; - let _416!: rt.Iter; - let iter14!: rt.Iter<[[Nibble.Nibble, rt.u8], Nibble.Nibble]>; - let _425!: [[Nibble.Nibble, rt.u8], Nibble.Nibble] | rt.Done; - let iter15!: rt.Iter<[string, Tally.Tally]>; - let _442!: [string, Tally.Tally] | rt.Done; b0: { - _4 = rt.u8Rem(kind, 4); + const _4: rt.u8 = rt.u8Rem(kind, 4); if (_4 === 0) { - map = rt.btreeNew(rt.cmp) as rt.BTreeMap; - iter = rt.iterStepBy(new rt.Range(0, data.length), 2); + const map: rt.BTreeMap = rt.btreeNew(rt.cmp) as rt.BTreeMap; + const iter: rt.Iter = rt.iterStepBy(new rt.Range(0, data.length), 2); while (true) { - _13 = iter.next(); + const _13: rt.usize | rt.Done = iter.next(); if (_13 === rt.DONE) { rt.byteVecPush(out, rt.optionMapOr(rt.btreeFirst(map), 255, (_223: [rt.u8, rt.u8]): rt.u8 => { return _223[0]; @@ -902,34 +631,34 @@ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void rt.byteVecPush(out, rt.optionMapOr(rt.btreeFirst(map, true), 255, (_224: [rt.u8, rt.u8]): rt.u8 => { return _224[0]; })); - iter2 = rt.btreeRange(map, new rt.Range(8, 24)); + const iter2: rt.Iter<[rt.u8, rt.u8]> = rt.btreeRange(map, new rt.Range(8, 24)); while (true) { - _73 = iter2.next(); + const _73: [rt.u8, rt.u8] | rt.Done = iter2.next(); if (_73 === rt.DONE) { - iter3 = rt.iterRev(rt.btreeRange(map, { start: 10 })); + const iter3: rt.Iter<[rt.u8, rt.u8]> = rt.iterRev(rt.btreeRange(map, { start: 10 })); while (true) { - _88 = iter3.next(); + const _88: [rt.u8, rt.u8] | rt.Done = iter3.next(); if (_88 === rt.DONE) { - iter4 = rt.iterMap(rt.btreeRange(map, { end: 6 }), (_229: [rt.u8, rt.u8]): rt.u8 => { + const iter4: rt.Iter = rt.iterMap(rt.btreeRange(map, { end: 6 }), (_229: [rt.u8, rt.u8]): rt.u8 => { return _229[1]; }); while (true) { - _101 = iter4.next(); + const _101: rt.u8 | rt.Done = iter4.next(); if (_101 === rt.DONE) { rt.iterExtendBytes(out, rt.btreeKeys(map)); rt.iterExtendBytes(out, rt.btreeValues(map)); rt.btreeRemove(map, 3); rt.byteVecPush(out, rt.btreeLen(map) & 0xff); rt.byteVecPush(out, rt.btreeContains(map, 3) ? 1 : 0); - lo = rt.u8Rem(rt.optionUnwrapOr(rt.sliceFirst(data), 0), 32); - hi = rt.u8Rem(rt.optionUnwrapOr(rt.sliceGet(data, 1), 0), 32); - _137 = rt.u8Rem(lo, 3); + const lo: rt.u8 = rt.u8Rem(rt.optionUnwrapOr(rt.sliceFirst(data), 0), 32); + const hi: rt.u8 = rt.u8Rem(rt.optionUnwrapOr(rt.sliceGet(data, 1), 0), 32); + const _137: rt.u8 = rt.u8Rem(lo, 3); if (_137 === 0) { within = rt.iterToByteVec(rt.iterMap(rt.btreeRange(map, new rt.Range(lo, hi)), (_238: [rt.u8, rt.u8]): rt.u8 => { return _238[0]; })); } else if (_137 === 1) { - _146 = new rt.RangeInclusive(lo, hi, rt.u8Step); + const _146: rt.RangeInclusive = new rt.RangeInclusive(lo, hi, rt.u8Step); within = rt.iterToByteVec(rt.iterMap(rt.btreeRange(map, _146), (_235: [rt.u8, rt.u8]): rt.u8 => { return _235[0]; })); @@ -952,12 +681,12 @@ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void rt.byteVecPush(out, _73[1]); } } - i = _13; + const i: rt.usize = _13; rt.idx(data, i); - _19 = [rt.u8Rem(data[i], 32), rt.optionUnwrapOr(rt.sliceGet(data, rt.usizeAdd(i, 1)), 0)] as [rt.u8, rt.u8]; - k = _19[0]; - v = _19[1]; - _30 = rt.u8Rem(v, 6); + const _19: [rt.u8, rt.u8] = [rt.u8Rem(data[i], 32), rt.optionUnwrapOr(rt.sliceGet(data, rt.usizeAdd(i, 1)), 0)]; + const k: rt.u8 = _19[0]; + const v: rt.u8 = _19[1]; + const _30: rt.u8 = rt.u8Rem(v, 6); if (_30 === 0) { rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeRemove(map, k), 238)); } else if (_30 === 1) { @@ -969,9 +698,9 @@ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void return _216[0] ^ _216[1]; })); } else if (_30 === 3) { - _42 = rt.btreeGet(map, k); + const _42: rt.u8 | undefined = rt.btreeGet(map, k); if (_42 !== undefined) { - _50 = rt.u8WrappingAdd(_42, 1); + const _50: rt.u8 = rt.u8WrappingAdd(_42, 1); rt.btreeInsert(map, k, _50); } rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeGet(map, k), 219)); @@ -981,34 +710,34 @@ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void } } if (_4 === 1) { - ranks = rt.btreeNew(Rank.cmp$Ord) as rt.BTreeMap; - pairs = rt.btreeNew(rt.cmpTuple([rt.cmp, rt.cmp])) as rt.BTreeMap<[rt.u8, rt.u8], rt.u8>; - wides = rt.btreeNew(rt.cmp) as rt.BTreeMap; - iterStart = 1; - iterEnd = data.length; + const ranks: rt.BTreeMap = rt.btreeNew(Rank.cmp$Ord) as rt.BTreeMap; + const pairs: rt.BTreeMap<[rt.u8, rt.u8], rt.u8> = rt.btreeNew(rt.cmpTuple([rt.cmp, rt.cmp])) as rt.BTreeMap<[rt.u8, rt.u8], rt.u8>; + const wides: rt.BTreeMap = rt.btreeNew(rt.cmp) as rt.BTreeMap; + let iterStart: rt.usize = 1; + const iterEnd: rt.usize = data.length; while (true) { if (!((_164 = iterStart++) < iterEnd)) { - _197 = rt.btreeGet(ranks, { tag: "Low" } as Rank.Rank); + const _197: Tally.Tally | undefined = rt.btreeGet(ranks, { tag: "Low" } as Rank.Rank); if (_197 !== undefined) { _197.n = _197.n ^ 23130; } - iterS = data; - iterI = 0; + const iterS: Uint8Array = data; + let iterI: number = 0; while (true) { - _205 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _205: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_205 === rt.DONE) { - iter7 = rt.btreeIter(ranks); + const iter7: rt.Iter<[Rank.Rank, Tally.Tally]> = rt.btreeIter(ranks); while (true) { - _240 = iter7.next(); + const _240: [Rank.Rank, Tally.Tally] | rt.Done = iter7.next(); if (_240 === rt.DONE) { - iter8 = rt.btreeIter(pairs); + const iter8: rt.Iter<[[rt.u8, rt.u8], rt.u8]> = rt.btreeIter(pairs); while (true) { - _255 = iter8.next(); + const _255: [[rt.u8, rt.u8], rt.u8] | rt.Done = iter8.next(); if (_255 === rt.DONE) { - _269 = { start: 4503599627370496 }; - iter9 = rt.btreeRange(wides, _269); + const _269: { start: rt.u64 } = { start: 4503599627370496 }; + const iter9: rt.Iter<[rt.u64, rt.u8]> = rt.btreeRange(wides, _269); while (true) { - _274 = iter9.next(); + const _274: [rt.u64, rt.u8] | rt.Done = iter9.next(); if (_274 === rt.DONE) { break b0; } @@ -1024,88 +753,86 @@ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(_240[1].n)); } } - b2 = _205; - r = rank(b2, rt.u8Div(b2, 3)); - _212 = rt.entry(ranks, r); + const b2: rt.u8 = _205; + const r: Rank.Rank = rank(b2, rt.u8Div(b2, 3)); + const _212: rt.Entry = rt.entry(ranks, r); if (!rt.entryOccupied(_212)) { - e = _212; + const e: rt.Entry = _212; rt.byteVecPush(out, rankByte(rt.entryKey(e))); rt.entryOrInsert(e, { n: b2 as rt.u16 }); } else if (!(rt.entryGet(_212).n > 256)) { - e3 = _212; + const e3: rt.Entry = _212; rt.byteVecPush(out, rt.entryInsert(e3, { n: 512 }).n & 0xff); } else { - _230 = rt.entryRemoveEntry(_212); + const _230: [Rank.Rank, Tally.Tally] = rt.entryRemoveEntry(_212); rt.byteVecPush(out, rankByte(_230[0])); } } } - i2 = _164; - _172 = rt.usizeSub(i2, 1); + const i2: rt.usize = _164; + const _172: rt.usize = rt.usizeSub(i2, 1); rt.idx(data, _172); - _171 = data[_172]; + const _171: rt.u8 = data[_172]; rt.idx(data, i2); - _170 = [_171, data[i2]] as [rt.u8, rt.u8]; - a = _171; - b = _170[1]; - _182 = rank(a, b); - t = rt.entryOrInsertWith(rt.entry(ranks, _182), Tally.default$Default); + const _170: [rt.u8, rt.u8] = [_171, data[i2]]; + const a: rt.u8 = _171; + const b: rt.u8 = _170[1]; + const _182: Rank.Rank = rank(a, b); + const t: Tally.Tally = rt.entryOrInsertWith(rt.entry(ranks, _182), Tally.default$Default); t.n = rt.u16WrappingAdd(t.n, b as rt.u16); - _188 = [rt.u8Rem(a, 4), rt.u8Rem(b, 4)] as [rt.u8, rt.u8]; + const _188: [rt.u8, rt.u8] = [rt.u8Rem(a, 4), rt.u8Rem(b, 4)]; rt.btreeInsert(pairs, _188, a); - _196 = wide(a); + const _196: rt.u64 = wide(a); rt.entryOrInsert(rt.entry(wides, _196), b); } } if (_4 === 2) { - _287 = rt.iterMap(rt.iterSlice(data), (_215: rt.u8): [Fussy.Fussy, Fussy.Fussy] => { - let b8!: rt.u8; - b8 = _215; + const _287: rt.Iter<[Fussy.Fussy, Fussy.Fussy]> = rt.iterMap(rt.iterSlice(data), (_215: rt.u8): [Fussy.Fussy, Fussy.Fussy] => { + const b8: rt.u8 = _215; return [{ _0: b8 }, { _0: b8 ^ 90 }] as [Fussy.Fussy, Fussy.Fussy]; }); - map2 = rt.btreeExtend(rt.btreeNew(Fussy.cmp$Ord) as rt.BTreeMap, _287, true); - copy = rt.btreeClone(map2, Fussy.clone$Clone, Fussy.clone$Clone); - iter10 = rt.btreeIter(copy); + const map2: rt.BTreeMap = rt.btreeExtend(rt.btreeNew(Fussy.cmp$Ord) as rt.BTreeMap, _287, true); + const copy: rt.BTreeMap = rt.btreeClone(map2, Fussy.clone$Clone, Fussy.clone$Clone); + const iter10: rt.Iter<[Fussy.Fussy, Fussy.Fussy]> = rt.btreeIter(copy); while (true) { - _294 = iter10.next(); + const _294: [Fussy.Fussy, Fussy.Fussy] | rt.Done = iter10.next(); if (_294 === rt.DONE) { break b0; } rt.byteVecPush(out, _294[0]._0 ^ _294[1]._0); } } - nibbles = rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeMap; - words = rt.btreeNew(rt.cmpStr) as rt.BTreeMap; - iterS2 = data; - iterI2 = 0; + const nibbles: rt.BTreeMap = rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeMap; + const words: rt.BTreeMap = rt.btreeNew(rt.cmpStr) as rt.BTreeMap; + const iterS2: Uint8Array = data; + let iterI2: number = 0; while (true) { - _307 = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; + const _307: rt.u8 | rt.Done = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; if (_307 === rt.DONE) { - iter12 = rt.btreeIter(nibbles); + const iter12: rt.Iter<[Nibble.Nibble, rt.u8]> = rt.btreeIter(nibbles); while (true) { - _331 = iter12.next(); + const _331: [Nibble.Nibble, rt.u8] | rt.Done = iter12.next(); if (_331 === rt.DONE) { - iterStart2 = 1; - iterEnd2 = data.length; + let iterStart2: rt.usize = 1; + const iterEnd2: rt.usize = data.length; while (true) { if (!((_344 = iterStart2++) < iterEnd2)) { - _409 = rt.iterMap(rt.iterSlice(data), (_2: rt.u8): [Nibble.Nibble, rt.u8] => { - let b5!: rt.u8; - b5 = _2; + const _409: rt.Iter<[Nibble.Nibble, rt.u8]> = rt.iterMap(rt.iterSlice(data), (_2: rt.u8): [Nibble.Nibble, rt.u8] => { + const b5: rt.u8 = _2; return [{ _0: b5 }, b5] as [Nibble.Nibble, rt.u8]; }); - collected = rt.btreeExtend(rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeMap, _409, true); - _412 = rt.iterMap(rt.iterSlice(data), (_213: rt.u8): Nibble.Nibble => { + const collected: rt.BTreeMap = rt.btreeExtend(rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeMap, _409, true); + const _412: rt.Iter = rt.iterMap(rt.iterSlice(data), (_213: rt.u8): Nibble.Nibble => { return { _0: _213 }; }); - keys = rt.btreeExtendKeys(rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeSet, _412, true); - _416 = rt.iterMap(rt.iterSlice(data), (_214: rt.u8): Nibble.Nibble => { + const keys: rt.BTreeSet = rt.btreeExtendKeys(rt.btreeNew(Nibble.cmp$Ord) as rt.BTreeSet, _412, true); + const _416: rt.Iter = rt.iterMap(rt.iterSlice(data), (_214: rt.u8): Nibble.Nibble => { return { _0: _214 ^ 48 }; }); rt.btreeExtendKeys(keys, _416); - iter14 = rt.iterZip(rt.btreeIter(collected), rt.btreeKeys(keys)); + const iter14: rt.Iter<[[Nibble.Nibble, rt.u8], Nibble.Nibble]> = rt.iterZip(rt.btreeIter(collected), rt.btreeKeys(keys)); while (true) { - _425 = iter14.next(); + const _425: [[Nibble.Nibble, rt.u8], Nibble.Nibble] | rt.Done = iter14.next(); if (_425 === rt.DONE) { rt.btreeRetain(words, (w: string, t3: Tally.Tally): boolean => { if (!(rt.stringLen(w) > 1)) { @@ -1113,9 +840,9 @@ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void } return true; }); - iter15 = rt.btreeIter(words); + const iter15: rt.Iter<[string, Tally.Tally]> = rt.btreeIter(words); while (true) { - _442 = iter15.next(); + const _442: [string, Tally.Tally] | rt.Done = iter15.next(); if (_442 === rt.DONE) { break b0; } @@ -1128,22 +855,22 @@ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void rt.byteVecPush(out, _425[1]._0); } } - i3 = _344; - _353 = rt.usizeSub(i3, 1); + const i3: rt.usize = _344; + const _353: rt.usize = rt.usizeSub(i3, 1); rt.idx(data, _353); - _351 = { _0: data[_353] }; + const _351: Nibble.Nibble = { _0: data[_353] }; rt.idx(data, i3); - _350 = [_351, { _0: data[i3] }] as [Nibble.Nibble, Nibble.Nibble]; - a2 = _351; - b4 = _350[1]; - _365 = rt.usizeSub(i3, 1); + const _350: [Nibble.Nibble, Nibble.Nibble] = [_351, { _0: data[i3] }]; + const a2: Nibble.Nibble = _351; + const b4: Nibble.Nibble = _350[1]; + const _365: rt.usize = rt.usizeSub(i3, 1); rt.idx(data, _365); - _364 = data[_365]; + const _364: rt.u8 = data[_365]; rt.idx(data, i3); - _363 = [_364, data[i3]] as [rt.u8, rt.u8]; - x = _364; - y = _363[1]; - o = rt.orderingThen(rt.orderingReverse(Nibble.cmp$Ord(a2, b4)), (): rt.Ordering => { + const _363: [rt.u8, rt.u8] = [_364, data[i3]]; + const x: rt.u8 = _364; + const y: rt.u8 = _363[1]; + const o: rt.Ordering = rt.orderingThen(rt.orderingReverse(Nibble.cmp$Ord(a2, b4)), (): rt.Ordering => { return rt.cmp(y, x); }, true); rt.byteVecPush(out, (o < 0 ? 1 : 0) | (((o >= 0 ? 1 : 0) << 1) & 0xff) | (((rt.orderingThen(Nibble.cmp$Ord(a2, b4), -1) === 0 ? 1 : 0) << 2) & 0xff)); @@ -1162,13 +889,13 @@ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void rt.byteVecPush(out, _331[1]); } } - b3 = _307; + const b3: rt.u8 = _307; rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeInsert(nibbles, { _0: b3 }, b3), 204)); - _320 = rt.usizeRem(b3 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); + const _320: rt.usize = rt.usizeRem(b3 as rt.usize, ["", "a", "ab", "b", "é", "", "￿", "𐀀"].length); if (!(_320 < 8)) { rt.panic("index out of bounds: the len is " + 8 + " but the index is " + _320); } - t2 = rt.entryOrInsertWith(rt.entry(words, ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_320]), Tally.default$Default); + const t2: Tally.Tally = rt.entryOrInsertWith(rt.entry(words, ["", "a", "ab", "b", "é", "", "￿", "𐀀"][_320]), Tally.default$Default); t2.n = rt.u16Add(t2.n, 1); } } @@ -1182,66 +909,39 @@ export function touch(q: rt.VecDeque): rt.VecDeque { /** `VecDeque`: a ring buffer, pushed and popped at both ends past its capacity. */ export function deques(data: Uint8Array, out: rt.ByteVec): void { - let q!: rt.VecDeque; - let pairs!: rt.VecDeque<[rt.u8, rt.u8]>; - let iterS!: Uint8Array; - let iterI!: number; - let _7!: rt.u8 | rt.Done; - let b!: rt.u8; - let _12!: rt.u8; - let _36!: rt.usize; - let _42!: [rt.u8, rt.u8]; - let _71!: rt.usize; - let iter2!: rt.Iter<[rt.u8, rt.u8]>; - let _83!: [rt.u8, rt.u8] | rt.Done; - let drained!: rt.ByteVec; - let tallies!: rt.VecDeque; - let _101!: rt.Iter; - let copy!: rt.VecDeque; - let _105!: Tally.Tally | undefined; - let _119!: rt.Iter; - let _121!: Tally.Tally | undefined; - let _135!: rt.Iter; - let _139!: rt.usize; - let a!: rt.usize; - let b2!: rt.usize; - let q2!: rt.VecDeque; - let _171!: rt.Iter; let drained2!: rt.ByteVec; - let _174!: rt.usize; - let _181!: rt.RangeInclusive; - q = rt.dequeNew() as rt.VecDeque; - pairs = rt.dequeNew() as rt.VecDeque<[rt.u8, rt.u8]>; - iterS = data; - iterI = 0; + const q: rt.VecDeque = rt.dequeNew() as rt.VecDeque; + const pairs: rt.VecDeque<[rt.u8, rt.u8]> = rt.dequeNew() as rt.VecDeque<[rt.u8, rt.u8]>; + const iterS: Uint8Array = data; + let iterI: number = 0; while (true) { - _7 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _7: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_7 === rt.DONE) { touch(q); touch(q); rt.byteVecPush(out, q.n & 0xff); rt.iterExtendBytes(out, rt.iterRev(rt.dequeIter(q))); if (!((q.n === 0))) { - _71 = rt.usizeDiv(q.n, 2); + const _71: rt.usize = rt.usizeDiv(q.n, 2); rt.byteVecPush(out, rt.dequeIndex(q, _71)); } rt.dequeRetain(q, (b3: rt.u8): boolean => { return rt.u8Rem(b3, 2) === 0; }); rt.iterExtendBytes(out, rt.dequeIter(q)); - iter2 = rt.dequeIter(pairs); + const iter2: rt.Iter<[rt.u8, rt.u8]> = rt.dequeIter(pairs); while (true) { - _83 = iter2.next(); + const _83: [rt.u8, rt.u8] | rt.Done = iter2.next(); if (_83 === rt.DONE) { - drained = rt.iterToByteVec(rt.dequeDrain(q, undefined)); + const drained: rt.ByteVec = rt.iterToByteVec(rt.dequeDrain(q, undefined)); rt.byteVecExtendFromSlice(out, rt.byteVecView(drained)); rt.byteVecPush(out, q.n === 0 ? 1 : 0); - _101 = rt.iterMap(rt.iterSlice(data), (_2: rt.u8): Tally.Tally => { + const _101: rt.Iter = rt.iterMap(rt.iterSlice(data), (_2: rt.u8): Tally.Tally => { return { n: _2 as rt.u16 }; }); - tallies = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, _101); - copy = rt.dequeClone(tallies, rt.copy); - _105 = rt.dequeEnd(copy); + const tallies: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, _101); + const copy: rt.VecDeque = rt.dequeClone(tallies, rt.copy); + const _105: Tally.Tally | undefined = rt.dequeEnd(copy); if (_105 !== undefined) { _105.n = _105.n ^ 255; } @@ -1251,9 +951,9 @@ export function deques(data: Uint8Array, out: rt.ByteVec): void { rt.iterExtendBytes(out, rt.iterMap(rt.dequeIter(copy), (t2: Tally.Tally): rt.u8 => { return t2.n & 0xff; })); - _119 = rt.dequeIter(tallies); + const _119: rt.Iter = rt.dequeIter(tallies); rt.dequeExtend(copy, rt.iterMap(_119, rt.copy)); - _121 = rt.dequeEnd(copy, true); + const _121: Tally.Tally | undefined = rt.dequeEnd(copy, true); if (_121 !== undefined) { _121.n = _121.n ^ 255; } @@ -1263,23 +963,23 @@ export function deques(data: Uint8Array, out: rt.ByteVec): void { rt.iterExtendBytes(out, rt.iterMap(rt.dequeIter(copy), (t4: Tally.Tally): rt.u8 => { return t4.n & 0xff; })); - _135 = rt.iterSlice(data); + const _135: rt.Iter = rt.iterSlice(data); rt.dequeExtend(q, _135); - _139 = rt.usizeDiv(q.n, 2); + const _139: rt.usize = rt.usizeDiv(q.n, 2); rt.dequeInsert(q, _139, 66); rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequeRemove(q, 1), 233)); rt.dequeTruncate(q, 5); rt.byteVecPush(out, rt.dequeContains(q, 66, rt.same) ? 1 : 0); rt.iterExtendBytes(out, rt.iterRev(rt.dequeIter(q))); - a = rt.usizeRem(rt.optionUnwrapOr(rt.sliceFirst(data), 0) as rt.usize, 8); - b2 = rt.usizeRem(rt.optionUnwrapOr(rt.sliceGet(data, 1), 0) as rt.usize, 8); - _171 = rt.iterSlice(data); - q2 = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, _171); - _174 = rt.usizeRem(a, 4); + const a: rt.usize = rt.usizeRem(rt.optionUnwrapOr(rt.sliceFirst(data), 0) as rt.usize, 8); + const b2: rt.usize = rt.usizeRem(rt.optionUnwrapOr(rt.sliceGet(data, 1), 0) as rt.usize, 8); + const _171: rt.Iter = rt.iterSlice(data); + const q2: rt.VecDeque = rt.dequeExtend(rt.dequeNew() as rt.VecDeque, _171); + const _174: rt.usize = rt.usizeRem(a, 4); if (_174 === 0) { drained2 = rt.iterToByteVec(rt.dequeDrain(q2, new rt.Range(a, b2))); } else if (_174 === 1) { - _181 = new rt.RangeInclusive(a, b2, rt.usizeStep); + const _181: rt.RangeInclusive = new rt.RangeInclusive(a, b2, rt.usizeStep); drained2 = rt.iterToByteVec(rt.dequeDrain(q2, _181)); } else if (_174 === 2) { drained2 = rt.iterToByteVec(rt.dequeDrain(q2, { end: b2 })); @@ -1294,8 +994,8 @@ export function deques(data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, _83[0] ^ _83[1]); } } - b = _7; - _12 = rt.u8Rem(b, 7); + const b: rt.u8 = _7; + const _12: rt.u8 = rt.u8Rem(b, 7); if (_12 === 0) { rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequePopFront(q), 238)); } else if (_12 === 1) { @@ -1305,12 +1005,12 @@ export function deques(data: Uint8Array, out: rt.ByteVec): void { } else if (_12 === 3) { rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequeEnd(q), 236)); rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequeEnd(q, true), 235)); - _36 = rt.usizeRem(b as rt.usize, 5); + const _36: rt.usize = rt.usizeRem(b as rt.usize, 5); rt.byteVecPush(out, rt.optionUnwrapOr(rt.dequeGet(q, _36), 234)); } else { rt.dequePushBack(q, b); } - _42 = [b, q.n & 0xff] as [rt.u8, rt.u8]; + const _42: [rt.u8, rt.u8] = [b, q.n & 0xff]; rt.dequePushBack(pairs, _42); if (pairs.n > 3) { rt.dequePopFront(pairs); diff --git a/ts/fixtures/lang/expected/fmt.Fails.ts b/ts/fixtures/lang/expected/fmt.Fails.ts index e50ae2db6..ad398b210 100644 --- a/ts/fixtures/lang/expected/fmt.Fails.ts +++ b/ts/fixtures/lang/expected/fmt.Fails.ts @@ -8,12 +8,10 @@ export interface Fails { } export function fmt$Display(self: Fails, f: rt.Formatter): rt.Result { - let _8!: rt.Result; - let args2!: rt.Fmt[]; if (!(rt.u8Rem(self._0, 2) === 0)) { const arg = ([self._0] as [rt.u8])[0]; - args2 = [(f: rt.Formatter) => rt.u8Display(arg, f)]; - _8 = rt.fmtWriteFmt(f, ["half ", args2[0]]); + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg, f)]; + const _8: rt.Result = rt.fmtWriteFmt(f, ["half ", args2[0]]); if (_8.ok) { return rt.Err(new rt.FmtError()); } diff --git a/ts/fixtures/lang/expected/fmt.Fault.ts b/ts/fixtures/lang/expected/fmt.Fault.ts index b8a79b95c..60038b842 100644 --- a/ts/fixtures/lang/expected/fmt.Fault.ts +++ b/ts/fixtures/lang/expected/fmt.Fault.ts @@ -4,33 +4,24 @@ import * as rt from "./rt.ts"; import * as Pair from "./fmt.Pair.ts"; export function fmt$Debug(self: Fault, f: rt.Formatter): rt.Result { - let _6!: string; - let _7!: rt.Fmt; - let _11!: string; - let _12!: string; - let _13!: rt.Fmt; - let _14!: string; - let _15!: rt.Fmt; - let _18!: string; - let _19!: rt.Fmt; if (self.tag === "Short") { return rt.fmtWriteStr(f, "Short"); } if (self.tag === "Code") { - _6 = "Code"; - _7 = (f: rt.Formatter) => rt.u16Display(self._0, f); + const _6: string = "Code"; + const _7: rt.Fmt = (f: rt.Formatter) => rt.u16Display(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _6), _7)); } if (self.tag === "TooLarge") { - _11 = "TooLarge"; - _12 = "size"; - _13 = (f: rt.Formatter) => rt.usizeDisplay(self.size, f); - _14 = "max"; - _15 = (f: rt.Formatter) => rt.usizeDisplay(self.max, f); + const _11: string = "TooLarge"; + const _12: string = "size"; + const _13: rt.Fmt = (f: rt.Formatter) => rt.usizeDisplay(self.size, f); + const _14: string = "max"; + const _15: rt.Fmt = (f: rt.Formatter) => rt.usizeDisplay(self.max, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _11), _12, _13), _14, _15)); } - _18 = "At"; - _19 = (f: rt.Formatter) => Pair.fmt$Debug(self._0, f); + const _18: string = "At"; + const _19: rt.Fmt = (f: rt.Formatter) => Pair.fmt$Debug(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _18), _19)); } @@ -45,39 +36,32 @@ export type Fault = | { tag: "At"; _0: Pair.Pair }; export function fmt$Display(self: Fault, f: rt.Formatter): rt.Result { - let args2!: rt.Fmt[]; - let args4!: rt.Fmt[]; - let _20!: rt.Fmt; - let args6!: rt.Fmt[]; if (self.tag === "Short") { return rt.fmtPad(f, "short buffer"); } if (self.tag === "Code") { const arg4 = ([self._0] as [rt.u16])[0]; - args2 = [(f: rt.Formatter) => rt.u16LowerHex(arg4, f)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u16LowerHex(arg4, f)]; return rt.fmtWriteFmt(f, ["code=", rt.fmtSpec({ alternate: true, zero: true, width: 6 }, args2[0])]); } if (self.tag === "TooLarge") { const arg2 = self.size; - _20 = (f: rt.Formatter) => rt.usizeDisplay(arg2, f); + const _20: rt.Fmt = (f: rt.Formatter) => rt.usizeDisplay(arg2, f); const arg3 = self.max; - args4 = [_20, (f: rt.Formatter) => rt.usizeDisplay(arg3, f)]; + const args4: rt.Fmt[] = [_20, (f: rt.Formatter) => rt.usizeDisplay(arg3, f)]; return rt.fmtWriteFmt(f, [args4[0], " bytes exceeds the ", args4[1], " byte limit"]); - } else { - const arg = ([self._0] as [Pair.Pair])[0]; - args6 = [(f: rt.Formatter) => Pair.fmt$Debug(arg, f)]; - return rt.fmtWriteFmt(f, ["at ", args6[0]]); } + const arg = ([self._0] as [Pair.Pair])[0]; + const args6: rt.Fmt[] = [(f: rt.Formatter) => Pair.fmt$Debug(arg, f)]; + return rt.fmtWriteFmt(f, ["at ", args6[0]]); } /** The fault `data` picks. */ function new_(data: Uint8Array): Fault { - let at!: (a0: rt.usize) => rt.u8; - let _3!: rt.u8; - at = (i: rt.usize): rt.u8 => { + const at: (a0: rt.usize) => rt.u8 = (i: rt.usize): rt.u8 => { return rt.optionUnwrapOr(rt.sliceGet(data, i), 0); }; - _3 = rt.u8Rem(at(0), 4); + const _3: rt.u8 = rt.u8Rem(at(0), 4); if (_3 === 0) { return { tag: "Short" } as Fault; } diff --git a/ts/fixtures/lang/expected/fmt.Hex.ts b/ts/fixtures/lang/expected/fmt.Hex.ts index 9f5d00737..52f0167b2 100644 --- a/ts/fixtures/lang/expected/fmt.Hex.ts +++ b/ts/fixtures/lang/expected/fmt.Hex.ts @@ -8,17 +8,14 @@ export interface Hex { } export function fmt$Display(self: Hex, f: rt.Formatter): rt.Result { - let args2!: rt.Fmt[]; - let args4!: rt.Fmt[]; if (!rt.fmtAlternate(f)) { const arg2 = ([self._0] as [rt.u32])[0]; - args4 = [(f: rt.Formatter) => rt.u32LowerHex(arg2, f)]; + const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u32LowerHex(arg2, f)]; return rt.fmtWriteFmt(f, [args4[0]]); - } else { - const arg = ([self._0] as [rt.u32])[0]; - args2 = [(f: rt.Formatter) => rt.u32LowerHex(arg, f)]; - return rt.fmtWriteFmt(f, [rt.fmtSpec({ alternate: true }, args2[0])]); } + const arg = ([self._0] as [rt.u32])[0]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u32LowerHex(arg, f)]; + return rt.fmtWriteFmt(f, [rt.fmtSpec({ alternate: true }, args2[0])]); } export function fmt$Debug(self: Hex, f: rt.Formatter): rt.Result { diff --git a/ts/fixtures/lang/expected/fmt.Kind.ts b/ts/fixtures/lang/expected/fmt.Kind.ts index cdbc5ee04..631f78ba8 100644 --- a/ts/fixtures/lang/expected/fmt.Kind.ts +++ b/ts/fixtures/lang/expected/fmt.Kind.ts @@ -3,13 +3,6 @@ import * as rt from "./rt.ts"; export function fmt$Debug(self: Kind, f: rt.Formatter): rt.Result { - let _8!: string; - let _9!: rt.Fmt; - let _13!: string; - let _14!: string; - let _15!: rt.Fmt; - let _16!: string; - let _17!: rt.Fmt; if (self.tag === "Empty") { return rt.fmtWriteStr(f, "Empty"); } @@ -20,15 +13,15 @@ export function fmt$Debug(self: Kind, f: rt.Formatter): rt.Result rt.u8Display(self._0, f); + const _8: string = "One"; + const _9: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _8), _9)); } - _13 = "Many"; - _14 = "count"; - _15 = (f: rt.Formatter) => rt.u32Display(self.count, f); - _16 = "items"; - _17 = (f: rt.Formatter) => rt.fmtList(rt.byteVecView(self.items), f, rt.u8Display); + const _13: string = "Many"; + const _14: string = "count"; + const _15: rt.Fmt = (f: rt.Formatter) => rt.u32Display(self.count, f); + const _16: string = "items"; + const _17: rt.Fmt = (f: rt.Formatter) => rt.fmtList(rt.byteVecView(self.items), f, rt.u8Display); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _13), _14, _15), _16, _17)); } diff --git a/ts/fixtures/lang/expected/fmt.Manual.ts b/ts/fixtures/lang/expected/fmt.Manual.ts index 4691ba0a5..3290a5e99 100644 --- a/ts/fixtures/lang/expected/fmt.Manual.ts +++ b/ts/fixtures/lang/expected/fmt.Manual.ts @@ -9,8 +9,7 @@ export interface Manual { } export function fmt$Debug(self: Manual, f: rt.Formatter): rt.Result { - let _6!: rt.DebugStruct; - _6 = rt.fmtDebugStruct(f, "Manual"); + const _6: rt.DebugStruct = rt.fmtDebugStruct(f, "Manual"); return rt.debugStructFinishNonExhaustive(rt.debugStructField(rt.debugStructField(_6, "id", (f: rt.Formatter) => rt.u8Display(self.id, f)), "list", (f: rt.Formatter) => rt.fmtList(self.list, f, rt.u16Display))); } diff --git a/ts/fixtures/lang/expected/fmt.Nested.ts b/ts/fixtures/lang/expected/fmt.Nested.ts index fcb48905b..016843b50 100644 --- a/ts/fixtures/lang/expected/fmt.Nested.ts +++ b/ts/fixtures/lang/expected/fmt.Nested.ts @@ -7,12 +7,9 @@ import * as Point from "./shapes.Point.ts"; import * as Shape from "./shapes.Shape.ts"; export function fmt$Debug(self: Nested, f: rt.Formatter): rt.Result { - let names!: string[]; - let values!: rt.Fmt[]; - let _36!: string; - names = ["name", "point", "shape", "tags", "pairs", "maybe", "none", "result", "list", "tuple", "single", "empty", "unit", "boxed"]; - values = [(f: rt.Formatter) => rt.fmtStr(self.name, f), (f: rt.Formatter) => Point.fmt$Debug(self.point, f), (f: rt.Formatter) => Shape.fmt$Debug(self.shape, f), (f: rt.Formatter) => rt.fmtList(rt.byteVecView(self.tags), f, rt.u8Display), (f: rt.Formatter) => rt.fmtList(self.pairs, f, (value: Pair.Pair, f: rt.Formatter) => Pair.fmt$Debug(value, f)), (f: rt.Formatter) => rt.fmtOption(self.maybe, f, (value: Pair.Pair, f: rt.Formatter) => Pair.fmt$Debug(value, f)), (f: rt.Formatter) => rt.fmtOption(self.none, f, rt.u8Display), (f: rt.Formatter) => rt.fmtResult(self.result, f, rt.u8Display, rt.fmtStr), (f: rt.Formatter) => rt.fmtList(self.list, f, rt.i16Display), (f: rt.Formatter) => rt.fmtTuple([(f: rt.Formatter) => rt.u8Display(self.tuple[0], f), (f: rt.Formatter) => rt.fmtBool(self.tuple[1], f), (f: rt.Formatter) => rt.fmtStr(self.tuple[2], f)], f), (f: rt.Formatter) => rt.fmtTuple([(f: rt.Formatter) => rt.u8Display(self.single[0], f)], f), (f: rt.Formatter) => rt.fmtList(rt.byteVecView(self.empty), f, rt.u8Display), (f: rt.Formatter) => rt.fmtUnit(self.unit, f), (f: rt.Formatter) => Kind.fmt$Debug(self.boxed, f)]; - _36 = "Nested"; + const names: string[] = ["name", "point", "shape", "tags", "pairs", "maybe", "none", "result", "list", "tuple", "single", "empty", "unit", "boxed"]; + const values: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtStr(self.name, f), (f: rt.Formatter) => Point.fmt$Debug(self.point, f), (f: rt.Formatter) => Shape.fmt$Debug(self.shape, f), (f: rt.Formatter) => rt.fmtList(rt.byteVecView(self.tags), f, rt.u8Display), (f: rt.Formatter) => rt.fmtList(self.pairs, f, (value: Pair.Pair, f: rt.Formatter) => Pair.fmt$Debug(value, f)), (f: rt.Formatter) => rt.fmtOption(self.maybe, f, (value: Pair.Pair, f: rt.Formatter) => Pair.fmt$Debug(value, f)), (f: rt.Formatter) => rt.fmtOption(self.none, f, rt.u8Display), (f: rt.Formatter) => rt.fmtResult(self.result, f, rt.u8Display, rt.fmtStr), (f: rt.Formatter) => rt.fmtList(self.list, f, rt.i16Display), (f: rt.Formatter) => rt.fmtTuple([(f: rt.Formatter) => rt.u8Display(self.tuple[0], f), (f: rt.Formatter) => rt.fmtBool(self.tuple[1], f), (f: rt.Formatter) => rt.fmtStr(self.tuple[2], f)], f), (f: rt.Formatter) => rt.fmtTuple([(f: rt.Formatter) => rt.u8Display(self.single[0], f)], f), (f: rt.Formatter) => rt.fmtList(rt.byteVecView(self.empty), f, rt.u8Display), (f: rt.Formatter) => rt.fmtUnit(self.unit, f), (f: rt.Formatter) => Kind.fmt$Debug(self.boxed, f)]; + const _36: string = "Nested"; return rt.fmtDebugStructFields(f, _36, names, values); } diff --git a/ts/fixtures/lang/expected/fmt.Padded.ts b/ts/fixtures/lang/expected/fmt.Padded.ts index bbc08e6c2..7b1051ea9 100644 --- a/ts/fixtures/lang/expected/fmt.Padded.ts +++ b/ts/fixtures/lang/expected/fmt.Padded.ts @@ -8,8 +8,7 @@ export interface Padded { } export function fmt$Display(self: Padded, f: rt.Formatter): rt.Result { - let _3!: rt.usize | undefined; - _3 = rt.fmtWidth(f); + const _3: rt.usize | undefined = rt.fmtWidth(f); if (_3 !== undefined) { if (_3 > 20) { return rt.fmtWriteStr(f, "wide"); diff --git a/ts/fixtures/lang/expected/fmt.Pair.ts b/ts/fixtures/lang/expected/fmt.Pair.ts index 921d01ee7..b95d20371 100644 --- a/ts/fixtures/lang/expected/fmt.Pair.ts +++ b/ts/fixtures/lang/expected/fmt.Pair.ts @@ -3,12 +3,9 @@ import * as rt from "./rt.ts"; export function fmt$Debug(self: Pair, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: rt.Fmt; - let _6!: rt.Fmt; - _3 = "Pair"; - _4 = (f: rt.Formatter) => rt.u8Display(self._0, f); - _6 = (f: rt.Formatter) => rt.i64Display(self._1, f); + const _3: string = "Pair"; + const _4: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self._0, f); + const _6: rt.Fmt = (f: rt.Formatter) => rt.i64Display(self._1, f); return rt.debugTupleFinish(rt.debugTupleField(rt.debugTupleField(rt.fmtDebugTuple(f, _3), _4), _6)); } diff --git a/ts/fixtures/lang/expected/fmt.Seq.ts b/ts/fixtures/lang/expected/fmt.Seq.ts index 4794e2f1e..626527ee2 100644 --- a/ts/fixtures/lang/expected/fmt.Seq.ts +++ b/ts/fixtures/lang/expected/fmt.Seq.ts @@ -8,10 +8,8 @@ export interface Seq { } export function fmt$Debug(self: Seq, f: rt.Formatter): rt.Result { - let _5!: rt.DebugList; - let _6!: rt.Iter; - _5 = rt.fmtDebugList(f); - _6 = rt.iterSlice(self._0); + const _5: rt.DebugList = rt.fmtDebugList(f); + const _6: rt.Iter = rt.iterSlice(self._0); return rt.debugListFinish(rt.debugListEntries(_5, _6, (value: Pair.Pair, f: rt.Formatter) => Pair.fmt$Debug(value, f))); } diff --git a/ts/fixtures/lang/expected/fmt.Six.ts b/ts/fixtures/lang/expected/fmt.Six.ts index 1e0176a98..c6a4d3718 100644 --- a/ts/fixtures/lang/expected/fmt.Six.ts +++ b/ts/fixtures/lang/expected/fmt.Six.ts @@ -3,10 +3,8 @@ import * as rt from "./rt.ts"; export function fmt$Debug(self: Six, f: rt.Formatter): rt.Result { - let values!: rt.Fmt[]; - let _19!: string; - values = [(f: rt.Formatter) => rt.u8Display(self._0, f), (f: rt.Formatter) => rt.u8Display(self._1, f), (f: rt.Formatter) => rt.u8Display(self._2, f), (f: rt.Formatter) => rt.u8Display(self._3, f), (f: rt.Formatter) => rt.u8Display(self._4, f), (f: rt.Formatter) => rt.u8Display(self._5, f)]; - _19 = "Six"; + const values: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(self._0, f), (f: rt.Formatter) => rt.u8Display(self._1, f), (f: rt.Formatter) => rt.u8Display(self._2, f), (f: rt.Formatter) => rt.u8Display(self._3, f), (f: rt.Formatter) => rt.u8Display(self._4, f), (f: rt.Formatter) => rt.u8Display(self._5, f)]; + const _19: string = "Six"; return rt.fmtDebugTupleFields(f, _19, values); } diff --git a/ts/fixtures/lang/expected/fmt.Tup.ts b/ts/fixtures/lang/expected/fmt.Tup.ts index 14f4df599..03986f37c 100644 --- a/ts/fixtures/lang/expected/fmt.Tup.ts +++ b/ts/fixtures/lang/expected/fmt.Tup.ts @@ -8,13 +8,11 @@ export interface Tup { } export function fmt$Debug(self: Tup, f: rt.Formatter): rt.Result { - let _7!: rt.DebugTuple; - let _15!: rt.DebugTuple; if (self._1 === undefined) { - _15 = rt.fmtDebugTuple(f, "Tup"); + const _15: rt.DebugTuple = rt.fmtDebugTuple(f, "Tup"); return rt.debugTupleFinishNonExhaustive(rt.debugTupleField(_15, (f: rt.Formatter) => rt.u8Display(self._0, f))); } - _7 = rt.fmtDebugTuple(f, "Tup"); + const _7: rt.DebugTuple = rt.fmtDebugTuple(f, "Tup"); return rt.debugTupleFinish(rt.debugTupleField(rt.debugTupleField(_7, (f: rt.Formatter) => rt.u8Display(self._0, f)), (f: rt.Formatter) => rt.fmtOption(self._1, f, rt.u8Display))); } diff --git a/ts/fixtures/lang/expected/fmt.Wide.ts b/ts/fixtures/lang/expected/fmt.Wide.ts index 0ef6fcc30..d69a29bbd 100644 --- a/ts/fixtures/lang/expected/fmt.Wide.ts +++ b/ts/fixtures/lang/expected/fmt.Wide.ts @@ -3,12 +3,9 @@ import * as rt from "./rt.ts"; export function fmt$Debug(self: Wide, f: rt.Formatter): rt.Result { - let names!: string[]; - let values!: rt.Fmt[]; - let _20!: string; - names = ["a", "b", "c", "d", "e", "f"]; - values = [(f: rt.Formatter) => rt.u8Display(self.a, f), (f: rt.Formatter) => rt.u16Display(self.b, f), (f: rt.Formatter) => rt.u32Display(self.c, f), (f: rt.Formatter) => rt.u64Display(self.d, f), (f: rt.Formatter) => rt.i8Display(self.e, f), (f: rt.Formatter) => rt.fmtBool(self.f, f)]; - _20 = "Wide"; + const names: string[] = ["a", "b", "c", "d", "e", "f"]; + const values: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(self.a, f), (f: rt.Formatter) => rt.u16Display(self.b, f), (f: rt.Formatter) => rt.u32Display(self.c, f), (f: rt.Formatter) => rt.u64Display(self.d, f), (f: rt.Formatter) => rt.i8Display(self.e, f), (f: rt.Formatter) => rt.fmtBool(self.f, f)]; + const _20: string = "Wide"; return rt.fmtDebugStructFields(f, _20, names, values); } diff --git a/ts/fixtures/lang/expected/fmt.ts b/ts/fixtures/lang/expected/fmt.ts index 763c591df..eb457046b 100644 --- a/ts/fixtures/lang/expected/fmt.ts +++ b/ts/fixtures/lang/expected/fmt.ts @@ -25,249 +25,151 @@ export function put(out: rt.ByteVec, s: string): void { /** Integers of every width, with each spec. */ export function ints(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let _4!: rt.u8; - let v!: rt.u8; - let buf!: Uint8Array; - let n!: rt.usize; - let _23!: string; - let args2!: rt.Fmt[]; - let _38!: string; - let v2!: rt.u16; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _57!: string; - let args4!: rt.Fmt[]; - let _72!: string; - let v3!: rt.u32; - let buf3!: Uint8Array; - let n3!: rt.usize; - let _91!: string; - let args6!: rt.Fmt[]; - let _106!: string; - let v4!: rt.u64; - let buf4!: Uint8Array; - let n4!: rt.usize; - let _125!: string; - let args8!: rt.Fmt[]; - let _140!: string; - let v5!: rt.u128; - let buf5!: Uint8Array; - let n5!: rt.usize; - let _159!: string; - let args10!: rt.Fmt[]; - let _174!: string; - let v6!: rt.usize; - let buf6!: Uint8Array; - let n6!: rt.usize; - let _193!: string; - let args12!: rt.Fmt[]; - let _208!: string; - let v7!: rt.i8; - let buf7!: Uint8Array; - let n7!: rt.usize; - let _227!: string; - let args14!: rt.Fmt[]; - let _242!: string; - let v8!: rt.i16; - let buf8!: Uint8Array; - let n8!: rt.usize; - let _261!: string; - let args16!: rt.Fmt[]; - let _276!: string; - let v9!: rt.i32; - let buf9!: Uint8Array; - let n9!: rt.usize; - let _295!: string; - let args18!: rt.Fmt[]; - let _310!: string; - let v10!: rt.i64; - let buf10!: Uint8Array; - let n10!: rt.usize; - let _329!: string; - let args20!: rt.Fmt[]; - let _344!: string; - let v11!: rt.i128; - let buf11!: Uint8Array; - let n11!: rt.usize; - let _363!: string; - let args22!: rt.Fmt[]; - let _378!: string; - let v12!: rt.isize; - let buf12!: Uint8Array; - let n12!: rt.usize; - let _397!: string; - let args24!: rt.Fmt[]; - let _412!: string; - _4 = rt.u8Rem(kind, 12); + const _4: rt.u8 = rt.u8Rem(kind, 12); if (_4 === 0) { - buf = Uint8Array.of(0); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = Uint8Array.of(0); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - v = rt.u8FromBeBytes(buf); - args2 = [(f: rt.Formatter) => rt.u8Display(v, f), (f: rt.Formatter) => rt.u8Display(v, f), (f: rt.Formatter) => rt.u8LowerHex(v, f), (f: rt.Formatter) => rt.u8UpperHex(v, f)]; - _23 = rt.fmtFormat([args2[0], " ", args2[1], " ", rt.fmtSpec({ width: 5 }, args2[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args2[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args2[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args2[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args2[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args2[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args2[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args2[0]), "|", args2[2], " ", args2[3], " ", rt.fmtSpec({ alternate: true }, args2[2]), " ", rt.fmtSpec({ alternate: true }, args2[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args2[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args2[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args2[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args2[3]), "|", rt.fmtSpec({ alternate: true }, args2[1]), " ", rt.fmtSpec({ width: 3 }, args2[1])]); + const v: rt.u8 = rt.u8FromBeBytes(buf); + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(v, f), (f: rt.Formatter) => rt.u8Display(v, f), (f: rt.Formatter) => rt.u8LowerHex(v, f), (f: rt.Formatter) => rt.u8UpperHex(v, f)]; + const _23: string = rt.fmtFormat([args2[0], " ", args2[1], " ", rt.fmtSpec({ width: 5 }, args2[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args2[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args2[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args2[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args2[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args2[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args2[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args2[0]), "|", args2[2], " ", args2[3], " ", rt.fmtSpec({ alternate: true }, args2[2]), " ", rt.fmtSpec({ alternate: true }, args2[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args2[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args2[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args2[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args2[3]), "|", rt.fmtSpec({ alternate: true }, args2[1]), " ", rt.fmtSpec({ width: 3 }, args2[1])]); put(out, _23); - _38 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v, f)); + const _38: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v, f)); put(out, _38); } else if (_4 === 1) { - buf2 = rt.bytes(2); - n2 = rt.min(data.length, buf2.length); + const buf2: Uint8Array = rt.bytes(2); + const n2: rt.usize = rt.min(data.length, buf2.length); rt.sliceCopyFromSlice(rt.sliceRange(buf2, 0, n2), rt.sliceRange(data, 0, n2)); - v2 = rt.u16FromBeBytes(buf2); - args4 = [(f: rt.Formatter) => rt.u16Display(v2, f), (f: rt.Formatter) => rt.u16Display(v2, f), (f: rt.Formatter) => rt.u16LowerHex(v2, f), (f: rt.Formatter) => rt.u16UpperHex(v2, f)]; - _57 = rt.fmtFormat([args4[0], " ", args4[1], " ", rt.fmtSpec({ width: 5 }, args4[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args4[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args4[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args4[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args4[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args4[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args4[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args4[0]), "|", args4[2], " ", args4[3], " ", rt.fmtSpec({ alternate: true }, args4[2]), " ", rt.fmtSpec({ alternate: true }, args4[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args4[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args4[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args4[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args4[3]), "|", rt.fmtSpec({ alternate: true }, args4[1]), " ", rt.fmtSpec({ width: 3 }, args4[1])]); + const v2: rt.u16 = rt.u16FromBeBytes(buf2); + const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u16Display(v2, f), (f: rt.Formatter) => rt.u16Display(v2, f), (f: rt.Formatter) => rt.u16LowerHex(v2, f), (f: rt.Formatter) => rt.u16UpperHex(v2, f)]; + const _57: string = rt.fmtFormat([args4[0], " ", args4[1], " ", rt.fmtSpec({ width: 5 }, args4[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args4[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args4[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args4[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args4[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args4[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args4[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args4[0]), "|", args4[2], " ", args4[3], " ", rt.fmtSpec({ alternate: true }, args4[2]), " ", rt.fmtSpec({ alternate: true }, args4[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args4[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args4[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args4[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args4[3]), "|", rt.fmtSpec({ alternate: true }, args4[1]), " ", rt.fmtSpec({ width: 3 }, args4[1])]); put(out, _57); - _72 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v2, f)); + const _72: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v2, f)); put(out, _72); } else if (_4 === 2) { - buf3 = rt.bytes(4); - n3 = rt.min(data.length, buf3.length); + const buf3: Uint8Array = rt.bytes(4); + const n3: rt.usize = rt.min(data.length, buf3.length); rt.sliceCopyFromSlice(rt.sliceRange(buf3, 0, n3), rt.sliceRange(data, 0, n3)); - v3 = rt.u32FromBeBytes(buf3); - args6 = [(f: rt.Formatter) => rt.u32Display(v3, f), (f: rt.Formatter) => rt.u32Display(v3, f), (f: rt.Formatter) => rt.u32LowerHex(v3, f), (f: rt.Formatter) => rt.u32UpperHex(v3, f)]; - _91 = rt.fmtFormat([args6[0], " ", args6[1], " ", rt.fmtSpec({ width: 5 }, args6[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args6[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args6[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args6[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args6[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args6[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args6[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args6[0]), "|", args6[2], " ", args6[3], " ", rt.fmtSpec({ alternate: true }, args6[2]), " ", rt.fmtSpec({ alternate: true }, args6[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args6[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args6[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args6[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args6[3]), "|", rt.fmtSpec({ alternate: true }, args6[1]), " ", rt.fmtSpec({ width: 3 }, args6[1])]); + const v3: rt.u32 = rt.u32FromBeBytes(buf3); + const args6: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(v3, f), (f: rt.Formatter) => rt.u32Display(v3, f), (f: rt.Formatter) => rt.u32LowerHex(v3, f), (f: rt.Formatter) => rt.u32UpperHex(v3, f)]; + const _91: string = rt.fmtFormat([args6[0], " ", args6[1], " ", rt.fmtSpec({ width: 5 }, args6[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args6[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args6[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args6[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args6[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args6[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args6[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args6[0]), "|", args6[2], " ", args6[3], " ", rt.fmtSpec({ alternate: true }, args6[2]), " ", rt.fmtSpec({ alternate: true }, args6[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args6[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args6[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args6[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args6[3]), "|", rt.fmtSpec({ alternate: true }, args6[1]), " ", rt.fmtSpec({ width: 3 }, args6[1])]); put(out, _91); - _106 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v3, f)); + const _106: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v3, f)); put(out, _106); } else if (_4 === 3) { - buf4 = rt.bytes(8); - n4 = rt.min(data.length, buf4.length); + const buf4: Uint8Array = rt.bytes(8); + const n4: rt.usize = rt.min(data.length, buf4.length); rt.sliceCopyFromSlice(rt.sliceRange(buf4, 0, n4), rt.sliceRange(data, 0, n4)); - v4 = rt.u64FromBeBytes(buf4); - args8 = [(f: rt.Formatter) => rt.u64Display(v4, f), (f: rt.Formatter) => rt.u64Display(v4, f), (f: rt.Formatter) => rt.u64LowerHex(v4, f), (f: rt.Formatter) => rt.u64UpperHex(v4, f)]; - _125 = rt.fmtFormat([args8[0], " ", args8[1], " ", rt.fmtSpec({ width: 5 }, args8[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args8[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args8[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args8[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args8[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args8[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args8[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args8[0]), "|", args8[2], " ", args8[3], " ", rt.fmtSpec({ alternate: true }, args8[2]), " ", rt.fmtSpec({ alternate: true }, args8[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args8[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args8[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args8[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args8[3]), "|", rt.fmtSpec({ alternate: true }, args8[1]), " ", rt.fmtSpec({ width: 3 }, args8[1])]); + const v4: rt.u64 = rt.u64FromBeBytes(buf4); + const args8: rt.Fmt[] = [(f: rt.Formatter) => rt.u64Display(v4, f), (f: rt.Formatter) => rt.u64Display(v4, f), (f: rt.Formatter) => rt.u64LowerHex(v4, f), (f: rt.Formatter) => rt.u64UpperHex(v4, f)]; + const _125: string = rt.fmtFormat([args8[0], " ", args8[1], " ", rt.fmtSpec({ width: 5 }, args8[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args8[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args8[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args8[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args8[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args8[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args8[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args8[0]), "|", args8[2], " ", args8[3], " ", rt.fmtSpec({ alternate: true }, args8[2]), " ", rt.fmtSpec({ alternate: true }, args8[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args8[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args8[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args8[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args8[3]), "|", rt.fmtSpec({ alternate: true }, args8[1]), " ", rt.fmtSpec({ width: 3 }, args8[1])]); put(out, _125); - _140 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v4, f)); + const _140: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v4, f)); put(out, _140); } else if (_4 === 4) { - buf5 = rt.bytes(16); - n5 = rt.min(data.length, buf5.length); + const buf5: Uint8Array = rt.bytes(16); + const n5: rt.usize = rt.min(data.length, buf5.length); rt.sliceCopyFromSlice(rt.sliceRange(buf5, 0, n5), rt.sliceRange(data, 0, n5)); - v5 = rt.u128FromBeBytes(buf5); - args10 = [(f: rt.Formatter) => rt.u128Display(v5, f), (f: rt.Formatter) => rt.u128Display(v5, f), (f: rt.Formatter) => rt.u128LowerHex(v5, f), (f: rt.Formatter) => rt.u128UpperHex(v5, f)]; - _159 = rt.fmtFormat([args10[0], " ", args10[1], " ", rt.fmtSpec({ width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args10[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args10[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args10[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args10[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args10[0]), "|", args10[2], " ", args10[3], " ", rt.fmtSpec({ alternate: true }, args10[2]), " ", rt.fmtSpec({ alternate: true }, args10[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args10[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args10[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args10[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args10[3]), "|", rt.fmtSpec({ alternate: true }, args10[1]), " ", rt.fmtSpec({ width: 3 }, args10[1])]); + const v5: rt.u128 = rt.u128FromBeBytes(buf5); + const args10: rt.Fmt[] = [(f: rt.Formatter) => rt.u128Display(v5, f), (f: rt.Formatter) => rt.u128Display(v5, f), (f: rt.Formatter) => rt.u128LowerHex(v5, f), (f: rt.Formatter) => rt.u128UpperHex(v5, f)]; + const _159: string = rt.fmtFormat([args10[0], " ", args10[1], " ", rt.fmtSpec({ width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args10[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args10[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args10[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args10[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args10[0]), "|", args10[2], " ", args10[3], " ", rt.fmtSpec({ alternate: true }, args10[2]), " ", rt.fmtSpec({ alternate: true }, args10[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args10[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args10[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args10[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args10[3]), "|", rt.fmtSpec({ alternate: true }, args10[1]), " ", rt.fmtSpec({ width: 3 }, args10[1])]); put(out, _159); - _174 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v5, f)); + const _174: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v5, f)); put(out, _174); } else if (_4 === 5) { - buf6 = rt.bytes(4); - n6 = rt.min(data.length, buf6.length); + const buf6: Uint8Array = rt.bytes(4); + const n6: rt.usize = rt.min(data.length, buf6.length); rt.sliceCopyFromSlice(rt.sliceRange(buf6, 0, n6), rt.sliceRange(data, 0, n6)); - v6 = rt.usizeFromBeBytes(buf6); - args12 = [(f: rt.Formatter) => rt.usizeDisplay(v6, f), (f: rt.Formatter) => rt.usizeDisplay(v6, f), (f: rt.Formatter) => rt.usizeLowerHex(v6, f), (f: rt.Formatter) => rt.usizeUpperHex(v6, f)]; - _193 = rt.fmtFormat([args12[0], " ", args12[1], " ", rt.fmtSpec({ width: 5 }, args12[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args12[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args12[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args12[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args12[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args12[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args12[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args12[0]), "|", args12[2], " ", args12[3], " ", rt.fmtSpec({ alternate: true }, args12[2]), " ", rt.fmtSpec({ alternate: true }, args12[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args12[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args12[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args12[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args12[3]), "|", rt.fmtSpec({ alternate: true }, args12[1]), " ", rt.fmtSpec({ width: 3 }, args12[1])]); + const v6: rt.usize = rt.usizeFromBeBytes(buf6); + const args12: rt.Fmt[] = [(f: rt.Formatter) => rt.usizeDisplay(v6, f), (f: rt.Formatter) => rt.usizeDisplay(v6, f), (f: rt.Formatter) => rt.usizeLowerHex(v6, f), (f: rt.Formatter) => rt.usizeUpperHex(v6, f)]; + const _193: string = rt.fmtFormat([args12[0], " ", args12[1], " ", rt.fmtSpec({ width: 5 }, args12[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args12[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args12[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args12[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args12[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args12[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args12[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args12[0]), "|", args12[2], " ", args12[3], " ", rt.fmtSpec({ alternate: true }, args12[2]), " ", rt.fmtSpec({ alternate: true }, args12[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args12[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args12[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args12[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args12[3]), "|", rt.fmtSpec({ alternate: true }, args12[1]), " ", rt.fmtSpec({ width: 3 }, args12[1])]); put(out, _193); - _208 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v6, f)); + const _208: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v6, f)); put(out, _208); } else if (_4 === 6) { - buf7 = Uint8Array.of(0); - n7 = rt.min(data.length, buf7.length); + const buf7: Uint8Array = Uint8Array.of(0); + const n7: rt.usize = rt.min(data.length, buf7.length); rt.sliceCopyFromSlice(rt.sliceRange(buf7, 0, n7), rt.sliceRange(data, 0, n7)); - v7 = rt.i8FromBeBytes(buf7); - args14 = [(f: rt.Formatter) => rt.i8Display(v7, f), (f: rt.Formatter) => rt.i8Display(v7, f), (f: rt.Formatter) => rt.i8LowerHex(v7, f), (f: rt.Formatter) => rt.i8UpperHex(v7, f)]; - _227 = rt.fmtFormat([args14[0], " ", args14[1], " ", rt.fmtSpec({ width: 5 }, args14[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args14[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args14[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args14[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args14[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args14[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args14[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args14[0]), "|", args14[2], " ", args14[3], " ", rt.fmtSpec({ alternate: true }, args14[2]), " ", rt.fmtSpec({ alternate: true }, args14[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args14[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args14[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args14[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args14[3]), "|", rt.fmtSpec({ alternate: true }, args14[1]), " ", rt.fmtSpec({ width: 3 }, args14[1])]); + const v7: rt.i8 = rt.i8FromBeBytes(buf7); + const args14: rt.Fmt[] = [(f: rt.Formatter) => rt.i8Display(v7, f), (f: rt.Formatter) => rt.i8Display(v7, f), (f: rt.Formatter) => rt.i8LowerHex(v7, f), (f: rt.Formatter) => rt.i8UpperHex(v7, f)]; + const _227: string = rt.fmtFormat([args14[0], " ", args14[1], " ", rt.fmtSpec({ width: 5 }, args14[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args14[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args14[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args14[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args14[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args14[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args14[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args14[0]), "|", args14[2], " ", args14[3], " ", rt.fmtSpec({ alternate: true }, args14[2]), " ", rt.fmtSpec({ alternate: true }, args14[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args14[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args14[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args14[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args14[3]), "|", rt.fmtSpec({ alternate: true }, args14[1]), " ", rt.fmtSpec({ width: 3 }, args14[1])]); put(out, _227); - _242 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v7, f)); + const _242: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v7, f)); put(out, _242); } else if (_4 === 7) { - buf8 = rt.bytes(2); - n8 = rt.min(data.length, buf8.length); + const buf8: Uint8Array = rt.bytes(2); + const n8: rt.usize = rt.min(data.length, buf8.length); rt.sliceCopyFromSlice(rt.sliceRange(buf8, 0, n8), rt.sliceRange(data, 0, n8)); - v8 = rt.i16FromBeBytes(buf8); - args16 = [(f: rt.Formatter) => rt.i16Display(v8, f), (f: rt.Formatter) => rt.i16Display(v8, f), (f: rt.Formatter) => rt.i16LowerHex(v8, f), (f: rt.Formatter) => rt.i16UpperHex(v8, f)]; - _261 = rt.fmtFormat([args16[0], " ", args16[1], " ", rt.fmtSpec({ width: 5 }, args16[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args16[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args16[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args16[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args16[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args16[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args16[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args16[0]), "|", args16[2], " ", args16[3], " ", rt.fmtSpec({ alternate: true }, args16[2]), " ", rt.fmtSpec({ alternate: true }, args16[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args16[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args16[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args16[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args16[3]), "|", rt.fmtSpec({ alternate: true }, args16[1]), " ", rt.fmtSpec({ width: 3 }, args16[1])]); + const v8: rt.i16 = rt.i16FromBeBytes(buf8); + const args16: rt.Fmt[] = [(f: rt.Formatter) => rt.i16Display(v8, f), (f: rt.Formatter) => rt.i16Display(v8, f), (f: rt.Formatter) => rt.i16LowerHex(v8, f), (f: rt.Formatter) => rt.i16UpperHex(v8, f)]; + const _261: string = rt.fmtFormat([args16[0], " ", args16[1], " ", rt.fmtSpec({ width: 5 }, args16[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args16[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args16[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args16[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args16[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args16[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args16[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args16[0]), "|", args16[2], " ", args16[3], " ", rt.fmtSpec({ alternate: true }, args16[2]), " ", rt.fmtSpec({ alternate: true }, args16[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args16[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args16[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args16[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args16[3]), "|", rt.fmtSpec({ alternate: true }, args16[1]), " ", rt.fmtSpec({ width: 3 }, args16[1])]); put(out, _261); - _276 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v8, f)); + const _276: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v8, f)); put(out, _276); } else if (_4 === 8) { - buf9 = rt.bytes(4); - n9 = rt.min(data.length, buf9.length); + const buf9: Uint8Array = rt.bytes(4); + const n9: rt.usize = rt.min(data.length, buf9.length); rt.sliceCopyFromSlice(rt.sliceRange(buf9, 0, n9), rt.sliceRange(data, 0, n9)); - v9 = rt.i32FromBeBytes(buf9); - args18 = [(f: rt.Formatter) => rt.i32Display(v9, f), (f: rt.Formatter) => rt.i32Display(v9, f), (f: rt.Formatter) => rt.i32LowerHex(v9, f), (f: rt.Formatter) => rt.i32UpperHex(v9, f)]; - _295 = rt.fmtFormat([args18[0], " ", args18[1], " ", rt.fmtSpec({ width: 5 }, args18[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args18[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args18[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args18[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args18[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args18[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args18[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args18[0]), "|", args18[2], " ", args18[3], " ", rt.fmtSpec({ alternate: true }, args18[2]), " ", rt.fmtSpec({ alternate: true }, args18[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args18[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args18[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args18[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args18[3]), "|", rt.fmtSpec({ alternate: true }, args18[1]), " ", rt.fmtSpec({ width: 3 }, args18[1])]); + const v9: rt.i32 = rt.i32FromBeBytes(buf9); + const args18: rt.Fmt[] = [(f: rt.Formatter) => rt.i32Display(v9, f), (f: rt.Formatter) => rt.i32Display(v9, f), (f: rt.Formatter) => rt.i32LowerHex(v9, f), (f: rt.Formatter) => rt.i32UpperHex(v9, f)]; + const _295: string = rt.fmtFormat([args18[0], " ", args18[1], " ", rt.fmtSpec({ width: 5 }, args18[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args18[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args18[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args18[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args18[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args18[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args18[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args18[0]), "|", args18[2], " ", args18[3], " ", rt.fmtSpec({ alternate: true }, args18[2]), " ", rt.fmtSpec({ alternate: true }, args18[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args18[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args18[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args18[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args18[3]), "|", rt.fmtSpec({ alternate: true }, args18[1]), " ", rt.fmtSpec({ width: 3 }, args18[1])]); put(out, _295); - _310 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v9, f)); + const _310: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v9, f)); put(out, _310); } else if (_4 === 9) { - buf10 = rt.bytes(8); - n10 = rt.min(data.length, buf10.length); + const buf10: Uint8Array = rt.bytes(8); + const n10: rt.usize = rt.min(data.length, buf10.length); rt.sliceCopyFromSlice(rt.sliceRange(buf10, 0, n10), rt.sliceRange(data, 0, n10)); - v10 = rt.i64FromBeBytes(buf10); - args20 = [(f: rt.Formatter) => rt.i64Display(v10, f), (f: rt.Formatter) => rt.i64Display(v10, f), (f: rt.Formatter) => rt.i64LowerHex(v10, f), (f: rt.Formatter) => rt.i64UpperHex(v10, f)]; - _329 = rt.fmtFormat([args20[0], " ", args20[1], " ", rt.fmtSpec({ width: 5 }, args20[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args20[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args20[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args20[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args20[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args20[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args20[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args20[0]), "|", args20[2], " ", args20[3], " ", rt.fmtSpec({ alternate: true }, args20[2]), " ", rt.fmtSpec({ alternate: true }, args20[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args20[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args20[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args20[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args20[3]), "|", rt.fmtSpec({ alternate: true }, args20[1]), " ", rt.fmtSpec({ width: 3 }, args20[1])]); + const v10: rt.i64 = rt.i64FromBeBytes(buf10); + const args20: rt.Fmt[] = [(f: rt.Formatter) => rt.i64Display(v10, f), (f: rt.Formatter) => rt.i64Display(v10, f), (f: rt.Formatter) => rt.i64LowerHex(v10, f), (f: rt.Formatter) => rt.i64UpperHex(v10, f)]; + const _329: string = rt.fmtFormat([args20[0], " ", args20[1], " ", rt.fmtSpec({ width: 5 }, args20[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args20[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args20[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args20[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args20[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args20[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args20[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args20[0]), "|", args20[2], " ", args20[3], " ", rt.fmtSpec({ alternate: true }, args20[2]), " ", rt.fmtSpec({ alternate: true }, args20[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args20[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args20[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args20[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args20[3]), "|", rt.fmtSpec({ alternate: true }, args20[1]), " ", rt.fmtSpec({ width: 3 }, args20[1])]); put(out, _329); - _344 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v10, f)); + const _344: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v10, f)); put(out, _344); } else if (_4 === 10) { - buf11 = rt.bytes(16); - n11 = rt.min(data.length, buf11.length); + const buf11: Uint8Array = rt.bytes(16); + const n11: rt.usize = rt.min(data.length, buf11.length); rt.sliceCopyFromSlice(rt.sliceRange(buf11, 0, n11), rt.sliceRange(data, 0, n11)); - v11 = rt.i128FromBeBytes(buf11); - args22 = [(f: rt.Formatter) => rt.i128Display(v11, f), (f: rt.Formatter) => rt.i128Display(v11, f), (f: rt.Formatter) => rt.i128LowerHex(v11, f), (f: rt.Formatter) => rt.i128UpperHex(v11, f)]; - _363 = rt.fmtFormat([args22[0], " ", args22[1], " ", rt.fmtSpec({ width: 5 }, args22[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args22[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args22[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args22[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args22[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args22[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args22[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args22[0]), "|", args22[2], " ", args22[3], " ", rt.fmtSpec({ alternate: true }, args22[2]), " ", rt.fmtSpec({ alternate: true }, args22[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args22[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args22[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args22[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args22[3]), "|", rt.fmtSpec({ alternate: true }, args22[1]), " ", rt.fmtSpec({ width: 3 }, args22[1])]); + const v11: rt.i128 = rt.i128FromBeBytes(buf11); + const args22: rt.Fmt[] = [(f: rt.Formatter) => rt.i128Display(v11, f), (f: rt.Formatter) => rt.i128Display(v11, f), (f: rt.Formatter) => rt.i128LowerHex(v11, f), (f: rt.Formatter) => rt.i128UpperHex(v11, f)]; + const _363: string = rt.fmtFormat([args22[0], " ", args22[1], " ", rt.fmtSpec({ width: 5 }, args22[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args22[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args22[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args22[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args22[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args22[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args22[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args22[0]), "|", args22[2], " ", args22[3], " ", rt.fmtSpec({ alternate: true }, args22[2]), " ", rt.fmtSpec({ alternate: true }, args22[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args22[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args22[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args22[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args22[3]), "|", rt.fmtSpec({ alternate: true }, args22[1]), " ", rt.fmtSpec({ width: 3 }, args22[1])]); put(out, _363); - _378 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v11, f)); + const _378: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v11, f)); put(out, _378); } else { - buf12 = rt.bytes(4); - n12 = rt.min(data.length, buf12.length); + const buf12: Uint8Array = rt.bytes(4); + const n12: rt.usize = rt.min(data.length, buf12.length); rt.sliceCopyFromSlice(rt.sliceRange(buf12, 0, n12), rt.sliceRange(data, 0, n12)); - v12 = rt.isizeFromBeBytes(buf12); - args24 = [(f: rt.Formatter) => rt.isizeDisplay(v12, f), (f: rt.Formatter) => rt.isizeDisplay(v12, f), (f: rt.Formatter) => rt.isizeLowerHex(v12, f), (f: rt.Formatter) => rt.isizeUpperHex(v12, f)]; - _397 = rt.fmtFormat([args24[0], " ", args24[1], " ", rt.fmtSpec({ width: 5 }, args24[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args24[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args24[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args24[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args24[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args24[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args24[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args24[0]), "|", args24[2], " ", args24[3], " ", rt.fmtSpec({ alternate: true }, args24[2]), " ", rt.fmtSpec({ alternate: true }, args24[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args24[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args24[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args24[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args24[3]), "|", rt.fmtSpec({ alternate: true }, args24[1]), " ", rt.fmtSpec({ width: 3 }, args24[1])]); + const v12: rt.isize = rt.isizeFromBeBytes(buf12); + const args24: rt.Fmt[] = [(f: rt.Formatter) => rt.isizeDisplay(v12, f), (f: rt.Formatter) => rt.isizeDisplay(v12, f), (f: rt.Formatter) => rt.isizeLowerHex(v12, f), (f: rt.Formatter) => rt.isizeUpperHex(v12, f)]; + const _397: string = rt.fmtFormat([args24[0], " ", args24[1], " ", rt.fmtSpec({ width: 5 }, args24[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args24[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args24[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args24[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args24[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args24[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args24[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args24[0]), "|", args24[2], " ", args24[3], " ", rt.fmtSpec({ alternate: true }, args24[2]), " ", rt.fmtSpec({ alternate: true }, args24[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args24[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args24[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args24[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args24[3]), "|", rt.fmtSpec({ alternate: true }, args24[1]), " ", rt.fmtSpec({ width: 3 }, args24[1])]); put(out, _397); - _412 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v12, f)); + const _412: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v12, f)); put(out, _412); } } /** Strings padded and escaped, and bytes that may not be UTF-8. */ export function strings(data: Uint8Array, out: rt.ByteVec): void { - let iterS!: Uint8Array; - let iterI!: number; - let _9!: rt.u8 | rt.Done; - let _15!: rt.usize; - let _25!: string; - let args2!: rt.Fmt[]; - let _31!: rt.Fmt; - let _36!: rt.Result; - let s!: string; - let _42!: string; - let args4!: rt.Fmt[]; - let e!: rt.FromUtf8Error; - let _55!: string; - let args6!: rt.Fmt[]; let flag!: boolean; - let _66!: rt.u8 | undefined; - let _76!: string; - let args8!: rt.Fmt[]; - let _93!: string; - let _94!: boolean; - let _95!: rt.Result; - let _104!: string; - let args10!: rt.Fmt[]; - let _116!: string; - let args12!: rt.Fmt[]; - let _122!: rt.Fmt; - iterS = rt.sliceRange(data, 0, rt.min(data.length, 3)); - iterI = 0; + const iterS: Uint8Array = rt.sliceRange(data, 0, rt.min(data.length, 3)); + let iterI: number = 0; while (true) { - _9 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _9: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_9 === rt.DONE) { - _36 = rt.stringFromUtf8(rt.sliceToByteVec(data)); + const _36: rt.Result = rt.stringFromUtf8(rt.sliceToByteVec(data)); if (_36.ok) { - s = _36.value; - args4 = [(f: rt.Formatter) => rt.fmtStr(s, f), (f: rt.Formatter) => rt.fmtPad(f, s)]; - _42 = rt.fmtFormat([args4[0], " ", rt.fmtSpec({ align: ">", width: 4 }, args4[1])]); + const s: string = _36.value; + const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtStr(s, f), (f: rt.Formatter) => rt.fmtPad(f, s)]; + const _42: string = rt.fmtFormat([args4[0], " ", rt.fmtSpec({ align: ">", width: 4 }, args4[1])]); put(out, _42); } else { - e = _36.error; - args6 = [(f: rt.Formatter) => rt.fmtFromUtf8ErrorDisplay(e, f), (f: rt.Formatter) => rt.fmtFromUtf8ErrorDebug(e, f)]; - _55 = rt.fmtFormat([args6[0], " ", args6[1], " ", rt.fmtSpec({ alternate: true }, args6[1]), " ", rt.fmtSpec({ align: ">", width: 80 }, args6[0])]); + const e: rt.FromUtf8Error = _36.error; + const args6: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtFromUtf8ErrorDisplay(e, f), (f: rt.Formatter) => rt.fmtFromUtf8ErrorDebug(e, f)]; + const _55: string = rt.fmtFormat([args6[0], " ", args6[1], " ", rt.fmtSpec({ alternate: true }, args6[1]), " ", rt.fmtSpec({ align: ">", width: 80 }, args6[0])]); put(out, _55); } - _66 = rt.sliceFirst(data); + const _66: rt.u8 | undefined = rt.sliceFirst(data); b2: { if (_66 !== undefined) { if (rt.u8Rem(_66, 2) === 0) { @@ -277,71 +179,57 @@ export function strings(data: Uint8Array, out: rt.ByteVec): void { } flag = false; } - args8 = [(f: rt.Formatter) => rt.fmtBool(flag, f), (f: rt.Formatter) => rt.fmtBool(flag, f), (f: rt.Formatter) => rt.fmtUnit(undefined, f), (f: rt.Formatter) => rt.fmtUnit(undefined, f)]; - _76 = rt.fmtFormat([args8[0], " ", args8[1], " ", rt.fmtSpec({ align: ">", width: 6 }, args8[0]), " ", args8[2], " ", rt.fmtSpec({ alternate: true }, args8[3])]); + const args8: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtBool(flag, f), (f: rt.Formatter) => rt.fmtBool(flag, f), (f: rt.Formatter) => rt.fmtUnit(undefined, f), (f: rt.Formatter) => rt.fmtUnit(undefined, f)]; + const _76: string = rt.fmtFormat([args8[0], " ", args8[1], " ", rt.fmtSpec({ align: ">", width: 6 }, args8[0]), " ", args8[2], " ", rt.fmtSpec({ alternate: true }, args8[3])]); put(out, _76); - _94 = flag; - _93 = rt.fmtToString((f: rt.Formatter) => rt.fmtBool(_94, f)); + const _94: boolean = flag; + const _93: string = rt.fmtToString((f: rt.Formatter) => rt.fmtBool(_94, f)); put(out, _93); - _95 = rt.u8TryFrom(rt.i32Sub(data.length | 0, 3)); + const _95: rt.Result = rt.u8TryFrom(rt.i32Sub(data.length | 0, 3)); if (_95.ok) { const arg5 = ([_95.value] as [rt.u8])[0]; - args10 = [(f: rt.Formatter) => rt.u8Display(arg5, f)]; - _104 = rt.fmtFormat([args10[0]]); + const args10: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg5, f)]; + const _104: string = rt.fmtFormat([args10[0]]); put(out, _104); } else { const arg3 = _95.error; - _122 = (f: rt.Formatter) => rt.fmtTryFromIntErrorDisplay(arg3, f); + const _122: rt.Fmt = (f: rt.Formatter) => rt.fmtTryFromIntErrorDisplay(arg3, f); const arg4 = _95.error; - args12 = [_122, (f: rt.Formatter) => rt.fmtTryFromIntErrorDebug(arg4, f)]; - _116 = rt.fmtFormat([args12[0], " ", args12[1], " ", rt.fmtSpec({ align: ">", width: 40 }, args12[0]), "|"]); + const args12: rt.Fmt[] = [_122, (f: rt.Formatter) => rt.fmtTryFromIntErrorDebug(arg4, f)]; + const _116: string = rt.fmtFormat([args12[0], " ", args12[1], " ", rt.fmtSpec({ align: ">", width: 40 }, args12[0]), "|"]); put(out, _116); } return; - } else { - _15 = rt.usizeRem(_9 as rt.usize, ["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"].length); - if (!(_15 < 14)) { - rt.panic("index out of bounds: the len is " + 14 + " but the index is " + _15); - } - [["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"][_15]] as [string]; - const arg = ["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"][_15]; - _31 = (f: rt.Formatter) => rt.fmtPad(f, arg); - const arg2 = ["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"][_15]; - args2 = [_31, (f: rt.Formatter) => rt.fmtStr(arg2, f)]; - _25 = rt.fmtFormat([args2[0], "|", rt.fmtSpec({ width: 8 }, args2[0]), "|", rt.fmtSpec({ align: ">", width: 8 }, args2[0]), "|", rt.fmtSpec({ align: "^", width: 8 }, args2[0]), "|", rt.fmtSpec({ fill: "-", align: "<", width: 3 }, args2[0]), "|", args2[1], "|", rt.fmtSpec({ width: 12 }, args2[1]), "|", rt.fmtSpec({ alternate: true }, args2[1]), "|{", args2[0], "}"]); - put(out, _25); } + const _15: rt.usize = rt.usizeRem(_9 as rt.usize, ["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"].length); + if (!(_15 < 14)) { + rt.panic("index out of bounds: the len is " + 14 + " but the index is " + _15); + } + [["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"][_15]] as [string]; + const arg = ["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"][_15]; + const _31: rt.Fmt = (f: rt.Formatter) => rt.fmtPad(f, arg); + const arg2 = ["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"][_15]; + const args2: rt.Fmt[] = [_31, (f: rt.Formatter) => rt.fmtStr(arg2, f)]; + const _25: string = rt.fmtFormat([args2[0], "|", rt.fmtSpec({ width: 8 }, args2[0]), "|", rt.fmtSpec({ align: ">", width: 8 }, args2[0]), "|", rt.fmtSpec({ align: "^", width: 8 }, args2[0]), "|", rt.fmtSpec({ fill: "-", align: "<", width: 3 }, args2[0]), "|", args2[1], "|", rt.fmtSpec({ width: 12 }, args2[1]), "|", rt.fmtSpec({ alternate: true }, args2[1]), "|{", args2[0], "}"]); + put(out, _25); } } export function nested(data: Uint8Array): Nested.Nested { - let at!: (a0: rt.usize) => rt.u8; - let _3!: string; - let _5!: rt.usize; - let _15!: Point.Point; let _22!: Shape.Shape; - let _23!: rt.u8; - let _35!: rt.ByteVec; - let _40!: Pair.Pair[]; let _49!: Pair.Pair | undefined; - let _60!: rt.u8 | undefined; let _61!: rt.Result; - let _73!: rt.i16[]; - let _80!: [rt.u8, boolean, string]; - let _84!: [rt.u8]; - let _88!: rt.ByteVec; let _90!: Kind.Kind; - let _91!: rt.u8; - at = (i: rt.usize): rt.u8 => { + const at: (a0: rt.usize) => rt.u8 = (i: rt.usize): rt.u8 => { return rt.optionUnwrapOr(rt.sliceGet(data, i), 0); }; - _5 = rt.usizeRem(at(0) as rt.usize, ["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"].length); + const _5: rt.usize = rt.usizeRem(at(0) as rt.usize, ["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"].length); if (!(_5 < 14)) { rt.panic("index out of bounds: the len is " + 14 + " but the index is " + _5); } - _3 = ["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"][_5]; - _15 = { x: rt.i32Sub(at(1) as rt.i32, 128), y: -7 }; - _23 = rt.u8Rem(at(2), 3); + const _3: string = ["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"][_5]; + const _15: Point.Point = { x: rt.i32Sub(at(1) as rt.i32, 128), y: -7 }; + const _23: rt.u8 = rt.u8Rem(at(2), 3); if (_23 === 0) { _22 = { tag: "Dot" } as Shape.Shape; } else if (_23 === 1) { @@ -349,24 +237,24 @@ export function nested(data: Uint8Array): Nested.Nested { } else { _22 = { tag: "Rect", corner: { x: 0, y: 0 }, width: at(3) as rt.u16, height: 9 } as Shape.Shape; } - _35 = rt.sliceToByteVec(rt.sliceRange(data, 0, rt.min(data.length, 4))); - _40 = rt.sliceToVec([{ _0: at(4), _1: -1 }, { _0: 2, _1: rt.i64Of(-9223372036854775808n) }]); + const _35: rt.ByteVec = rt.sliceToByteVec(rt.sliceRange(data, 0, rt.min(data.length, 4))); + const _40: Pair.Pair[] = rt.sliceToVec([{ _0: at(4), _1: -1 }, { _0: 2, _1: rt.i64Of(-9223372036854775808n) }]); if (!(rt.u8Rem(at(5), 2) === 0)) { _49 = undefined; } else { _49 = { _0: at(5), _1: 5 }; } - _60 = undefined; + const _60: rt.u8 | undefined = undefined; if (!(rt.u8Rem(at(6), 2) === 0)) { _61 = rt.Err("no"); } else { _61 = rt.Ok(at(6)); } - _73 = [rt.i16Sub(at(7) as rt.i16, 100), 32767]; - _80 = [at(8), true, "t"] as [rt.u8, boolean, string]; - _84 = [at(9)] as [rt.u8]; - _88 = new rt.ByteVec(); - _91 = rt.u8Rem(at(10), 3); + const _73: rt.i16[] = [rt.i16Sub(at(7) as rt.i16, 100), 32767]; + const _80: [rt.u8, boolean, string] = [at(8), true, "t"]; + const _84: [rt.u8] = [at(9)]; + const _88: rt.ByteVec = new rt.ByteVec(); + const _91: rt.u8 = rt.u8Rem(at(10), 3); if (_91 === 0) { _90 = { tag: "Empty" } as Kind.Kind; } else if (_91 === 1) { @@ -379,260 +267,142 @@ export function nested(data: Uint8Array): Nested.Nested { /** Derived `Debug` of every shape, compact and pretty, with options passed to fields. */ export function derived(data: Uint8Array, out: rt.ByteVec): void { - let at!: (a0: rt.usize) => rt.u8; - let value!: Nested.Nested; - let _8!: string; - let args2!: rt.Fmt[]; - let _20!: string; - let args4!: rt.Fmt[]; - let wide!: Wide.Wide; - let _30!: rt.u8; - let _33!: boolean; - let six!: Six.Six; - let _47!: string; - let args6!: rt.Fmt[]; - let _56!: rt.Fmt; - let _57!: rt.Fmt; - let _58!: rt.Fmt; - let _65!: string; - let args8!: rt.Fmt[]; - let point!: Point.Point; - let _84!: string; - let _89!: Pair.Pair; - let args10!: rt.Fmt[]; - let kinds!: Kind.Kind[]; - let _100!: Kind.Kind; - let _101!: Kind.Kind; - let _105!: Kind.Kind; - let _106!: Kind.Kind; - let _112!: string; - let _118!: Kind.Kind; - let args12!: rt.Fmt[]; - let _130!: string; - let args14!: rt.Fmt[]; - let words!: rt.u16[]; - let _148!: string; - let _153!: rt.u8 | undefined; - let _155!: rt.u8 | undefined; - let args16!: rt.Fmt[]; - let _168!: string; - let args18!: rt.Fmt[]; - let _177!: rt.Fmt; - let _178!: rt.Fmt; - let _179!: rt.Fmt; - at = (i: rt.usize): rt.u8 => { + const at: (a0: rt.usize) => rt.u8 = (i: rt.usize): rt.u8 => { return rt.optionUnwrapOr(rt.sliceGet(data, i), 0); }; - value = nested(data); + const value: Nested.Nested = nested(data); const arg = ([value] as [Nested.Nested])[0]; - args2 = [(f: rt.Formatter) => Nested.fmt$Debug(arg, f)]; - _8 = rt.fmtFormat([args2[0]]); + const args2: rt.Fmt[] = [(f: rt.Formatter) => Nested.fmt$Debug(arg, f)]; + const _8: string = rt.fmtFormat([args2[0]]); put(out, _8); const arg2 = ([value] as [Nested.Nested])[0]; - args4 = [(f: rt.Formatter) => Nested.fmt$Debug(arg2, f)]; - _20 = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args4[0])]); + const args4: rt.Fmt[] = [(f: rt.Formatter) => Nested.fmt$Debug(arg2, f)]; + const _20: string = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args4[0])]); put(out, _20); - _30 = at(0); - _33 = at(1) > 10; - wide = { a: _30, b: 300, c: 70000, d: rt.u64Of(18446744073709551615n), e: -1, f: _33 }; - six = { _0: at(0), _1: 1, _2: 2, _3: 3, _4: 4, _5: at(1) }; - _56 = (f: rt.Formatter) => Wide.fmt$Debug(wide, f); - _57 = (f: rt.Formatter) => Six.fmt$Debug(six, f); + const _30: rt.u8 = at(0); + const _33: boolean = at(1) > 10; + const wide: Wide.Wide = { a: _30, b: 300, c: 70000, d: rt.u64Of(18446744073709551615n), e: -1, f: _33 }; + const six: Six.Six = { _0: at(0), _1: 1, _2: 2, _3: 3, _4: 4, _5: at(1) }; + const _56: rt.Fmt = (f: rt.Formatter) => Wide.fmt$Debug(wide, f); + const _57: rt.Fmt = (f: rt.Formatter) => Six.fmt$Debug(six, f); const arg3 = {}; - _58 = (f: rt.Formatter) => Unit.fmt$Debug(arg3, f); + const _58: rt.Fmt = (f: rt.Formatter) => Unit.fmt$Debug(arg3, f); const arg4 = {}; - args6 = [_56, _57, _58, (f: rt.Formatter) => Unit.fmt$Debug(arg4, f)]; - _47 = rt.fmtFormat([args6[0], " ", args6[1], " ", args6[2], " ", rt.fmtSpec({ alternate: true }, args6[3])]); + const args6: rt.Fmt[] = [_56, _57, _58, (f: rt.Formatter) => Unit.fmt$Debug(arg4, f)]; + const _47: string = rt.fmtFormat([args6[0], " ", args6[1], " ", args6[2], " ", rt.fmtSpec({ alternate: true }, args6[3])]); put(out, _47); - args8 = [(f: rt.Formatter) => Wide.fmt$Debug(wide, f), (f: rt.Formatter) => Six.fmt$Debug(six, f)]; - _65 = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args8[0]), " ", rt.fmtSpec({ alternate: true }, args8[1])]); + const args8: rt.Fmt[] = [(f: rt.Formatter) => Wide.fmt$Debug(wide, f), (f: rt.Formatter) => Six.fmt$Debug(six, f)]; + const _65: string = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args8[0]), " ", rt.fmtSpec({ alternate: true }, args8[1])]); put(out, _65); - point = { x: at(2) as rt.i32, y: -1 }; - _89 = { _0: at(3), _1: -9 }; - args10 = [(f: rt.Formatter) => Point.fmt$Debug(point, f), (f: rt.Formatter) => Pair.fmt$Debug(_89, f)]; - _84 = rt.fmtFormat([rt.fmtSpec({ width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "<", width: 4 }, args10[0]), "|", rt.fmtSpec({ alternate: true, width: 4 }, args10[0]), "|", rt.fmtSpec({ align: ">", width: 3 }, args10[1])]); + const point: Point.Point = { x: at(2) as rt.i32, y: -1 }; + const _89: Pair.Pair = { _0: at(3), _1: -9 }; + const args10: rt.Fmt[] = [(f: rt.Formatter) => Point.fmt$Debug(point, f), (f: rt.Formatter) => Pair.fmt$Debug(_89, f)]; + const _84: string = rt.fmtFormat([rt.fmtSpec({ width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "<", width: 4 }, args10[0]), "|", rt.fmtSpec({ alternate: true, width: 4 }, args10[0]), "|", rt.fmtSpec({ align: ">", width: 3 }, args10[1])]); put(out, _84); - _100 = { tag: "Empty" } as Kind.Kind; - _101 = { tag: "One", _0: at(4) } as Kind.Kind; - _105 = { tag: "Braced" } as Kind.Kind; - _106 = { tag: "Bare" } as Kind.Kind; - kinds = [_100, _101, _105, _106, { tag: "Many", count: 0, items: new rt.ByteVec() } as Kind.Kind]; - _118 = kinds[1]; - args12 = [(f: rt.Formatter) => rt.fmtList(kinds, f, (value: Kind.Kind, f: rt.Formatter) => Kind.fmt$Debug(value, f)), (f: rt.Formatter) => Kind.fmt$Debug(_118, f)]; - _112 = rt.fmtFormat([args12[0], " ", args12[1]]); + const _100: Kind.Kind = { tag: "Empty" }; + const _101: Kind.Kind = { tag: "One", _0: at(4) }; + const _105: Kind.Kind = { tag: "Braced" }; + const _106: Kind.Kind = { tag: "Bare" }; + const kinds: Kind.Kind[] = [_100, _101, _105, _106, { tag: "Many", count: 0, items: new rt.ByteVec() } as Kind.Kind]; + const _118: Kind.Kind = kinds[1]; + const args12: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtList(kinds, f, (value: Kind.Kind, f: rt.Formatter) => Kind.fmt$Debug(value, f)), (f: rt.Formatter) => Kind.fmt$Debug(_118, f)]; + const _112: string = rt.fmtFormat([args12[0], " ", args12[1]]); put(out, _112); const arg5 = ([kinds] as [Kind.Kind[]])[0]; - args14 = [(f: rt.Formatter) => rt.fmtList(arg5, f, (value: Kind.Kind, f: rt.Formatter) => Kind.fmt$Debug(value, f))]; - _130 = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args14[0])]); + const args14: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtList(arg5, f, (value: Kind.Kind, f: rt.Formatter) => Kind.fmt$Debug(value, f))]; + const _130: string = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args14[0])]); put(out, _130); - words = [at(5) as rt.u16, 65535]; - _153 = rt.sliceFirst(data); - _155 = rt.sliceGet(data, 100); - args16 = [(f: rt.Formatter) => rt.fmtList(data, f, rt.u8Display), (f: rt.Formatter) => rt.fmtList(words, f, rt.u16Display), (f: rt.Formatter) => rt.fmtOption(_153, f, rt.u8Display), (f: rt.Formatter) => rt.fmtOption(_155, f, rt.u8Display)]; - _148 = rt.fmtFormat([args16[0], " ", args16[1], " ", args16[2], " ", args16[3]]); + const words: rt.u16[] = [at(5) as rt.u16, 65535]; + const _153: rt.u8 | undefined = rt.sliceFirst(data); + const _155: rt.u8 | undefined = rt.sliceGet(data, 100); + const args16: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtList(data, f, rt.u8Display), (f: rt.Formatter) => rt.fmtList(words, f, rt.u16Display), (f: rt.Formatter) => rt.fmtOption(_153, f, rt.u8Display), (f: rt.Formatter) => rt.fmtOption(_155, f, rt.u8Display)]; + const _148: string = rt.fmtFormat([args16[0], " ", args16[1], " ", args16[2], " ", args16[3]]); put(out, _148); const arg6 = {}; - _177 = (f: rt.Formatter) => Braced.fmt$Debug(arg6, f); + const _177: rt.Fmt = (f: rt.Formatter) => Braced.fmt$Debug(arg6, f); const arg7 = {}; - _178 = (f: rt.Formatter) => Braced.fmt$Debug(arg7, f); + const _178: rt.Fmt = (f: rt.Formatter) => Braced.fmt$Debug(arg7, f); const arg8 = {}; - _179 = (f: rt.Formatter) => Bare.fmt$Debug(arg8, f); + const _179: rt.Fmt = (f: rt.Formatter) => Bare.fmt$Debug(arg8, f); const arg9 = {}; - args18 = [_177, _178, _179, (f: rt.Formatter) => Bare.fmt$Debug(arg9, f)]; - _168 = rt.fmtFormat([args18[0], " ", rt.fmtSpec({ alternate: true }, args18[1]), " ", args18[2], " ", rt.fmtSpec({ alternate: true }, args18[3])]); + const args18: rt.Fmt[] = [_177, _178, _179, (f: rt.Formatter) => Bare.fmt$Debug(arg9, f)]; + const _168: string = rt.fmtFormat([args18[0], " ", rt.fmtSpec({ alternate: true }, args18[1]), " ", args18[2], " ", rt.fmtSpec({ alternate: true }, args18[3])]); put(out, _168); rt.byteVecExtendFromSlice(out, Uint8Array.of(Braced.eq$PartialEq({}, {}) ? 1 : 0, Bare.eq$PartialEq({}, {}) ? 1 : 0)); } /** Written `Display` and `Debug`, and a `Display` that fails inside `format!`. */ export function written(data: Uint8Array, out: rt.ByteVec): void { - let at!: (a0: rt.usize) => rt.u8; - let hex!: Hex.Hex; - let _14!: string; - let args2!: rt.Fmt[]; - let _27!: string; - let _33!: string; - let args4!: rt.Fmt[]; - let manual!: Manual.Manual; - let empty!: Manual.Manual; - let _59!: string; - let args6!: rt.Fmt[]; - let seq!: Seq.Seq; - let none!: Seq.Seq; - let _85!: string; - let args8!: rt.Fmt[]; - let _97!: rt.u8; let _100!: rt.u8 | undefined; - let _113!: string; - let args10!: rt.Fmt[]; - let _131!: string; - let args12!: rt.Fmt[]; - let _143!: string; - let args14!: rt.Fmt[]; - let _157!: rt.Fmt; - let _158!: rt.Fmt; - at = (i: rt.usize): rt.u8 => { + const at: (a0: rt.usize) => rt.u8 = (i: rt.usize): rt.u8 => { return rt.optionUnwrapOr(rt.sliceGet(data, i), 0); }; - hex = { _0: rt.u32Mul(at(0) as rt.u32, 4097) }; - args2 = [(f: rt.Formatter) => Hex.fmt$Display(hex, f), (f: rt.Formatter) => Hex.fmt$Debug(hex, f)]; - _14 = rt.fmtFormat([args2[0], "|", rt.fmtSpec({ align: ">", width: 12 }, args2[0]), "|", rt.fmtSpec({ alternate: true }, args2[0]), "|", args2[1], "|", rt.fmtSpec({ align: ">", width: 6 }, args2[1]), "|", rt.fmtSpec({ alternate: true }, args2[1])]); + const hex: Hex.Hex = { _0: rt.u32Mul(at(0) as rt.u32, 4097) }; + const args2: rt.Fmt[] = [(f: rt.Formatter) => Hex.fmt$Display(hex, f), (f: rt.Formatter) => Hex.fmt$Debug(hex, f)]; + const _14: string = rt.fmtFormat([args2[0], "|", rt.fmtSpec({ align: ">", width: 12 }, args2[0]), "|", rt.fmtSpec({ alternate: true }, args2[0]), "|", args2[1], "|", rt.fmtSpec({ align: ">", width: 6 }, args2[1]), "|", rt.fmtSpec({ alternate: true }, args2[1])]); put(out, _14); - _27 = rt.fmtToString((f: rt.Formatter) => Hex.fmt$Display(hex, f)); + const _27: string = rt.fmtToString((f: rt.Formatter) => Hex.fmt$Display(hex, f)); put(out, _27); const arg = ([{ _0: "pad" }] as [Padded.Padded])[0]; - args4 = [(f: rt.Formatter) => Padded.fmt$Display(arg, f)]; - _33 = rt.fmtFormat([args4[0], "|", rt.fmtSpec({ align: ">", width: 6 }, args4[0]), "|", rt.fmtSpec({ fill: "_", align: "^", width: 9 }, args4[0]), "|", rt.fmtSpec({ width: 30 }, args4[0]), "|"]); + const args4: rt.Fmt[] = [(f: rt.Formatter) => Padded.fmt$Display(arg, f)]; + const _33: string = rt.fmtFormat([args4[0], "|", rt.fmtSpec({ align: ">", width: 6 }, args4[0]), "|", rt.fmtSpec({ fill: "_", align: "^", width: 9 }, args4[0]), "|", rt.fmtSpec({ width: 30 }, args4[0]), "|"]); put(out, _33); - manual = { id: at(1), list: rt.sliceToVec([1, at(2) as rt.u16]) }; - empty = { id: 0, list: [] }; - args6 = [(f: rt.Formatter) => Manual.fmt$Debug(manual, f), (f: rt.Formatter) => Manual.fmt$Debug(empty, f)]; - _59 = rt.fmtFormat([args6[0], " ", rt.fmtSpec({ alternate: true }, args6[0]), " ", args6[1]]); + const manual: Manual.Manual = { id: at(1), list: rt.sliceToVec([1, at(2) as rt.u16]) }; + const empty: Manual.Manual = { id: 0, list: [] }; + const args6: rt.Fmt[] = [(f: rt.Formatter) => Manual.fmt$Debug(manual, f), (f: rt.Formatter) => Manual.fmt$Debug(empty, f)]; + const _59: string = rt.fmtFormat([args6[0], " ", rt.fmtSpec({ alternate: true }, args6[0]), " ", args6[1]]); put(out, _59); - seq = { _0: rt.sliceToVec([{ _0: at(3), _1: 0 }, { _0: 1, _1: -1 }]) }; - none = { _0: [] }; - args8 = [(f: rt.Formatter) => Seq.fmt$Debug(seq, f), (f: rt.Formatter) => Seq.fmt$Debug(none, f)]; - _85 = rt.fmtFormat([args8[0], " ", rt.fmtSpec({ alternate: true }, args8[0]), " ", args8[1], " ", rt.fmtSpec({ alternate: true }, args8[1])]); + const seq: Seq.Seq = { _0: rt.sliceToVec([{ _0: at(3), _1: 0 }, { _0: 1, _1: -1 }]) }; + const none: Seq.Seq = { _0: [] }; + const args8: rt.Fmt[] = [(f: rt.Formatter) => Seq.fmt$Debug(seq, f), (f: rt.Formatter) => Seq.fmt$Debug(none, f)]; + const _85: string = rt.fmtFormat([args8[0], " ", rt.fmtSpec({ alternate: true }, args8[0]), " ", args8[1], " ", rt.fmtSpec({ alternate: true }, args8[1])]); put(out, _85); - _97 = at(4); + const _97: rt.u8 = at(4); if (!(rt.u8Rem(at(5), 2) === 0)) { _100 = undefined; } else { _100 = at(5); } const arg2 = ([{ _0: _97, _1: _100 }] as [Tup.Tup])[0]; - args10 = [(f: rt.Formatter) => Tup.fmt$Debug(arg2, f)]; - _113 = rt.fmtFormat([args10[0], " ", rt.fmtSpec({ alternate: true }, args10[0])]); + const args10: rt.Fmt[] = [(f: rt.Formatter) => Tup.fmt$Debug(arg2, f)]; + const _113: string = rt.fmtFormat([args10[0], " ", rt.fmtSpec({ alternate: true }, args10[0])]); put(out, _113); const arg3 = ([{ _0: at(6) & (~1 & 0xff) }] as [Fails.Fails])[0]; - args12 = [(f: rt.Formatter) => Fails.fmt$Display(arg3, f)]; - _131 = rt.fmtFormat([args12[0], " ", rt.fmtSpec({ align: ">", width: 9 }, args12[0])]); + const args12: rt.Fmt[] = [(f: rt.Formatter) => Fails.fmt$Display(arg3, f)]; + const _131: string = rt.fmtFormat([args12[0], " ", rt.fmtSpec({ align: ">", width: 9 }, args12[0])]); put(out, _131); [at(7), at(8), "named"] as [rt.u8, rt.u8, string]; const arg4 = at(8); - _157 = (f: rt.Formatter) => rt.u8Display(arg4, f); + const _157: rt.Fmt = (f: rt.Formatter) => rt.u8Display(arg4, f); const arg5 = at(7); - _158 = (f: rt.Formatter) => rt.u8Display(arg5, f); + const _158: rt.Fmt = (f: rt.Formatter) => rt.u8Display(arg5, f); const arg6 = at(7); - args14 = [_157, _158, (f: rt.Formatter) => rt.u8Display(arg6, f), (f: rt.Formatter) => rt.fmtPad(f, "named")]; - _143 = rt.fmtFormat([args14[0], " ", args14[1], " ", args14[2], " named ", rt.fmtSpec({ align: ">", width: 5 }, args14[3])]); + const args14: rt.Fmt[] = [_157, _158, (f: rt.Formatter) => rt.u8Display(arg6, f), (f: rt.Formatter) => rt.fmtPad(f, "named")]; + const _143: string = rt.fmtFormat([args14[0], " ", args14[1], " ", args14[2], " named ", rt.fmtSpec({ align: ">", width: 5 }, args14[3])]); put(out, _143); } /** Panics, each with the message native Rust formats. */ export function panics(kind: rt.u8, rest: Uint8Array, out: rt.ByteVec): void { - let n!: rt.u8; - let _7!: rt.u8; - let args2!: rt.Fmt[]; - let args4!: rt.Fmt[]; - let _27!: rt.Fmt; - let args6!: rt.Fmt[]; - let _39!: rt.Fmt; - let kind3!: string; - let _66!: rt.Arguments | undefined; - let args8!: rt.Fmt[]; let r!: rt.Result; - let _98!: string; - let _100!: rt.u8; let r2!: rt.Result; - let _108!: string; - let _110!: rt.u8; - let _119!: string; - let _121!: rt.u8; - let missing!: rt.u8 | undefined; - let _127!: string; - let _129!: rt.u8; - let _132!: string; - let args10!: rt.Fmt[]; - let _143!: string; - let args12!: rt.Fmt[]; - let _155!: string; - let _157!: Fails.Fails; - let args14!: rt.Fmt[]; - let _167!: rt.Fmt; - let start!: rt.usize; - let end!: rt.usize; - let _173!: [rt.usize, rt.usize]; - let _183!: string; - let _189!: Uint8Array; - let args16!: rt.Fmt[]; - let _196!: rt.Fmt; - let buf!: Uint8Array; - let _202!: Uint8Array; - let _211!: string; - let args18!: rt.Fmt[]; let r4!: rt.Result; - let _221!: rt.Result; - let s!: string; - let _225!: rt.u8; - let e!: rt.FromUtf8Error; - let _232!: string; - let _234!: rt.u8; - let buf2!: Uint8Array; - let dest!: rt.usize; - let _244!: Uint8Array; - let _258!: string; - let args20!: rt.Fmt[]; - let _269!: string; - let _271!: rt.usize; let r5!: rt.Result; - let _283!: string; - let args22!: rt.Fmt[]; - n = rt.optionUnwrapOr(rt.sliceFirst(rest), 0); - _7 = rt.u8Rem(kind, 20); + const n: rt.u8 = rt.optionUnwrapOr(rt.sliceFirst(rest), 0); + const _7: rt.u8 = rt.u8Rem(kind, 20); if (_7 === 0) { - args2 = [(f: rt.Formatter) => rt.u8Display(n, f), (f: rt.Formatter) => rt.fmtList(rest, f, rt.u8Display)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(n, f), (f: rt.Formatter) => rt.fmtList(rest, f, rt.u8Display)]; rt.panicFmt(["bad ", args2[0], ": ", args2[1]]); } else if (_7 === 1) { - _27 = (f: rt.Formatter) => rt.u8LowerHex(n, f); + const _27: rt.Fmt = (f: rt.Formatter) => rt.u8LowerHex(n, f); const arg14 = { _0: n as rt.u32 }; - args4 = [_27, (f: rt.Formatter) => Hex.fmt$Display(arg14, f)]; + const args4: rt.Fmt[] = [_27, (f: rt.Formatter) => Hex.fmt$Display(arg14, f)]; rt.panicFmt(["internal error: entered unreachable code: never ", rt.fmtSpec({ alternate: true }, args4[0]), " ", args4[1]]); } else if (_7 === 2) { if (!(n > 200)) { - _39 = (f: rt.Formatter) => rt.u8Display(n, f); + const _39: rt.Fmt = (f: rt.Formatter) => rt.u8Display(n, f); const arg13 = { _0: n, _1: 0 }; - args6 = [_39, (f: rt.Formatter) => Pair.fmt$Debug(arg13, f)]; + const args6: rt.Fmt[] = [_39, (f: rt.Formatter) => Pair.fmt$Debug(arg13, f)]; rt.panicFmt(["small ", args6[0], " ", args6[1]]); } } else if (_7 === 3) { @@ -646,9 +416,9 @@ export function panics(kind: rt.u8, rest: Uint8Array, out: rt.ByteVec): void { } else if (_7 === 5) { if (Pair.eq$PartialEq({ _0: n, _1: 1 }, { _0: n, _1: 1 })) { const arg10 = ([n] as [rt.u8])[0]; - kind3 = "!="; - args8 = [(f: rt.Formatter) => rt.u8Display(arg10, f)]; - _66 = ["same ", args8[0]]; + const kind3: string = "!="; + const args8: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg10, f)]; + const _66: rt.Arguments | undefined = ["same ", args8[0]]; const arg11 = { _0: n, _1: 1 }; const arg12 = { _0: n, _1: 1 }; rt.assertFailed(kind3, (f: rt.Formatter) => Pair.fmt$Debug(arg11, f), (f: rt.Formatter) => Pair.fmt$Debug(arg12, f), _66); @@ -663,8 +433,8 @@ export function panics(kind: rt.u8, rest: Uint8Array, out: rt.ByteVec): void { } else { r = rt.Err({ tag: "Many", count: 1, items: rt.sliceToByteVec(Uint8Array.of(n)) } as Kind.Kind); } - _100 = rt.resultUnwrap(r, (value: Kind.Kind, f: rt.Formatter) => Kind.fmt$Debug(value, f)); - _98 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_100, f)); + const _100: rt.u8 = rt.resultUnwrap(r, (value: Kind.Kind, f: rt.Formatter) => Kind.fmt$Debug(value, f)); + const _98: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_100, f)); put(out, _98); } else if (_7 === 8) { if (!(n > 128)) { @@ -672,85 +442,85 @@ export function panics(kind: rt.u8, rest: Uint8Array, out: rt.ByteVec): void { } else { r2 = rt.Ok(n); } - _110 = rt.resultExpect(r2, "expected a byte", (value: Pair.Pair, f: rt.Formatter) => Pair.fmt$Debug(value, f)); - _108 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_110, f)); + const _110: rt.u8 = rt.resultExpect(r2, "expected a byte", (value: Pair.Pair, f: rt.Formatter) => Pair.fmt$Debug(value, f)); + const _108: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_110, f)); put(out, _108); } else if (_7 === 9) { - _121 = rt.resultUnwrapErr(rt.Ok({ x: n as rt.i32, y: 0 }), (value: Point.Point, f: rt.Formatter) => Point.fmt$Debug(value, f)); - _119 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_121, f)); + const _121: rt.u8 = rt.resultUnwrapErr(rt.Ok({ x: n as rt.i32, y: 0 }), (value: Point.Point, f: rt.Formatter) => Point.fmt$Debug(value, f)); + const _119: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_121, f)); put(out, _119); } else if (_7 === 10) { - missing = rt.sliceGet(rest, 200); + const missing: rt.u8 | undefined = rt.sliceGet(rest, 200); const arg9 = ([n] as [rt.u8])[0]; - args10 = [(f: rt.Formatter) => rt.u8Display(arg9, f)]; - _132 = rt.fmtFormat(["missing ", args10[0]]); - _129 = rt.optionExpect(missing, _132); - _127 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_129, f)); + const args10: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg9, f)]; + const _132: string = rt.fmtFormat(["missing ", args10[0]]); + const _129: rt.u8 = rt.optionExpect(missing, _132); + const _127: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_129, f)); put(out, _127); } else if (_7 === 11) { const arg8 = ([{ _0: n }] as [Fails.Fails])[0]; - args12 = [(f: rt.Formatter) => Fails.fmt$Display(arg8, f)]; - _143 = rt.fmtFormat([args12[0]]); + const args12: rt.Fmt[] = [(f: rt.Formatter) => Fails.fmt$Display(arg8, f)]; + const _143: string = rt.fmtFormat([args12[0]]); put(out, _143); } else if (_7 === 12) { - _157 = { _0: n }; - _155 = rt.fmtToString((f: rt.Formatter) => Fails.fmt$Display(_157, f)); + const _157: Fails.Fails = { _0: n }; + const _155: string = rt.fmtToString((f: rt.Formatter) => Fails.fmt$Display(_157, f)); put(out, _155); } else if (_7 === 13) { const arg6 = { _0: n as rt.u32 }; - _167 = (f: rt.Formatter) => Hex.fmt$Display(arg6, f); + const _167: rt.Fmt = (f: rt.Formatter) => Hex.fmt$Display(arg6, f); const arg7 = { _0: n }; - args14 = [_167, (f: rt.Formatter) => Fails.fmt$Display(arg7, f)]; + const args14: rt.Fmt[] = [_167, (f: rt.Formatter) => Fails.fmt$Display(arg7, f)]; rt.panicFmt([args14[0], " then ", args14[1]]); } else if (_7 === 14) { - _173 = [rt.u8Rem(n, 8) as rt.usize, rt.u8Div(n, 32) as rt.usize] as [rt.usize, rt.usize]; - start = _173[0]; - end = _173[1]; - _189 = rt.sliceRange(rest, start); + const _173: [rt.usize, rt.usize] = [rt.u8Rem(n, 8) as rt.usize, rt.u8Div(n, 32) as rt.usize]; + const start: rt.usize = _173[0]; + const end: rt.usize = _173[1]; + const _189: Uint8Array = rt.sliceRange(rest, start); [_189, rt.sliceRange(rest, start, end)] as [Uint8Array, Uint8Array]; - _196 = (f: rt.Formatter) => rt.fmtList(_189, f, rt.u8Display); + const _196: rt.Fmt = (f: rt.Formatter) => rt.fmtList(_189, f, rt.u8Display); const arg5 = rt.sliceRange(rest, start, end); - args16 = [_196, (f: rt.Formatter) => rt.fmtList(arg5, f, rt.u8Display)]; - _183 = rt.fmtFormat([args16[0], " ", args16[1]]); + const args16: rt.Fmt[] = [_196, (f: rt.Formatter) => rt.fmtList(arg5, f, rt.u8Display)]; + const _183: string = rt.fmtFormat([args16[0], " ", args16[1]]); put(out, _183); } else if (_7 === 15) { - buf = rt.bytes(3); - _202 = buf; + const buf: Uint8Array = rt.bytes(3); + const _202: Uint8Array = buf; const part3 = rt.min(rest.length, 4); rt.sliceCopyFromSlice(_202, rt.sliceRange(rest, 0, part3)); const arg4 = ([buf] as [Uint8Array])[0]; - args18 = [(f: rt.Formatter) => rt.fmtList(arg4, f, rt.u8Display)]; - _211 = rt.fmtFormat([args18[0]]); + const args18: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtList(arg4, f, rt.u8Display)]; + const _211: string = rt.fmtFormat([args18[0]]); put(out, _211); } else if (_7 === 16) { - _221 = rt.stringFromUtf8(rt.sliceToByteVec(rest)); + const _221: rt.Result = rt.stringFromUtf8(rt.sliceToByteVec(rest)); if (_221.ok) { - s = _221.value; - _225 = rt.stringLen(s) & 0xff; + const s: string = _221.value; + const _225: rt.u8 = rt.stringLen(s) & 0xff; r4 = rt.Ok(_225); } else { - e = _221.error; + const e: rt.FromUtf8Error = _221.error; r4 = rt.Err(e); } - _234 = rt.resultUnwrap(r4, rt.fmtFromUtf8ErrorDebug); - _232 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_234, f)); + const _234: rt.u8 = rt.resultUnwrap(r4, rt.fmtFromUtf8ErrorDebug); + const _232: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_234, f)); put(out, _232); } else if (_7 === 17) { - buf2 = Uint8Array.of(1, 2, 3, 4); + const buf2: Uint8Array = Uint8Array.of(1, 2, 3, 4); const part = rt.u8Rem(n, 6) as rt.usize; const part2 = rt.u8Rem(rt.u8Div(n, 6), 6) as rt.usize; - dest = rt.usizeRem(rt.optionUnwrapOr(rt.sliceGet(rest, 1), 0) as rt.usize, 4); - _244 = buf2; + const dest: rt.usize = rt.usizeRem(rt.optionUnwrapOr(rt.sliceGet(rest, 1), 0) as rt.usize, 4); + const _244: Uint8Array = buf2; rt.sliceCopyWithin(_244, part, part2, dest); const arg3 = ([buf2] as [Uint8Array])[0]; - args20 = [(f: rt.Formatter) => rt.fmtList(arg3, f, rt.u8Display)]; - _258 = rt.fmtFormat([args20[0]]); + const args20: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtList(arg3, f, rt.u8Display)]; + const _258: string = rt.fmtFormat([args20[0]]); put(out, _258); } else if (_7 === 18) { - _271 = rt.u8Rem(n, 8) as rt.usize; + const _271: rt.usize = rt.u8Rem(n, 8) as rt.usize; rt.idx(rest, _271); const arg2 = rest[_271]; - _269 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(arg2, f)); + const _269: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(arg2, f)); put(out, _269); } else { if (!(rt.u8Rem(n, 2) === 0)) { @@ -759,8 +529,8 @@ export function panics(kind: rt.u8, rest: Uint8Array, out: rt.ByteVec): void { r5 = rt.Err(n); } const arg = ([rt.resultUnwrapErr(r5, rt.u8Display)] as [rt.u8])[0]; - args22 = [(f: rt.Formatter) => rt.u8Display(arg, f)]; - _283 = rt.fmtFormat([args22[0]]); + const args22: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg, f)]; + const _283: string = rt.fmtFormat([args22[0]]); put(out, _283); } } diff --git a/ts/fixtures/lang/expected/generics.Either.ts b/ts/fixtures/lang/expected/generics.Either.ts index 45c81fcea..55812552c 100644 --- a/ts/fixtures/lang/expected/generics.Either.ts +++ b/ts/fixtures/lang/expected/generics.Either.ts @@ -4,60 +4,45 @@ import * as rt from "./rt.ts"; import * as Point from "./shapes.Point.ts"; export function fmt$Debug_Point_u8(self: Either, f: rt.Formatter): rt.Result { - let _5!: string; - let _6!: rt.Fmt; - let _9!: string; - let _10!: string; - let _11!: rt.Fmt; if (self.tag === "Left") { - _5 = "Left"; - _6 = (f: rt.Formatter) => Point.fmt$Debug(self._0, f); + const _5: string = "Left"; + const _6: rt.Fmt = (f: rt.Formatter) => Point.fmt$Debug(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _5), _6)); } if (self.tag === "Right") { - _9 = "Right"; - _10 = "value"; - _11 = (f: rt.Formatter) => rt.u8Display(self.value, f); + const _9: string = "Right"; + const _10: string = "value"; + const _11: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self.value, f); return rt.debugStructFinish(rt.debugStructField(rt.fmtDebugStruct(f, _9), _10, _11)); } return rt.fmtWriteStr(f, "Neither"); } export function fmt$Debug_u8_Point(self: Either, f: rt.Formatter): rt.Result { - let _5!: string; - let _6!: rt.Fmt; - let _9!: string; - let _10!: string; - let _11!: rt.Fmt; if (self.tag === "Left") { - _5 = "Left"; - _6 = (f: rt.Formatter) => rt.u8Display(self._0, f); + const _5: string = "Left"; + const _6: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _5), _6)); } if (self.tag === "Right") { - _9 = "Right"; - _10 = "value"; - _11 = (f: rt.Formatter) => Point.fmt$Debug(self.value, f); + const _9: string = "Right"; + const _10: string = "value"; + const _11: rt.Fmt = (f: rt.Formatter) => Point.fmt$Debug(self.value, f); return rt.debugStructFinish(rt.debugStructField(rt.fmtDebugStruct(f, _9), _10, _11)); } return rt.fmtWriteStr(f, "Neither"); } export function fmt$Debug_u8_u16(self: Either, f: rt.Formatter): rt.Result { - let _5!: string; - let _6!: rt.Fmt; - let _9!: string; - let _10!: string; - let _11!: rt.Fmt; if (self.tag === "Left") { - _5 = "Left"; - _6 = (f: rt.Formatter) => rt.u8Display(self._0, f); + const _5: string = "Left"; + const _6: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self._0, f); return rt.debugTupleFinish(rt.debugTupleField(rt.fmtDebugTuple(f, _5), _6)); } if (self.tag === "Right") { - _9 = "Right"; - _10 = "value"; - _11 = (f: rt.Formatter) => rt.u16Display(self.value, f); + const _9: string = "Right"; + const _10: string = "value"; + const _11: rt.Fmt = (f: rt.Formatter) => rt.u16Display(self.value, f); return rt.debugStructFinish(rt.debugStructField(rt.fmtDebugStruct(f, _9), _10, _11)); } return rt.fmtWriteStr(f, "Neither"); diff --git a/ts/fixtures/lang/expected/generics.Tagged.ts b/ts/fixtures/lang/expected/generics.Tagged.ts index eb3cf6c88..32edc8610 100644 --- a/ts/fixtures/lang/expected/generics.Tagged.ts +++ b/ts/fixtures/lang/expected/generics.Tagged.ts @@ -5,20 +5,13 @@ import * as Either from "./generics.Either.ts"; import * as Wrap from "./generics.Wrap.ts"; export function fmt$Debug_Either_u8_u16_i16(self: Tagged, rt.i16>, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: string; - let _5!: rt.Fmt; - let _7!: string; - let _8!: rt.Fmt; - let _10!: string; - let _11!: rt.Fmt; - _3 = "Tagged"; - _4 = "key"; - _5 = (f: rt.Formatter) => Either.fmt$Debug_u8_u16(self.key, f); - _7 = "inner"; - _8 = (f: rt.Formatter) => Wrap.fmt$Debug_i16(self.inner, f); - _10 = "all"; - _11 = (f: rt.Formatter) => rt.fmtList(self.all, f, (value: Wrap.Wrap, f: rt.Formatter) => Wrap.fmt$Debug_i16(value, f)); + const _3: string = "Tagged"; + const _4: string = "key"; + const _5: rt.Fmt = (f: rt.Formatter) => Either.fmt$Debug_u8_u16(self.key, f); + const _7: string = "inner"; + const _8: rt.Fmt = (f: rt.Formatter) => Wrap.fmt$Debug_i16(self.inner, f); + const _10: string = "all"; + const _11: rt.Fmt = (f: rt.Formatter) => rt.fmtList(self.all, f, (value: Wrap.Wrap, f: rt.Formatter) => Wrap.fmt$Debug_i16(value, f)); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _3), _4, _5), _7, _8), _10, _11)); } diff --git a/ts/fixtures/lang/expected/generics.Wrap.ts b/ts/fixtures/lang/expected/generics.Wrap.ts index a63722570..648aa9f7b 100644 --- a/ts/fixtures/lang/expected/generics.Wrap.ts +++ b/ts/fixtures/lang/expected/generics.Wrap.ts @@ -7,128 +7,83 @@ import * as Point from "./shapes.Point.ts"; import * as Shape from "./shapes.Shape.ts"; export function fmt$Debug_Option_u8(self: Wrap, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: string; - let _5!: rt.Fmt; - let _7!: string; - let _8!: rt.Fmt; - _3 = "Wrap"; - _4 = "value"; - _5 = (f: rt.Formatter) => rt.fmtOption(self.value, f, rt.u8Display); - _7 = "count"; - _8 = (f: rt.Formatter) => rt.u8Display(self.count, f); + const _3: string = "Wrap"; + const _4: string = "value"; + const _5: rt.Fmt = (f: rt.Formatter) => rt.fmtOption(self.value, f, rt.u8Display); + const _7: string = "count"; + const _8: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self.count, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _3), _4, _5), _7, _8)); } export function fmt$Debug_Pair(self: Wrap, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: string; - let _5!: rt.Fmt; - let _7!: string; - let _8!: rt.Fmt; - _3 = "Wrap"; - _4 = "value"; - _5 = (f: rt.Formatter) => Pair.fmt$Debug(self.value, f); - _7 = "count"; - _8 = (f: rt.Formatter) => rt.u8Display(self.count, f); + const _3: string = "Wrap"; + const _4: string = "value"; + const _5: rt.Fmt = (f: rt.Formatter) => Pair.fmt$Debug(self.value, f); + const _7: string = "count"; + const _8: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self.count, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _3), _4, _5), _7, _8)); } export function fmt$Debug_Point(self: Wrap, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: string; - let _5!: rt.Fmt; - let _7!: string; - let _8!: rt.Fmt; - _3 = "Wrap"; - _4 = "value"; - _5 = (f: rt.Formatter) => Point.fmt$Debug(self.value, f); - _7 = "count"; - _8 = (f: rt.Formatter) => rt.u8Display(self.count, f); + const _3: string = "Wrap"; + const _4: string = "value"; + const _5: rt.Fmt = (f: rt.Formatter) => Point.fmt$Debug(self.value, f); + const _7: string = "count"; + const _8: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self.count, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _3), _4, _5), _7, _8)); } export function fmt$Debug_Result_u8_Shape(self: Wrap>, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: string; - let _5!: rt.Fmt; - let _7!: string; - let _8!: rt.Fmt; - _3 = "Wrap"; - _4 = "value"; - _5 = (f: rt.Formatter) => rt.fmtResult(self.value, f, rt.u8Display, (value: Shape.Shape, f: rt.Formatter) => Shape.fmt$Debug(value, f)); - _7 = "count"; - _8 = (f: rt.Formatter) => rt.u8Display(self.count, f); + const _3: string = "Wrap"; + const _4: string = "value"; + const _5: rt.Fmt = (f: rt.Formatter) => rt.fmtResult(self.value, f, rt.u8Display, (value: Shape.Shape, f: rt.Formatter) => Shape.fmt$Debug(value, f)); + const _7: string = "count"; + const _8: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self.count, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _3), _4, _5), _7, _8)); } export function fmt$Debug_Shape(self: Wrap, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: string; - let _5!: rt.Fmt; - let _7!: string; - let _8!: rt.Fmt; - _3 = "Wrap"; - _4 = "value"; - _5 = (f: rt.Formatter) => Shape.fmt$Debug(self.value, f); - _7 = "count"; - _8 = (f: rt.Formatter) => rt.u8Display(self.count, f); + const _3: string = "Wrap"; + const _4: string = "value"; + const _5: rt.Fmt = (f: rt.Formatter) => Shape.fmt$Debug(self.value, f); + const _7: string = "count"; + const _8: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self.count, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _3), _4, _5), _7, _8)); } export function fmt$Debug_Vec_u16(self: Wrap, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: string; - let _5!: rt.Fmt; - let _7!: string; - let _8!: rt.Fmt; - _3 = "Wrap"; - _4 = "value"; - _5 = (f: rt.Formatter) => rt.fmtList(self.value, f, rt.u16Display); - _7 = "count"; - _8 = (f: rt.Formatter) => rt.u8Display(self.count, f); + const _3: string = "Wrap"; + const _4: string = "value"; + const _5: rt.Fmt = (f: rt.Formatter) => rt.fmtList(self.value, f, rt.u16Display); + const _7: string = "count"; + const _8: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self.count, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _3), _4, _5), _7, _8)); } export function fmt$Debug_Wrap_Pair(self: Wrap>, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: string; - let _5!: rt.Fmt; - let _7!: string; - let _8!: rt.Fmt; - _3 = "Wrap"; - _4 = "value"; - _5 = (f: rt.Formatter) => fmt$Debug_Pair(self.value, f); - _7 = "count"; - _8 = (f: rt.Formatter) => rt.u8Display(self.count, f); + const _3: string = "Wrap"; + const _4: string = "value"; + const _5: rt.Fmt = (f: rt.Formatter) => fmt$Debug_Pair(self.value, f); + const _7: string = "count"; + const _8: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self.count, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _3), _4, _5), _7, _8)); } export function fmt$Debug_i16(self: Wrap, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: string; - let _5!: rt.Fmt; - let _7!: string; - let _8!: rt.Fmt; - _3 = "Wrap"; - _4 = "value"; - _5 = (f: rt.Formatter) => rt.i16Display(self.value, f); - _7 = "count"; - _8 = (f: rt.Formatter) => rt.u8Display(self.count, f); + const _3: string = "Wrap"; + const _4: string = "value"; + const _5: rt.Fmt = (f: rt.Formatter) => rt.i16Display(self.value, f); + const _7: string = "count"; + const _8: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self.count, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _3), _4, _5), _7, _8)); } export function fmt$Debug_u8(self: Wrap, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: string; - let _5!: rt.Fmt; - let _7!: string; - let _8!: rt.Fmt; - _3 = "Wrap"; - _4 = "value"; - _5 = (f: rt.Formatter) => rt.u8Display(self.value, f); - _7 = "count"; - _8 = (f: rt.Formatter) => rt.u8Display(self.count, f); + const _3: string = "Wrap"; + const _4: string = "value"; + const _5: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self.value, f); + const _7: string = "count"; + const _8: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self.count, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _3), _4, _5), _7, _8)); } diff --git a/ts/fixtures/lang/expected/generics.ts b/ts/fixtures/lang/expected/generics.ts index 05ae75ddb..2c01b1f33 100644 --- a/ts/fixtures/lang/expected/generics.ts +++ b/ts/fixtures/lang/expected/generics.ts @@ -12,59 +12,23 @@ import type * as Shape from "./shapes.Shape.ts"; /** Each method once per instance: `Wrap` of a struct, an enum, a number, and itself. */ export function methods(data: Uint8Array, out: rt.ByteVec): void { - let at!: (a0: rt.usize) => rt.u8; - let point!: Wrap.Wrap; - let byte!: Wrap.Wrap; - let nested!: Wrap.Wrap>; - let meters!: Wrap.Wrap; - let shape!: Wrap.Wrap; - let _46!: string; - let args2!: rt.Fmt[]; - let _64!: string; - let args4!: rt.Fmt[]; - let mapped!: Wrap.Wrap; - let _111!: string; - let _119!: Wrap.Wrap; - let args6!: rt.Fmt[]; - let _126!: rt.Fmt; - let iter!: rt.Iter>; - let _140!: Either.Either | rt.Done; - let either!: Either.Either; - let flipped!: Either.Either; - let _148!: string; - let args8!: rt.Fmt[]; - let _161!: rt.Fmt; - let _162!: rt.Fmt; - let _163!: rt.Fmt; - let list!: Wrap.Wrap; - let _171!: rt.u16; - let none!: Wrap.Wrap; - let some!: Wrap.Wrap; - let err!: Wrap.Wrap>; - let _188!: string; - let _193!: rt.u8; - let args10!: rt.Fmt[]; - let tagged!: Tagged.Tagged, rt.i16>; - let _232!: string; - let args12!: rt.Fmt[]; - let _241!: rt.Fmt; - at = (i: rt.usize): rt.u8 => { + const at: (a0: rt.usize) => rt.u8 = (i: rt.usize): rt.u8 => { return rt.optionUnwrapOr(rt.sliceGet(data, i), 0); }; - point = rt.copy(Wrap.new$Point({ x: at(0) as rt.i32, y: -2 })); + const point: Wrap.Wrap = rt.copy(Wrap.new$Point({ x: at(0) as rt.i32, y: -2 })); Wrap.bump$Point(point); - byte = rt.copy(Wrap.new$u8(at(1))); + const byte: Wrap.Wrap = rt.copy(Wrap.new$u8(at(1))); Wrap.bump$u8(byte); Wrap.bump$u8(byte); - nested = Wrap.new$Wrap_Pair(Wrap.new$Pair({ _0: at(2), _1: -3 })); - meters = new Wrap.Wrap({ value: { _0: at(3) as rt.u64 }, count: at(4) }); - shape = Wrap.new$Shape({ tag: "Rect", corner: Wrap.intoInner$Point(point), width: at(5) as rt.u16, height: 3 } as Shape.Shape); - args2 = [(f: rt.Formatter) => Wrap.fmt$Debug_Point(point, f), (f: rt.Formatter) => Wrap.fmt$Debug_u8(byte, f), (f: rt.Formatter) => Wrap.fmt$Debug_Wrap_Pair(nested, f), (f: rt.Formatter) => Wrap.fmt$Debug_Shape(shape, f)]; - _46 = rt.fmtFormat([args2[0], " ", args2[1], " ", args2[2], " ", args2[3]]); + const nested: Wrap.Wrap> = Wrap.new$Wrap_Pair(Wrap.new$Pair({ _0: at(2), _1: -3 })); + const meters: Wrap.Wrap = new Wrap.Wrap({ value: { _0: at(3) as rt.u64 }, count: at(4) }); + const shape: Wrap.Wrap = Wrap.new$Shape({ tag: "Rect", corner: Wrap.intoInner$Point(point), width: at(5) as rt.u16, height: 3 } as Shape.Shape); + const args2: rt.Fmt[] = [(f: rt.Formatter) => Wrap.fmt$Debug_Point(point, f), (f: rt.Formatter) => Wrap.fmt$Debug_u8(byte, f), (f: rt.Formatter) => Wrap.fmt$Debug_Wrap_Pair(nested, f), (f: rt.Formatter) => Wrap.fmt$Debug_Shape(shape, f)]; + const _46: string = rt.fmtFormat([args2[0], " ", args2[1], " ", args2[2], " ", args2[3]]); put(out, _46); const arg = ([nested] as [Wrap.Wrap>])[0]; - args4 = [(f: rt.Formatter) => Wrap.fmt$Debug_Wrap_Pair(arg, f)]; - _64 = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args4[0])]); + const args4: rt.Fmt[] = [(f: rt.Formatter) => Wrap.fmt$Debug_Wrap_Pair(arg, f)]; + const _64: string = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args4[0])]); put(out, _64); rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(Wrap.double$u8(byte))); rt.byteVecPush(out, Wrap.get$u8(byte)); @@ -73,54 +37,53 @@ export function methods(data: Uint8Array, out: rt.ByteVec): void { rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(Wrap.scaled$Shape(shape))); Wrap.describe$Area_Meters(meters, out); Wrap.describe$Area_Shape(shape, out); - mapped = Wrap.map$u8_Pair_methods_closure1(byte, (b: rt.u8): Pair.Pair => { + const mapped: Wrap.Wrap = Wrap.map$u8_Pair_methods_closure1(byte, (b: rt.u8): Pair.Pair => { return { _0: b, _1: at(6) as rt.i64 }; }); - _119 = Wrap.new$Pair({ _0: at(1), _1: 0 }); + const _119: Wrap.Wrap = Wrap.new$Pair({ _0: at(1), _1: 0 }); [Wrap.eq$PartialEq_Pair(mapped, _119), mapped] as [boolean, Wrap.Wrap]; - _126 = (f: rt.Formatter) => Wrap.fmt$Debug_Pair(mapped, f); + const _126: rt.Fmt = (f: rt.Formatter) => Wrap.fmt$Debug_Pair(mapped, f); const arg2 = Wrap.eq$PartialEq_Pair(mapped, _119); - args6 = [_126, (f: rt.Formatter) => rt.fmtBool(arg2, f)]; - _111 = rt.fmtFormat([args6[0], " ", args6[1]]); + const args6: rt.Fmt[] = [_126, (f: rt.Formatter) => rt.fmtBool(arg2, f)]; + const _111: string = rt.fmtFormat([args6[0], " ", args6[1]]); put(out, _111); - iter = rt.iterSlice([{ tag: "Left", _0: at(7) } as Either.Either, { tag: "Right", value: Point.new(1, -1) } as Either.Either, { tag: "Neither" } as Either.Either]); + const iter: rt.Iter> = rt.iterSlice([{ tag: "Left", _0: at(7) } as Either.Either, { tag: "Right", value: Point.new(1, -1) } as Either.Either, { tag: "Neither" } as Either.Either]); while (true) { - _140 = iter.next(); + const _140: Either.Either | rt.Done = iter.next(); if (_140 === rt.DONE) { - list = new Wrap.Wrap({ value: [], count: 1 }); - _171 = at(10) as rt.u16; + const list: Wrap.Wrap = new Wrap.Wrap({ value: [], count: 1 }); + const _171: rt.u16 = at(10) as rt.u16; list.value.push(_171); Wrap.bump$Vec_u16(list); - none = new Wrap.Wrap({ value: undefined, count: 0 }); - some = Wrap.new$Option_u8(rt.sliceGet(data, 11)); - err = new Wrap.Wrap({ value: rt.Err({ tag: "Dot" } as Shape.Shape), count: 2 }); - _193 = rt.optionUnwrapOr(Wrap.get$Option_u8(none), some.count); - args10 = [(f: rt.Formatter) => Wrap.fmt$Debug_Vec_u16(list, f), (f: rt.Formatter) => Wrap.fmt$Debug_Option_u8(none, f), (f: rt.Formatter) => Wrap.fmt$Debug_Option_u8(some, f), (f: rt.Formatter) => Wrap.fmt$Debug_Result_u8_Shape(err, f), (f: rt.Formatter) => rt.u8Display(_193, f)]; - _188 = rt.fmtFormat([args10[0], " ", args10[1], " ", args10[2], " ", args10[3], " ", args10[4]]); + const none: Wrap.Wrap = new Wrap.Wrap({ value: undefined, count: 0 }); + const some: Wrap.Wrap = Wrap.new$Option_u8(rt.sliceGet(data, 11)); + const err: Wrap.Wrap> = new Wrap.Wrap({ value: rt.Err({ tag: "Dot" } as Shape.Shape), count: 2 }); + const _193: rt.u8 = rt.optionUnwrapOr(Wrap.get$Option_u8(none), some.count); + const args10: rt.Fmt[] = [(f: rt.Formatter) => Wrap.fmt$Debug_Vec_u16(list, f), (f: rt.Formatter) => Wrap.fmt$Debug_Option_u8(none, f), (f: rt.Formatter) => Wrap.fmt$Debug_Option_u8(some, f), (f: rt.Formatter) => Wrap.fmt$Debug_Result_u8_Shape(err, f), (f: rt.Formatter) => rt.u8Display(_193, f)]; + const _188: string = rt.fmtFormat([args10[0], " ", args10[1], " ", args10[2], " ", args10[3], " ", args10[4]]); put(out, _188); - tagged = new Tagged.Tagged({ key: { tag: "Right", value: 500 } as Either.Either, inner: Wrap.new$i16(rt.i16Sub(at(8) as rt.i16, 100)), all: rt.sliceToVec([Wrap.new$i16(-1), Wrap.new$i16(at(9) as rt.i16)]) }); + const tagged: Tagged.Tagged, rt.i16> = new Tagged.Tagged({ key: { tag: "Right", value: 500 } as Either.Either, inner: Wrap.new$i16(rt.i16Sub(at(8) as rt.i16, 100)), all: rt.sliceToVec([Wrap.new$i16(-1), Wrap.new$i16(at(9) as rt.i16)]) }); [Tagged.first$Either_u8_u16_i16(tagged), tagged] as [Wrap.Wrap | undefined, Tagged.Tagged, rt.i16>]; - _241 = (f: rt.Formatter) => Tagged.fmt$Debug_Either_u8_u16_i16(tagged, f); + const _241: rt.Fmt = (f: rt.Formatter) => Tagged.fmt$Debug_Either_u8_u16_i16(tagged, f); const arg5 = Tagged.first$Either_u8_u16_i16(tagged); - args12 = [_241, (f: rt.Formatter) => rt.fmtOption(arg5, f, (value: Wrap.Wrap, f: rt.Formatter) => Wrap.fmt$Debug_i16(value, f))]; - _232 = rt.fmtFormat([args12[0], " ", args12[1]]); + const args12: rt.Fmt[] = [_241, (f: rt.Formatter) => rt.fmtOption(arg5, f, (value: Wrap.Wrap, f: rt.Formatter) => Wrap.fmt$Debug_i16(value, f))]; + const _232: string = rt.fmtFormat([args12[0], " ", args12[1]]); put(out, _232); rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(tagged.inner.value)); rt.byteVecPush(out, rt.optionUnwrapOr(Either.left$u8_u16(tagged.key), 0)); return; - } else { - either = _140; - flipped = Either.flip$u8_Point(either); - [Either.left$u8_Point(either), Either.left$Point_u8(flipped), either, flipped] as [rt.u8 | undefined, Point.Point | undefined, Either.Either, Either.Either]; - _161 = (f: rt.Formatter) => Either.fmt$Debug_u8_Point(either, f); - _162 = (f: rt.Formatter) => Either.fmt$Debug_Point_u8(flipped, f); - const arg3 = Either.left$u8_Point(either); - _163 = (f: rt.Formatter) => rt.fmtOption(arg3, f, rt.u8Display); - const arg4 = Either.left$Point_u8(flipped); - args8 = [_161, _162, _163, (f: rt.Formatter) => rt.fmtOption(arg4, f, (value: Point.Point, f: rt.Formatter) => Point.fmt$Debug(value, f))]; - _148 = rt.fmtFormat([args8[0], " ", rt.fmtSpec({ alternate: true }, args8[1]), " ", args8[2], " ", args8[3]]); - put(out, _148); } + const either: Either.Either = _140; + const flipped: Either.Either = Either.flip$u8_Point(either); + [Either.left$u8_Point(either), Either.left$Point_u8(flipped), either, flipped] as [rt.u8 | undefined, Point.Point | undefined, Either.Either, Either.Either]; + const _161: rt.Fmt = (f: rt.Formatter) => Either.fmt$Debug_u8_Point(either, f); + const _162: rt.Fmt = (f: rt.Formatter) => Either.fmt$Debug_Point_u8(flipped, f); + const arg3 = Either.left$u8_Point(either); + const _163: rt.Fmt = (f: rt.Formatter) => rt.fmtOption(arg3, f, rt.u8Display); + const arg4 = Either.left$Point_u8(flipped); + const args8: rt.Fmt[] = [_161, _162, _163, (f: rt.Formatter) => rt.fmtOption(arg4, f, (value: Point.Point, f: rt.Formatter) => Point.fmt$Debug(value, f))]; + const _148: string = rt.fmtFormat([args8[0], " ", rt.fmtSpec({ alternate: true }, args8[1]), " ", args8[2], " ", args8[3]]); + put(out, _148); } } diff --git a/ts/fixtures/lang/expected/harness.ts b/ts/fixtures/lang/expected/harness.ts index 78f0fb31c..6fbd92139 100644 --- a/ts/fixtures/lang/expected/harness.ts +++ b/ts/fixtures/lang/expected/harness.ts @@ -10,21 +10,14 @@ import { copies, order, discriminants, loops, patterns, closures, library } from /** Run one case. */ export function run(input: Uint8Array): rt.ByteVec { - let out!: rt.ByteVec; - let op!: rt.u8; - let kind!: rt.u8; - let _10!: [rt.u8, rt.u8]; - let _14!: rt.u8; - let _28!: rt.u8; - let _36!: [rt.u8, Uint8Array] | undefined; - out = new rt.ByteVec(); + const out: rt.ByteVec = new rt.ByteVec(); if (!(input.length >= 2)) { return out; } - _10 = [input[0], input[1]] as [rt.u8, rt.u8]; - op = _10[0]; - kind = _10[1]; - _14 = rt.u8Rem(op, 38); + const _10: [rt.u8, rt.u8] = [input[0], input[1]]; + const op: rt.u8 = _10[0]; + const kind: rt.u8 = _10[1]; + const _14: rt.u8 = rt.u8Rem(op, 38); if (_14 === 0) { u8Op(kind, input.subarray(2, input.length - 0), out); } else if (_14 === 1) { @@ -50,7 +43,7 @@ export function run(input: Uint8Array): rt.ByteVec { } else if (_14 === 11) { isizeOp(kind, input.subarray(2, input.length - 0), out); } else if (_14 === 12) { - _28 = rt.u8Rem(kind, 6); + const _28: rt.u8 = rt.u8Rem(kind, 6); if (_28 === 0) { i8Neg(input.subarray(2, input.length - 0), out); } else if (_28 === 1) { @@ -65,7 +58,7 @@ export function run(input: Uint8Array): rt.ByteVec { isizeNeg(input.subarray(2, input.length - 0), out); } } else if (_14 === 13) { - _36 = rt.sliceSplitFirst(input.subarray(2, input.length - 0)); + const _36: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(input.subarray(2, input.length - 0)); if (_36 === undefined) { cast(kind, rt.u8Div(kind, 12), input.subarray(2, input.length - 0), out); } else { diff --git a/ts/fixtures/lang/expected/ints.ts b/ts/fixtures/lang/expected/ints.ts index 3f08d93d0..fcabcd0cd 100644 --- a/ts/fixtures/lang/expected/ints.ts +++ b/ts/fixtures/lang/expected/ints.ts @@ -4,51 +4,35 @@ import * as rt from "./rt.ts"; /** Apply operation `op` to operands taken from `data`. */ export function u8Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.u8; - let _6!: [rt.u8, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let b!: rt.u8; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _33!: Uint8Array; - let _38!: rt.u8; - let shift!: rt.u32; - let _50!: (a0: rt.ByteVec, a1: rt.u8) => void; - let _51!: (a0: rt.ByteVec, a1: rt.u8 | undefined) => void; - let _52!: rt.u8; - let x!: rt.u8; - let x2!: rt.u8; - _50 = (out2: rt.ByteVec, v: rt.u8): void => { + const _50: (a0: rt.ByteVec, a1: rt.u8) => void = (out2: rt.ByteVec, v: rt.u8): void => { rt.byteVecExtendFromSlice(out2, rt.u128ToBeBytes(v as rt.u128)); rt.byteVecPush(out2, rt.u8FromBeBytes(rt.u8ToBeBytes(v)) === v ? 1 : 0); }; - _51 = (out3: rt.ByteVec, v2: rt.u8 | undefined): void => { - let v3!: rt.u8; + const _51: (a0: rt.ByteVec, a1: rt.u8 | undefined) => void = (out3: rt.ByteVec, v2: rt.u8 | undefined): void => { if (v2 === undefined) { rt.byteVecPush(out3, 0); } else { - v3 = v2; + const v3: rt.u8 = v2; rt.byteVecPush(out3, 1); rt.byteVecExtendFromSlice(out3, rt.u128ToBeBytes(v3 as rt.u128)); } }; - buf = Uint8Array.of(0); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = Uint8Array.of(0); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _6 = [rt.u8FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.u8, Uint8Array]; - a = _6[0]; - buf2 = Uint8Array.of(0); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _33 = rt.sliceRange(buf2, 0, n2); + const _6: [rt.u8, Uint8Array] = [rt.u8FromBeBytes(buf), rt.sliceRange(data, n)]; + const a: rt.u8 = _6[0]; + const buf2: Uint8Array = Uint8Array.of(0); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _33: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_33, rt.sliceRange(slice, 0, n2)); - _38 = rt.u8FromBeBytes(buf2); + const _38: rt.u8 = rt.u8FromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); [_38, rt.sliceRange(slice2, n2)] as [rt.u8, Uint8Array]; - b = _38; - shift = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 8)); - _52 = rt.u8Rem(op, 25); + const b: rt.u8 = _38; + const shift: rt.u32 = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 8)); + const _52: rt.u8 = rt.u8Rem(op, 25); if (_52 === 0) { const part16 = rt.u8Add(a, b); _50(out, part16); @@ -115,12 +99,12 @@ export function u8Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, a >= b ? 1 : 0); rt.byteVecPush(out, rt.u8WrappingSub(a, b) === 0 ? 1 : 0); } else if (_52 === 23) { - x = rt.u8Add(a, b); + const x: rt.u8 = rt.u8Add(a, b); rt.u8Mul(x, b); rt.u8Mul(rt.u8Sub(x, b), a); rt.byteVecPush(out, 1); } else { - x2 = a; + let x2: rt.u8 = a; x2 = rt.u8Add(x2, b); x2 = rt.u8Sub(x2, 1); x2 = rt.u8Mul(x2, 2); @@ -137,51 +121,35 @@ export function u8Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** Apply operation `op` to operands taken from `data`. */ export function u16Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.u16; - let _6!: [rt.u16, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let b!: rt.u16; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _33!: Uint8Array; - let _38!: rt.u16; - let shift!: rt.u32; - let _50!: (a0: rt.ByteVec, a1: rt.u16) => void; - let _51!: (a0: rt.ByteVec, a1: rt.u16 | undefined) => void; - let _52!: rt.u8; - let x!: rt.u16; - let x2!: rt.u16; - _50 = (out2: rt.ByteVec, v: rt.u16): void => { + const _50: (a0: rt.ByteVec, a1: rt.u16) => void = (out2: rt.ByteVec, v: rt.u16): void => { rt.byteVecExtendFromSlice(out2, rt.u128ToBeBytes(v as rt.u128)); rt.byteVecPush(out2, rt.u16FromBeBytes(rt.u16ToBeBytes(v)) === v ? 1 : 0); }; - _51 = (out3: rt.ByteVec, v2: rt.u16 | undefined): void => { - let v3!: rt.u16; + const _51: (a0: rt.ByteVec, a1: rt.u16 | undefined) => void = (out3: rt.ByteVec, v2: rt.u16 | undefined): void => { if (v2 === undefined) { rt.byteVecPush(out3, 0); } else { - v3 = v2; + const v3: rt.u16 = v2; rt.byteVecPush(out3, 1); rt.byteVecExtendFromSlice(out3, rt.u128ToBeBytes(v3 as rt.u128)); } }; - buf = rt.bytes(2); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(2); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _6 = [rt.u16FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.u16, Uint8Array]; - a = _6[0]; - buf2 = rt.bytes(2); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _33 = rt.sliceRange(buf2, 0, n2); + const _6: [rt.u16, Uint8Array] = [rt.u16FromBeBytes(buf), rt.sliceRange(data, n)]; + const a: rt.u16 = _6[0]; + const buf2: Uint8Array = rt.bytes(2); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _33: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_33, rt.sliceRange(slice, 0, n2)); - _38 = rt.u16FromBeBytes(buf2); + const _38: rt.u16 = rt.u16FromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); [_38, rt.sliceRange(slice2, n2)] as [rt.u16, Uint8Array]; - b = _38; - shift = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 16)); - _52 = rt.u8Rem(op, 25); + const b: rt.u16 = _38; + const shift: rt.u32 = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 16)); + const _52: rt.u8 = rt.u8Rem(op, 25); if (_52 === 0) { const part16 = rt.u16Add(a, b); _50(out, part16); @@ -248,12 +216,12 @@ export function u16Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, a >= b ? 1 : 0); rt.byteVecPush(out, rt.u16WrappingSub(a, b) === 0 ? 1 : 0); } else if (_52 === 23) { - x = rt.u16Add(a, b); + const x: rt.u16 = rt.u16Add(a, b); rt.u16Mul(x, b); rt.u16Mul(rt.u16Sub(x, b), a); rt.byteVecPush(out, 1); } else { - x2 = a; + let x2: rt.u16 = a; x2 = rt.u16Add(x2, b); x2 = rt.u16Sub(x2, 1); x2 = rt.u16Mul(x2, 2); @@ -270,51 +238,35 @@ export function u16Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** Apply operation `op` to operands taken from `data`. */ export function u32Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.u32; - let _6!: [rt.u32, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let b!: rt.u32; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _33!: Uint8Array; - let _38!: rt.u32; - let shift!: rt.u32; - let _50!: (a0: rt.ByteVec, a1: rt.u32) => void; - let _51!: (a0: rt.ByteVec, a1: rt.u32 | undefined) => void; - let _52!: rt.u8; - let x!: rt.u32; - let x2!: rt.u32; - _50 = (out2: rt.ByteVec, v: rt.u32): void => { + const _50: (a0: rt.ByteVec, a1: rt.u32) => void = (out2: rt.ByteVec, v: rt.u32): void => { rt.byteVecExtendFromSlice(out2, rt.u128ToBeBytes(v as rt.u128)); rt.byteVecPush(out2, rt.u32FromBeBytes(rt.u32ToBeBytes(v)) === v ? 1 : 0); }; - _51 = (out3: rt.ByteVec, v2: rt.u32 | undefined): void => { - let v3!: rt.u32; + const _51: (a0: rt.ByteVec, a1: rt.u32 | undefined) => void = (out3: rt.ByteVec, v2: rt.u32 | undefined): void => { if (v2 === undefined) { rt.byteVecPush(out3, 0); } else { - v3 = v2; + const v3: rt.u32 = v2; rt.byteVecPush(out3, 1); rt.byteVecExtendFromSlice(out3, rt.u128ToBeBytes(v3 as rt.u128)); } }; - buf = rt.bytes(4); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(4); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _6 = [rt.u32FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.u32, Uint8Array]; - a = _6[0]; - buf2 = rt.bytes(4); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _33 = rt.sliceRange(buf2, 0, n2); + const _6: [rt.u32, Uint8Array] = [rt.u32FromBeBytes(buf), rt.sliceRange(data, n)]; + const a: rt.u32 = _6[0]; + const buf2: Uint8Array = rt.bytes(4); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _33: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_33, rt.sliceRange(slice, 0, n2)); - _38 = rt.u32FromBeBytes(buf2); + const _38: rt.u32 = rt.u32FromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); [_38, rt.sliceRange(slice2, n2)] as [rt.u32, Uint8Array]; - b = _38; - shift = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 32)); - _52 = rt.u8Rem(op, 25); + const b: rt.u32 = _38; + const shift: rt.u32 = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 32)); + const _52: rt.u8 = rt.u8Rem(op, 25); if (_52 === 0) { const part16 = rt.u32Add(a, b); _50(out, part16); @@ -381,12 +333,12 @@ export function u32Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, a >= b ? 1 : 0); rt.byteVecPush(out, rt.u32WrappingSub(a, b) === 0 ? 1 : 0); } else if (_52 === 23) { - x = rt.u32Add(a, b); + const x: rt.u32 = rt.u32Add(a, b); rt.u32Mul(x, b); rt.u32Mul(rt.u32Sub(x, b), a); rt.byteVecPush(out, 1); } else { - x2 = a; + let x2: rt.u32 = a; x2 = rt.u32Add(x2, b); x2 = rt.u32Sub(x2, 1); x2 = rt.u32Mul(x2, 2); @@ -403,51 +355,35 @@ export function u32Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** Apply operation `op` to operands taken from `data`. */ export function u64Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.u64; - let _6!: [rt.u64, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let b!: rt.u64; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _33!: Uint8Array; - let _38!: rt.u64; - let shift!: rt.u32; - let _50!: (a0: rt.ByteVec, a1: rt.u64) => void; - let _51!: (a0: rt.ByteVec, a1: rt.u64 | undefined) => void; - let _52!: rt.u8; - let x!: rt.u64; - let x2!: rt.u64; - _50 = (out2: rt.ByteVec, v: rt.u64): void => { + const _50: (a0: rt.ByteVec, a1: rt.u64) => void = (out2: rt.ByteVec, v: rt.u64): void => { rt.byteVecExtendFromSlice(out2, rt.u128ToBeBytes(rt.u128Cast(v))); rt.byteVecPush(out2, rt.u64Eq(rt.u64FromBeBytes(rt.u64ToBeBytes(v)), v) ? 1 : 0); }; - _51 = (out3: rt.ByteVec, v2: rt.u64 | undefined): void => { - let v3!: rt.u64; + const _51: (a0: rt.ByteVec, a1: rt.u64 | undefined) => void = (out3: rt.ByteVec, v2: rt.u64 | undefined): void => { if (v2 === undefined) { rt.byteVecPush(out3, 0); } else { - v3 = v2; + const v3: rt.u64 = v2; rt.byteVecPush(out3, 1); rt.byteVecExtendFromSlice(out3, rt.u128ToBeBytes(rt.u128Cast(v3))); } }; - buf = rt.bytes(8); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(8); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _6 = [rt.u64FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.u64, Uint8Array]; - a = _6[0]; - buf2 = rt.bytes(8); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _33 = rt.sliceRange(buf2, 0, n2); + const _6: [rt.u64, Uint8Array] = [rt.u64FromBeBytes(buf), rt.sliceRange(data, n)]; + const a: rt.u64 = _6[0]; + const buf2: Uint8Array = rt.bytes(8); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _33: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_33, rt.sliceRange(slice, 0, n2)); - _38 = rt.u64FromBeBytes(buf2); + const _38: rt.u64 = rt.u64FromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); [_38, rt.sliceRange(slice2, n2)] as [rt.u64, Uint8Array]; - b = _38; - shift = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 64)); - _52 = rt.u8Rem(op, 25); + const b: rt.u64 = _38; + const shift: rt.u32 = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 64)); + const _52: rt.u8 = rt.u8Rem(op, 25); if (_52 === 0) { const part16 = rt.u64Add(a, b); _50(out, part16); @@ -514,12 +450,12 @@ export function u64Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, rt.u64Ge(a, b) ? 1 : 0); rt.byteVecPush(out, rt.u64WrappingSub(a, b) === 0 ? 1 : 0); } else if (_52 === 23) { - x = rt.u64Add(a, b); + const x: rt.u64 = rt.u64Add(a, b); rt.u64Mul(x, b); rt.u64Mul(rt.u64Sub(x, b), a); rt.byteVecPush(out, 1); } else { - x2 = a; + let x2: rt.u64 = a; x2 = rt.u64Add(x2, b); x2 = rt.u64Sub(x2, 1); x2 = rt.u64Mul(x2, 2); @@ -536,51 +472,35 @@ export function u64Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** Apply operation `op` to operands taken from `data`. */ export function u128Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.u128; - let _6!: [rt.u128, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let b!: rt.u128; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _33!: Uint8Array; - let _38!: rt.u128; - let shift!: rt.u32; - let _50!: (a0: rt.ByteVec, a1: rt.u128) => void; - let _51!: (a0: rt.ByteVec, a1: rt.u128 | undefined) => void; - let _52!: rt.u8; - let x!: rt.u128; - let x2!: rt.u128; - _50 = (out2: rt.ByteVec, v: rt.u128): void => { + const _50: (a0: rt.ByteVec, a1: rt.u128) => void = (out2: rt.ByteVec, v: rt.u128): void => { rt.byteVecExtendFromSlice(out2, rt.u128ToBeBytes(v)); rt.byteVecPush(out2, rt.u128Eq(rt.u128FromBeBytes(rt.u128ToBeBytes(v)), v) ? 1 : 0); }; - _51 = (out3: rt.ByteVec, v2: rt.u128 | undefined): void => { - let v3!: rt.u128; + const _51: (a0: rt.ByteVec, a1: rt.u128 | undefined) => void = (out3: rt.ByteVec, v2: rt.u128 | undefined): void => { if (v2 === undefined) { rt.byteVecPush(out3, 0); } else { - v3 = v2; + const v3: rt.u128 = v2; rt.byteVecPush(out3, 1); rt.byteVecExtendFromSlice(out3, rt.u128ToBeBytes(v3)); } }; - buf = rt.bytes(16); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(16); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _6 = [rt.u128FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.u128, Uint8Array]; - a = _6[0]; - buf2 = rt.bytes(16); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _33 = rt.sliceRange(buf2, 0, n2); + const _6: [rt.u128, Uint8Array] = [rt.u128FromBeBytes(buf), rt.sliceRange(data, n)]; + const a: rt.u128 = _6[0]; + const buf2: Uint8Array = rt.bytes(16); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _33: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_33, rt.sliceRange(slice, 0, n2)); - _38 = rt.u128FromBeBytes(buf2); + const _38: rt.u128 = rt.u128FromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); [_38, rt.sliceRange(slice2, n2)] as [rt.u128, Uint8Array]; - b = _38; - shift = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 128)); - _52 = rt.u8Rem(op, 25); + const b: rt.u128 = _38; + const shift: rt.u32 = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 128)); + const _52: rt.u8 = rt.u8Rem(op, 25); if (_52 === 0) { const part16 = rt.u128Add(a, b); _50(out, part16); @@ -647,12 +567,12 @@ export function u128Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, rt.u128Ge(a, b) ? 1 : 0); rt.byteVecPush(out, rt.u128WrappingSub(a, b) === 0 ? 1 : 0); } else if (_52 === 23) { - x = rt.u128Add(a, b); + const x: rt.u128 = rt.u128Add(a, b); rt.u128Mul(x, b); rt.u128Mul(rt.u128Sub(x, b), a); rt.byteVecPush(out, 1); } else { - x2 = a; + let x2: rt.u128 = a; x2 = rt.u128Add(x2, b); x2 = rt.u128Sub(x2, 1); x2 = rt.u128Mul(x2, 2); @@ -669,51 +589,35 @@ export function u128Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** Apply operation `op` to operands taken from `data`. */ export function usizeOp(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.usize; - let _6!: [rt.usize, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let b!: rt.usize; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _33!: Uint8Array; - let _38!: rt.usize; - let shift!: rt.u32; - let _50!: (a0: rt.ByteVec, a1: rt.usize) => void; - let _51!: (a0: rt.ByteVec, a1: rt.usize | undefined) => void; - let _52!: rt.u8; - let x!: rt.usize; - let x2!: rt.usize; - _50 = (out2: rt.ByteVec, v: rt.usize): void => { + const _50: (a0: rt.ByteVec, a1: rt.usize) => void = (out2: rt.ByteVec, v: rt.usize): void => { rt.byteVecExtendFromSlice(out2, rt.u128ToBeBytes(v as rt.u128)); rt.byteVecPush(out2, rt.usizeFromBeBytes(rt.usizeToBeBytes(v)) === v ? 1 : 0); }; - _51 = (out3: rt.ByteVec, v2: rt.usize | undefined): void => { - let v3!: rt.usize; + const _51: (a0: rt.ByteVec, a1: rt.usize | undefined) => void = (out3: rt.ByteVec, v2: rt.usize | undefined): void => { if (v2 === undefined) { rt.byteVecPush(out3, 0); } else { - v3 = v2; + const v3: rt.usize = v2; rt.byteVecPush(out3, 1); rt.byteVecExtendFromSlice(out3, rt.u128ToBeBytes(v3 as rt.u128)); } }; - buf = rt.bytes(4); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(4); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _6 = [rt.usizeFromBeBytes(buf), rt.sliceRange(data, n)] as [rt.usize, Uint8Array]; - a = _6[0]; - buf2 = rt.bytes(4); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _33 = rt.sliceRange(buf2, 0, n2); + const _6: [rt.usize, Uint8Array] = [rt.usizeFromBeBytes(buf), rt.sliceRange(data, n)]; + const a: rt.usize = _6[0]; + const buf2: Uint8Array = rt.bytes(4); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _33: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_33, rt.sliceRange(slice, 0, n2)); - _38 = rt.usizeFromBeBytes(buf2); + const _38: rt.usize = rt.usizeFromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); [_38, rt.sliceRange(slice2, n2)] as [rt.usize, Uint8Array]; - b = _38; - shift = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 32)); - _52 = rt.u8Rem(op, 25); + const b: rt.usize = _38; + const shift: rt.u32 = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 32)); + const _52: rt.u8 = rt.u8Rem(op, 25); if (_52 === 0) { const part16 = rt.usizeAdd(a, b); _50(out, part16); @@ -780,12 +684,12 @@ export function usizeOp(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, a >= b ? 1 : 0); rt.byteVecPush(out, rt.usizeWrappingSub(a, b) === 0 ? 1 : 0); } else if (_52 === 23) { - x = rt.usizeAdd(a, b); + const x: rt.usize = rt.usizeAdd(a, b); rt.usizeMul(x, b); rt.usizeMul(rt.usizeSub(x, b), a); rt.byteVecPush(out, 1); } else { - x2 = a; + let x2: rt.usize = a; x2 = rt.usizeAdd(x2, b); x2 = rt.usizeSub(x2, 1); x2 = rt.usizeMul(x2, 2); @@ -802,51 +706,35 @@ export function usizeOp(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** Apply operation `op` to operands taken from `data`. */ export function i8Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.i8; - let _6!: [rt.i8, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let b!: rt.i8; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _33!: Uint8Array; - let _38!: rt.i8; - let shift!: rt.u32; - let _50!: (a0: rt.ByteVec, a1: rt.i8) => void; - let _51!: (a0: rt.ByteVec, a1: rt.i8 | undefined) => void; - let _52!: rt.u8; - let x!: rt.i8; - let x2!: rt.i8; - _50 = (out2: rt.ByteVec, v: rt.i8): void => { + const _50: (a0: rt.ByteVec, a1: rt.i8) => void = (out2: rt.ByteVec, v: rt.i8): void => { rt.byteVecExtendFromSlice(out2, rt.i128ToBeBytes(v as rt.i128)); rt.byteVecPush(out2, rt.i8FromBeBytes(rt.i8ToBeBytes(v)) === v ? 1 : 0); }; - _51 = (out3: rt.ByteVec, v2: rt.i8 | undefined): void => { - let v3!: rt.i8; + const _51: (a0: rt.ByteVec, a1: rt.i8 | undefined) => void = (out3: rt.ByteVec, v2: rt.i8 | undefined): void => { if (v2 === undefined) { rt.byteVecPush(out3, 0); } else { - v3 = v2; + const v3: rt.i8 = v2; rt.byteVecPush(out3, 1); rt.byteVecExtendFromSlice(out3, rt.i128ToBeBytes(v3 as rt.i128)); } }; - buf = Uint8Array.of(0); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = Uint8Array.of(0); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _6 = [rt.i8FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.i8, Uint8Array]; - a = _6[0]; - buf2 = Uint8Array.of(0); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _33 = rt.sliceRange(buf2, 0, n2); + const _6: [rt.i8, Uint8Array] = [rt.i8FromBeBytes(buf), rt.sliceRange(data, n)]; + const a: rt.i8 = _6[0]; + const buf2: Uint8Array = Uint8Array.of(0); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _33: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_33, rt.sliceRange(slice, 0, n2)); - _38 = rt.i8FromBeBytes(buf2); + const _38: rt.i8 = rt.i8FromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); [_38, rt.sliceRange(slice2, n2)] as [rt.i8, Uint8Array]; - b = _38; - shift = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 8)); - _52 = rt.u8Rem(op, 25); + const b: rt.i8 = _38; + const shift: rt.u32 = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 8)); + const _52: rt.u8 = rt.u8Rem(op, 25); if (_52 === 0) { const part16 = rt.i8Add(a, b); _50(out, part16); @@ -913,12 +801,12 @@ export function i8Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, a >= b ? 1 : 0); rt.byteVecPush(out, rt.i8WrappingSub(a, b) === 0 ? 1 : 0); } else if (_52 === 23) { - x = rt.i8Add(a, b); + const x: rt.i8 = rt.i8Add(a, b); rt.i8Mul(x, b); rt.i8Mul(rt.i8Sub(x, b), a); rt.byteVecPush(out, 1); } else { - x2 = a; + let x2: rt.i8 = a; x2 = rt.i8Add(x2, b); x2 = rt.i8Sub(x2, 1); x2 = rt.i8Mul(x2, 2); @@ -935,51 +823,35 @@ export function i8Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** Apply operation `op` to operands taken from `data`. */ export function i16Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.i16; - let _6!: [rt.i16, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let b!: rt.i16; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _33!: Uint8Array; - let _38!: rt.i16; - let shift!: rt.u32; - let _50!: (a0: rt.ByteVec, a1: rt.i16) => void; - let _51!: (a0: rt.ByteVec, a1: rt.i16 | undefined) => void; - let _52!: rt.u8; - let x!: rt.i16; - let x2!: rt.i16; - _50 = (out2: rt.ByteVec, v: rt.i16): void => { + const _50: (a0: rt.ByteVec, a1: rt.i16) => void = (out2: rt.ByteVec, v: rt.i16): void => { rt.byteVecExtendFromSlice(out2, rt.i128ToBeBytes(v as rt.i128)); rt.byteVecPush(out2, rt.i16FromBeBytes(rt.i16ToBeBytes(v)) === v ? 1 : 0); }; - _51 = (out3: rt.ByteVec, v2: rt.i16 | undefined): void => { - let v3!: rt.i16; + const _51: (a0: rt.ByteVec, a1: rt.i16 | undefined) => void = (out3: rt.ByteVec, v2: rt.i16 | undefined): void => { if (v2 === undefined) { rt.byteVecPush(out3, 0); } else { - v3 = v2; + const v3: rt.i16 = v2; rt.byteVecPush(out3, 1); rt.byteVecExtendFromSlice(out3, rt.i128ToBeBytes(v3 as rt.i128)); } }; - buf = rt.bytes(2); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(2); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _6 = [rt.i16FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.i16, Uint8Array]; - a = _6[0]; - buf2 = rt.bytes(2); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _33 = rt.sliceRange(buf2, 0, n2); + const _6: [rt.i16, Uint8Array] = [rt.i16FromBeBytes(buf), rt.sliceRange(data, n)]; + const a: rt.i16 = _6[0]; + const buf2: Uint8Array = rt.bytes(2); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _33: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_33, rt.sliceRange(slice, 0, n2)); - _38 = rt.i16FromBeBytes(buf2); + const _38: rt.i16 = rt.i16FromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); [_38, rt.sliceRange(slice2, n2)] as [rt.i16, Uint8Array]; - b = _38; - shift = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 16)); - _52 = rt.u8Rem(op, 25); + const b: rt.i16 = _38; + const shift: rt.u32 = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 16)); + const _52: rt.u8 = rt.u8Rem(op, 25); if (_52 === 0) { const part16 = rt.i16Add(a, b); _50(out, part16); @@ -1046,12 +918,12 @@ export function i16Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, a >= b ? 1 : 0); rt.byteVecPush(out, rt.i16WrappingSub(a, b) === 0 ? 1 : 0); } else if (_52 === 23) { - x = rt.i16Add(a, b); + const x: rt.i16 = rt.i16Add(a, b); rt.i16Mul(x, b); rt.i16Mul(rt.i16Sub(x, b), a); rt.byteVecPush(out, 1); } else { - x2 = a; + let x2: rt.i16 = a; x2 = rt.i16Add(x2, b); x2 = rt.i16Sub(x2, 1); x2 = rt.i16Mul(x2, 2); @@ -1068,51 +940,35 @@ export function i16Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** Apply operation `op` to operands taken from `data`. */ export function i32Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.i32; - let _6!: [rt.i32, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let b!: rt.i32; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _33!: Uint8Array; - let _38!: rt.i32; - let shift!: rt.u32; - let _50!: (a0: rt.ByteVec, a1: rt.i32) => void; - let _51!: (a0: rt.ByteVec, a1: rt.i32 | undefined) => void; - let _52!: rt.u8; - let x!: rt.i32; - let x2!: rt.i32; - _50 = (out2: rt.ByteVec, v: rt.i32): void => { + const _50: (a0: rt.ByteVec, a1: rt.i32) => void = (out2: rt.ByteVec, v: rt.i32): void => { rt.byteVecExtendFromSlice(out2, rt.i128ToBeBytes(v as rt.i128)); rt.byteVecPush(out2, rt.i32FromBeBytes(rt.i32ToBeBytes(v)) === v ? 1 : 0); }; - _51 = (out3: rt.ByteVec, v2: rt.i32 | undefined): void => { - let v3!: rt.i32; + const _51: (a0: rt.ByteVec, a1: rt.i32 | undefined) => void = (out3: rt.ByteVec, v2: rt.i32 | undefined): void => { if (v2 === undefined) { rt.byteVecPush(out3, 0); } else { - v3 = v2; + const v3: rt.i32 = v2; rt.byteVecPush(out3, 1); rt.byteVecExtendFromSlice(out3, rt.i128ToBeBytes(v3 as rt.i128)); } }; - buf = rt.bytes(4); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(4); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _6 = [rt.i32FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.i32, Uint8Array]; - a = _6[0]; - buf2 = rt.bytes(4); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _33 = rt.sliceRange(buf2, 0, n2); + const _6: [rt.i32, Uint8Array] = [rt.i32FromBeBytes(buf), rt.sliceRange(data, n)]; + const a: rt.i32 = _6[0]; + const buf2: Uint8Array = rt.bytes(4); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _33: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_33, rt.sliceRange(slice, 0, n2)); - _38 = rt.i32FromBeBytes(buf2); + const _38: rt.i32 = rt.i32FromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); [_38, rt.sliceRange(slice2, n2)] as [rt.i32, Uint8Array]; - b = _38; - shift = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 32)); - _52 = rt.u8Rem(op, 25); + const b: rt.i32 = _38; + const shift: rt.u32 = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 32)); + const _52: rt.u8 = rt.u8Rem(op, 25); if (_52 === 0) { const part16 = rt.i32Add(a, b); _50(out, part16); @@ -1179,12 +1035,12 @@ export function i32Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, a >= b ? 1 : 0); rt.byteVecPush(out, rt.i32WrappingSub(a, b) === 0 ? 1 : 0); } else if (_52 === 23) { - x = rt.i32Add(a, b); + const x: rt.i32 = rt.i32Add(a, b); rt.i32Mul(x, b); rt.i32Mul(rt.i32Sub(x, b), a); rt.byteVecPush(out, 1); } else { - x2 = a; + let x2: rt.i32 = a; x2 = rt.i32Add(x2, b); x2 = rt.i32Sub(x2, 1); x2 = rt.i32Mul(x2, 2); @@ -1201,51 +1057,35 @@ export function i32Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** Apply operation `op` to operands taken from `data`. */ export function i64Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.i64; - let _6!: [rt.i64, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let b!: rt.i64; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _33!: Uint8Array; - let _38!: rt.i64; - let shift!: rt.u32; - let _50!: (a0: rt.ByteVec, a1: rt.i64) => void; - let _51!: (a0: rt.ByteVec, a1: rt.i64 | undefined) => void; - let _52!: rt.u8; - let x!: rt.i64; - let x2!: rt.i64; - _50 = (out2: rt.ByteVec, v: rt.i64): void => { + const _50: (a0: rt.ByteVec, a1: rt.i64) => void = (out2: rt.ByteVec, v: rt.i64): void => { rt.byteVecExtendFromSlice(out2, rt.i128ToBeBytes(rt.i128Cast(v))); rt.byteVecPush(out2, rt.i64Eq(rt.i64FromBeBytes(rt.i64ToBeBytes(v)), v) ? 1 : 0); }; - _51 = (out3: rt.ByteVec, v2: rt.i64 | undefined): void => { - let v3!: rt.i64; + const _51: (a0: rt.ByteVec, a1: rt.i64 | undefined) => void = (out3: rt.ByteVec, v2: rt.i64 | undefined): void => { if (v2 === undefined) { rt.byteVecPush(out3, 0); } else { - v3 = v2; + const v3: rt.i64 = v2; rt.byteVecPush(out3, 1); rt.byteVecExtendFromSlice(out3, rt.i128ToBeBytes(rt.i128Cast(v3))); } }; - buf = rt.bytes(8); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(8); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _6 = [rt.i64FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.i64, Uint8Array]; - a = _6[0]; - buf2 = rt.bytes(8); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _33 = rt.sliceRange(buf2, 0, n2); + const _6: [rt.i64, Uint8Array] = [rt.i64FromBeBytes(buf), rt.sliceRange(data, n)]; + const a: rt.i64 = _6[0]; + const buf2: Uint8Array = rt.bytes(8); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _33: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_33, rt.sliceRange(slice, 0, n2)); - _38 = rt.i64FromBeBytes(buf2); + const _38: rt.i64 = rt.i64FromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); [_38, rt.sliceRange(slice2, n2)] as [rt.i64, Uint8Array]; - b = _38; - shift = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 64)); - _52 = rt.u8Rem(op, 25); + const b: rt.i64 = _38; + const shift: rt.u32 = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 64)); + const _52: rt.u8 = rt.u8Rem(op, 25); if (_52 === 0) { const part16 = rt.i64Add(a, b); _50(out, part16); @@ -1312,12 +1152,12 @@ export function i64Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, rt.i64Ge(a, b) ? 1 : 0); rt.byteVecPush(out, rt.i64WrappingSub(a, b) === 0 ? 1 : 0); } else if (_52 === 23) { - x = rt.i64Add(a, b); + const x: rt.i64 = rt.i64Add(a, b); rt.i64Mul(x, b); rt.i64Mul(rt.i64Sub(x, b), a); rt.byteVecPush(out, 1); } else { - x2 = a; + let x2: rt.i64 = a; x2 = rt.i64Add(x2, b); x2 = rt.i64Sub(x2, 1); x2 = rt.i64Mul(x2, 2); @@ -1334,51 +1174,35 @@ export function i64Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** Apply operation `op` to operands taken from `data`. */ export function i128Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.i128; - let _6!: [rt.i128, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let b!: rt.i128; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _33!: Uint8Array; - let _38!: rt.i128; - let shift!: rt.u32; - let _50!: (a0: rt.ByteVec, a1: rt.i128) => void; - let _51!: (a0: rt.ByteVec, a1: rt.i128 | undefined) => void; - let _52!: rt.u8; - let x!: rt.i128; - let x2!: rt.i128; - _50 = (out2: rt.ByteVec, v: rt.i128): void => { + const _50: (a0: rt.ByteVec, a1: rt.i128) => void = (out2: rt.ByteVec, v: rt.i128): void => { rt.byteVecExtendFromSlice(out2, rt.i128ToBeBytes(v)); rt.byteVecPush(out2, rt.i128Eq(rt.i128FromBeBytes(rt.i128ToBeBytes(v)), v) ? 1 : 0); }; - _51 = (out3: rt.ByteVec, v2: rt.i128 | undefined): void => { - let v3!: rt.i128; + const _51: (a0: rt.ByteVec, a1: rt.i128 | undefined) => void = (out3: rt.ByteVec, v2: rt.i128 | undefined): void => { if (v2 === undefined) { rt.byteVecPush(out3, 0); } else { - v3 = v2; + const v3: rt.i128 = v2; rt.byteVecPush(out3, 1); rt.byteVecExtendFromSlice(out3, rt.i128ToBeBytes(v3)); } }; - buf = rt.bytes(16); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(16); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _6 = [rt.i128FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.i128, Uint8Array]; - a = _6[0]; - buf2 = rt.bytes(16); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _33 = rt.sliceRange(buf2, 0, n2); + const _6: [rt.i128, Uint8Array] = [rt.i128FromBeBytes(buf), rt.sliceRange(data, n)]; + const a: rt.i128 = _6[0]; + const buf2: Uint8Array = rt.bytes(16); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _33: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_33, rt.sliceRange(slice, 0, n2)); - _38 = rt.i128FromBeBytes(buf2); + const _38: rt.i128 = rt.i128FromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); [_38, rt.sliceRange(slice2, n2)] as [rt.i128, Uint8Array]; - b = _38; - shift = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 128)); - _52 = rt.u8Rem(op, 25); + const b: rt.i128 = _38; + const shift: rt.u32 = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 128)); + const _52: rt.u8 = rt.u8Rem(op, 25); if (_52 === 0) { const part16 = rt.i128Add(a, b); _50(out, part16); @@ -1445,12 +1269,12 @@ export function i128Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, rt.i128Ge(a, b) ? 1 : 0); rt.byteVecPush(out, rt.i128WrappingSub(a, b) === 0 ? 1 : 0); } else if (_52 === 23) { - x = rt.i128Add(a, b); + const x: rt.i128 = rt.i128Add(a, b); rt.i128Mul(x, b); rt.i128Mul(rt.i128Sub(x, b), a); rt.byteVecPush(out, 1); } else { - x2 = a; + let x2: rt.i128 = a; x2 = rt.i128Add(x2, b); x2 = rt.i128Sub(x2, 1); x2 = rt.i128Mul(x2, 2); @@ -1467,51 +1291,35 @@ export function i128Op(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** Apply operation `op` to operands taken from `data`. */ export function isizeOp(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.isize; - let _6!: [rt.isize, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let b!: rt.isize; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _33!: Uint8Array; - let _38!: rt.isize; - let shift!: rt.u32; - let _50!: (a0: rt.ByteVec, a1: rt.isize) => void; - let _51!: (a0: rt.ByteVec, a1: rt.isize | undefined) => void; - let _52!: rt.u8; - let x!: rt.isize; - let x2!: rt.isize; - _50 = (out2: rt.ByteVec, v: rt.isize): void => { + const _50: (a0: rt.ByteVec, a1: rt.isize) => void = (out2: rt.ByteVec, v: rt.isize): void => { rt.byteVecExtendFromSlice(out2, rt.i128ToBeBytes(v as rt.i128)); rt.byteVecPush(out2, rt.isizeFromBeBytes(rt.isizeToBeBytes(v)) === v ? 1 : 0); }; - _51 = (out3: rt.ByteVec, v2: rt.isize | undefined): void => { - let v3!: rt.isize; + const _51: (a0: rt.ByteVec, a1: rt.isize | undefined) => void = (out3: rt.ByteVec, v2: rt.isize | undefined): void => { if (v2 === undefined) { rt.byteVecPush(out3, 0); } else { - v3 = v2; + const v3: rt.isize = v2; rt.byteVecPush(out3, 1); rt.byteVecExtendFromSlice(out3, rt.i128ToBeBytes(v3 as rt.i128)); } }; - buf = rt.bytes(4); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(4); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _6 = [rt.isizeFromBeBytes(buf), rt.sliceRange(data, n)] as [rt.isize, Uint8Array]; - a = _6[0]; - buf2 = rt.bytes(4); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _33 = rt.sliceRange(buf2, 0, n2); + const _6: [rt.isize, Uint8Array] = [rt.isizeFromBeBytes(buf), rt.sliceRange(data, n)]; + const a: rt.isize = _6[0]; + const buf2: Uint8Array = rt.bytes(4); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _33: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_33, rt.sliceRange(slice, 0, n2)); - _38 = rt.isizeFromBeBytes(buf2); + const _38: rt.isize = rt.isizeFromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); [_38, rt.sliceRange(slice2, n2)] as [rt.isize, Uint8Array]; - b = _38; - shift = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 32)); - _52 = rt.u8Rem(op, 25); + const b: rt.isize = _38; + const shift: rt.u32 = rt.u32Rem(rt.optionUnwrapOr(rt.sliceFirst(rt.sliceRange(slice2, n2)), 0) as rt.u32, rt.u32Mul(2, 32)); + const _52: rt.u8 = rt.u8Rem(op, 25); if (_52 === 0) { const part16 = rt.isizeAdd(a, b); _50(out, part16); @@ -1578,12 +1386,12 @@ export function isizeOp(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, a >= b ? 1 : 0); rt.byteVecPush(out, rt.isizeWrappingSub(a, b) === 0 ? 1 : 0); } else if (_52 === 23) { - x = rt.isizeAdd(a, b); + const x: rt.isize = rt.isizeAdd(a, b); rt.isizeMul(x, b); rt.isizeMul(rt.isizeSub(x, b), a); rt.byteVecPush(out, 1); } else { - x2 = a; + let x2: rt.isize = a; x2 = rt.isizeAdd(x2, b); x2 = rt.isizeSub(x2, 1); x2 = rt.isizeMul(x2, 2); @@ -1600,1206 +1408,857 @@ export function isizeOp(op: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** Negate, which overflows at the minimum. */ export function i8Neg(data: Uint8Array, out: rt.ByteVec): void { - let buf!: Uint8Array; - let n!: rt.usize; - buf = Uint8Array.of(0); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = Uint8Array.of(0); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(rt.i8Neg(([rt.i8FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.i8, Uint8Array])[0]) as rt.i128)); } /** Negate, which overflows at the minimum. */ export function i16Neg(data: Uint8Array, out: rt.ByteVec): void { - let buf!: Uint8Array; - let n!: rt.usize; - buf = rt.bytes(2); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(2); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(rt.i16Neg(([rt.i16FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.i16, Uint8Array])[0]) as rt.i128)); } /** Negate, which overflows at the minimum. */ export function i32Neg(data: Uint8Array, out: rt.ByteVec): void { - let buf!: Uint8Array; - let n!: rt.usize; - buf = rt.bytes(4); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(4); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(rt.i32Neg(([rt.i32FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.i32, Uint8Array])[0]) as rt.i128)); } /** Negate, which overflows at the minimum. */ export function i64Neg(data: Uint8Array, out: rt.ByteVec): void { - let buf!: Uint8Array; - let n!: rt.usize; - buf = rt.bytes(8); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(8); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(rt.i128Cast(rt.i64Neg(([rt.i64FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.i64, Uint8Array])[0])))); } /** Negate, which overflows at the minimum. */ export function i128Neg(data: Uint8Array, out: rt.ByteVec): void { - let buf!: Uint8Array; - let n!: rt.usize; - buf = rt.bytes(16); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(16); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(rt.i128Neg(([rt.i128FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.i128, Uint8Array])[0]))); } /** Negate, which overflows at the minimum. */ export function isizeNeg(data: Uint8Array, out: rt.ByteVec): void { - let buf!: Uint8Array; - let n!: rt.usize; - buf = rt.bytes(4); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(4); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(rt.isizeNeg(([rt.isizeFromBeBytes(buf), rt.sliceRange(data, n)] as [rt.isize, Uint8Array])[0]) as rt.i128)); } /** Cast a value of type `from` to type `to`, both indexes into the twelve types. */ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let _5!: rt.u8; - let v!: rt.u8; - let buf!: Uint8Array; - let n!: rt.usize; - let _25!: rt.u8; - let v2!: rt.u8; - let _35!: string; - let v3!: rt.u16; - let _45!: string; - let v4!: rt.u32; - let _55!: string; - let v5!: rt.u64; - let _65!: string; - let v6!: rt.u128; - let _75!: string; - let v7!: rt.usize; - let _85!: string; - let v8!: rt.i8; - let _95!: string; - let v9!: rt.i16; - let _105!: string; - let v10!: rt.i32; - let _115!: string; - let v11!: rt.i64; - let _125!: string; - let v12!: rt.i128; - let _135!: string; - let v13!: rt.isize; - let _145!: string; - let v14!: rt.u16; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _165!: rt.u8; - let v15!: rt.u8; - let _175!: string; - let v16!: rt.u16; - let _185!: string; - let v17!: rt.u32; - let _195!: string; - let v18!: rt.u64; - let _205!: string; - let v19!: rt.u128; - let _215!: string; - let v20!: rt.usize; - let _225!: string; - let v21!: rt.i8; - let _235!: string; - let v22!: rt.i16; - let _245!: string; - let v23!: rt.i32; - let _255!: string; - let v24!: rt.i64; - let _265!: string; - let v25!: rt.i128; - let _275!: string; - let v26!: rt.isize; - let _285!: string; - let v27!: rt.u32; - let buf3!: Uint8Array; - let n3!: rt.usize; - let _305!: rt.u8; - let v28!: rt.u8; - let _315!: string; - let v29!: rt.u16; - let _325!: string; - let v30!: rt.u32; - let _335!: string; - let v31!: rt.u64; - let _345!: string; - let v32!: rt.u128; - let _355!: string; - let v33!: rt.usize; - let _365!: string; - let v34!: rt.i8; - let _375!: string; - let v35!: rt.i16; - let _385!: string; - let v36!: rt.i32; - let _395!: string; - let v37!: rt.i64; - let _405!: string; - let v38!: rt.i128; - let _415!: string; - let v39!: rt.isize; - let _425!: string; - let v40!: rt.u64; - let buf4!: Uint8Array; - let n4!: rt.usize; - let _445!: rt.u8; - let v41!: rt.u8; - let _455!: string; - let v42!: rt.u16; - let _465!: string; - let v43!: rt.u32; - let _475!: string; - let v44!: rt.u64; - let _485!: string; - let v45!: rt.u128; - let _495!: string; - let v46!: rt.usize; - let _505!: string; - let v47!: rt.i8; - let _515!: string; - let v48!: rt.i16; - let _525!: string; - let v49!: rt.i32; - let _535!: string; - let v50!: rt.i64; - let _545!: string; - let v51!: rt.i128; - let _555!: string; - let v52!: rt.isize; - let _565!: string; - let v53!: rt.u128; - let buf5!: Uint8Array; - let n5!: rt.usize; - let _585!: rt.u8; - let v54!: rt.u8; - let _595!: string; - let v55!: rt.u16; - let _605!: string; - let v56!: rt.u32; - let _615!: string; - let v57!: rt.u64; - let _625!: string; - let v58!: rt.u128; - let _635!: string; - let v59!: rt.usize; - let _645!: string; - let v60!: rt.i8; - let _655!: string; - let v61!: rt.i16; - let _665!: string; - let v62!: rt.i32; - let _675!: string; - let v63!: rt.i64; - let _685!: string; - let v64!: rt.i128; - let _695!: string; - let v65!: rt.isize; - let _705!: string; - let v66!: rt.usize; - let buf6!: Uint8Array; - let n6!: rt.usize; - let _725!: rt.u8; - let v67!: rt.u8; - let _735!: string; - let v68!: rt.u16; - let _745!: string; - let v69!: rt.u32; - let _755!: string; - let v70!: rt.u64; - let _765!: string; - let v71!: rt.u128; - let _775!: string; - let v72!: rt.usize; - let _785!: string; - let v73!: rt.i8; - let _795!: string; - let v74!: rt.i16; - let _805!: string; - let v75!: rt.i32; - let _815!: string; - let v76!: rt.i64; - let _825!: string; - let v77!: rt.i128; - let _835!: string; - let v78!: rt.isize; - let _845!: string; - let v79!: rt.i8; - let buf7!: Uint8Array; - let n7!: rt.usize; - let _865!: rt.u8; - let v80!: rt.u8; - let _875!: string; - let v81!: rt.u16; - let _885!: string; - let v82!: rt.u32; - let _895!: string; - let v83!: rt.u64; - let _905!: string; - let v84!: rt.u128; - let _915!: string; - let v85!: rt.usize; - let _925!: string; - let v86!: rt.i8; - let _935!: string; - let v87!: rt.i16; - let _945!: string; - let v88!: rt.i32; - let _955!: string; - let v89!: rt.i64; - let _965!: string; - let v90!: rt.i128; - let _975!: string; - let v91!: rt.isize; - let _985!: string; - let v92!: rt.i16; - let buf8!: Uint8Array; - let n8!: rt.usize; - let _1005!: rt.u8; - let v93!: rt.u8; - let _1015!: string; - let v94!: rt.u16; - let _1025!: string; - let v95!: rt.u32; - let _1035!: string; - let v96!: rt.u64; - let _1045!: string; - let v97!: rt.u128; - let _1055!: string; - let v98!: rt.usize; - let _1065!: string; - let v99!: rt.i8; - let _1075!: string; - let v100!: rt.i16; - let _1085!: string; - let v101!: rt.i32; - let _1095!: string; - let v102!: rt.i64; - let _1105!: string; - let v103!: rt.i128; - let _1115!: string; - let v104!: rt.isize; - let _1125!: string; - let v105!: rt.i32; - let buf9!: Uint8Array; - let n9!: rt.usize; - let _1145!: rt.u8; - let v106!: rt.u8; - let _1155!: string; - let v107!: rt.u16; - let _1165!: string; - let v108!: rt.u32; - let _1175!: string; - let v109!: rt.u64; - let _1185!: string; - let v110!: rt.u128; - let _1195!: string; - let v111!: rt.usize; - let _1205!: string; - let v112!: rt.i8; - let _1215!: string; - let v113!: rt.i16; - let _1225!: string; - let v114!: rt.i32; - let _1235!: string; - let v115!: rt.i64; - let _1245!: string; - let v116!: rt.i128; - let _1255!: string; - let v117!: rt.isize; - let _1265!: string; - let v118!: rt.i64; - let buf10!: Uint8Array; - let n10!: rt.usize; - let _1285!: rt.u8; - let v119!: rt.u8; - let _1295!: string; - let v120!: rt.u16; - let _1305!: string; - let v121!: rt.u32; - let _1315!: string; - let v122!: rt.u64; - let _1325!: string; - let v123!: rt.u128; - let _1335!: string; - let v124!: rt.usize; - let _1345!: string; - let v125!: rt.i8; - let _1355!: string; - let v126!: rt.i16; - let _1365!: string; - let v127!: rt.i32; - let _1375!: string; - let v128!: rt.i64; - let _1385!: string; - let v129!: rt.i128; - let _1395!: string; - let v130!: rt.isize; - let _1405!: string; - let v131!: rt.i128; - let buf11!: Uint8Array; - let n11!: rt.usize; - let _1425!: rt.u8; - let v132!: rt.u8; - let _1435!: string; - let v133!: rt.u16; - let _1445!: string; - let v134!: rt.u32; - let _1455!: string; - let v135!: rt.u64; - let _1465!: string; - let v136!: rt.u128; - let _1475!: string; - let v137!: rt.usize; - let _1485!: string; - let v138!: rt.i8; - let _1495!: string; - let v139!: rt.i16; - let _1505!: string; - let v140!: rt.i32; - let _1515!: string; - let v141!: rt.i64; - let _1525!: string; - let v142!: rt.i128; - let _1535!: string; - let v143!: rt.isize; - let _1545!: string; - let v144!: rt.isize; - let buf12!: Uint8Array; - let n12!: rt.usize; - let _1565!: rt.u8; - let v145!: rt.u8; - let _1575!: string; - let v146!: rt.u16; - let _1585!: string; - let v147!: rt.u32; - let _1595!: string; - let v148!: rt.u64; - let _1605!: string; - let v149!: rt.u128; - let _1615!: string; - let v150!: rt.usize; - let _1625!: string; - let v151!: rt.i8; - let _1635!: string; - let v152!: rt.i16; - let _1645!: string; - let v153!: rt.i32; - let _1655!: string; - let v154!: rt.i64; - let _1665!: string; - let v155!: rt.i128; - let _1675!: string; - let v156!: rt.isize; - let _1685!: string; - _5 = rt.u8Rem(from, 12); + const _5: rt.u8 = rt.u8Rem(from, 12); if (_5 === 0) { - buf = Uint8Array.of(0); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = Uint8Array.of(0); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - v = ([rt.u8FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.u8, Uint8Array])[0]; - _25 = rt.u8Rem(to, 12); + const v: rt.u8 = ([rt.u8FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.u8, Uint8Array])[0]; + const _25: rt.u8 = rt.u8Rem(to, 12); if (_25 === 0) { - v2 = v; + const v2: rt.u8 = v; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v2)); - _35 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v2, f)); + const _35: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v2, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_35)); } else if (_25 === 1) { - v3 = v as rt.u16; + const v3: rt.u16 = v as rt.u16; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v3)); - _45 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v3, f)); + const _45: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v3, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_45)); } else if (_25 === 2) { - v4 = v as rt.u32; + const v4: rt.u32 = v as rt.u32; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v4)); - _55 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v4, f)); + const _55: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v4, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_55)); } else if (_25 === 3) { - v5 = v as rt.u64; + const v5: rt.u64 = v as rt.u64; rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v5)); - _65 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v5, f)); + const _65: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v5, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_65)); } else if (_25 === 4) { - v6 = v as rt.u128; + const v6: rt.u128 = v as rt.u128; rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v6)); - _75 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v6, f)); + const _75: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v6, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_75)); } else if (_25 === 5) { - v7 = v as rt.usize; + const v7: rt.usize = v as rt.usize; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v7)); - _85 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v7, f)); + const _85: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v7, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_85)); } else if (_25 === 6) { - v8 = (v << 24) >> 24; + const v8: rt.i8 = (v << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v8)); - _95 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v8, f)); + const _95: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v8, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_95)); } else if (_25 === 7) { - v9 = v as rt.i16; + const v9: rt.i16 = v as rt.i16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v9)); - _105 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v9, f)); + const _105: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v9, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_105)); } else if (_25 === 8) { - v10 = v as rt.i32; + const v10: rt.i32 = v as rt.i32; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v10)); - _115 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v10, f)); + const _115: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v10, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_115)); } else if (_25 === 9) { - v11 = v as rt.i64; + const v11: rt.i64 = v as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v11)); - _125 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v11, f)); + const _125: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v11, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_125)); } else if (_25 === 10) { - v12 = v as rt.i128; + const v12: rt.i128 = v as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v12)); - _135 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v12, f)); + const _135: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v12, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_135)); } else { - v13 = v as rt.isize; + const v13: rt.isize = v as rt.isize; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v13)); - _145 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v13, f)); + const _145: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v13, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_145)); } } else if (_5 === 1) { - buf2 = rt.bytes(2); - n2 = rt.min(data.length, buf2.length); + const buf2: Uint8Array = rt.bytes(2); + const n2: rt.usize = rt.min(data.length, buf2.length); rt.sliceCopyFromSlice(rt.sliceRange(buf2, 0, n2), rt.sliceRange(data, 0, n2)); - v14 = ([rt.u16FromBeBytes(buf2), rt.sliceRange(data, n2)] as [rt.u16, Uint8Array])[0]; - _165 = rt.u8Rem(to, 12); + const v14: rt.u16 = ([rt.u16FromBeBytes(buf2), rt.sliceRange(data, n2)] as [rt.u16, Uint8Array])[0]; + const _165: rt.u8 = rt.u8Rem(to, 12); if (_165 === 0) { - v15 = v14 & 0xff; + const v15: rt.u8 = v14 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v15)); - _175 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v15, f)); + const _175: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v15, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_175)); } else if (_165 === 1) { - v16 = v14; + const v16: rt.u16 = v14; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v16)); - _185 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v16, f)); + const _185: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v16, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_185)); } else if (_165 === 2) { - v17 = v14 as rt.u32; + const v17: rt.u32 = v14 as rt.u32; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v17)); - _195 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v17, f)); + const _195: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v17, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_195)); } else if (_165 === 3) { - v18 = v14 as rt.u64; + const v18: rt.u64 = v14 as rt.u64; rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v18)); - _205 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v18, f)); + const _205: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v18, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_205)); } else if (_165 === 4) { - v19 = v14 as rt.u128; + const v19: rt.u128 = v14 as rt.u128; rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v19)); - _215 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v19, f)); + const _215: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v19, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_215)); } else if (_165 === 5) { - v20 = v14 as rt.usize; + const v20: rt.usize = v14 as rt.usize; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v20)); - _225 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v20, f)); + const _225: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v20, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_225)); } else if (_165 === 6) { - v21 = (v14 << 24) >> 24; + const v21: rt.i8 = (v14 << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v21)); - _235 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v21, f)); + const _235: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v21, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_235)); } else if (_165 === 7) { - v22 = (v14 << 16) >> 16; + const v22: rt.i16 = (v14 << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v22)); - _245 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v22, f)); + const _245: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v22, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_245)); } else if (_165 === 8) { - v23 = v14 as rt.i32; + const v23: rt.i32 = v14 as rt.i32; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v23)); - _255 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v23, f)); + const _255: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v23, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_255)); } else if (_165 === 9) { - v24 = v14 as rt.i64; + const v24: rt.i64 = v14 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v24)); - _265 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v24, f)); + const _265: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v24, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_265)); } else if (_165 === 10) { - v25 = v14 as rt.i128; + const v25: rt.i128 = v14 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v25)); - _275 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v25, f)); + const _275: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v25, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_275)); } else { - v26 = v14 as rt.isize; + const v26: rt.isize = v14 as rt.isize; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v26)); - _285 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v26, f)); + const _285: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v26, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_285)); } } else if (_5 === 2) { - buf3 = rt.bytes(4); - n3 = rt.min(data.length, buf3.length); + const buf3: Uint8Array = rt.bytes(4); + const n3: rt.usize = rt.min(data.length, buf3.length); rt.sliceCopyFromSlice(rt.sliceRange(buf3, 0, n3), rt.sliceRange(data, 0, n3)); - v27 = ([rt.u32FromBeBytes(buf3), rt.sliceRange(data, n3)] as [rt.u32, Uint8Array])[0]; - _305 = rt.u8Rem(to, 12); + const v27: rt.u32 = ([rt.u32FromBeBytes(buf3), rt.sliceRange(data, n3)] as [rt.u32, Uint8Array])[0]; + const _305: rt.u8 = rt.u8Rem(to, 12); if (_305 === 0) { - v28 = v27 & 0xff; + const v28: rt.u8 = v27 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v28)); - _315 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v28, f)); + const _315: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v28, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_315)); } else if (_305 === 1) { - v29 = v27 & 0xffff; + const v29: rt.u16 = v27 & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v29)); - _325 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v29, f)); + const _325: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v29, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_325)); } else if (_305 === 2) { - v30 = v27; + const v30: rt.u32 = v27; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v30)); - _335 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v30, f)); + const _335: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v30, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_335)); } else if (_305 === 3) { - v31 = v27 as rt.u64; + const v31: rt.u64 = v27 as rt.u64; rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v31)); - _345 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v31, f)); + const _345: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v31, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_345)); } else if (_305 === 4) { - v32 = v27 as rt.u128; + const v32: rt.u128 = v27 as rt.u128; rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v32)); - _355 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v32, f)); + const _355: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v32, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_355)); } else if (_305 === 5) { - v33 = v27 as rt.usize; + const v33: rt.usize = v27 as rt.usize; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v33)); - _365 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v33, f)); + const _365: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v33, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_365)); } else if (_305 === 6) { - v34 = (v27 << 24) >> 24; + const v34: rt.i8 = (v27 << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v34)); - _375 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v34, f)); + const _375: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v34, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_375)); } else if (_305 === 7) { - v35 = (v27 << 16) >> 16; + const v35: rt.i16 = (v27 << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v35)); - _385 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v35, f)); + const _385: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v35, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_385)); } else if (_305 === 8) { - v36 = v27 | 0; + const v36: rt.i32 = v27 | 0; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v36)); - _395 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v36, f)); + const _395: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v36, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_395)); } else if (_305 === 9) { - v37 = v27 as rt.i64; + const v37: rt.i64 = v27 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v37)); - _405 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v37, f)); + const _405: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v37, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_405)); } else if (_305 === 10) { - v38 = v27 as rt.i128; + const v38: rt.i128 = v27 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v38)); - _415 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v38, f)); + const _415: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v38, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_415)); } else { - v39 = v27 | 0; + const v39: rt.isize = v27 | 0; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v39)); - _425 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v39, f)); + const _425: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v39, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_425)); } } else if (_5 === 3) { - buf4 = rt.bytes(8); - n4 = rt.min(data.length, buf4.length); + const buf4: Uint8Array = rt.bytes(8); + const n4: rt.usize = rt.min(data.length, buf4.length); rt.sliceCopyFromSlice(rt.sliceRange(buf4, 0, n4), rt.sliceRange(data, 0, n4)); - v40 = ([rt.u64FromBeBytes(buf4), rt.sliceRange(data, n4)] as [rt.u64, Uint8Array])[0]; - _445 = rt.u8Rem(to, 12); + const v40: rt.u64 = ([rt.u64FromBeBytes(buf4), rt.sliceRange(data, n4)] as [rt.u64, Uint8Array])[0]; + const _445: rt.u8 = rt.u8Rem(to, 12); if (_445 === 0) { - v41 = rt.u64Low(v40) & 0xff; + const v41: rt.u8 = rt.u64Low(v40) & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v41)); - _455 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v41, f)); + const _455: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v41, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_455)); } else if (_445 === 1) { - v42 = rt.u64Low(v40) & 0xffff; + const v42: rt.u16 = rt.u64Low(v40) & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v42)); - _465 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v42, f)); + const _465: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v42, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_465)); } else if (_445 === 2) { - v43 = rt.u64Low(v40); + const v43: rt.u32 = rt.u64Low(v40); rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v43)); - _475 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v43, f)); + const _475: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v43, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_475)); } else if (_445 === 3) { - v44 = v40; + const v44: rt.u64 = v40; rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v44)); - _485 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v44, f)); + const _485: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v44, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_485)); } else if (_445 === 4) { - v45 = rt.u128Cast(v40); + const v45: rt.u128 = rt.u128Cast(v40); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v45)); - _495 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v45, f)); + const _495: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v45, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_495)); } else if (_445 === 5) { - v46 = rt.u64Low(v40); + const v46: rt.usize = rt.u64Low(v40); rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v46)); - _505 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v46, f)); + const _505: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v46, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_505)); } else if (_445 === 6) { - v47 = (rt.u64Low(v40) << 24) >> 24; + const v47: rt.i8 = (rt.u64Low(v40) << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v47)); - _515 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v47, f)); + const _515: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v47, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_515)); } else if (_445 === 7) { - v48 = (rt.u64Low(v40) << 16) >> 16; + const v48: rt.i16 = (rt.u64Low(v40) << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v48)); - _525 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v48, f)); + const _525: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v48, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_525)); } else if (_445 === 8) { - v49 = rt.u64Low(v40) | 0; + const v49: rt.i32 = rt.u64Low(v40) | 0; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v49)); - _535 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v49, f)); + const _535: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v49, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_535)); } else if (_445 === 9) { - v50 = rt.i64Cast(v40); + const v50: rt.i64 = rt.i64Cast(v40); rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v50)); - _545 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v50, f)); + const _545: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v50, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_545)); } else if (_445 === 10) { - v51 = rt.i128Cast(v40); + const v51: rt.i128 = rt.i128Cast(v40); rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v51)); - _555 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v51, f)); + const _555: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v51, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_555)); } else { - v52 = rt.u64Low(v40) | 0; + const v52: rt.isize = rt.u64Low(v40) | 0; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v52)); - _565 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v52, f)); + const _565: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v52, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_565)); } } else if (_5 === 4) { - buf5 = rt.bytes(16); - n5 = rt.min(data.length, buf5.length); + const buf5: Uint8Array = rt.bytes(16); + const n5: rt.usize = rt.min(data.length, buf5.length); rt.sliceCopyFromSlice(rt.sliceRange(buf5, 0, n5), rt.sliceRange(data, 0, n5)); - v53 = ([rt.u128FromBeBytes(buf5), rt.sliceRange(data, n5)] as [rt.u128, Uint8Array])[0]; - _585 = rt.u8Rem(to, 12); + const v53: rt.u128 = ([rt.u128FromBeBytes(buf5), rt.sliceRange(data, n5)] as [rt.u128, Uint8Array])[0]; + const _585: rt.u8 = rt.u8Rem(to, 12); if (_585 === 0) { - v54 = rt.u128Low(v53) & 0xff; + const v54: rt.u8 = rt.u128Low(v53) & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v54)); - _595 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v54, f)); + const _595: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v54, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_595)); } else if (_585 === 1) { - v55 = rt.u128Low(v53) & 0xffff; + const v55: rt.u16 = rt.u128Low(v53) & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v55)); - _605 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v55, f)); + const _605: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v55, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_605)); } else if (_585 === 2) { - v56 = rt.u128Low(v53); + const v56: rt.u32 = rt.u128Low(v53); rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v56)); - _615 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v56, f)); + const _615: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v56, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_615)); } else if (_585 === 3) { - v57 = rt.u64Cast(v53); + const v57: rt.u64 = rt.u64Cast(v53); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v57)); - _625 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v57, f)); + const _625: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v57, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_625)); } else if (_585 === 4) { - v58 = v53; + const v58: rt.u128 = v53; rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v58)); - _635 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v58, f)); + const _635: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v58, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_635)); } else if (_585 === 5) { - v59 = rt.u128Low(v53); + const v59: rt.usize = rt.u128Low(v53); rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v59)); - _645 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v59, f)); + const _645: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v59, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_645)); } else if (_585 === 6) { - v60 = (rt.u128Low(v53) << 24) >> 24; + const v60: rt.i8 = (rt.u128Low(v53) << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v60)); - _655 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v60, f)); + const _655: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v60, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_655)); } else if (_585 === 7) { - v61 = (rt.u128Low(v53) << 16) >> 16; + const v61: rt.i16 = (rt.u128Low(v53) << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v61)); - _665 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v61, f)); + const _665: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v61, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_665)); } else if (_585 === 8) { - v62 = rt.u128Low(v53) | 0; + const v62: rt.i32 = rt.u128Low(v53) | 0; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v62)); - _675 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v62, f)); + const _675: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v62, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_675)); } else if (_585 === 9) { - v63 = rt.i64Cast(v53); + const v63: rt.i64 = rt.i64Cast(v53); rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v63)); - _685 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v63, f)); + const _685: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v63, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_685)); } else if (_585 === 10) { - v64 = rt.i128Cast(v53); + const v64: rt.i128 = rt.i128Cast(v53); rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v64)); - _695 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v64, f)); + const _695: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v64, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_695)); } else { - v65 = rt.u128Low(v53) | 0; + const v65: rt.isize = rt.u128Low(v53) | 0; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v65)); - _705 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v65, f)); + const _705: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v65, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_705)); } } else if (_5 === 5) { - buf6 = rt.bytes(4); - n6 = rt.min(data.length, buf6.length); + const buf6: Uint8Array = rt.bytes(4); + const n6: rt.usize = rt.min(data.length, buf6.length); rt.sliceCopyFromSlice(rt.sliceRange(buf6, 0, n6), rt.sliceRange(data, 0, n6)); - v66 = ([rt.usizeFromBeBytes(buf6), rt.sliceRange(data, n6)] as [rt.usize, Uint8Array])[0]; - _725 = rt.u8Rem(to, 12); + const v66: rt.usize = ([rt.usizeFromBeBytes(buf6), rt.sliceRange(data, n6)] as [rt.usize, Uint8Array])[0]; + const _725: rt.u8 = rt.u8Rem(to, 12); if (_725 === 0) { - v67 = v66 & 0xff; + const v67: rt.u8 = v66 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v67)); - _735 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v67, f)); + const _735: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v67, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_735)); } else if (_725 === 1) { - v68 = v66 & 0xffff; + const v68: rt.u16 = v66 & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v68)); - _745 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v68, f)); + const _745: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v68, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_745)); } else if (_725 === 2) { - v69 = v66 as rt.u32; + const v69: rt.u32 = v66 as rt.u32; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v69)); - _755 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v69, f)); + const _755: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v69, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_755)); } else if (_725 === 3) { - v70 = v66 as rt.u64; + const v70: rt.u64 = v66 as rt.u64; rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v70)); - _765 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v70, f)); + const _765: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v70, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_765)); } else if (_725 === 4) { - v71 = v66 as rt.u128; + const v71: rt.u128 = v66 as rt.u128; rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v71)); - _775 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v71, f)); + const _775: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v71, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_775)); } else if (_725 === 5) { - v72 = v66; + const v72: rt.usize = v66; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v72)); - _785 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v72, f)); + const _785: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v72, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_785)); } else if (_725 === 6) { - v73 = (v66 << 24) >> 24; + const v73: rt.i8 = (v66 << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v73)); - _795 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v73, f)); + const _795: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v73, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_795)); } else if (_725 === 7) { - v74 = (v66 << 16) >> 16; + const v74: rt.i16 = (v66 << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v74)); - _805 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v74, f)); + const _805: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v74, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_805)); } else if (_725 === 8) { - v75 = v66 | 0; + const v75: rt.i32 = v66 | 0; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v75)); - _815 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v75, f)); + const _815: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v75, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_815)); } else if (_725 === 9) { - v76 = v66 as rt.i64; + const v76: rt.i64 = v66 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v76)); - _825 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v76, f)); + const _825: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v76, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_825)); } else if (_725 === 10) { - v77 = v66 as rt.i128; + const v77: rt.i128 = v66 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v77)); - _835 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v77, f)); + const _835: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v77, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_835)); } else { - v78 = v66 | 0; + const v78: rt.isize = v66 | 0; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v78)); - _845 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v78, f)); + const _845: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v78, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_845)); } } else if (_5 === 6) { - buf7 = Uint8Array.of(0); - n7 = rt.min(data.length, buf7.length); + const buf7: Uint8Array = Uint8Array.of(0); + const n7: rt.usize = rt.min(data.length, buf7.length); rt.sliceCopyFromSlice(rt.sliceRange(buf7, 0, n7), rt.sliceRange(data, 0, n7)); - v79 = ([rt.i8FromBeBytes(buf7), rt.sliceRange(data, n7)] as [rt.i8, Uint8Array])[0]; - _865 = rt.u8Rem(to, 12); + const v79: rt.i8 = ([rt.i8FromBeBytes(buf7), rt.sliceRange(data, n7)] as [rt.i8, Uint8Array])[0]; + const _865: rt.u8 = rt.u8Rem(to, 12); if (_865 === 0) { - v80 = v79 & 0xff; + const v80: rt.u8 = v79 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v80)); - _875 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v80, f)); + const _875: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v80, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_875)); } else if (_865 === 1) { - v81 = v79 & 0xffff; + const v81: rt.u16 = v79 & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v81)); - _885 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v81, f)); + const _885: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v81, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_885)); } else if (_865 === 2) { - v82 = v79 >>> 0; + const v82: rt.u32 = v79 >>> 0; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v82)); - _895 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v82, f)); + const _895: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v82, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_895)); } else if (_865 === 3) { - v83 = rt.u64Cast(v79); + const v83: rt.u64 = rt.u64Cast(v79); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v83)); - _905 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v83, f)); + const _905: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v83, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_905)); } else if (_865 === 4) { - v84 = rt.u128Cast(v79); + const v84: rt.u128 = rt.u128Cast(v79); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v84)); - _915 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v84, f)); + const _915: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v84, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_915)); } else if (_865 === 5) { - v85 = v79 >>> 0; + const v85: rt.usize = v79 >>> 0; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v85)); - _925 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v85, f)); + const _925: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v85, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_925)); } else if (_865 === 6) { - v86 = v79; + const v86: rt.i8 = v79; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v86)); - _935 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v86, f)); + const _935: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v86, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_935)); } else if (_865 === 7) { - v87 = v79 as rt.i16; + const v87: rt.i16 = v79 as rt.i16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v87)); - _945 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v87, f)); + const _945: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v87, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_945)); } else if (_865 === 8) { - v88 = v79 as rt.i32; + const v88: rt.i32 = v79 as rt.i32; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v88)); - _955 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v88, f)); + const _955: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v88, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_955)); } else if (_865 === 9) { - v89 = v79 as rt.i64; + const v89: rt.i64 = v79 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v89)); - _965 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v89, f)); + const _965: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v89, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_965)); } else if (_865 === 10) { - v90 = v79 as rt.i128; + const v90: rt.i128 = v79 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v90)); - _975 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v90, f)); + const _975: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v90, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_975)); } else { - v91 = v79 as rt.isize; + const v91: rt.isize = v79 as rt.isize; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v91)); - _985 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v91, f)); + const _985: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v91, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_985)); } } else if (_5 === 7) { - buf8 = rt.bytes(2); - n8 = rt.min(data.length, buf8.length); + const buf8: Uint8Array = rt.bytes(2); + const n8: rt.usize = rt.min(data.length, buf8.length); rt.sliceCopyFromSlice(rt.sliceRange(buf8, 0, n8), rt.sliceRange(data, 0, n8)); - v92 = ([rt.i16FromBeBytes(buf8), rt.sliceRange(data, n8)] as [rt.i16, Uint8Array])[0]; - _1005 = rt.u8Rem(to, 12); + const v92: rt.i16 = ([rt.i16FromBeBytes(buf8), rt.sliceRange(data, n8)] as [rt.i16, Uint8Array])[0]; + const _1005: rt.u8 = rt.u8Rem(to, 12); if (_1005 === 0) { - v93 = v92 & 0xff; + const v93: rt.u8 = v92 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v93)); - _1015 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v93, f)); + const _1015: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v93, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1015)); } else if (_1005 === 1) { - v94 = v92 & 0xffff; + const v94: rt.u16 = v92 & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v94)); - _1025 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v94, f)); + const _1025: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v94, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1025)); } else if (_1005 === 2) { - v95 = v92 >>> 0; + const v95: rt.u32 = v92 >>> 0; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v95)); - _1035 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v95, f)); + const _1035: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v95, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1035)); } else if (_1005 === 3) { - v96 = rt.u64Cast(v92); + const v96: rt.u64 = rt.u64Cast(v92); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v96)); - _1045 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v96, f)); + const _1045: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v96, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1045)); } else if (_1005 === 4) { - v97 = rt.u128Cast(v92); + const v97: rt.u128 = rt.u128Cast(v92); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v97)); - _1055 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v97, f)); + const _1055: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v97, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1055)); } else if (_1005 === 5) { - v98 = v92 >>> 0; + const v98: rt.usize = v92 >>> 0; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v98)); - _1065 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v98, f)); + const _1065: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v98, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1065)); } else if (_1005 === 6) { - v99 = (v92 << 24) >> 24; + const v99: rt.i8 = (v92 << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v99)); - _1075 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v99, f)); + const _1075: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v99, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1075)); } else if (_1005 === 7) { - v100 = v92; + const v100: rt.i16 = v92; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v100)); - _1085 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v100, f)); + const _1085: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v100, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1085)); } else if (_1005 === 8) { - v101 = v92 as rt.i32; + const v101: rt.i32 = v92 as rt.i32; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v101)); - _1095 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v101, f)); + const _1095: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v101, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1095)); } else if (_1005 === 9) { - v102 = v92 as rt.i64; + const v102: rt.i64 = v92 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v102)); - _1105 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v102, f)); + const _1105: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v102, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1105)); } else if (_1005 === 10) { - v103 = v92 as rt.i128; + const v103: rt.i128 = v92 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v103)); - _1115 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v103, f)); + const _1115: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v103, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1115)); } else { - v104 = v92 as rt.isize; + const v104: rt.isize = v92 as rt.isize; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v104)); - _1125 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v104, f)); + const _1125: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v104, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1125)); } } else if (_5 === 8) { - buf9 = rt.bytes(4); - n9 = rt.min(data.length, buf9.length); + const buf9: Uint8Array = rt.bytes(4); + const n9: rt.usize = rt.min(data.length, buf9.length); rt.sliceCopyFromSlice(rt.sliceRange(buf9, 0, n9), rt.sliceRange(data, 0, n9)); - v105 = ([rt.i32FromBeBytes(buf9), rt.sliceRange(data, n9)] as [rt.i32, Uint8Array])[0]; - _1145 = rt.u8Rem(to, 12); + const v105: rt.i32 = ([rt.i32FromBeBytes(buf9), rt.sliceRange(data, n9)] as [rt.i32, Uint8Array])[0]; + const _1145: rt.u8 = rt.u8Rem(to, 12); if (_1145 === 0) { - v106 = v105 & 0xff; + const v106: rt.u8 = v105 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v106)); - _1155 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v106, f)); + const _1155: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v106, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1155)); } else if (_1145 === 1) { - v107 = v105 & 0xffff; + const v107: rt.u16 = v105 & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v107)); - _1165 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v107, f)); + const _1165: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v107, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1165)); } else if (_1145 === 2) { - v108 = v105 >>> 0; + const v108: rt.u32 = v105 >>> 0; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v108)); - _1175 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v108, f)); + const _1175: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v108, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1175)); } else if (_1145 === 3) { - v109 = rt.u64Cast(v105); + const v109: rt.u64 = rt.u64Cast(v105); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v109)); - _1185 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v109, f)); + const _1185: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v109, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1185)); } else if (_1145 === 4) { - v110 = rt.u128Cast(v105); + const v110: rt.u128 = rt.u128Cast(v105); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v110)); - _1195 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v110, f)); + const _1195: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v110, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1195)); } else if (_1145 === 5) { - v111 = v105 >>> 0; + const v111: rt.usize = v105 >>> 0; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v111)); - _1205 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v111, f)); + const _1205: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v111, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1205)); } else if (_1145 === 6) { - v112 = (v105 << 24) >> 24; + const v112: rt.i8 = (v105 << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v112)); - _1215 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v112, f)); + const _1215: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v112, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1215)); } else if (_1145 === 7) { - v113 = (v105 << 16) >> 16; + const v113: rt.i16 = (v105 << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v113)); - _1225 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v113, f)); + const _1225: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v113, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1225)); } else if (_1145 === 8) { - v114 = v105; + const v114: rt.i32 = v105; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v114)); - _1235 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v114, f)); + const _1235: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v114, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1235)); } else if (_1145 === 9) { - v115 = v105 as rt.i64; + const v115: rt.i64 = v105 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v115)); - _1245 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v115, f)); + const _1245: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v115, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1245)); } else if (_1145 === 10) { - v116 = v105 as rt.i128; + const v116: rt.i128 = v105 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v116)); - _1255 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v116, f)); + const _1255: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v116, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1255)); } else { - v117 = v105 as rt.isize; + const v117: rt.isize = v105 as rt.isize; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v117)); - _1265 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v117, f)); + const _1265: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v117, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1265)); } } else if (_5 === 9) { - buf10 = rt.bytes(8); - n10 = rt.min(data.length, buf10.length); + const buf10: Uint8Array = rt.bytes(8); + const n10: rt.usize = rt.min(data.length, buf10.length); rt.sliceCopyFromSlice(rt.sliceRange(buf10, 0, n10), rt.sliceRange(data, 0, n10)); - v118 = ([rt.i64FromBeBytes(buf10), rt.sliceRange(data, n10)] as [rt.i64, Uint8Array])[0]; - _1285 = rt.u8Rem(to, 12); + const v118: rt.i64 = ([rt.i64FromBeBytes(buf10), rt.sliceRange(data, n10)] as [rt.i64, Uint8Array])[0]; + const _1285: rt.u8 = rt.u8Rem(to, 12); if (_1285 === 0) { - v119 = rt.i64Low(v118) & 0xff; + const v119: rt.u8 = rt.i64Low(v118) & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v119)); - _1295 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v119, f)); + const _1295: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v119, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1295)); } else if (_1285 === 1) { - v120 = rt.i64Low(v118) & 0xffff; + const v120: rt.u16 = rt.i64Low(v118) & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v120)); - _1305 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v120, f)); + const _1305: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v120, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1305)); } else if (_1285 === 2) { - v121 = rt.i64Low(v118); + const v121: rt.u32 = rt.i64Low(v118); rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v121)); - _1315 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v121, f)); + const _1315: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v121, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1315)); } else if (_1285 === 3) { - v122 = rt.u64Cast(v118); + const v122: rt.u64 = rt.u64Cast(v118); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v122)); - _1325 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v122, f)); + const _1325: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v122, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1325)); } else if (_1285 === 4) { - v123 = rt.u128Cast(v118); + const v123: rt.u128 = rt.u128Cast(v118); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v123)); - _1335 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v123, f)); + const _1335: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v123, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1335)); } else if (_1285 === 5) { - v124 = rt.i64Low(v118); + const v124: rt.usize = rt.i64Low(v118); rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v124)); - _1345 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v124, f)); + const _1345: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v124, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1345)); } else if (_1285 === 6) { - v125 = (rt.i64Low(v118) << 24) >> 24; + const v125: rt.i8 = (rt.i64Low(v118) << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v125)); - _1355 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v125, f)); + const _1355: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v125, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1355)); } else if (_1285 === 7) { - v126 = (rt.i64Low(v118) << 16) >> 16; + const v126: rt.i16 = (rt.i64Low(v118) << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v126)); - _1365 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v126, f)); + const _1365: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v126, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1365)); } else if (_1285 === 8) { - v127 = rt.i64Low(v118) | 0; + const v127: rt.i32 = rt.i64Low(v118) | 0; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v127)); - _1375 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v127, f)); + const _1375: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v127, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1375)); } else if (_1285 === 9) { - v128 = v118; + const v128: rt.i64 = v118; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v128)); - _1385 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v128, f)); + const _1385: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v128, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1385)); } else if (_1285 === 10) { - v129 = rt.i128Cast(v118); + const v129: rt.i128 = rt.i128Cast(v118); rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v129)); - _1395 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v129, f)); + const _1395: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v129, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1395)); } else { - v130 = rt.i64Low(v118) | 0; + const v130: rt.isize = rt.i64Low(v118) | 0; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v130)); - _1405 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v130, f)); + const _1405: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v130, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1405)); } } else if (_5 === 10) { - buf11 = rt.bytes(16); - n11 = rt.min(data.length, buf11.length); + const buf11: Uint8Array = rt.bytes(16); + const n11: rt.usize = rt.min(data.length, buf11.length); rt.sliceCopyFromSlice(rt.sliceRange(buf11, 0, n11), rt.sliceRange(data, 0, n11)); - v131 = ([rt.i128FromBeBytes(buf11), rt.sliceRange(data, n11)] as [rt.i128, Uint8Array])[0]; - _1425 = rt.u8Rem(to, 12); + const v131: rt.i128 = ([rt.i128FromBeBytes(buf11), rt.sliceRange(data, n11)] as [rt.i128, Uint8Array])[0]; + const _1425: rt.u8 = rt.u8Rem(to, 12); if (_1425 === 0) { - v132 = rt.i128Low(v131) & 0xff; + const v132: rt.u8 = rt.i128Low(v131) & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v132)); - _1435 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v132, f)); + const _1435: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v132, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1435)); } else if (_1425 === 1) { - v133 = rt.i128Low(v131) & 0xffff; + const v133: rt.u16 = rt.i128Low(v131) & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v133)); - _1445 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v133, f)); + const _1445: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v133, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1445)); } else if (_1425 === 2) { - v134 = rt.i128Low(v131); + const v134: rt.u32 = rt.i128Low(v131); rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v134)); - _1455 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v134, f)); + const _1455: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v134, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1455)); } else if (_1425 === 3) { - v135 = rt.u64Cast(v131); + const v135: rt.u64 = rt.u64Cast(v131); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v135)); - _1465 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v135, f)); + const _1465: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v135, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1465)); } else if (_1425 === 4) { - v136 = rt.u128Cast(v131); + const v136: rt.u128 = rt.u128Cast(v131); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v136)); - _1475 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v136, f)); + const _1475: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v136, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1475)); } else if (_1425 === 5) { - v137 = rt.i128Low(v131); + const v137: rt.usize = rt.i128Low(v131); rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v137)); - _1485 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v137, f)); + const _1485: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v137, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1485)); } else if (_1425 === 6) { - v138 = (rt.i128Low(v131) << 24) >> 24; + const v138: rt.i8 = (rt.i128Low(v131) << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v138)); - _1495 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v138, f)); + const _1495: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v138, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1495)); } else if (_1425 === 7) { - v139 = (rt.i128Low(v131) << 16) >> 16; + const v139: rt.i16 = (rt.i128Low(v131) << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v139)); - _1505 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v139, f)); + const _1505: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v139, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1505)); } else if (_1425 === 8) { - v140 = rt.i128Low(v131) | 0; + const v140: rt.i32 = rt.i128Low(v131) | 0; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v140)); - _1515 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v140, f)); + const _1515: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v140, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1515)); } else if (_1425 === 9) { - v141 = rt.i64Cast(v131); + const v141: rt.i64 = rt.i64Cast(v131); rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v141)); - _1525 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v141, f)); + const _1525: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v141, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1525)); } else if (_1425 === 10) { - v142 = v131; + const v142: rt.i128 = v131; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v142)); - _1535 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v142, f)); + const _1535: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v142, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1535)); } else { - v143 = rt.i128Low(v131) | 0; + const v143: rt.isize = rt.i128Low(v131) | 0; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v143)); - _1545 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v143, f)); + const _1545: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v143, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1545)); } } else { - buf12 = rt.bytes(4); - n12 = rt.min(data.length, buf12.length); + const buf12: Uint8Array = rt.bytes(4); + const n12: rt.usize = rt.min(data.length, buf12.length); rt.sliceCopyFromSlice(rt.sliceRange(buf12, 0, n12), rt.sliceRange(data, 0, n12)); - v144 = ([rt.isizeFromBeBytes(buf12), rt.sliceRange(data, n12)] as [rt.isize, Uint8Array])[0]; - _1565 = rt.u8Rem(to, 12); + const v144: rt.isize = ([rt.isizeFromBeBytes(buf12), rt.sliceRange(data, n12)] as [rt.isize, Uint8Array])[0]; + const _1565: rt.u8 = rt.u8Rem(to, 12); if (_1565 === 0) { - v145 = v144 & 0xff; + const v145: rt.u8 = v144 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v145)); - _1575 = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v145, f)); + const _1575: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v145, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1575)); } else if (_1565 === 1) { - v146 = v144 & 0xffff; + const v146: rt.u16 = v144 & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v146)); - _1585 = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v146, f)); + const _1585: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v146, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1585)); } else if (_1565 === 2) { - v147 = v144 >>> 0; + const v147: rt.u32 = v144 >>> 0; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v147)); - _1595 = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v147, f)); + const _1595: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v147, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1595)); } else if (_1565 === 3) { - v148 = rt.u64Cast(v144); + const v148: rt.u64 = rt.u64Cast(v144); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v148)); - _1605 = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v148, f)); + const _1605: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v148, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1605)); } else if (_1565 === 4) { - v149 = rt.u128Cast(v144); + const v149: rt.u128 = rt.u128Cast(v144); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v149)); - _1615 = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v149, f)); + const _1615: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v149, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1615)); } else if (_1565 === 5) { - v150 = v144 >>> 0; + const v150: rt.usize = v144 >>> 0; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v150)); - _1625 = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v150, f)); + const _1625: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v150, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1625)); } else if (_1565 === 6) { - v151 = (v144 << 24) >> 24; + const v151: rt.i8 = (v144 << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v151)); - _1635 = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v151, f)); + const _1635: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v151, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1635)); } else if (_1565 === 7) { - v152 = (v144 << 16) >> 16; + const v152: rt.i16 = (v144 << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v152)); - _1645 = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v152, f)); + const _1645: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v152, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1645)); } else if (_1565 === 8) { - v153 = v144 as rt.i32; + const v153: rt.i32 = v144 as rt.i32; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v153)); - _1655 = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v153, f)); + const _1655: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v153, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1655)); } else if (_1565 === 9) { - v154 = v144 as rt.i64; + const v154: rt.i64 = v144 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v154)); - _1665 = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v154, f)); + const _1665: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v154, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1665)); } else if (_1565 === 10) { - v155 = v144 as rt.i128; + const v155: rt.i128 = v144 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v155)); - _1675 = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v155, f)); + const _1675: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v155, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1675)); } else { - v156 = v144; + const v156: rt.isize = v144; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v156)); - _1685 = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v156, f)); + const _1685: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v156, f)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1685)); } } @@ -2807,67 +2266,48 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): /** Conversions that check, and ones that cannot fail. */ export function convert(data: Uint8Array, out: rt.ByteVec): void { - let wide!: rt.u64; - let _5!: [rt.u64, Uint8Array]; - let buf!: Uint8Array; - let n!: rt.usize; - let signed!: rt.i32; - let buf2!: Uint8Array; - let n2!: rt.usize; - let _31!: Uint8Array; - let _36!: rt.i32; - let _46!: rt.Result; - let _53!: rt.Result; - let _60!: rt.Result; - let widened!: rt.u64; - let into!: rt.i64; - let a!: rt.u8; - let b!: rt.u8; - let c!: rt.u8; - let d!: rt.u8; - let _86!: Uint8Array; - buf = rt.bytes(8); - n = rt.min(data.length, buf.length); + const buf: Uint8Array = rt.bytes(8); + const n: rt.usize = rt.min(data.length, buf.length); rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); - _5 = [rt.u64FromBeBytes(buf), rt.sliceRange(data, n)] as [rt.u64, Uint8Array]; - wide = _5[0]; - buf2 = rt.bytes(4); - n2 = rt.min(rt.sliceRange(data, n).length, buf2.length); - _31 = rt.sliceRange(buf2, 0, n2); + const _5: [rt.u64, Uint8Array] = [rt.u64FromBeBytes(buf), rt.sliceRange(data, n)]; + const wide: rt.u64 = _5[0]; + const buf2: Uint8Array = rt.bytes(4); + const n2: rt.usize = rt.min(rt.sliceRange(data, n).length, buf2.length); + const _31: Uint8Array = rt.sliceRange(buf2, 0, n2); const slice = rt.sliceRange(data, n); rt.sliceCopyFromSlice(_31, rt.sliceRange(slice, 0, n2)); - _36 = rt.i32FromBeBytes(buf2); + const _36: rt.i32 = rt.i32FromBeBytes(buf2); const slice2 = rt.sliceRange(data, n); - signed = ([_36, rt.sliceRange(slice2, n2)] as [rt.i32, Uint8Array])[0]; + const signed: rt.i32 = ([_36, rt.sliceRange(slice2, n2)] as [rt.i32, Uint8Array])[0]; rt.byteVecPush(out, rt.u8TryFrom(wide).ok ? 1 : 0); - _46 = rt.u32TryFrom(wide); + const _46: rt.Result = rt.u32TryFrom(wide); if (_46.ok) { rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(_46.value)); } else { rt.byteVecPush(out, 255); } - _53 = rt.usizeTryFrom(signed); + const _53: rt.Result = rt.usizeTryFrom(signed); if (_53.ok) { rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(_53.value)); } else { rt.byteVecPush(out, 254); } - _60 = rt.i8TryFrom(signed); + const _60: rt.Result = rt.i8TryFrom(signed); if (_60.ok) { rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(_60.value)); } else { rt.byteVecPush(out, 253); } - widened = (rt.u64Low(wide) & 0xffff) as rt.u64; - into = signed as rt.i64; + const widened: rt.u64 = (rt.u64Low(wide) & 0xffff) as rt.u64; + const into: rt.i64 = signed as rt.i64; rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(widened)); rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(into)); rt.byteVecPush(out, rt.u8Add(true ? 1 : 0, false ? 1 : 0)); - _86 = rt.u32ToBeBytes(signed >>> 0); - a = _86[0]; - b = _86[1]; - c = _86[2]; - d = _86[3]; + const _86: Uint8Array = rt.u32ToBeBytes(signed >>> 0); + const a: rt.u8 = _86[0]; + const b: rt.u8 = _86[1]; + const c: rt.u8 = _86[2]; + const d: rt.u8 = _86[3]; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes((a << 24) >> 24)); rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes((a << 8) | b)); rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes((((a << 8) | b) << 16) >> 16)); diff --git a/ts/fixtures/lang/expected/iters.Countdown.ts b/ts/fixtures/lang/expected/iters.Countdown.ts index 960963125..b302f1880 100644 --- a/ts/fixtures/lang/expected/iters.Countdown.ts +++ b/ts/fixtures/lang/expected/iters.Countdown.ts @@ -9,11 +9,10 @@ export interface Countdown { } export function next$Iterator(self: Countdown): rt.u8 | rt.Done { - let left!: rt.u8; if (self.left === 0) { return rt.DONE; } - left = self.left; + const left: rt.u8 = self.left; self.left = rt.u8SaturatingSub(left, self.step); return left; } diff --git a/ts/fixtures/lang/expected/iters.Doubled.ts b/ts/fixtures/lang/expected/iters.Doubled.ts index 10eb2be27..6ef494301 100644 --- a/ts/fixtures/lang/expected/iters.Doubled.ts +++ b/ts/fixtures/lang/expected/iters.Doubled.ts @@ -8,10 +8,8 @@ export interface Doubled { } export function fmt$Debug(self: Doubled, f: rt.Formatter): rt.Result { - let _5!: rt.DebugList; - let _6!: rt.Iter; - _5 = rt.fmtDebugList(f); - _6 = rt.iterMap(rt.iterSlice(self._0), (_2: rt.u8): rt.u16 => { + const _5: rt.DebugList = rt.fmtDebugList(f); + const _6: rt.Iter = rt.iterMap(rt.iterSlice(self._0), (_2: rt.u8): rt.u16 => { return rt.u16Mul(_2 as rt.u16, 2); }); return rt.debugListFinish(rt.debugListEntries(_5, _6, rt.u16Display)); diff --git a/ts/fixtures/lang/expected/iters.Evens.ts b/ts/fixtures/lang/expected/iters.Evens.ts index 680945bac..4ea3ae9e3 100644 --- a/ts/fixtures/lang/expected/iters.Evens.ts +++ b/ts/fixtures/lang/expected/iters.Evens.ts @@ -8,12 +8,10 @@ export interface Evens { } export function next$Iterator(self: Evens): rt.u8 | rt.Done { - let _2!: rt.u8 | rt.Done; - let b!: rt.u8; l0: while (true) { - _2 = self.inner.next(); + const _2: rt.u8 | rt.Done = self.inner.next(); if (_2 !== rt.DONE) { - b = _2; + const b: rt.u8 = _2; if (!(rt.u8Rem(b, 2) === 0)) { continue l0; } diff --git a/ts/fixtures/lang/expected/iters.Gaps.ts b/ts/fixtures/lang/expected/iters.Gaps.ts index 3146f3ac8..08c1ba8d4 100644 --- a/ts/fixtures/lang/expected/iters.Gaps.ts +++ b/ts/fixtures/lang/expected/iters.Gaps.ts @@ -9,11 +9,9 @@ export interface Gaps { } export function next$Iterator(self: Gaps): rt.u8 | undefined | rt.Done { - let b!: rt.u8; - let _3!: rt.u8 | undefined; - _3 = rt.sliceGet(self.data, self.at); + const _3: rt.u8 | undefined = rt.sliceGet(self.data, self.at); if (_3 !== undefined) { - b = _3; + const b: rt.u8 = _3; self.at = rt.usizeAdd(self.at, 1); if (!(b === 0)) { return b; diff --git a/ts/fixtures/lang/expected/iters.Halving.ts b/ts/fixtures/lang/expected/iters.Halving.ts index bdbdc2a86..1d2d62e4c 100644 --- a/ts/fixtures/lang/expected/iters.Halving.ts +++ b/ts/fixtures/lang/expected/iters.Halving.ts @@ -12,18 +12,16 @@ export class Halving { } export function next$Iterator_u8(self: Halving): rt.u8 | rt.Done { - let value!: rt.u8; - value = self.value; + const value: rt.u8 = self.value; self.value = rt.u8Div(self.value, 2); return rt.iterFromOption(rt.thenSome(value !== 0, value)); } export function next$Iterator_u64(self: Halving): rt.u64 | rt.Done { - let value!: rt.u64; if (self.value === 0) { return rt.DONE; } - value = self.value; + const value: rt.u64 = self.value; self.value = rt.u64Shr(value, 1); return value; } diff --git a/ts/fixtures/lang/expected/iters.ts b/ts/fixtures/lang/expected/iters.ts index 115351fd7..50f7fa499 100644 --- a/ts/fixtures/lang/expected/iters.ts +++ b/ts/fixtures/lang/expected/iters.ts @@ -13,57 +13,22 @@ import * as Wrapper from "./iters.Wrapper.ts"; /** Adaptor chains over the input bytes, each consumed one way. */ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let _4!: rt.u8; - let doubled!: rt.ByteVec; - let iterS!: rt.u16[]; - let iterI!: number; - let _18!: rt.u16 | rt.Done; - let iter2!: rt.Iter<[rt.usize, rt.u8]>; - let _32!: [rt.usize, rt.u8] | rt.Done; - let i!: rt.usize; - let b!: rt.u8; - let iter3!: rt.Iter<[rt.usize, rt.u8]>; - let _46!: [rt.usize, rt.u8] | rt.Done; - let _56!: [Uint8Array, Uint8Array]; - let zipped!: rt.ByteVec; - let chained!: rt.ByteVec; - let taken!: rt.ByteVec; - let skipped!: rt.ByteVec; - let mapped!: rt.ByteVec; - let words!: rt.ByteVec[]; - let flat!: rt.ByteVec; - let it!: rt.Peekable; - let _118!: rt.u8 | rt.Done; - let b2!: rt.u8; - let run!: rt.u8; - let _133!: rt.u8 | undefined; - let it2!: rt.Iter; - let firsts!: rt.ByteVec; - let _152!: rt.u8 | undefined; - let rest!: rt.ByteVec; - let pairs!: Uint8Array[]; - let copies!: Uint8Array[]; - let iter4!: rt.Iter; - let _187!: Uint8Array | rt.Done; - let v2!: rt.u16[]; - let _196!: rt.Iter; b0: { - _4 = rt.u8Rem(kind, 8); + const _4: rt.u8 = rt.u8Rem(kind, 8); if (_4 === 0) { - doubled = rt.iterToByteVec(rt.iterFilter(rt.iterMap(rt.iterSlice(data), (_216: rt.u8): rt.u8 => { + const doubled: rt.ByteVec = rt.iterToByteVec(rt.iterFilter(rt.iterMap(rt.iterSlice(data), (_216: rt.u8): rt.u8 => { return rt.u8Div(_216, 2); }), (b11: rt.u8): boolean => { return rt.u8Rem(b11, 3) !== 0; })); rt.byteVecExtendFromSlice(out, rt.byteVecView(doubled)); - iterS = rt.iterToArray(rt.iterFilterMap(rt.iterSlice(data), (_217: rt.u8): rt.u16 | undefined => { - let b12!: rt.u8; - b12 = _217; + const iterS: rt.u16[] = rt.iterToArray(rt.iterFilterMap(rt.iterSlice(data), (_217: rt.u8): rt.u16 | undefined => { + const b12: rt.u8 = _217; return rt.thenSome(b12 < 100, rt.u16Mul(b12 as rt.u16, 200)); })); - iterI = 0; + let iterI: number = 0; while (true) { - _18 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _18: rt.u16 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_18 === rt.DONE) { break b0; } @@ -71,49 +36,49 @@ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { } } if (_4 === 1) { - iter2 = rt.iterStepBy(rt.iterSkip(rt.iterEnumerate(rt.iterSlice(data)), 1), 2); + const iter2: rt.Iter<[rt.usize, rt.u8]> = rt.iterStepBy(rt.iterSkip(rt.iterEnumerate(rt.iterSlice(data)), 1), 2); while (true) { - _32 = iter2.next(); + const _32: [rt.usize, rt.u8] | rt.Done = iter2.next(); if (_32 === rt.DONE) { - iter3 = rt.iterTake(rt.iterEnumerate(rt.iterRev(rt.iterSlice(data))), 3); + const iter3: rt.Iter<[rt.usize, rt.u8]> = rt.iterTake(rt.iterEnumerate(rt.iterRev(rt.iterSlice(data))), 3); while (true) { - _46 = iter3.next(); + const _46: [rt.usize, rt.u8] | rt.Done = iter3.next(); if (_46 === rt.DONE) { break b0; } rt.byteVecPush(out, (_46[0] & 0xff) ^ _46[1]); } } - i = _32[0]; - b = _32[1]; + const i: rt.usize = _32[0]; + const b: rt.u8 = _32[1]; rt.byteVecPush(out, i & 0xff); rt.byteVecPush(out, b); } } if (_4 === 2) { - _56 = rt.sliceSplitAt(data, rt.usizeDiv(data.length, 2)); - zipped = rt.iterToByteVec(rt.iterMap(rt.iterZip(rt.iterSlice(_56[0]), rt.iterRev(rt.iterSlice(_56[1]))), (_215: [rt.u8, rt.u8]): rt.u8 => { + const _56: [Uint8Array, Uint8Array] = rt.sliceSplitAt(data, rt.usizeDiv(data.length, 2)); + const zipped: rt.ByteVec = rt.iterToByteVec(rt.iterMap(rt.iterZip(rt.iterSlice(_56[0]), rt.iterRev(rt.iterSlice(_56[1]))), (_215: [rt.u8, rt.u8]): rt.u8 => { return _215[0] ^ _215[1]; })); rt.byteVecExtendFromSlice(out, rt.byteVecView(zipped)); - chained = rt.iterToByteVec(rt.iterRev(rt.iterChain(rt.iterSlice(_56[0]), rt.iterSlice(_56[1])))); + const chained: rt.ByteVec = rt.iterToByteVec(rt.iterRev(rt.iterChain(rt.iterSlice(_56[0]), rt.iterSlice(_56[1])))); rt.byteVecExtendFromSlice(out, rt.byteVecView(chained)); } else if (_4 === 3) { - taken = rt.iterToByteVec(rt.iterTakeWhile(rt.iterSlice(data), (_212: rt.u8): boolean => { + const taken: rt.ByteVec = rt.iterToByteVec(rt.iterTakeWhile(rt.iterSlice(data), (_212: rt.u8): boolean => { return _212 !== 0; })); - skipped = rt.iterToByteVec(rt.iterSkipWhile(rt.iterSlice(data), (_213: rt.u8): boolean => { + const skipped: rt.ByteVec = rt.iterToByteVec(rt.iterSkipWhile(rt.iterSlice(data), (_213: rt.u8): boolean => { return _213 < 128; })); - mapped = rt.iterToByteVec(rt.iterMapWhile(rt.iterSlice(data), (_214: rt.u8): rt.u8 | undefined => { + const mapped: rt.ByteVec = rt.iterToByteVec(rt.iterMapWhile(rt.iterSlice(data), (_214: rt.u8): rt.u8 | undefined => { return rt.u8CheckedAdd(_214, 64); })); rt.byteVecPush(out, taken.length & 0xff); rt.byteVecPush(out, skipped.length & 0xff); rt.byteVecExtendFromSlice(out, rt.byteVecView(mapped)); } else if (_4 === 4) { - words = chunksByZero$ChunksByZero_u8s(data); - flat = rt.iterToByteVec(rt.iterFlatMap(rt.iterSlice(words), (w: rt.ByteVec): rt.Iter => { + const words: rt.ByteVec[] = chunksByZero$ChunksByZero_u8s(data); + const flat: rt.ByteVec = rt.iterToByteVec(rt.iterFlatMap(rt.iterSlice(words), (w: rt.ByteVec): rt.Iter => { return rt.iterRev(rt.iterSlice(rt.byteVecView(w))); })); rt.byteVecExtendFromSlice(out, rt.byteVecView(flat)); @@ -122,71 +87,73 @@ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { return rt.u8WrappingAdd(_211, 3); }); })))); - } else if (_4 === 5) { - it = rt.iterPeekable(rt.iterSlice(data)); - l4: while (true) { - _118 = it.next(); - if (_118 !== rt.DONE) { - b2 = _118; - run = 1; - while (true) { - if (!((rt.peekableNextIf(it, (_210: rt.u8): boolean => { - return _210 === b2; - }) !== undefined))) { - rt.byteVecPush(out, b2); - rt.byteVecPush(out, run); - _133 = rt.peekablePeek(it); - if (_133 !== undefined) { - rt.byteVecPush(out, _133); + } else { + if (_4 === 5) { + const it: rt.Peekable = rt.iterPeekable(rt.iterSlice(data)); + l4: while (true) { + const _118: rt.u8 | rt.Done = it.next(); + if (_118 !== rt.DONE) { + const b2: rt.u8 = _118; + let run: rt.u8 = 1; + while (true) { + if (!((rt.peekableNextIf(it, (_210: rt.u8): boolean => { + return _210 === b2; + }) !== undefined))) { + rt.byteVecPush(out, b2); + rt.byteVecPush(out, run); + const _133: rt.u8 | undefined = rt.peekablePeek(it); + if (_133 !== undefined) { + rt.byteVecPush(out, _133); + continue l4; + } continue l4; } - continue l4; + run = rt.u8Add(run, 1); } - run = rt.u8Add(run, 1); } + break b0; } - break b0; } - } else if (_4 === 6) { - it2 = rt.iterSlice(data); - firsts = rt.iterToByteVec(rt.iterTake(it2, 2)); - rt.byteVecExtendFromSlice(out, rt.byteVecView(firsts)); - rt.byteVecPush(out, it2.len() & 0xff); - _152 = rt.iterToOption(it2.nextBack()); - if (_152 === undefined) { - rt.byteVecPush(out, 238); + if (_4 === 6) { + const it2: rt.Iter = rt.iterSlice(data); + const firsts: rt.ByteVec = rt.iterToByteVec(rt.iterTake(it2, 2)); + rt.byteVecExtendFromSlice(out, rt.byteVecView(firsts)); + rt.byteVecPush(out, it2.len() & 0xff); + const _152: rt.u8 | undefined = rt.iterToOption(it2.nextBack()); + if (_152 === undefined) { + rt.byteVecPush(out, 238); + } else { + rt.byteVecPush(out, _152); + } + const rest: rt.ByteVec = rt.iterToByteVec(rt.iterStepBy(rt.iterRev(it2), 3)); + rt.byteVecExtendFromSlice(out, rt.byteVecView(rest)); } else { - rt.byteVecPush(out, _152); - } - rest = rt.iterToByteVec(rt.iterStepBy(rt.iterRev(it2), 3)); - rt.byteVecExtendFromSlice(out, rt.byteVecView(rest)); - } else { - pairs = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (_2: rt.u8): Uint8Array => { - let b3!: rt.u8; - b3 = _2; - return Uint8Array.of(b3, ~b3 & 0xff); - })); - copies = rt.iterToArray(rt.iterMap(rt.iterSlice(pairs), rt.copy)); - if (!((copies.length === 0))) { - const at = rt.idx(copies, 0); - copies[at][0] = 85; - } - iter4 = rt.iterChain(rt.iterSlice(pairs), rt.iterSlice(copies)); - while (true) { - _187 = iter4.next(); - if (_187 === rt.DONE) { - v2 = []; - _196 = rt.iterMap(rt.iterSlice(data), (_22: rt.u8): rt.u16 => { - return rt.u16Add(_22 as rt.u16, 1); - }); - rt.iterExtend(v2, _196); - rt.byteVecPush(out, v2.length & 0xff); - rt.iterExtendBytes(out, rt.iterFilter(rt.iterSlice(data), (_24: rt.u8): boolean => { - return _24 > 128; - })); - break b0; + const pairs: Uint8Array[] = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (_2: rt.u8): Uint8Array => { + const b3: rt.u8 = _2; + return Uint8Array.of(b3, ~b3 & 0xff); + })); + const copies: Uint8Array[] = rt.iterToArray(rt.iterMap(rt.iterSlice(pairs), rt.copy)); + if (!((copies.length === 0))) { + const at = rt.idx(copies, 0); + copies[at][0] = 85; + } + const iter4: rt.Iter = rt.iterChain(rt.iterSlice(pairs), rt.iterSlice(copies)); + while (true) { + const _187: Uint8Array | rt.Done = iter4.next(); + if (_187 === rt.DONE) { + const v2: rt.u16[] = []; + const _196: rt.Iter = rt.iterMap(rt.iterSlice(data), (_22: rt.u8): rt.u16 => { + return rt.u16Add(_22 as rt.u16, 1); + }); + rt.iterExtend(v2, _196); + rt.byteVecPush(out, v2.length & 0xff); + rt.iterExtendBytes(out, rt.iterFilter(rt.iterSlice(data), (_24: rt.u8): boolean => { + return _24 > 128; + })); + break b0; + } + rt.byteVecExtendFromSlice(out, _187); } - rt.byteVecExtendFromSlice(out, _187); } } } @@ -194,30 +161,23 @@ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { /** The runs between zero bytes. */ export function chunksByZero$ChunksByZero_u8s(self: Uint8Array): rt.ByteVec[] { - let words!: rt.ByteVec[]; - let word!: rt.ByteVec; - let iterS!: Uint8Array; - let iterI!: number; - let _6!: rt.u8 | rt.Done; - let b!: rt.u8; - let _13!: rt.ByteVec; - words = []; - word = new rt.ByteVec(); - iterS = self; - iterI = 0; + const words: rt.ByteVec[] = []; + let word: rt.ByteVec = new rt.ByteVec(); + const iterS: Uint8Array = self; + let iterI: number = 0; while (true) { - _6 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _6: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_6 === rt.DONE) { words.push(word); return words; } - b = _6; + const b: rt.u8 = _6; if (!(b === 0)) { rt.byteVecPush(word, b); } else { const taken = word; word = new rt.ByteVec(); - _13 = taken; + const _13: rt.ByteVec = taken; words.push(_13); } } @@ -225,39 +185,17 @@ export function chunksByZero$ChunksByZero_u8s(self: Uint8Array): rt.ByteVec[] { /** Consumers, and how far each reads: `log` records every item a closure sees. */ export function consumers(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let log!: rt.ByteVec; - let _5!: rt.u8; - let _9!: rt.Iter; - let _17!: rt.Iter; - let _31!: rt.Iter; - let _40!: rt.Iter; - let _45!: rt.Iter; - let short!: Uint8Array; - let iter!: rt.Iter<[rt.u8, rt.u8]>; - let _69!: [rt.u8, rt.u8] | rt.Done; - let iter2!: rt.Iter<[rt.u8, rt.u8]>; - let _85!: [rt.u8, rt.u8] | rt.Done; - let back!: rt.Iter<[rt.u8, rt.u8]>; - let _97!: [rt.u8, rt.u8] | undefined; - let a3!: rt.u8; - let b2!: rt.u8; - let _140!: rt.Iter; - let it!: rt.Iter; - let _147!: rt.Iter; - let _162!: rt.Iter; - let parsed!: rt.Result; - let v!: rt.ByteVec; - log = new rt.ByteVec(); + const log: rt.ByteVec = new rt.ByteVec(); b0: { - _5 = rt.u8Rem(kind, 6); + const _5: rt.u8 = rt.u8Rem(kind, 6); if (_5 === 0) { - _9 = rt.iterInspect(rt.iterSlice(data), (_228: rt.u8): void => { + const _9: rt.Iter = rt.iterInspect(rt.iterSlice(data), (_228: rt.u8): void => { rt.byteVecPush(log, _228); }); rt.byteVecPush(out, rt.iterAny(_9, (_229: rt.u8): boolean => { return _229 > 240; }) ? 1 : 0); - _17 = rt.iterSlice(data); + const _17: rt.Iter = rt.iterSlice(data); rt.byteVecPush(out, rt.iterAll(_17, (_230: rt.u8): boolean => { return _230 !== 0; }) ? 1 : 0); @@ -265,132 +203,128 @@ export function consumers(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void rt.byteVecPush(out, rt.iterCount(rt.iterFilter(rt.iterSlice(data), (_231: rt.u8): boolean => { return rt.u8Rem(_231, 2) === 0; })) & 0xff); - } else if (_5 === 1) { - _31 = rt.iterInspect(rt.iterSlice(data), (_220: rt.u8): void => { - rt.byteVecPush(log, _220); - }); - rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterFind(_31, (_221: rt.u8): boolean => { - return rt.u8Rem(_221, 7) === 3; - }), 255)); - _40 = rt.iterSlice(data); - rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterFindMap(_40, (_222: rt.u8): rt.u8 | undefined => { - let b14!: rt.u8; - b14 = _222; - if (!(b14 > 80)) { - return undefined; - } - return rt.u8CheckedMul(b14, 3); - }), 0)); - _45 = rt.iterSlice(data); - rt.byteVecPush(out, rt.optionMapOr(rt.iterPosition(_45, (_223: rt.u8): boolean => { - return _223 === 64; - }), 255, (p: rt.usize): rt.u8 => { - return p & 0xff; - })); - short = rt.sliceRange(data, rt.usizeDiv(data.length, 2)); - rt.byteVecPush(out, rt.iterCount(rt.iterZip(rt.iterMap(rt.iterSlice(data), (_224: rt.u8): rt.u8 => { - let b16!: rt.u8; - b16 = _224; - rt.byteVecPush(log, b16); - return b16; - }), rt.iterSlice(short), true)) & 0xff); - iter = rt.iterZip(rt.iterMap(rt.iterSlice(data), (_225: rt.u8): rt.u8 => { - let b17!: rt.u8; - b17 = _225; - rt.byteVecPush(log, ~b17 & 0xff); - return b17; - }), rt.iterSlice(short), true); - while (true) { - _69 = iter.next(); - if (_69 === rt.DONE) { - iter2 = rt.iterZip(rt.iterMap(rt.iterInspect(rt.iterSlice(data), (_226: rt.u8): void => { - rt.byteVecPush(log, _226); - }), (b19: rt.u8): rt.u8 => { - return b19; - }), rt.iterSlice(short)); - while (true) { - _85 = iter2.next(); - if (_85 === rt.DONE) { - back = rt.iterZip(rt.iterMap(rt.iterSlice(data), (_227: rt.u8): rt.u8 => { - return rotateFree$RotateFree_u8(_227); - }), rt.iterSlice(short), true); - _97 = rt.iterToOption(back.nextBack()); - if (_97 !== undefined) { - a3 = _97[0]; - b2 = _97[1]; - rt.byteVecPush(out, a3); - rt.byteVecPush(out, b2); + } else { + if (_5 === 1) { + const _31: rt.Iter = rt.iterInspect(rt.iterSlice(data), (_220: rt.u8): void => { + rt.byteVecPush(log, _220); + }); + rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterFind(_31, (_221: rt.u8): boolean => { + return rt.u8Rem(_221, 7) === 3; + }), 255)); + const _40: rt.Iter = rt.iterSlice(data); + rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterFindMap(_40, (_222: rt.u8): rt.u8 | undefined => { + const b14: rt.u8 = _222; + if (!(b14 > 80)) { + return undefined; + } + return rt.u8CheckedMul(b14, 3); + }), 0)); + const _45: rt.Iter = rt.iterSlice(data); + rt.byteVecPush(out, rt.optionMapOr(rt.iterPosition(_45, (_223: rt.u8): boolean => { + return _223 === 64; + }), 255, (p: rt.usize): rt.u8 => { + return p & 0xff; + })); + const short: Uint8Array = rt.sliceRange(data, rt.usizeDiv(data.length, 2)); + rt.byteVecPush(out, rt.iterCount(rt.iterZip(rt.iterMap(rt.iterSlice(data), (_224: rt.u8): rt.u8 => { + const b16: rt.u8 = _224; + rt.byteVecPush(log, b16); + return b16; + }), rt.iterSlice(short), true)) & 0xff); + const iter: rt.Iter<[rt.u8, rt.u8]> = rt.iterZip(rt.iterMap(rt.iterSlice(data), (_225: rt.u8): rt.u8 => { + const b17: rt.u8 = _225; + rt.byteVecPush(log, ~b17 & 0xff); + return b17; + }), rt.iterSlice(short), true); + while (true) { + const _69: [rt.u8, rt.u8] | rt.Done = iter.next(); + if (_69 === rt.DONE) { + const iter2: rt.Iter<[rt.u8, rt.u8]> = rt.iterZip(rt.iterMap(rt.iterInspect(rt.iterSlice(data), (_226: rt.u8): void => { + rt.byteVecPush(log, _226); + }), (b19: rt.u8): rt.u8 => { + return b19; + }), rt.iterSlice(short)); + while (true) { + const _85: [rt.u8, rt.u8] | rt.Done = iter2.next(); + if (_85 === rt.DONE) { + const back: rt.Iter<[rt.u8, rt.u8]> = rt.iterZip(rt.iterMap(rt.iterSlice(data), (_227: rt.u8): rt.u8 => { + return rotateFree$RotateFree_u8(_227); + }), rt.iterSlice(short), true); + const _97: [rt.u8, rt.u8] | undefined = rt.iterToOption(back.nextBack()); + if (_97 !== undefined) { + const a3: rt.u8 = _97[0]; + const b2: rt.u8 = _97[1]; + rt.byteVecPush(out, a3); + rt.byteVecPush(out, b2); + } + rt.byteVecPush(out, back.len() & 0xff); + break b0; } - rt.byteVecPush(out, back.len() & 0xff); - break b0; + rt.byteVecPush(out, _85[0] ^ _85[1]); } - rt.byteVecPush(out, _85[0] ^ _85[1]); } + rt.byteVecPush(out, _69[0] ^ _69[1]); } - rt.byteVecPush(out, _69[0] ^ _69[1]); } - } else if (_5 === 2) { - rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterMax(rt.iterSlice(data)), 0)); - rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterMin(rt.iterSlice(data)), 255)); - rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterMaxByKey(rt.iterSlice(data), (_218: rt.u8): rt.u8 => { - return rt.u8Rem(_218, 16); - }), 238)); - rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterMinByKey(rt.iterSlice(data), (_219: rt.u8): rt.u8 => { - return rt.u8Div(_219, 16); - }), 238)); - rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterLast(rt.iterSlice(data)), 221)); - _140 = rt.iterSlice(data); - rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterNth(_140, 3), 204)); - it = rt.iterSlice(data); - _147 = rt.iterTake(it, rt.usizeRem(data.length, 3)); - rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterToOption(_147.nthBackItem(1)), 187)); - rt.byteVecPush(out, it.len() & 0xff); - _162 = rt.iterTake(it, rt.usizeRem(data.length, 5)); - rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterNth(_162, 2), 187)); - rt.byteVecPush(out, it.len() & 0xff); - } else if (_5 === 3) { - rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(rt.iterSum(rt.iterMap(rt.iterSlice(data), (_214: rt.u8): rt.u64 => { - return rt.u64Mul(_214 as rt.u64, 1103823438081); - }), rt.u64Add, 0))); - rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(rt.iterFold(rt.iterSlice(data), 0, (acc: rt.u32, _34: rt.u8): rt.u32 => { - let b8!: rt.u8; - let _510!: rt.u32; - b8 = _34; - _510 = (acc << 3) >>> 0; - return rt.u32WrappingAdd(_510, (b8 as rt.u32 ^ acc) >>> 0); - }))); - rt.iterForEach(rt.iterSlice(data), (_216: rt.u8): void => { - rt.byteVecPush(log, rotateFree$RotateFree_u8(_216)); - }); - } else if (_5 === 4) { - rt.byteVecPush(out, rt.iterSum(rt.iterSlice(data), rt.u8Add, 0)); - rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(rt.iterProduct(rt.iterMap(rt.iterSlice(data), (_213: rt.u8): rt.u16 => { - return rt.u16Add(rt.u16Rem(_213 as rt.u16, 4), 1); - }), rt.u16Mul, 1))); - } else { - parsed = rt.iterCollectResult(rt.iterMap(rt.iterSlice(data), (_2: rt.u8): rt.Result => { - let b3!: rt.u8; - b3 = _2; - if (!(b3 < 240)) { - return rt.Err(b3); - } - return rt.Ok(b3); - }), (values__: rt.Iter) => rt.iterToByteVec(values__)); - if (parsed.ok) { - v = parsed.value; - rt.byteVecExtendFromSlice(out, rt.byteVecView(v)); + if (_5 === 2) { + rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterMax(rt.iterSlice(data)), 0)); + rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterMin(rt.iterSlice(data)), 255)); + rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterMaxByKey(rt.iterSlice(data), (_218: rt.u8): rt.u8 => { + return rt.u8Rem(_218, 16); + }), 238)); + rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterMinByKey(rt.iterSlice(data), (_219: rt.u8): rt.u8 => { + return rt.u8Div(_219, 16); + }), 238)); + rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterLast(rt.iterSlice(data)), 221)); + const _140: rt.Iter = rt.iterSlice(data); + rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterNth(_140, 3), 204)); + const it: rt.Iter = rt.iterSlice(data); + const _147: rt.Iter = rt.iterTake(it, rt.usizeRem(data.length, 3)); + rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterToOption(_147.nthBackItem(1)), 187)); + rt.byteVecPush(out, it.len() & 0xff); + const _162: rt.Iter = rt.iterTake(it, rt.usizeRem(data.length, 5)); + rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterNth(_162, 2), 187)); + rt.byteVecPush(out, it.len() & 0xff); + } else if (_5 === 3) { + rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(rt.iterSum(rt.iterMap(rt.iterSlice(data), (_214: rt.u8): rt.u64 => { + return rt.u64Mul(_214 as rt.u64, 1103823438081); + }), rt.u64Add, 0))); + rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(rt.iterFold(rt.iterSlice(data), 0, (acc: rt.u32, _34: rt.u8): rt.u32 => { + const b8: rt.u8 = _34; + const _510: rt.u32 = (acc << 3) >>> 0; + return rt.u32WrappingAdd(_510, (b8 as rt.u32 ^ acc) >>> 0); + }))); + rt.iterForEach(rt.iterSlice(data), (_216: rt.u8): void => { + rt.byteVecPush(log, rotateFree$RotateFree_u8(_216)); + }); + } else if (_5 === 4) { + rt.byteVecPush(out, rt.iterSum(rt.iterSlice(data), rt.u8Add, 0)); + rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(rt.iterProduct(rt.iterMap(rt.iterSlice(data), (_213: rt.u8): rt.u16 => { + return rt.u16Add(rt.u16Rem(_213 as rt.u16, 4), 1); + }), rt.u16Mul, 1))); } else { - rt.byteVecPush(out, parsed.error); + const parsed: rt.Result = rt.iterCollectResult(rt.iterMap(rt.iterSlice(data), (_2: rt.u8): rt.Result => { + const b3: rt.u8 = _2; + if (!(b3 < 240)) { + return rt.Err(b3); + } + return rt.Ok(b3); + }), (values__: rt.Iter) => rt.iterToByteVec(values__)); + if (parsed.ok) { + const v: rt.ByteVec = parsed.value; + rt.byteVecExtendFromSlice(out, rt.byteVecView(v)); + } else { + rt.byteVecPush(out, parsed.error); + } + rt.byteVecPush(out, rt.optionMapOr(rt.iterCollectOption(rt.iterMap(rt.iterInspect(rt.iterSlice(data), (_24: rt.u8): void => { + rt.byteVecPush(log, _24); + }), (_29: rt.u8): rt.u16 | undefined => { + const b5: rt.u8 = _29; + return rt.thenSome(b5 !== 32, b5 as rt.u16); + }), (values__: rt.Iter) => rt.iterToArray(values__)), 255, (v2: rt.u16[]): rt.u8 => { + return v2.length & 0xff; + })); } - rt.byteVecPush(out, rt.optionMapOr(rt.iterCollectOption(rt.iterMap(rt.iterInspect(rt.iterSlice(data), (_24: rt.u8): void => { - rt.byteVecPush(log, _24); - }), (_29: rt.u8): rt.u16 | undefined => { - let b5!: rt.u8; - b5 = _29; - return rt.thenSome(b5 !== 32, b5 as rt.u16); - }), (values__: rt.Iter) => rt.iterToArray(values__)), 255, (v2: rt.u16[]): rt.u8 => { - return v2.length & 0xff; - })); } } rt.byteVecExtendFromSlice(out, rt.byteVecView(log)); @@ -402,100 +336,67 @@ export function rotateFree$RotateFree_u8(self: rt.u8): rt.u8 { /** Ranges as values and as iterators. */ export function ranges(data: Uint8Array, out: rt.ByteVec): void { - let a!: rt.u8; - let b!: rt.u8; - let range!: rt.Range; - let copy!: rt.Range; - let iter!: rt.Iter; - let _37!: rt.u8 | rt.Done; - let iter2!: rt.Iter; - let _47!: rt.u8 | rt.Done; - let _56!: rt.Range; - let top!: rt.ByteVec; - let inclusive!: rt.RangeInclusive; - let near!: rt.RangeInclusive; - let low!: rt.RangeInclusive; - let _113!: rt.usize; - let _125!: rt.u8; - let reversed!: rt.RangeInclusive; - let _132!: rt.Iter; - let counted!: rt.Iter<[rt.usize, rt.u8]>; - let i3!: rt.usize; - let n!: rt.u8; - let _149!: [rt.usize, rt.u8]; - let _152!: rt.usize; - let stepped!: rt.RangeInclusive; - let wide!: rt.Range; - let edge!: rt.u64; - let past!: rt.Range; - let _223!: rt.usize; - let _240!: rt.RangeInclusive; - let _243!: rt.usize; - let _250!: rt.u64; - let iterS!: rt.u32[]; - let iterI!: number; - let _295!: rt.u32 | rt.Done; - a = rt.optionUnwrapOr(rt.sliceFirst(data), 0); - b = rt.optionUnwrapOr(rt.sliceGet(data, 1), 0); - range = new rt.Range(a, b); + const a: rt.u8 = rt.optionUnwrapOr(rt.sliceFirst(data), 0); + const b: rt.u8 = rt.optionUnwrapOr(rt.sliceGet(data, 1), 0); + const range: rt.Range = new rt.Range(a, b); rt.byteVecPush(out, a); rt.byteVecPush(out, b); rt.byteVecPush(out, rt.rangeIsEmpty(range) ? 1 : 0); rt.byteVecPush(out, rt.rangeContains(range, 64) ? 1 : 0); - copy = rt.rangeClone(range); + const copy: rt.Range = rt.rangeClone(range); rt.byteVecPush(out, rt.optionUnwrapOr(copy.start < copy.end ? copy.start++ : undefined, 255)); rt.byteVecPush(out, range.len() & 0xff); - iter = rt.iterStepBy(rt.iterRev(range), 3); + const iter: rt.Iter = rt.iterStepBy(rt.iterRev(range), 3); while (true) { - _37 = iter.next(); + const _37: rt.u8 | rt.Done = iter.next(); if (_37 === rt.DONE) { - iter2 = rt.iterStepBy(rt.iterSkip(new rt.Range(a, b), 1), 4); + const iter2: rt.Iter = rt.iterStepBy(rt.iterSkip(new rt.Range(a, b), 1), 4); while (true) { - _47 = iter2.next(); + const _47: rt.u8 | rt.Done = iter2.next(); if (_47 === rt.DONE) { - _56 = new rt.Range(a, b); + const _56: rt.Range = new rt.Range(a, b); rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterNth(_56, 5), 238)); - top = rt.iterToByteVec(new rt.RangeInclusive(rt.max(a, 250), 255, rt.u8Step)); + const top: rt.ByteVec = rt.iterToByteVec(new rt.RangeInclusive(rt.max(a, 250), 255, rt.u8Step)); rt.byteVecExtendFromSlice(out, rt.byteVecView(top)); - inclusive = new rt.RangeInclusive(a, b, rt.u8Step); + const inclusive: rt.RangeInclusive = new rt.RangeInclusive(a, b, rt.u8Step); rt.byteVecPush(out, rt.rangeInclusiveStart(inclusive)); rt.byteVecPush(out, rt.rangeInclusiveEnd(inclusive)); rt.byteVecPush(out, rt.rangeInclusiveContains(inclusive, b) ? 1 : 0); rt.byteVecPush(out, rt.rangeInclusiveContains(new rt.RangeInclusive(32, 127, rt.u64Step), a as rt.u64) ? 1 : 0); - near = new rt.RangeInclusive(rt.max(a, 200), 255, rt.u8Step); + const near: rt.RangeInclusive = new rt.RangeInclusive(rt.max(a, 200), 255, rt.u8Step); rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterNth(near, b as rt.usize), 238)); rt.byteVecPush(out, rt.rangeInclusiveStart(near)); rt.byteVecPush(out, rt.rangeInclusiveIsEmpty(near) ? 1 : 0); rt.byteVecPush(out, rt.rangeInclusiveContains(near, 255) ? 1 : 0); rt.byteVecPush(out, rt.rangeInclusiveContains(near, 100) ? 1 : 0); - low = new rt.RangeInclusive(0, b, rt.u8Step); - _113 = rt.usizeRem(a as rt.usize, 16); + const low: rt.RangeInclusive = new rt.RangeInclusive(0, b, rt.u8Step); + const _113: rt.usize = rt.usizeRem(a as rt.usize, 16); rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterToOption(low.nthBackItem(_113)), 238)); rt.byteVecPush(out, rt.rangeInclusiveEnd(low)); - _125 = rt.u8Div(b, 2); + const _125: rt.u8 = rt.u8Div(b, 2); rt.byteVecPush(out, rt.rangeInclusiveContains(low, _125) ? 1 : 0); - reversed = new rt.RangeInclusive(a, b, rt.u8Step); - _132 = rt.iterRev(reversed); + const reversed: rt.RangeInclusive = new rt.RangeInclusive(a, b, rt.u8Step); + const _132: rt.Iter = rt.iterRev(reversed); rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterNth(_132, a as rt.usize), 238)); rt.byteVecPush(out, rt.rangeInclusiveEnd(reversed)); rt.byteVecPush(out, rt.rangeInclusiveContains(reversed, a) ? 1 : 0); - counted = rt.iterEnumerate(new rt.RangeInclusive(a, b, rt.u8Step)); - _152 = rt.usizeDiv(b as rt.usize, 4); - _149 = rt.optionUnwrapOr(rt.iterNth(counted, _152), [221, 221] as [rt.usize, rt.u8]); - i3 = _149[0]; - n = _149[1]; + const counted: rt.Iter<[rt.usize, rt.u8]> = rt.iterEnumerate(new rt.RangeInclusive(a, b, rt.u8Step)); + const _152: rt.usize = rt.usizeDiv(b as rt.usize, 4); + const _149: [rt.usize, rt.u8] = rt.optionUnwrapOr(rt.iterNth(counted, _152), [221, 221] as [rt.usize, rt.u8]); + const i3: rt.usize = _149[0]; + const n: rt.u8 = _149[1]; rt.byteVecPush(out, i3 & 0xff); rt.byteVecPush(out, n); rt.byteVecPush(out, rt.optionMapOr(rt.iterToOption(counted.next()), 204, (_2: [rt.usize, rt.u8]): rt.u8 => { return _2[0] & 0xff; })); - stepped = new rt.RangeInclusive(a, b, rt.u8Step); + const stepped: rt.RangeInclusive = new rt.RangeInclusive(a, b, rt.u8Step); rt.byteVecPush(out, rt.iterCount(rt.iterStepBy(stepped, 3)) & 0xff); rt.byteVecPush(out, rt.rangeInclusiveStart(stepped)); rt.iterExtendBytes(out, rt.iterMap(rt.iterRev(new rt.RangeInclusive((a << 24) >> 24, (b << 24) >> 24, rt.i8Step)), (i5: rt.i8): rt.u8 => { return i5 & 0xff; })); - wide = new rt.Range(a as rt.u64, rt.u64Mul(b as rt.u64, 3), rt.u64Step); + const wide: rt.Range = new rt.Range(a as rt.u64, rt.u64Mul(b as rt.u64, 3), rt.u64Step); rt.byteVecPush(out, rt.iterCount(rt.iterFilter(rt.iterMap(wide, (n2: rt.u64): rt.u64 => { return rt.u64Rem(n2, 5); }), (_23: rt.u64): boolean => { @@ -503,15 +404,15 @@ export function ranges(data: Uint8Array, out: rt.ByteVec): void { })) & 0xff); rt.byteVecPush(out, rt.rangeIsEmpty(wide) ? 1 : 0); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(rt.iterSum(new rt.Range(0, a as rt.u64, rt.u64Step), rt.u64Add, 0))); - edge = rt.u64Add(rt.u64Sub(rt.u64Of(9007199254740992n), 2), rt.u64Rem(a as rt.u64, 4)); - past = new rt.Range(edge, rt.u64Add(edge, 4), rt.u64Step); - _223 = rt.usizeRem(b as rt.usize, 3); + const edge: rt.u64 = rt.u64Add(rt.u64Sub(rt.u64Of(9007199254740992n), 2), rt.u64Rem(a as rt.u64, 4)); + const past: rt.Range = new rt.Range(edge, rt.u64Add(edge, 4), rt.u64Step); + const _223: rt.usize = rt.usizeRem(b as rt.usize, 3); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(rt.optionUnwrapOr(rt.iterNth(past, _223), 0))); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(rt.optionUnwrapOr(rt.iterToOption(past.nextBack()), 0))); - _240 = new rt.RangeInclusive(edge, rt.u64Add(edge, 3), rt.u64Step); - _243 = rt.usizeRem(b as rt.usize, 5); + const _240: rt.RangeInclusive = new rt.RangeInclusive(edge, rt.u64Add(edge, 3), rt.u64Step); + const _243: rt.usize = rt.usizeRem(b as rt.usize, 5); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(rt.optionUnwrapOr(rt.iterNth(_240, _243), 0))); - _250 = rt.u64Rem(a as rt.u64, 3); + const _250: rt.u64 = rt.u64Rem(a as rt.u64, 3); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(rt.iterSum(rt.iterMap(new rt.RangeInclusive(rt.u64Sub(rt.u64Of(18446744073709551615n), _250), rt.u64Of(18446744073709551615n), rt.u64Step), (n4: rt.u64): rt.u64 => { return rt.u64Rem(n4, 7); }), rt.u64Add, 0))); @@ -519,10 +420,10 @@ export function ranges(data: Uint8Array, out: rt.ByteVec): void { return _24; }), 0))); rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(rt.optionUnwrapOr(rt.iterMin(new rt.Range(rt.i64Sub(rt.i64Neg(rt.i64Of(9007199254740992n)), 1), rt.i64Add(rt.i64Neg(rt.i64Of(9007199254740992n)), 1), rt.i64Step)), 0))); - iterS = rt.iterToArray(rt.iterRev(rt.iterStepBy(new rt.Range(0, 48), 8))); - iterI = 0; + const iterS: rt.u32[] = rt.iterToArray(rt.iterRev(rt.iterStepBy(new rt.Range(0, 48), 8))); + let iterI: number = 0; while (true) { - _295 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _295: rt.u32 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_295 === rt.DONE) { updates(a, b, data, out); return; @@ -542,41 +443,25 @@ export function ranges(data: Uint8Array, out: rt.ByteVec): void { * the rest are read from it. */ export function updates(a: rt.u8, b: rt.u8, data: Uint8Array, out: rt.ByteVec): void { - let base!: rt.Range; - let made!: rt.Range; - let _7!: rt.u8; - let whole!: rt.Range; - let _14!: rt.Range; - let iterStart!: rt.u8; - let iterEnd!: rt.u8; let _29!: rt.u8; - let i!: rt.u8; - let _33!: rt.u8; - let len!: rt.usize; - let to!: rt.usize; - let from!: rt.usize; - let _41!: [rt.usize, rt.usize]; - let all!: rt.Range; - let copied!: rt.ByteVec; - let _76!: Uint8Array; - base = new rt.Range(a, b); + const base: rt.Range = new rt.Range(a, b); rt.byteVecPush(out, 208); - _7 = rt.u8Div(b, 2); + const _7: rt.u8 = rt.u8Div(b, 2); rt.byteVecPush(out, 209); - made = new rt.Range(rt.rangeClone(base).start, _7); - _14 = rt.rangeClone(base); - whole = new rt.Range(_14.start, _14.end); + const made: rt.Range = new rt.Range(rt.rangeClone(base).start, _7); + const _14: rt.Range = rt.rangeClone(base); + const whole: rt.Range = new rt.Range(_14.start, _14.end); rt.byteVecExtendFromSlice(out, Uint8Array.of(made.start, _7, whole.start, whole.end)); - iterStart = rt.u8Div(a, 2); - iterEnd = base.end; + let iterStart: rt.u8 = rt.u8Div(a, 2); + const iterEnd: rt.u8 = base.end; while (true) { if (!((_29 = iterStart++) < iterEnd)) { rt.byteVecPush(out, base.end); - len = data.length; - _41 = [rt.min(b as rt.usize, len), rt.min(a as rt.usize, len)] as [rt.usize, rt.usize]; - to = _41[0]; - from = _41[1]; - all = new rt.Range(0, len); + const len: rt.usize = data.length; + const _41: [rt.usize, rt.usize] = [rt.min(b as rt.usize, len), rt.min(a as rt.usize, len)]; + const to: rt.usize = _41[0]; + const from: rt.usize = _41[1]; + const all: rt.Range = new rt.Range(0, len); rt.byteVecPush(out, 210); rt.byteVecPush(out, 211); rt.byteVecPush(out, 212); @@ -588,14 +473,14 @@ export function updates(a: rt.u8, b: rt.u8, data: Uint8Array, out: rt.ByteVec): fullRange(out); rt.byteVecPush(out, rt.sliceRange(data, 0).length & 0xff); rt.byteVecPush(out, rt.sliceRange(data, 0).length & 0xff); - copied = rt.sliceToByteVec(data); - _76 = rt.byteVecView(copied); + const copied: rt.ByteVec = rt.sliceToByteVec(data); + const _76: Uint8Array = rt.byteVecView(copied); rt.sliceCopyWithin(_76, 0, to, 0); rt.byteVecExtendFromSlice(out, rt.byteVecView(copied)); return; } - i = _29; - _33 = rt.u8WrappingAdd(base.end, 1); + const i: rt.u8 = _29; + const _33: rt.u8 = rt.u8WrappingAdd(base.end, 1); base.end = _33; rt.byteVecPush(out, i); } @@ -608,36 +493,23 @@ export function fullRange(out: rt.ByteVec): undefined { /** Iterators of `Option`, which keep each `None` apart from their end. */ export function options(data: Uint8Array, out: rt.ByteVec): void { - let all!: Array; - let iter!: rt.Iter; - let _15!: rt.u8 | undefined | rt.Done; - let item!: rt.u8 | undefined; - let flat!: rt.ByteVec; - let first!: rt.u8 | undefined; - let iter2!: rt.Iter; - let _49!: rt.u8 | rt.Done; - let _57!: rt.Iter; - let n!: rt.u8; - let counted!: rt.ByteVec; - let iter3!: Gaps.Gaps; - let _70!: rt.u8 | undefined | rt.Done; - all = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (b2: rt.u8): rt.u8 | undefined => { + const all: Array = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (b2: rt.u8): rt.u8 | undefined => { if (!(rt.u8Rem(b2, 3) === 0)) { return b2; } return undefined; })); rt.byteVecPush(out, all.length & 0xff); - iter = rt.iterMap(rt.iterSlice(data), (b3: rt.u8): rt.u8 | undefined => { + const iter: rt.Iter = rt.iterMap(rt.iterSlice(data), (b3: rt.u8): rt.u8 | undefined => { if (!(rt.u8Rem(b3, 3) === 0)) { return b3; } return undefined; }); while (true) { - _15 = iter.next(); + const _15: rt.u8 | undefined | rt.Done = iter.next(); if (_15 === rt.DONE) { - flat = rt.iterToByteVec(rt.iterFlatten(rt.iterMap(rt.iterSlice(data), (b4: rt.u8): rt.u8 | undefined => { + const flat: rt.ByteVec = rt.iterToByteVec(rt.iterFlatten(rt.iterMap(rt.iterSlice(data), (b4: rt.u8): rt.u8 | undefined => { if (!(rt.u8Rem(b4, 3) === 0)) { return b4; } @@ -653,23 +525,23 @@ export function options(data: Uint8Array, out: rt.ByteVec): void { } return undefined; })), 205)); - first = rt.sliceFirst(data); - iter2 = rt.iterChain(rt.iterOption(first), rt.iterOnce(153)); + const first: rt.u8 | undefined = rt.sliceFirst(data); + const iter2: rt.Iter = rt.iterChain(rt.iterOption(first), rt.iterOnce(153)); while (true) { - _49 = iter2.next(); + const _49: rt.u8 | rt.Done = iter2.next(); if (_49 === rt.DONE) { - _57 = rt.iterOption(first); + const _57: rt.Iter = rt.iterOption(first); rt.iterEmpty(); rt.iterExtendBytes(out, rt.iterChain(_57, rt.iterEmpty())); - n = 0; - counted = rt.iterToByteVec(rt.iterFromFn((): rt.u8 | undefined => { + let n: rt.u8 = 0; + const counted: rt.ByteVec = rt.iterToByteVec(rt.iterFromFn((): rt.u8 | undefined => { n = rt.u8Add(n, 1); return rt.thenSome(n < 4, n); })); rt.byteVecExtendFromSlice(out, rt.byteVecView(counted)); - iter3 = { data, at: 0 }; + const iter3: Gaps.Gaps = { data, at: 0 }; while (true) { - _70 = Gaps.next$Iterator(iter3); + const _70: rt.u8 | undefined | rt.Done = Gaps.next$Iterator(iter3); if (_70 === rt.DONE) { return; } @@ -681,7 +553,7 @@ export function options(data: Uint8Array, out: rt.ByteVec): void { rt.byteVecPush(out, _49); } } - item = _15; + const item: rt.u8 | undefined = _15; if (item === undefined) { rt.byteVecPush(out, 0); } else { @@ -692,11 +564,9 @@ export function options(data: Uint8Array, out: rt.ByteVec): void { /** The second item of an iterator of options, through `?`, which tests for its end. */ export function second$Map_Iter_u8_options_closure0(items: rt.Iter): rt.u8 | undefined { - let _2!: rt.u8 | undefined | rt.Done; - let _7!: rt.u8 | undefined | rt.Done; - _2 = items.next(); + const _2: rt.u8 | undefined | rt.Done = items.next(); if (_2 !== rt.DONE) { - _7 = items.next(); + const _7: rt.u8 | undefined | rt.Done = items.next(); if (_7 !== rt.DONE) { return rt.optionUnwrapOr(_7, 171); } @@ -707,41 +577,31 @@ export function second$Map_Iter_u8_options_closure0(items: rt.Iter Countdown.next$Iterator(it)), (n3: rt.u8): rt.u64 => { return rt.u64Div(rt.u64Mul(n3 as rt.u64, 1000), 7); }), rt.u64Add, 0))); - down = { left, step }; + const down: Countdown.Countdown = { left, step }; l1: while (true) { - _26 = Countdown.next$Iterator(down); + const _26: rt.u8 | rt.Done = Countdown.next$Iterator(down); if (_26 !== rt.DONE) { if (!(rt.u8Rem(_26, 5) === 0)) { continue l1; } } rt.byteVecPush(out, down.left); - evens = rt.iterToByteVec(rt.iterFrom({ inner: rt.iterSlice(data) }, (it: Evens.Evens) => Evens.next$Iterator(it))); + const evens: rt.ByteVec = rt.iterToByteVec(rt.iterFrom({ inner: rt.iterSlice(data) }, (it: Evens.Evens) => Evens.next$Iterator(it))); rt.byteVecExtendFromSlice(out, rt.byteVecView(evens)); - byRef = { inner: rt.iterSlice(rt.sliceRange(data, rt.min(data.length, 1))) }; - firsts = rt.iterToByteVec(rt.iterTake(rt.iterFrom(byRef, (it: Evens.Evens) => Evens.next$Iterator(it)), 2)); + const byRef: Evens.Evens = { inner: rt.iterSlice(rt.sliceRange(data, rt.min(data.length, 1))) }; + const firsts: rt.ByteVec = rt.iterToByteVec(rt.iterTake(rt.iterFrom(byRef, (it: Evens.Evens) => Evens.next$Iterator(it)), 2)); rt.byteVecExtendFromSlice(out, rt.byteVecView(firsts)); rt.byteVecPush(out, rt.iterCount(rt.iterFrom(byRef, (it: Evens.Evens) => Evens.next$Iterator(it))) & 0xff); - halves = rt.iterToByteVec(rt.iterFrom(new Halving.Halving({ value: left }), (it: Halving.Halving) => Halving.next$Iterator_u8(it))); + const halves: rt.ByteVec = rt.iterToByteVec(rt.iterFrom(new Halving.Halving({ value: left }), (it: Halving.Halving) => Halving.next$Iterator_u8(it))); rt.byteVecExtendFromSlice(out, rt.byteVecView(halves)); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(rt.iterSum(rt.iterFrom(new Halving.Halving({ value: rt.u64Mul(left as rt.u64, 4294967297) }), (it: Halving.Halving) => Halving.next$Iterator_u64(it)), rt.u64Add, 0))); return; @@ -768,54 +628,37 @@ export function odds(data: Uint8Array): rt.Iter { /** Iterators as values: returned, stored, and printed. */ export function values(data: Uint8Array, out: rt.ByteVec): void { - let iter!: rt.Iter; - let _8!: rt.u8 | rt.Done; - let held!: Held.Held; - let iter2!: rt.Iter; - let _21!: rt.u8 | rt.Done; - let printed!: string; - let args2!: rt.Fmt[]; - let _39!: rt.Fmt; - let tags!: Tag.Tag[]; - let cloned!: Tag.Tag[]; - let iter3!: rt.Iter; - let _59!: Tag.Tag | rt.Done; - let iter4!: rt.Iter; - let _74!: Tag.Tag | rt.Done; - let bumps!: Bumped.Bumped[]; - let wrapped!: Wrapper.Wrapper[]; - iter = tail(Uint8Array.of(1, 2, 3), data); + const iter: rt.Iter = tail(Uint8Array.of(1, 2, 3), data); while (true) { - _8 = iter.next(); + const _8: rt.u8 | rt.Done = iter.next(); if (_8 === rt.DONE) { - held = { it: rt.iterSlice(data) }; + const held: Held.Held = { it: rt.iterSlice(data) }; rt.byteVecPush(out, Held.skipOne(held)); - iter2 = odds(data); + const iter2: rt.Iter = odds(data); while (true) { - _21 = iter2.next(); + const _21: rt.u8 | rt.Done = iter2.next(); if (_21 === rt.DONE) { [{ _0: data }, { _0: rt.sliceRange(data, 0, rt.min(data.length, 2)) }] as [Doubled.Doubled, Doubled.Doubled]; const arg = { _0: data }; - _39 = (f: rt.Formatter) => Doubled.fmt$Debug(arg, f); + const _39: rt.Fmt = (f: rt.Formatter) => Doubled.fmt$Debug(arg, f); const arg2 = { _0: rt.sliceRange(data, 0, rt.min(data.length, 2)) }; - args2 = [_39, (f: rt.Formatter) => Doubled.fmt$Debug(arg2, f)]; - printed = rt.fmtFormat([args2[0], "|", rt.fmtSpec({ alternate: true }, args2[1])]); + const args2: rt.Fmt[] = [_39, (f: rt.Formatter) => Doubled.fmt$Debug(arg2, f)]; + const printed: string = rt.fmtFormat([args2[0], "|", rt.fmtSpec({ alternate: true }, args2[1])]); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(printed)); - tags = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (_2: rt.u8): Tag.Tag => { - let b3!: rt.u8; - b3 = _2; + const tags: Tag.Tag[] = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (_2: rt.u8): Tag.Tag => { + const b3: rt.u8 = _2; return { bytes: rt.sliceToByteVec(Uint8Array.of(b3, ~b3 & 0xff)) }; })); - cloned = rt.iterToArray(rt.iterMap(rt.iterSlice(tags), Tag.clone$Clone)); - iter3 = rt.iterSlice(cloned); + const cloned: Tag.Tag[] = rt.iterToArray(rt.iterMap(rt.iterSlice(tags), Tag.clone$Clone)); + const iter3: rt.Iter = rt.iterSlice(cloned); while (true) { - _59 = iter3.next(); + const _59: Tag.Tag | rt.Done = iter3.next(); if (_59 === rt.DONE) { - iter4 = rt.iterChain(rt.iterSlice(tags), rt.iterSlice(cloned)); + const iter4: rt.Iter = rt.iterChain(rt.iterSlice(tags), rt.iterSlice(cloned)); while (true) { - _74 = iter4.next(); + const _74: Tag.Tag | rt.Done = iter4.next(); if (_74 === rt.DONE) { - bumps = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (_22: rt.u8): Bumped.Bumped => { + const bumps: Bumped.Bumped[] = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (_22: rt.u8): Bumped.Bumped => { return { _0: _22 }; })); rt.iterExtendBytes(out, rt.iterMap(rt.iterMap(rt.iterSlice(bumps), Bumped.clone$Clone), (b5: Bumped.Bumped): rt.u8 => { @@ -824,7 +667,7 @@ export function values(data: Uint8Array, out: rt.ByteVec): void { rt.iterExtendBytes(out, rt.iterMap(rt.iterMap(rt.iterSlice(bumps), rt.copy), (b6: Bumped.Bumped): rt.u8 => { return b6._0; })); - wrapped = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (_23: rt.u8): Wrapper.Wrapper => { + const wrapped: Wrapper.Wrapper[] = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (_23: rt.u8): Wrapper.Wrapper => { return new Wrapper.Wrapper({ _0: _23 }); })); rt.iterExtendBytes(out, rt.iterMap(rt.iterMap(rt.iterSlice(wrapped), Wrapper.clone$Clone_Bumped), (w: Wrapper.Wrapper): rt.u8 => { diff --git a/ts/fixtures/lang/expected/shapes.Moved.ts b/ts/fixtures/lang/expected/shapes.Moved.ts index 4f4c7216d..404118024 100644 --- a/ts/fixtures/lang/expected/shapes.Moved.ts +++ b/ts/fixtures/lang/expected/shapes.Moved.ts @@ -3,12 +3,9 @@ import * as rt from "./rt.ts"; export function fmt$Debug(self: Moved, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: rt.Fmt; - let _6!: rt.Fmt; - _3 = "Moved"; - _4 = (f: rt.Formatter) => rt.u8Display(self._0, f); - _6 = (f: rt.Formatter) => rt.u16Display(self._1, f); + const _3: string = "Moved"; + const _4: rt.Fmt = (f: rt.Formatter) => rt.u8Display(self._0, f); + const _6: rt.Fmt = (f: rt.Formatter) => rt.u16Display(self._1, f); return rt.debugTupleFinish(rt.debugTupleField(rt.debugTupleField(rt.fmtDebugTuple(f, _3), _4), _6)); } diff --git a/ts/fixtures/lang/expected/shapes.Point.ts b/ts/fixtures/lang/expected/shapes.Point.ts index 4443772d7..8f90f1feb 100644 --- a/ts/fixtures/lang/expected/shapes.Point.ts +++ b/ts/fixtures/lang/expected/shapes.Point.ts @@ -3,16 +3,11 @@ import * as rt from "./rt.ts"; export function fmt$Debug(self: Point, f: rt.Formatter): rt.Result { - let _3!: string; - let _4!: string; - let _5!: rt.Fmt; - let _7!: string; - let _8!: rt.Fmt; - _3 = "Point"; - _4 = "x"; - _5 = (f: rt.Formatter) => rt.i32Display(self.x, f); - _7 = "y"; - _8 = (f: rt.Formatter) => rt.i32Display(self.y, f); + const _3: string = "Point"; + const _4: string = "x"; + const _5: rt.Fmt = (f: rt.Formatter) => rt.i32Display(self.x, f); + const _7: string = "y"; + const _8: rt.Fmt = (f: rt.Formatter) => rt.i32Display(self.y, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _3), _4, _5), _7, _8)); } diff --git a/ts/fixtures/lang/expected/shapes.Shape.ts b/ts/fixtures/lang/expected/shapes.Shape.ts index faf85b337..5fd6e2a69 100644 --- a/ts/fixtures/lang/expected/shapes.Shape.ts +++ b/ts/fixtures/lang/expected/shapes.Shape.ts @@ -4,32 +4,22 @@ import * as rt from "./rt.ts"; import * as Point from "./shapes.Point.ts"; export function fmt$Debug(self: Shape, f: rt.Formatter): rt.Result { - let _7!: string; - let _8!: rt.Fmt; - let _9!: rt.Fmt; - let _14!: string; - let _15!: string; - let _16!: rt.Fmt; - let _17!: string; - let _18!: rt.Fmt; - let _19!: string; - let _20!: rt.Fmt; if (self.tag === "Dot") { return rt.fmtWriteStr(f, "Dot"); } if (self.tag === "Line") { - _7 = "Line"; - _8 = (f: rt.Formatter) => Point.fmt$Debug(self._0, f); - _9 = (f: rt.Formatter) => Point.fmt$Debug(self._1, f); + const _7: string = "Line"; + const _8: rt.Fmt = (f: rt.Formatter) => Point.fmt$Debug(self._0, f); + const _9: rt.Fmt = (f: rt.Formatter) => Point.fmt$Debug(self._1, f); return rt.debugTupleFinish(rt.debugTupleField(rt.debugTupleField(rt.fmtDebugTuple(f, _7), _8), _9)); } - _14 = "Rect"; - _15 = "corner"; - _16 = (f: rt.Formatter) => Point.fmt$Debug(self.corner, f); - _17 = "width"; - _18 = (f: rt.Formatter) => rt.u16Display(self.width, f); - _19 = "height"; - _20 = (f: rt.Formatter) => rt.u16Display(self.height, f); + const _14: string = "Rect"; + const _15: string = "corner"; + const _16: rt.Fmt = (f: rt.Formatter) => Point.fmt$Debug(self.corner, f); + const _17: string = "width"; + const _18: rt.Fmt = (f: rt.Formatter) => rt.u16Display(self.width, f); + const _19: string = "height"; + const _20: rt.Fmt = (f: rt.Formatter) => rt.u16Display(self.height, f); return rt.debugStructFinish(rt.debugStructField(rt.debugStructField(rt.debugStructField(rt.fmtDebugStruct(f, _14), _15, _16), _17, _18), _19, _20)); } @@ -46,16 +36,14 @@ export function describe$Area(self: Shape, out: rt.ByteVec): void { } export function area$Area(self: Shape): rt.u64 { - let width!: rt.u16; - let height!: rt.u16; if (self.tag === "Dot") { return 0; } if (self.tag === "Line") { return 0; } - width = self.width; - height = self.height; + const width: rt.u16 = self.width; + const height: rt.u16 = self.height; return rt.u64Mul(width as rt.u64, height as rt.u64); } diff --git a/ts/fixtures/lang/expected/shapes.ts b/ts/fixtures/lang/expected/shapes.ts index a1e59a467..52aa193f7 100644 --- a/ts/fixtures/lang/expected/shapes.ts +++ b/ts/fixtures/lang/expected/shapes.ts @@ -12,15 +12,11 @@ import * as Void from "./shapes.Void.ts"; import type * as Wide from "./shapes.Wide.ts"; export function total$Meters(items: Meters.Meters[], out: rt.ByteVec): rt.u64 { - let sum!: rt.u64; - let iterS!: Meters.Meters[]; - let iterI!: number; - let _6!: Meters.Meters | rt.Done; - sum = 0; - iterS = items; - iterI = 0; + let sum: rt.u64 = 0; + const iterS: Meters.Meters[] = items; + let iterI: number = 0; while (true) { - _6 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _6: Meters.Meters | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_6 === rt.DONE) { return sum; } @@ -30,15 +26,11 @@ export function total$Meters(items: Meters.Meters[], out: rt.ByteVec): rt.u64 { } export function total$Shape(items: Shape.Shape[], out: rt.ByteVec): rt.u64 { - let sum!: rt.u64; - let iterS!: Shape.Shape[]; - let iterI!: number; - let _6!: Shape.Shape | rt.Done; - sum = 0; - iterS = items; - iterI = 0; + let sum: rt.u64 = 0; + const iterS: Shape.Shape[] = items; + let iterI: number = 0; while (true) { - _6 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _6: Shape.Shape | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_6 === rt.DONE) { return sum; } @@ -52,8 +44,7 @@ export function from$From_Dir_u8(dir_: Dir.Dir): rt.u8 { } export function dir(byte: rt.u8): Dir.Dir | undefined { - let _2!: rt.u8; - _2 = rt.u8Rem(byte, 5); + const _2: rt.u8 = rt.u8Rem(byte, 5); if (_2 === 0) { return "North" as Dir.Dir; } @@ -70,17 +61,13 @@ export function dir(byte: rt.u8): Dir.Dir | undefined { } export function shape(data: Uint8Array): Shape.Shape { - let kind!: rt.u8; - let _4!: [rt.u8, Uint8Array] | undefined; - let at!: (a0: rt.usize) => rt.i32; - let _7!: rt.u8; - _4 = rt.sliceSplitFirst(data); + const _4: [rt.u8, Uint8Array] | undefined = rt.sliceSplitFirst(data); if (_4 !== undefined) { - kind = _4[0]; - at = (i: rt.usize): rt.i32 => { + const kind: rt.u8 = _4[0]; + const at: (a0: rt.usize) => rt.i32 = (i: rt.usize): rt.i32 => { return rt.i32Sub(rt.optionUnwrapOr(rt.sliceGet(_4[1], i), 0) as rt.i32, 128); }; - _7 = rt.u8Rem(kind, 3); + const _7: rt.u8 = rt.u8Rem(kind, 3); if (_7 === 0) { return { tag: "Dot" } as Shape.Shape; } @@ -94,126 +81,85 @@ export function shape(data: Uint8Array): Shape.Shape { /** `Copy` aggregates: a copy changes apart from its original. */ export function copies(data: Uint8Array, out: rt.ByteVec): void { - let p!: Point.Point; - let q!: Point.Point; - let _9!: rt.i32; - let r!: Point.Point; - let pair!: [Point.Point, rt.u8]; - let saved!: [Point.Point, rt.u8]; - let grid!: Point.Point[]; - let row!: Point.Point[]; - let _20!: Point.Point; - let _25!: rt.i32; - let _26!: rt.i32; - let _27!: rt.i32; - let _28!: rt.i32; - let _29!: rt.i32; - let _30!: rt.i32; - let _31!: rt.i32; - let _32!: rt.i32; - let _35!: rt.i32; - let iter!: rt.Iter; - let _42!: rt.i32 | rt.Done; - let a!: Point.Point; - let b!: Point.Point; - let old!: Point.Point; - let _66!: Point.Point; - let _71!: rt.u8; - let _73!: rt.u8; - let n!: rt.u32; - let both!: [rt.u32, rt.u32]; - let word!: Uint8Array; - let converted!: rt.u32; - let cell!: Uint8Array; - let source!: Uint8Array; - let returned!: Uint8Array; - let _128!: rt.u8; - let marked!: boolean; - let opt!: Meters.Meters | undefined; - let taken!: Meters.Meters | undefined; - let res!: rt.Result; - let first!: Point.Point; - let fail!: rt.Result; - let err!: Point.Point; - p = Point.new(rt.optionUnwrapOr(rt.sliceFirst(data), 0) as rt.i32, 7); - q = rt.copy(p); - _9 = rt.i32Add(q.x, 100); + const p: Point.Point = Point.new(rt.optionUnwrapOr(rt.sliceFirst(data), 0) as rt.i32, 7); + const q: Point.Point = rt.copy(p); + const _9: rt.i32 = rt.i32Add(q.x, 100); q.x = _9; Point.bump(q); - r = Point.shift(p, 5); - pair = [rt.copy(p), 3] as [Point.Point, rt.u8]; - saved = rt.copy(pair); + const r: Point.Point = Point.shift(p, 5); + const pair: [Point.Point, rt.u8] = [rt.copy(p), 3]; + const saved: [Point.Point, rt.u8] = rt.copy(pair); pair[0].y = -1; pair[1] = rt.u8Add(pair[1], 1); const item = rt.copy(p); - grid = Array.from({ length: 3 }, (): Point.Point => { + const grid: Point.Point[] = Array.from({ length: 3 }, (): Point.Point => { return rt.copy(item); }); grid[1].x = 9; - row = rt.copy(grid); - _20 = rt.copy(q); + const row: Point.Point[] = rt.copy(grid); + const _20: Point.Point = rt.copy(q); grid[2] = rt.copy(_20); - _25 = p.x; - _26 = p.y; - _27 = q.x; - _28 = q.y; - _29 = r.x; - _30 = saved[0].y; - _31 = pair[0].y; - _32 = row[1].x; - _35 = row[2].x; - iter = rt.iterSlice([_25, _26, _27, _28, _29, _30, _31, _32, _35, grid[2].x]); + const _25: rt.i32 = p.x; + const _26: rt.i32 = p.y; + const _27: rt.i32 = q.x; + const _28: rt.i32 = q.y; + const _29: rt.i32 = r.x; + const _30: rt.i32 = saved[0].y; + const _31: rt.i32 = pair[0].y; + const _32: rt.i32 = row[1].x; + const _35: rt.i32 = row[2].x; + const iter: rt.Iter = rt.iterSlice([_25, _26, _27, _28, _29, _30, _31, _32, _35, grid[2].x]); while (true) { - _42 = iter.next(); + const _42: rt.i32 | rt.Done = iter.next(); if (_42 === rt.DONE) { rt.byteVecPush(out, saved[1]); rt.byteVecPush(out, pair[1]); rt.byteVecPush(out, Point.eq$PartialEq(p, saved[0]) ? 1 : 0); - a = rt.copy(Point.new(1, 2)); - b = rt.copy(Point.new(3, 4)); + let a: Point.Point = rt.copy(Point.new(1, 2)); + let b: Point.Point = rt.copy(Point.new(3, 4)); const swapped = a; a = b; b = swapped; undefined; - _66 = Point.new(5, 6); + const _66: Point.Point = Point.new(5, 6); const old2 = a; a = rt.copy(_66); - old = old2; - _71 = a.x & 0xff; - _73 = b.x & 0xff; + const old: Point.Point = old2; + const _71: rt.u8 = a.x & 0xff; + const _73: rt.u8 = b.x & 0xff; rt.byteVecExtendFromSlice(out, Uint8Array.of(_71, _73, old.x & 0xff)); - n = data.length as rt.u32; - both = [n, n] as [rt.u32, rt.u32]; + let n: rt.u32 = data.length as rt.u32; + const both: [rt.u32, rt.u32] = [n, n]; n = 9; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(rt.u32Add(rt.u32Add(both[0], both[1]), n))); - word = Uint8Array.of(0, 0, 0, data.length & 0xff); - converted = rt.u32FromBeBytes(word); + const word: Uint8Array = Uint8Array.of(0, 0, 0, data.length & 0xff); + const converted: rt.u32 = rt.u32FromBeBytes(word); word[0] = 9; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(rt.u32Add(converted, word[0] as rt.u32))); - cell = Uint8Array.of(data.length & 0xff); + const cell: Uint8Array = Uint8Array.of(data.length & 0xff); rt.byteVecPush(out, writeThenRead(rt.copy(cell), cell)); - source = Uint8Array.of(data.length & 0xff); - returned = same(rt.copy(source)); + const source: Uint8Array = Uint8Array.of(data.length & 0xff); + const returned: Uint8Array = same(rt.copy(source)); source[0] = 9; - _128 = returned[0]; + const _128: rt.u8 = returned[0]; rt.byteVecExtendFromSlice(out, Uint8Array.of(_128, source[0])); rt.byteVecPush(out, copyThenWrite([data.length & 0xff, 0] as [rt.u8, rt.u8])); - marked = mark(out, 1) === 0; + const marked: boolean = mark(out, 1) === 0; mark(out, 2); rt.byteVecPush(out, marked ? 1 : 0); - opt = rt.copy({ _0: 9 }); + let opt: Meters.Meters | undefined = rt.copy({ _0: 9 }); const taken2 = opt; opt = undefined; - taken = taken2; + const taken: Meters.Meters | undefined = taken2; rt.byteVecPush(out, opt === undefined ? 1 : 0); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(rt.optionMapOr(taken, 0, (m: Meters.Meters): rt.u64 => { return m._0; }))); - res = rt.Ok(p); - first = rt.copy(rt.resultUnwrap(res, rt.u8Display)); + const res: rt.Result = rt.Ok(p); + const first: Point.Point = rt.copy(rt.resultUnwrap(res, rt.u8Display)); first.x = 2; - fail = rt.Err(rt.copy(q)); - err = rt.copy(rt.resultUnwrapErr(fail, rt.u8Display)); + const fail: rt.Result = rt.Err(rt.copy(q)); + const err: Point.Point = rt.copy(rt.resultUnwrapErr(fail, rt.u8Display)); err.y = 3; rt.byteVecExtendFromSlice(out, Uint8Array.of(first.x & 0xff, rt.resultUnwrap(res, rt.u8Display).x & 0xff, err.y & 0xff, rt.resultUnwrapErr(fail, rt.u8Display).y & 0xff)); return; @@ -230,9 +176,8 @@ export function writeThenRead(a: Uint8Array, b: Uint8Array): rt.u8 { /** A copy of `a` read after `a` changes in place, which it doesn't see. */ export function copyThenWrite(a: [rt.u8, rt.u8]): rt.u8 { - let b!: [rt.u8, rt.u8]; a = rt.copy(a); - b = rt.copy(a); + const b: [rt.u8, rt.u8] = rt.copy(a); a[0] = 9; return rt.u8WrappingAdd(b[0], a[0]); } @@ -253,90 +198,54 @@ export function mark(out: rt.ByteVec, b: rt.u8): rt.usize { * written: each field logs as it runs. */ export function order(data: Uint8Array, out: rt.ByteVec): void { - let at!: (a0: rt.usize) => rt.u8; - let rect!: Shape.Shape; - let _5!: rt.u16; - let _10!: rt.u16; - let _16!: rt.i32; - let _18!: rt.i32; - let line!: Shape.Shape; - let _21!: Point.Point; - let _24!: Point.Point; - let pair!: Pair.Pair; - let _28!: rt.i64; - let _30!: rt.u8; - let n!: Uint8Array; - let read!: Point.Point; - let _37!: rt.i32; - let _41!: rt.i32; - let base!: Moved.Moved; - let updated!: Moved.Moved; - let _49!: rt.u16; let taken!: Shape.Shape; - let _57!: rt.u16; - let _59!: Point.Point; - let _63!: rt.usize; - let _64!: rt.usize; - let sum!: rt.usize; - let _70!: rt.usize; - let iterStart!: rt.usize; - let iterEnd!: rt.usize; let _75!: rt.usize; - let len!: rt.usize; - let _82!: Uint8Array; - let _83!: Uint8Array; - let _85!: rt.usize; - let _87!: rt.usize; - let text!: string; - let _102!: Shape.Shape; - let _103!: rt.usize; - let args2!: rt.Fmt[]; - at = (i2: rt.usize): rt.u8 => { + const at: (a0: rt.usize) => rt.u8 = (i2: rt.usize): rt.u8 => { return rt.optionUnwrapOr(rt.sliceGet(data, i2), 0); }; - _5 = mark(out, at(0)) & 0xffff; - _10 = mark(out, at(1)) & 0xffff; - _16 = mark(out, 2) | 0; - _18 = mark(out, 3) | 0; - rect = { tag: "Rect", corner: { x: _18, y: _16 }, width: _10, height: _5 } as Shape.Shape; - _21 = Point.new(mark(out, 4) | 0, 0); - _24 = Point.new(mark(out, 5) | 0, 0); - line = { tag: "Line", _0: _24, _1: _21 } as Shape.Shape; - _28 = mark(out, 6) as rt.i64; - _30 = mark(out, 7) & 0xff; - pair = { _0: _30, _1: _28 }; - n = Uint8Array.of(at(2)); - _37 = n[0] as rt.i32; - _41 = increment(n) as rt.i32; - read = { x: _41, y: _37 }; - base = { _0: at(4), _1: 0 }; - _49 = reset(base); - updated = { _0: base._0, _1: _49 }; + const _5: rt.u16 = mark(out, at(0)) & 0xffff; + const _10: rt.u16 = mark(out, at(1)) & 0xffff; + const _16: rt.i32 = mark(out, 2) | 0; + const _18: rt.i32 = mark(out, 3) | 0; + const rect: Shape.Shape = { tag: "Rect", corner: { x: _18, y: _16 }, width: _10, height: _5 }; + const _21: Point.Point = Point.new(mark(out, 4) | 0, 0); + const _24: Point.Point = Point.new(mark(out, 5) | 0, 0); + const line: Shape.Shape = { tag: "Line", _0: _24, _1: _21 }; + const _28: rt.i64 = mark(out, 6) as rt.i64; + const _30: rt.u8 = mark(out, 7) & 0xff; + const pair: Pair.Pair = { _0: _30, _1: _28 }; + const n: Uint8Array = Uint8Array.of(at(2)); + const _37: rt.i32 = n[0] as rt.i32; + const _41: rt.i32 = increment(n) as rt.i32; + const read: Point.Point = { x: _41, y: _37 }; + const base: Moved.Moved = { _0: at(4), _1: 0 }; + const _49: rt.u16 = reset(base); + const updated: Moved.Moved = { _0: base._0, _1: _49 }; if (rt.u8Rem(at(3), 2) === 0) { - _57 = mark(out, 8) & 0xffff; - _59 = Point.new(0, mark(out, 9) | 0); + const _57: rt.u16 = mark(out, 8) & 0xffff; + const _59: Point.Point = Point.new(0, mark(out, 9) | 0); taken = { tag: "Rect", corner: _59, width: _57, height: 1 } as Shape.Shape; } else { taken = { tag: "Dot" } as Shape.Shape; } - _63 = mark(out, 10); - _64 = rt.usizeDiv(mark(out, 11), 2); + const _63: rt.usize = mark(out, 10); + const _64: rt.usize = rt.usizeDiv(mark(out, 11), 2); new rt.Range(_64, _63); - sum = 0; - _70 = mark(out, 12); - iterStart = rt.usizeSub(mark(out, 13), 4); - iterEnd = _70; + let sum: rt.usize = 0; + const _70: rt.usize = mark(out, 12); + let iterStart: rt.usize = rt.usizeSub(mark(out, 13), 4); + const iterEnd: rt.usize = _70; while (true) { if (!((_75 = iterStart++) < iterEnd)) { - len = data.length; - _83 = logged(data, out); - _85 = rt.min(mark(out, 14), len); - _87 = rt.usizeDiv(rt.min(mark(out, 15), len), 2); - _82 = rt.sliceRange(_83, _87, _85); - _102 = taken; - _103 = sum; - args2 = [(f: rt.Formatter) => Shape.fmt$Debug(rect, f), (f: rt.Formatter) => Shape.fmt$Debug(line, f), (f: rt.Formatter) => Pair.fmt$Debug(pair, f), (f: rt.Formatter) => Point.fmt$Debug(read, f), (f: rt.Formatter) => Moved.fmt$Debug(updated, f), (f: rt.Formatter) => Shape.fmt$Debug(_102, f), (f: rt.Formatter) => rt.usizeDisplay(_64, f), (f: rt.Formatter) => rt.usizeDisplay(_63, f), (f: rt.Formatter) => rt.usizeDisplay(_103, f), (f: rt.Formatter) => rt.fmtList(_82, f, rt.u8Display)]; - text = rt.fmtFormat([args2[0], " ", args2[1], " ", args2[2], " ", args2[3], " ", args2[4], " ", args2[5], " ", args2[6], " ", args2[7], " ", args2[8], " ", args2[9]]); + const len: rt.usize = data.length; + const _83: Uint8Array = logged(data, out); + const _85: rt.usize = rt.min(mark(out, 14), len); + const _87: rt.usize = rt.usizeDiv(rt.min(mark(out, 15), len), 2); + const _82: Uint8Array = rt.sliceRange(_83, _87, _85); + const _102: Shape.Shape = taken; + const _103: rt.usize = sum; + const args2: rt.Fmt[] = [(f: rt.Formatter) => Shape.fmt$Debug(rect, f), (f: rt.Formatter) => Shape.fmt$Debug(line, f), (f: rt.Formatter) => Pair.fmt$Debug(pair, f), (f: rt.Formatter) => Point.fmt$Debug(read, f), (f: rt.Formatter) => Moved.fmt$Debug(updated, f), (f: rt.Formatter) => Shape.fmt$Debug(_102, f), (f: rt.Formatter) => rt.usizeDisplay(_64, f), (f: rt.Formatter) => rt.usizeDisplay(_63, f), (f: rt.Formatter) => rt.usizeDisplay(_103, f), (f: rt.Formatter) => rt.fmtList(_82, f, rt.u8Display)]; + const text: string = rt.fmtFormat([args2[0], " ", args2[1], " ", args2[2], " ", args2[3], " ", args2[4], " ", args2[5], " ", args2[6], " ", args2[7], " ", args2[8], " ", args2[9]]); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(text)); indexed(data, out); return; @@ -351,54 +260,38 @@ export function order(data: Uint8Array, out: rt.ByteVec): void { * earlier operand read. */ export function indexed(data: Uint8Array, out: rt.ByteVec): void { - let at!: (a0: rt.usize) => rt.u8; - let first!: rt.u8; - let _7!: rt.ByteVec; - let bytes!: Uint8Array; - let _23!: Uint8Array; - let _30!: Uint8Array; - let _36!: Uint8Array; - let second!: rt.u8; - let _41!: Uint8Array; - let f!: (a0: rt.u8) => rt.u8; - let called!: rt.u8; - let _50!: (a0: rt.u8) => rt.u8; - let n!: rt.u8; - let slots!: Uint8Array; - let _58!: rt.u8; - let _68!: rt.u8; - at = (i: rt.usize): rt.u8 => { + const at: (a0: rt.usize) => rt.u8 = (i: rt.usize): rt.u8 => { return rt.optionUnwrapOr(rt.sliceGet(data, i), 0); }; - _7 = listed(out, at(0)); + const _7: rt.ByteVec = listed(out, at(0)); rt.byteVecPush(out, 225); const slice = rt.byteVecView(_7); const at2 = rt.idx(slice, 1); - first = slice[at2]; - bytes = Uint8Array.of(at(1), at(2), at(3), 4); - _23 = loggedMut(bytes, out); + const first: rt.u8 = slice[at2]; + const bytes: Uint8Array = Uint8Array.of(at(1), at(2), at(3), 4); + const _23: Uint8Array = loggedMut(bytes, out); rt.byteVecPush(out, 227); rt.byteVecPush(out, 228); rt.sliceCopyWithin(_23, 1, 3, 0); - _30 = loggedMut(bytes, out); + const _30: Uint8Array = loggedMut(bytes, out); rt.byteVecPush(out, 229); rt.sliceCopyWithin(_30, 2, _30.length, 1); - _36 = loggedMut(bytes, out); + const _36: Uint8Array = loggedMut(bytes, out); rt.sliceCopyWithin(_36, 3, _36.length, 0); - _41 = logged(bytes, out); + const _41: Uint8Array = logged(bytes, out); rt.byteVecPush(out, 230); rt.idx(_41, 1); - second = _41[1]; - f = halve; - _50 = f; + const second: rt.u8 = _41[1]; + let f: (a0: rt.u8) => rt.u8 = halve; + const _50: (a0: rt.u8) => rt.u8 = f; f = twice; - called = _50(at(4)); - n = at(5); - slots = rt.bytes(2); - _58 = n; + const called: rt.u8 = _50(at(4)); + let n: rt.u8 = at(5); + const slots: Uint8Array = rt.bytes(2); + const _58: rt.u8 = n; n = rt.u8WrappingAdd(n, 1); slots[0] = rt.u8Add(slots[0], _58); - _68 = f(1); + const _68: rt.u8 = f(1); rt.byteVecExtendFromSlice(out, Uint8Array.of(first, second, called, _68, slots[0], n)); rt.byteVecExtendFromSlice(out, bytes); } @@ -431,8 +324,7 @@ export function logged(data: Uint8Array, out: rt.ByteVec): Uint8Array { /** `n`'s byte, incremented. */ export function increment(n: Uint8Array): rt.u8 { - let _2!: rt.u8; - _2 = rt.u8WrappingAdd(n[0], 1); + const _2: rt.u8 = rt.u8WrappingAdd(n[0], 1); n[0] = _2; return n[0]; } @@ -445,23 +337,17 @@ export function reset(m: Moved.Moved): rt.u16 { /** Fieldless enums cast to every width, past their discriminant's range and sign. */ export function discriminants(data: Uint8Array, out: rt.ByteVec): void { - let iterS!: Uint8Array; - let iterI!: number; - let _5!: rt.u8 | rt.Done; - let b!: rt.u8; let wide!: Wide.Wide; - let _10!: rt.u8; let signed!: Signed.Signed; - let _13!: rt.u8; - iterS = data; - iterI = 0; + const iterS: Uint8Array = data; + let iterI: number = 0; while (true) { - _5 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _5: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_5 === rt.DONE) { return; } - b = _5; - _10 = rt.u8Rem(b, 3); + const b: rt.u8 = _5; + const _10: rt.u8 = rt.u8Rem(b, 3); if (_10 === 0) { wide = "Low" as Wide.Wide; } else if (_10 === 1) { @@ -469,7 +355,7 @@ export function discriminants(data: Uint8Array, out: rt.ByteVec): void { } else { wide = "Top" as Wide.Wide; } - _13 = rt.u8Rem(b, 3); + const _13: rt.u8 = rt.u8Rem(b, 3); if (_13 === 0) { signed = "Neg" as Signed.Signed; } else if (_13 === 1) { @@ -494,41 +380,13 @@ export function discriminants(data: Uint8Array, out: rt.ByteVec): void { * and values of type `!`. */ export function loops(data: Uint8Array, out: rt.ByteVec): void { - let stack!: rt.ByteVec; - let popped!: rt.u32; - let _5!: rt.u8 | undefined; - let top!: rt.u8; - let found!: [rt.usize, rt.usize] | undefined; - let iterStart!: rt.usize; - let iterEnd!: rt.usize; let _24!: rt.usize; - let i!: rt.usize; - let iterStart2!: rt.usize; - let iterEnd2!: rt.usize; let _34!: rt.usize; - let j!: rt.usize; - let _39!: rt.u8; - let i2!: rt.usize; - let j2!: rt.usize; - let n!: rt.u64; let steps!: rt.u8; let _65!: rt.u64; - let count!: rt.u8; - let iter3!: rt.RangeInclusive; - let _84!: rt.u8 | rt.Done; - let i3!: rt.i8; - let lo!: rt.i32; - let r!: rt.Range; - let first!: rt.i32 | undefined; - let second!: rt.i32 | undefined; - let iterStart3!: rt.i32; - let iterEnd3!: rt.i32; let _124!: rt.i32; - let iterStart4!: rt.i8; - let iterEnd4!: rt.i8; let _136!: rt.i8; - let _158!: (a0: rt.u8) => rt.u8; - _158 = (x3: rt.u8): rt.u8 => { + const _158: (a0: rt.u8) => rt.u8 = (x3: rt.u8): rt.u8 => { while (true) { if (!(x3 < 10)) { x3 = rt.u8Div(x3, 3); @@ -537,12 +395,12 @@ export function loops(data: Uint8Array, out: rt.ByteVec): void { } } }; - stack = rt.sliceToByteVec(data); - popped = 0; + const stack: rt.ByteVec = rt.sliceToByteVec(data); + let popped: rt.u32 = 0; l0: while (true) { - _5 = rt.byteVecPop(stack); + const _5: rt.u8 | undefined = rt.byteVecPop(stack); if (_5 !== undefined) { - top = _5; + const top: rt.u8 = _5; if (!(top === 0)) { popped = rt.u32Add(popped, top as rt.u32); if (!(popped > 1000)) { @@ -553,22 +411,22 @@ export function loops(data: Uint8Array, out: rt.ByteVec): void { } } rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(popped)); - found = undefined; - iterStart = 0; - iterEnd = data.length; + let found: [rt.usize, rt.usize] | undefined = undefined; + let iterStart: rt.usize = 0; + const iterEnd: rt.usize = data.length; l2: while (true) { b3: { if ((_24 = iterStart++) < iterEnd) { - i = _24; - iterStart2 = rt.usizeAdd(i, 1); - iterEnd2 = data.length; + const i: rt.usize = _24; + let iterStart2: rt.usize = rt.usizeAdd(i, 1); + const iterEnd2: rt.usize = data.length; while (true) { if (!((_34 = iterStart2++) < iterEnd2)) { continue l2; } - j = _34; + const j: rt.usize = _34; rt.idx(data, i); - _39 = data[i]; + const _39: rt.u8 = data[i]; rt.idx(data, j); if (!(_39 === data[j])) { rt.idx(data, j); @@ -585,11 +443,11 @@ export function loops(data: Uint8Array, out: rt.ByteVec): void { if (found === undefined) { rt.byteVecPush(out, 255); } else { - i2 = found[0]; - j2 = found[1]; + const i2: rt.usize = found[0]; + const j2: rt.usize = found[1]; rt.byteVecExtendFromSlice(out, Uint8Array.of(i2 & 0xff, j2 & 0xff)); } - n = data.length as rt.u64; + let n: rt.u64 = data.length as rt.u64; l6: while (true) { if (!rt.u64Le(n, 1)) { if (!(rt.u64Rem(n, 2) === 0)) { @@ -606,32 +464,32 @@ export function loops(data: Uint8Array, out: rt.ByteVec): void { steps = 0; } rt.byteVecPush(out, steps); - count = 0; - iter3 = new rt.RangeInclusive(0, 3, rt.u8Step); + let count: rt.u8 = 0; + const iter3: rt.RangeInclusive = new rt.RangeInclusive(0, 3, rt.u8Step); while (true) { - _84 = iter3.next(); + const _84: rt.u8 | rt.Done = iter3.next(); if (_84 === rt.DONE) { - i3 = 10; + let i3: rt.i8 = 10; while (true) { if (!(i3 > -3)) { rt.byteVecPush(out, count); - lo = rt.i32Neg(rt.usizeRem(data.length, 4) | 0); - r = new rt.Range(lo, rt.i32Add(lo, 3)); - first = r.start < r.end ? r.start++ : undefined; + const lo: rt.i32 = rt.i32Neg(rt.usizeRem(data.length, 4) | 0); + const r: rt.Range = new rt.Range(lo, rt.i32Add(lo, 3)); + const first: rt.i32 | undefined = r.start < r.end ? r.start++ : undefined; r.end = r.start; - second = r.start < r.end ? r.start++ : undefined; + const second: rt.i32 | undefined = r.start < r.end ? r.start++ : undefined; if (first !== undefined) { rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(first)); } if (second !== undefined) { rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(second)); } - iterStart3 = lo; - iterEnd3 = 2; + let iterStart3: rt.i32 = lo; + const iterEnd3: rt.i32 = 2; while (true) { if (!((_124 = iterStart3++) < iterEnd3)) { - iterStart4 = rt.i8Sub(124, (lo << 24) >> 24); - iterEnd4 = 127; + let iterStart4: rt.i8 = rt.i8Sub(124, (lo << 24) >> 24); + const iterEnd4: rt.i8 = 127; while (true) { if (!((_136 = iterStart4++) < iterEnd4)) { rt.byteVecPush(out, firstRepeat(data)); @@ -667,21 +525,16 @@ export function loops(data: Uint8Array, out: rt.ByteVec): void { * inputs run every case to its end. */ export function diverging(data: Uint8Array, out: rt.ByteVec): void { - let head!: Uint8Array; - let b!: rt.u8; - let _15!: (a0: rt.u8) => rt.u8; - _15 = (b2: rt.u8): rt.u8 => { - let args2!: rt.Fmt[]; + const _15: (a0: rt.u8) => rt.u8 = (b2: rt.u8): rt.u8 => { if (!(b2 === 253)) { return rt.u8Div(b2, 3); - } else { - const arg = ([b2] as [rt.u8])[0]; - args2 = [(f: rt.Formatter) => rt.u8Display(arg, f)]; - rt.panicFmt(["closure ", args2[0]]); } + const arg = ([b2] as [rt.u8])[0]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg, f)]; + rt.panicFmt(["closure ", args2[0]]); }; - head = rt.sliceRange(data, 0, rt.min(data.length, 2)); - b = rt.optionUnwrapOr(rt.sliceFirst(head), 0); + const head: Uint8Array = rt.sliceRange(data, 0, rt.min(data.length, 2)); + const b: rt.u8 = rt.optionUnwrapOr(rt.sliceFirst(head), 0); rt.byteVecPush(out, returnedNever(b, data.length)); rt.byteVecPush(out, brokenNever(head)); rt.byteVecPush(out, _15(b)); @@ -696,21 +549,16 @@ export function diverging(data: Uint8Array, out: rt.ByteVec): void { * function made: a statement, a bound value, and the tail. */ export function closureNever(b: rt.u8): rt.u8 { - let x!: rt.u8; - let _2!: (a0: rt.u8) => never; - let ptr!: (a0: rt.u8) => never; - let _4!: (a0: rt.u8) => never; - _2 = (b2: rt.u8): never => { - let args2!: rt.Fmt[]; + const _2: (a0: rt.u8) => never = (b2: rt.u8): never => { const arg = ([b2] as [rt.u8])[0]; - args2 = [(f: rt.Formatter) => rt.u8LowerHex(arg, f)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u8LowerHex(arg, f)]; rt.panicFmt(["closure failed on ", rt.fmtSpec({ alternate: true }, args2[0])]); }; - _4 = madeNever(); - ptr = bail; + const _4: (a0: rt.u8) => never = madeNever(); + const ptr: (a0: rt.u8) => never = bail; if (!(b === 245)) { if (!(b === 244)) { - x = rt.u8Div(b, 5); + const x: rt.u8 = rt.u8Div(b, 5); if (b === 243) { _2(b); } else if (b === 250) { @@ -729,9 +577,8 @@ export function closureNever(b: rt.u8): rt.u8 { /** A closure that never returns, made by a function. */ export function madeNever(): (a0: rt.u8) => never { return (b: rt.u8): never => { - let args2!: rt.Fmt[]; const arg = ([b] as [rt.u8])[0]; - args2 = [(f: rt.Formatter) => rt.u8Display(arg, f)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg, f)]; rt.panicFmt(["made ", args2[0]]); }; } @@ -741,14 +588,12 @@ export function madeNever(): (a0: rt.u8) => never { * never exists: given one, and given an `Option` of none, which then calls one. */ export function genericNever(b: rt.u8, len: rt.usize): void { - let args2!: rt.Fmt[]; - let args4!: rt.Fmt[]; if (!(b === 241)) { if (!(b === 246)) { if (b === 249) { if (!(len > 1)) { const arg2 = ([b] as [rt.u8])[0]; - args4 = [(f: rt.Formatter) => rt.u8Display(arg2, f)]; + const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg2, f)]; rt.panicFmt(["some ", args4[0]]); } else { unwrapOrBail$never(undefined, b); @@ -756,7 +601,7 @@ export function genericNever(b: rt.u8, len: rt.usize): void { } } else { const arg = ([b] as [rt.u8])[0]; - args2 = [(f: rt.Formatter) => rt.u8Display(arg, f)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg, f)]; rt.panicFmt(["passed ", args2[0]]); } } else { @@ -779,43 +624,39 @@ export function unwrapOrBail$never(o: never | undefined, b: rt.u8): never { /** A function that never returns. */ export function bail(b: rt.u8): never { - let args2!: rt.Fmt[]; const arg = ([b] as [rt.u8])[0]; - args2 = [(f: rt.Formatter) => rt.u8LowerHex(arg, f)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u8LowerHex(arg, f)]; rt.panicFmt(["failed on ", rt.fmtSpec({ alternate: true }, args2[0])]); } /** `return`, and `break` out of the function's labeled block, with values that never exist. */ export function returnedNever(b: rt.u8, len: rt.usize): rt.u8 { - let args2!: rt.Fmt[]; - let args4!: rt.Fmt[]; if (b === 247) { const arg2 = ([b] as [rt.u8])[0]; - args2 = [(f: rt.Formatter) => rt.u8Display(arg2, f)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg2, f)]; rt.panicFmt(["returned ", args2[0]]); } else if (b === 248) { if (!(rt.usizeRem(len, 2) === 0)) { bail(b); } else { const arg = ([b] as [rt.u8])[0]; - args4 = [(f: rt.Formatter) => rt.u8Display(arg, f)]; + const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg, f)]; rt.panicFmt(["then ", args4[0]]); } - } else if (!(b === 254)) { - return b ^ 17; } else { + if (!(b === 254)) { + return b ^ 17; + } bail(b); } } /** A `return` of a `match` that guards, whose arms fall through to the next. */ export function guardedReturn(data: Uint8Array): rt.u8 { - let a!: rt.u8; - let b!: rt.u8; if (!((data.length === 0))) { if (data.length === 2) { - a = data[0]; - b = data[1]; + const a: rt.u8 = data[0]; + const b: rt.u8 = data[1]; if (a > b) { return rt.u8Sub(a, b); } @@ -833,24 +674,20 @@ export function guardedReturn(data: Uint8Array): rt.u8 { /** A loop ending the function, left by `break` with values that never exist. */ export function brokenNever(data: Uint8Array): rt.u8 { let _0!: rt.u8; - let i!: rt.usize; - let _6!: rt.usize; - let args2!: rt.Fmt[]; - let _19!: rt.usize; - i = 0; + let i: rt.usize = 0; l0: while (true) { if (!(i >= data.length)) { - _6 = i; + const _6: rt.usize = i; rt.idx(data, _6); const value = data[_6]; if (value === 251) { const arg = ([i] as [rt.usize])[0]; - args2 = [(f: rt.Formatter) => rt.usizeDisplay(arg, f)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.usizeDisplay(arg, f)]; rt.panicFmt(["broken at ", args2[0]]); return _0; } if (value === 252) { - _19 = i; + const _19: rt.usize = i; rt.idx(data, _19); bail(data[_19]); return _0; @@ -871,25 +708,20 @@ export function brokenNever(data: Uint8Array): rt.u8 { */ export function boundNever(data: Uint8Array, _out: rt.ByteVec): rt.u8 { let _0!: rt.u8; - let i!: rt.usize; - let _8!: rt.usize; - let args2!: rt.Fmt[]; - let _22!: rt.usize; - let _32!: rt.usize; - i = 0; + let i: rt.usize = 0; l0: while (true) { if (!(i >= data.length)) { - _8 = i; + const _8: rt.usize = i; rt.idx(data, _8); const value = data[_8]; if (value === 239) { const arg = ([i] as [rt.usize])[0]; - args2 = [(f: rt.Formatter) => rt.usizeDisplay(arg, f)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.usizeDisplay(arg, f)]; rt.panicFmt(["bound at ", args2[0]]); return _0; } if (value === 240) { - _22 = i; + const _22: rt.usize = i; rt.idx(data, _22); bail(data[_22]); return _0; @@ -901,7 +733,7 @@ export function boundNever(data: Uint8Array, _out: rt.ByteVec): rt.u8 { l2: while (true) { i = rt.usizeAdd(i, 1); if (!(i >= data.length)) { - _32 = i; + const _32: rt.usize = i; rt.idx(data, _32); if (!(data[_32] < 128)) { continue l2; @@ -919,25 +751,19 @@ export function boundNever(data: Uint8Array, _out: rt.ByteVec): rt.u8 { /** Loops that `break` ending a guarded `match` arm and an `if let` chain branch. */ export function branchLoops(data: Uint8Array, out: rt.ByteVec): void { - let i!: rt.usize; - let w!: Uint8Array; - let a!: rt.u8; - let b!: rt.u8; - let n!: rt.u8; - let n2!: rt.u8; - i = 0; + let i: rt.usize = 0; l0: while (true) { if (!(rt.usizeAdd(i, 1) < data.length)) { return; } - w = rt.sliceRange(data, i, rt.usizeAdd(i, 2)); + const w: Uint8Array = rt.sliceRange(data, i, rt.usizeAdd(i, 2)); b1: { i = rt.usizeAdd(i, 2); if (w.length === 2) { - a = w[0]; - b = w[1]; + const a: rt.u8 = w[0]; + const b: rt.u8 = w[1]; if (a > b) { - n = a; + let n: rt.u8 = a; while (true) { if (!(n <= b)) { n = rt.u8Sub(n, 1); @@ -954,7 +780,7 @@ export function branchLoops(data: Uint8Array, out: rt.ByteVec): void { } if (w.length === 2) { if (rt.u8Rem(w[0], 3) === rt.u8Rem(w[1], 3)) { - n2 = w[0]; + let n2: rt.u8 = w[0]; while (true) { n2 = rt.u8Div(n2, 2); rt.byteVecPush(out, n2); @@ -970,20 +796,15 @@ export function branchLoops(data: Uint8Array, out: rt.ByteVec): void { /** A loop that only `return` leaves, returned itself, around loops that `break`. */ export function returnedLoop(data: Uint8Array): rt.u8 { - let i!: rt.usize; - let iterS!: Uint8Array; - let iterI!: number; - let _11!: rt.u8 | rt.Done; - let b!: rt.u8; - i = 0; + let i: rt.usize = 0; l0: while (true) { if (!(i >= data.length)) { - iterS = rt.sliceRange(data, i); - iterI = 0; + const iterS: Uint8Array = rt.sliceRange(data, i); + let iterI: number = 0; l2: while (true) { - _11 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _11: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_11 !== rt.DONE) { - b = _11; + const b: rt.u8 = _11; if (!(b === 0)) { if (!(b > 240)) { continue l2; @@ -1001,34 +822,27 @@ export function returnedLoop(data: Uint8Array): rt.u8 { /** A loop that ends the function, left only by `return` from nested scopes. */ export function firstRepeat(data: Uint8Array): rt.u8 { - let i!: rt.usize; - let j!: rt.usize; - let _14!: rt.usize; - let _20!: rt.u8; - let _21!: rt.usize; - let _25!: rt.usize; - let _29!: rt.usize; - i = 0; + let i: rt.usize = 0; l0: while (true) { if (!(i >= data.length)) { - j = rt.usizeAdd(i, 1); + let j: rt.usize = rt.usizeAdd(i, 1); while (true) { if (!(j < data.length)) { i = rt.usizeAdd(i, 1); continue l0; } - _14 = j; + const _14: rt.usize = j; rt.idx(data, _14); if (!(data[_14] === 0)) { - _21 = i; + const _21: rt.usize = i; rt.idx(data, _21); - _20 = data[_21]; - _25 = j; + const _20: rt.u8 = data[_21]; + const _25: rt.usize = j; rt.idx(data, _25); if (!(_20 === data[_25])) { j = rt.usizeAdd(j, 1); } else { - _29 = j; + const _29: rt.usize = j; rt.idx(data, _29); return data[_29] ^ (i & 0xff); } @@ -1044,35 +858,26 @@ export function firstRepeat(data: Uint8Array): rt.u8 { /** A loop that ends the function, left by `break` with a value from nested scopes. */ export function tailBreak(data: Uint8Array): rt.u16 { - let i!: rt.usize; - let b!: rt.u8; - let _7!: rt.usize; - let _11!: rt.u8; - let iterS!: Uint8Array; - let iterI!: number; - let _18!: rt.u8 | rt.Done; - let c!: rt.u8; - let n!: rt.u8; - i = 0; + let i: rt.usize = 0; l0: while (true) { if (!(i >= data.length)) { - _7 = i; + const _7: rt.usize = i; rt.idx(data, _7); - b = data[_7]; + const b: rt.u8 = data[_7]; i = rt.usizeAdd(i, 1); - _11 = rt.u8Rem(b, 4); + const _11: rt.u8 = rt.u8Rem(b, 4); if (_11 === 0) { continue l0; } if (_11 === 1) { - iterS = rt.sliceRange(data, i); - iterI = 0; + const iterS: Uint8Array = rt.sliceRange(data, i); + let iterI: number = 0; while (true) { - _18 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _18: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_18 === rt.DONE) { continue l0; } - c = _18; + const c: rt.u8 = _18; if (c === b) { return rt.u16Mul(c as rt.u16, 2); } @@ -1083,7 +888,7 @@ export function tailBreak(data: Uint8Array): rt.u16 { return rt.u16Add(b as rt.u16, i & 0xffff); } } - n = b; + let n: rt.u8 = b; while (true) { if (!(n < 10)) { n = rt.u8Div(n, 3); @@ -1101,12 +906,8 @@ export function tailBreak(data: Uint8Array): rt.u16 { /** A loop that only `return` leaves, in a `match` arm that needs a value. */ export function armLoop(data: Uint8Array): rt.u8 { - let k!: rt.usize; - let _3!: rt.u8 | undefined; - let _13!: rt.usize; - let _17!: rt.usize; - k = 0; - _3 = rt.sliceFirst(data); + let k: rt.usize = 0; + const _3: rt.u8 | undefined = rt.sliceFirst(data); if (_3 !== undefined) { if (_3 >= 128) { return rt.u8Div(_3, 2); @@ -1114,12 +915,12 @@ export function armLoop(data: Uint8Array): rt.u8 { } while (true) { if (!(k >= data.length)) { - _13 = k; + const _13: rt.usize = k; rt.idx(data, _13); if (!(data[_13] >= 128)) { k = rt.usizeAdd(k, 1); } else { - _17 = k; + const _17: rt.usize = k; rt.idx(data, _17); return rt.u8Sub(data[_17], 128); } @@ -1131,12 +932,10 @@ export function armLoop(data: Uint8Array): rt.u8 { /** A generic function ending in a loop. */ export function position$u8(items: Uint8Array, want: rt.u8): rt.usize { - let i!: rt.usize; - let _9!: rt.usize; - i = 0; + let i: rt.usize = 0; l0: while (true) { if (!(i === items.length)) { - _9 = i; + const _9: rt.usize = i; rt.idx(items, _9); if (!((items[_9] === want))) { i = rt.usizeAdd(i, 1); @@ -1150,12 +949,10 @@ export function position$u8(items: Uint8Array, want: rt.u8): rt.usize { /** A unit function ending in a loop. */ export function drain(data: Uint8Array, out: rt.ByteVec): void { - let i!: rt.usize; - let _10!: rt.usize; - i = 0; + let i: rt.usize = 0; while (true) { if (!(i >= data.length)) { - _10 = i; + const _10: rt.usize = i; rt.idx(data, _10); rt.byteVecPush(out, data[_10] ^ 90); i = rt.usizeAdd(i, 2); @@ -1167,29 +964,10 @@ export function drain(data: Uint8Array, out: rt.ByteVec): void { /** Patterns: slices, ranges, guards that bind, `@` bindings, and let chains. */ export function patterns(data: Uint8Array, out: rt.ByteVec): void { - let iterS!: Uint8Array; - let iterI!: number; - let _33!: rt.u8 | rt.Done; - let b!: rt.u8; let class_!: rt.u8; - let _56!: Dir.Dir | undefined; - let d!: Dir.Dir; - let shape_!: Shape.Shape; let area!: rt.i64; - let x!: rt.i32; - let _74!: rt.i64; - let width2!: rt.u16; - let height!: rt.u16; - let a!: Point.Point; - let b2!: Point.Point; let either!: rt.Result; let v!: rt.u8; - let bytes!: Uint8Array; - let parsed!: rt.Result; - let a2!: rt.u8; - let b3!: rt.u8; - let _166!: string; - let args2!: rt.Fmt[]; if (!(data.length === 0)) { if (!(data.length === 1)) { if (!(data.length >= 2)) { @@ -1206,16 +984,16 @@ export function patterns(data: Uint8Array, out: rt.ByteVec): void { } else { rt.byteVecPush(out, 0); } - iterS = rt.sliceRange(data, 0, rt.min(data.length, 4)); - iterI = 0; + const iterS: Uint8Array = rt.sliceRange(data, 0, rt.min(data.length, 4)); + let iterI: number = 0; while (true) { - _33 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _33: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_33 === rt.DONE) { b5: { if (data.length >= 2) { - _56 = dir(data[0]); + const _56: Dir.Dir | undefined = dir(data[0]); if (_56 !== undefined) { - d = _56; + const d: Dir.Dir = _56; if (data[1] > 10) { rt.byteVecPush(out, from$From_Dir_u8(d)); break b5; @@ -1224,24 +1002,24 @@ export function patterns(data: Uint8Array, out: rt.ByteVec): void { } rt.byteVecPush(out, 238); } - shape_ = shape(data); + const shape_: Shape.Shape = shape(data); b7: { if (shape_.tag !== "Dot") { if (shape_.tag === "Line") { - a = shape_._0; - b2 = shape_._1; + const a: Point.Point = shape_._0; + const b2: Point.Point = shape_._1; area = rt.i64Mul(rt.i32Sub(a.x, b2.x) as rt.i64, rt.i32Sub(a.y, b2.y) as rt.i64); break b7; } if (shape_.width !== 0) { if (!(shape_.corner.x > 0)) { - width2 = shape_.width; - height = shape_.height; + const width2: rt.u16 = shape_.width; + const height: rt.u16 = shape_.height; area = rt.i64Neg(rt.i64Mul(width2 as rt.i64, height as rt.i64)); break b7; } - x = shape_.corner.x; - _74 = shape_.width as rt.i64; + const x: rt.i32 = shape_.corner.x; + const _74: rt.i64 = shape_.width as rt.i64; area = rt.i64Mul(_74, x as rt.i64); break b7; } @@ -1261,22 +1039,22 @@ export function patterns(data: Uint8Array, out: rt.ByteVec): void { } rt.byteVecPush(out, v); rt.byteVecPush(out, rt.u8Add(Uint8Array.of().length & 0xff, rt.iterSum(rt.iterSlice(Uint8Array.of()), rt.u8Add, 0))); - bytes = Uint8Array.of(data.length & 0xff, 1, 2); + const bytes: Uint8Array = Uint8Array.of(data.length & 0xff, 1, 2); bytes.subarray(1, 3)[0] = 9; rt.byteVecExtendFromSlice(out, bytes); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(rt.u64Add(total$Shape([shape_, { tag: "Dot" } as Shape.Shape], out), total$Meters([{ _0: 3 }, { _0: rt.u64Of(18446744073709551615n) }], out)))); - parsed = rt.Ok(data.length & 0xff); - a2 = (parsed as { ok: true; value: rt.u8 }).value; - b3 = (parsed as { ok: true; value: rt.u8 }).value; + const parsed: rt.Result = rt.Ok(data.length & 0xff); + const a2: rt.u8 = (parsed as { ok: true; value: rt.u8 }).value; + const b3: rt.u8 = (parsed as { ok: true; value: rt.u8 }).value; rt.byteVecExtendFromSlice(out, Uint8Array.of(a2, b3, (parsed as { ok: true; value: rt.u8 }).value, early(a2))); const arg = ([parsed] as [rt.Result])[0]; - args2 = [(f: rt.Formatter) => rt.fmtResult(arg, f, rt.u8Display, (value: Void.Void, f: rt.Formatter) => Void.fmt$Debug(value, f))]; - _166 = rt.fmtFormat([args2[0]]); + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtResult(arg, f, rt.u8Display, (value: Void.Void, f: rt.Formatter) => Void.fmt$Debug(value, f))]; + const _166: string = rt.fmtFormat([args2[0]]); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_166)); return; } b2: { - b = _33; + const b: rt.u8 = _33; if (b === 0) { class_ = 0; } else if (b === 10 || b === 20 || b === 30) { @@ -1314,68 +1092,50 @@ export function early(n: rt.u8): rt.u8 { /** Closures capturing by reference and by move, and functions as values. */ export function closures(data: Uint8Array, out: rt.ByteVec): void { - let sum!: rt.u32; - let add!: (a0: rt.u8) => void; - let iterS!: Uint8Array; - let iterI!: number; - let _8!: rt.u8 | rt.Done; - let base!: rt.u32; - let n!: rt.u32; - let whole!: Uint8Array; - let parsed!: Array; - let iterS2!: Uint8Array; - let iterI2!: number; - let _53!: rt.u8 | rt.Done; - let _59!: Dir.Dir | undefined; - let tags!: rt.ByteVec; - let iterS3!: Array; - let iterI3!: number; - let _64!: Dir.Dir | undefined | rt.Done; - let _70!: rt.u8; - sum = 0; - add = (v: rt.u8): void => { + let sum: rt.u32 = 0; + const add: (a0: rt.u8) => void = (v: rt.u8): void => { sum = rt.u32Add(sum, v as rt.u32); }; - iterS = data; - iterI = 0; + const iterS: Uint8Array = data; + let iterI: number = 0; while (true) { - _8 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _8: rt.u8 | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_8 === rt.DONE) { rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(sum)); - base = data.length as rt.u32; + const base: rt.u32 = data.length as rt.u32; const captured = base; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(apply$closures_closure1((v2: rt.u32): rt.u32 => { return rt.u32Add(rt.u32Mul(v2, 3), captured); }, sum))); - n = base; + let n: rt.u32 = base; const captured2 = n; n = rt.u32Add(n, 10); rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(rt.u32Add(((): rt.u32 => { return rt.u32Add(captured2, 1); })(), n))); - whole = Uint8Array.of(data.length & 0xff); + const whole: Uint8Array = Uint8Array.of(data.length & 0xff); overwrite(whole); rt.byteVecPush(out, whole[0]); - parsed = []; - iterS2 = data; - iterI2 = 0; + const parsed: Array = []; + const iterS2: Uint8Array = data; + let iterI2: number = 0; while (true) { - _53 = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; + const _53: rt.u8 | rt.Done = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; if (_53 === rt.DONE) { - tags = new rt.ByteVec(); - iterS3 = parsed; - iterI3 = 0; + const tags: rt.ByteVec = new rt.ByteVec(); + const iterS3: Array = parsed; + let iterI3: number = 0; while (true) { - _64 = iterI3 < iterS3.length ? iterS3[iterI3++] : rt.DONE; + const _64: Dir.Dir | undefined | rt.Done = iterI3 < iterS3.length ? iterS3[iterI3++] : rt.DONE; if (_64 === rt.DONE) { rt.byteVecExtendFromSlice(out, rt.byteVecView(tags)); return; } - _70 = rt.optionUnwrapOr(rt.optionMap(_64, from$From_Dir_u8), 0); + const _70: rt.u8 = rt.optionUnwrapOr(rt.optionMap(_64, from$From_Dir_u8), 0); rt.byteVecPush(tags, _70); } } - _59 = dir(_53); + const _59: Dir.Dir | undefined = dir(_53); parsed.push(_59); } } @@ -1385,8 +1145,7 @@ export function closures(data: Uint8Array, out: rt.ByteVec): void { /** Replaces `a` whole from a closure. */ export function overwrite(a: Uint8Array): void { - let write!: () => void; - write = (): void => { + const write: () => void = (): void => { a.set(Uint8Array.of(9)); }; write(); @@ -1398,21 +1157,11 @@ export function apply$closures_closure1(f: (a0: rt.u32) => rt.u32, v: rt.u32): r /** Options, results, `?`, and strings. */ export function library(data: Uint8Array, out: rt.ByteVec): void { - let _3!: (a0: rt.u8, a1: rt.u8) => rt.u8 | undefined; - let a!: rt.u8; - let b!: rt.u8; let parsed!: rt.Result; - let mapped!: rt.Result; - let _30!: (a0: rt.u8) => rt.Poll>; - let _32!: rt.Poll>; - let _45!: rt.Result; - let s!: string; - _3 = (a2: rt.u8, b2: rt.u8): rt.u8 | undefined => { - let _4!: rt.u8 | undefined; - let _82!: rt.u8 | undefined; - _4 = rt.u8CheckedAdd(a2, b2); + const _3: (a0: rt.u8, a1: rt.u8) => rt.u8 | undefined = (a2: rt.u8, b2: rt.u8): rt.u8 | undefined => { + const _4: rt.u8 | undefined = rt.u8CheckedAdd(a2, b2); if (_4 !== undefined) { - _82 = rt.u8CheckedMul(_4, 2); + const _82: rt.u8 | undefined = rt.u8CheckedMul(_4, 2); if (_82 !== undefined) { return rt.u8Sub(_82, 1); } @@ -1420,12 +1169,9 @@ export function library(data: Uint8Array, out: rt.ByteVec): void { } return undefined; }; - _30 = (a3: rt.u8): rt.Poll> => { + const _30: (a0: rt.u8) => rt.Poll> = (a3: rt.u8): rt.Poll> => { let half!: rt.Result; - let _43!: Dir.Dir | undefined; - let _132!: rt.Result; - let residual!: rt.Result; - _43 = dir(a3); + const _43: Dir.Dir | undefined = dir(a3); b0: { if (_43 !== undefined) { if (rt.u8Rem(a3, 2) === 1) { @@ -1435,22 +1181,22 @@ export function library(data: Uint8Array, out: rt.ByteVec): void { } half = rt.Ok(rt.u8Div(a3, 2)); } - _132 = half; + const _132: rt.Result = half; if (_132.ok) { return rt.Ok(_132.value); } - residual = _132; + const residual: rt.Result = _132; return rt.Err(from$From_Dir_u8((residual as { ok: false; error: Dir.Dir }).error)); }; - a = rt.optionUnwrapOr(rt.sliceFirst(data), 0); - b = rt.optionUnwrapOr(rt.sliceGet(data, 1), 0); + const a: rt.u8 = rt.optionUnwrapOr(rt.sliceFirst(data), 0); + const b: rt.u8 = rt.optionUnwrapOr(rt.sliceGet(data, 1), 0); rt.byteVecPush(out, rt.optionUnwrapOr(_3(a, b), 255)); if (a === 0) { parsed = rt.Err("zero"); } else { parsed = rt.Ok(a); } - mapped = rt.resultMapErr(rt.resultMap(parsed, (n5: rt.u8): rt.u8 => { + const mapped: rt.Result = rt.resultMapErr(rt.resultMap(parsed, (n5: rt.u8): rt.u8 => { return rt.u8Div(n5, 2); }), (e2: string): rt.u8 => { return rt.stringLen(e2) & 0xff; @@ -1460,7 +1206,7 @@ export function library(data: Uint8Array, out: rt.ByteVec): void { } else { rt.byteVecExtendFromSlice(out, Uint8Array.of(1, mapped.error)); } - _32 = _30(b); + const _32: rt.Poll> = _30(b); if (_32 !== rt.Pending) { if (_32.ok) { rt.byteVecExtendFromSlice(out, Uint8Array.of(2, _32.value)); @@ -1470,9 +1216,9 @@ export function library(data: Uint8Array, out: rt.ByteVec): void { } else { rt.byteVecPush(out, 4); } - _45 = rt.stringFromUtf8(rt.sliceToByteVec(data)); + const _45: rt.Result = rt.stringFromUtf8(rt.sliceToByteVec(data)); if (_45.ok) { - s = _45.value; + const s: string = _45.value; rt.byteVecPush(out, 1); rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(rt.stringLen(s) as rt.u32)); rt.byteVecExtendFromSlice(out, rt.stringAsBytes(s)); diff --git a/ts/fixtures/task/expected/kio.Consumer.ts b/ts/fixtures/task/expected/kio.Consumer.ts index c57b699e0..f50a51324 100644 --- a/ts/fixtures/task/expected/kio.Consumer.ts +++ b/ts/fixtures/task/expected/kio.Consumer.ts @@ -25,25 +25,20 @@ export class Consumer { /** The next value, or `None` once the channel closed and every value was read. */ export function pollRecv(self: Consumer, waiter: Waiter.Waiter): rt.Poll { - let state!: rt.Mutex; - let value!: rt.u64; - let _16!: State.State; - let _18!: rt.usize; - state = self.state.value; + const state: rt.Mutex = self.state.value; if (!(self.next < state.value.queue.length)) { if (!state.value.closed) { Waiter.register(waiter, state.value.waiters); return rt.Pending; } return undefined; - } else { - _16 = state.value; - _18 = self.next; - const at = rt.idx(_16.queue, _18); - value = _16.queue[at]; - self.next = rt.usizeAdd(self.next, 1); - return value; } + const _16: State.State = state.value; + const _18: rt.usize = self.next; + const at = rt.idx(_16.queue, _18); + const value: rt.u64 = _16.queue[at]; + self.next = rt.usizeAdd(self.next, 1); + return value; } //# sourceMappingURL=kio.Consumer.ts.map diff --git a/ts/fixtures/task/expected/kio.Park.ts b/ts/fixtures/task/expected/kio.Park.ts index 6820dd6af..30d2f0410 100644 --- a/ts/fixtures/task/expected/kio.Park.ts +++ b/ts/fixtures/task/expected/kio.Park.ts @@ -26,14 +26,13 @@ export class Park { */ export function hold(self: Park, cx: rt.Context): Waiter.Waiter { let reuse!: boolean; - let _10!: Waiter.Waiter | undefined; if (self._0 === undefined) { reuse = false; } else { reuse = cx.willWake(self._0.waker); } if (!reuse) { - _10 = Waiter.new(cx.clone()); + const _10: Waiter.Waiter | undefined = Waiter.new(cx.clone()); rt.drop(self._0); self._0 = _10; } diff --git a/ts/fixtures/task/expected/kio.Pending.ts b/ts/fixtures/task/expected/kio.Pending.ts index fce8c486e..3c2bdbf48 100644 --- a/ts/fixtures/task/expected/kio.Pending.ts +++ b/ts/fixtures/task/expected/kio.Pending.ts @@ -21,8 +21,7 @@ export class Pending { } export function poll$Future_recv_closure0_closure0(self: Pending<(a0: Waiter.Waiter) => rt.Poll>, cx: rt.Context): rt.Poll { - let this_!: Pending<(a0: Waiter.Waiter) => rt.Poll>; - this_ = self; + const this_: Pending<(a0: Waiter.Waiter) => rt.Poll> = self; return this_.poll(Park.hold(this_.park, cx)); } diff --git a/ts/fixtures/task/expected/kio.Producer.ts b/ts/fixtures/task/expected/kio.Producer.ts index 4405b31a0..433a1bbfa 100644 --- a/ts/fixtures/task/expected/kio.Producer.ts +++ b/ts/fixtures/task/expected/kio.Producer.ts @@ -20,18 +20,15 @@ export class Producer { } function new_(): Producer { - let _2!: rt.u64[]; - _2 = []; + const _2: rt.u64[] = []; return new Producer({ state: new rt.Arc(new rt.Mutex({ queue: _2, closed: false, producers: 1, waiters: WaiterList.new() })) }); } /** Queue `value` and wake every consumer, after releasing the lock. */ export function send(self: Producer, value: rt.u64): void { - let waiters!: WaiterList.WaiterList; - let state!: rt.Mutex; - state = self.state.value; + const state: rt.Mutex = self.state.value; state.value.queue.push(value); - waiters = WaiterList.take(state.value.waiters); + const waiters: WaiterList.WaiterList = WaiterList.take(state.value.waiters); WaiterList.wake(waiters); } @@ -40,24 +37,19 @@ export function consume(self: Producer): Consumer.Consumer { } export function clone$Clone(self: Producer): Producer { - let _2!: State.State; - let _4!: rt.Mutex; - _4 = self.state.value; - _2 = _4.value; + const _4: rt.Mutex = self.state.value; + const _2: State.State = _4.value; _2.producers = rt.usizeAdd(_2.producers, 1); return new Producer({ state: rt.arcClone(self.state) }); } export function drop$Drop(self: Producer): void { - let waiters!: WaiterList.WaiterList; - let state!: rt.Mutex; - let _7!: State.State; - state = self.state.value; - _7 = state.value; + const state: rt.Mutex = self.state.value; + const _7: State.State = state.value; _7.producers = rt.usizeSub(_7.producers, 1); if (!(state.value.producers > 0)) { state.value.closed = true; - waiters = WaiterList.take(state.value.waiters); + const waiters: WaiterList.WaiterList = WaiterList.take(state.value.waiters); WaiterList.wake(waiters); } } diff --git a/ts/fixtures/task/expected/kio.Waiter.ts b/ts/fixtures/task/expected/kio.Waiter.ts index 58d151d43..50e0b270d 100644 --- a/ts/fixtures/task/expected/kio.Waiter.ts +++ b/ts/fixtures/task/expected/kio.Waiter.ts @@ -20,13 +20,11 @@ export class Waiter { } function new_(waker: rt.Waker): Waiter { - let shared!: rt.Arc; - let _5!: rt.Waker; let unwind: number = 0; try { unwind = 4; - shared = new rt.Arc(waker.clone()); - _5 = waker; + const shared: rt.Arc = new rt.Arc(waker.clone()); + const _5: rt.Waker = waker; return new Waiter({ waker: _5, shared }); } catch (e) { if (unwind === 0) { diff --git a/ts/fixtures/task/expected/kio.WaiterList.ts b/ts/fixtures/task/expected/kio.WaiterList.ts index 8d7235123..88457120c 100644 --- a/ts/fixtures/task/expected/kio.WaiterList.ts +++ b/ts/fixtures/task/expected/kio.WaiterList.ts @@ -15,47 +15,33 @@ function new_(): WaiterList { } export function register(self: WaiterList, waiter: Waiter.Waiter): void { - let weak!: rt.Weak; - let iterS!: rt.Weak[]; - let iterI!: number; - let _8!: rt.Weak | rt.Done; - let probes!: rt.usize; - let _23!: rt.usize; - let _24!: rt.Weak; - let _27!: rt.usize; - let live!: rt.Weak[]; - let iterS2!: rt.Weak[]; - let iterI2!: number; - let _43!: rt.Weak | rt.Done; - let entry!: rt.Weak; - let _53!: rt.Weak[]; - weak = new rt.Weak(waiter.shared); - iterS = self.entries; - iterI = 0; + const weak: rt.Weak = new rt.Weak(waiter.shared); + const iterS: rt.Weak[] = self.entries; + let iterI: number = 0; l0: while (true) { - _8 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _8: rt.Weak | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; b1: { b2: { if (_8 === rt.DONE) { - probes = rt.min(self.entries.length, 2); + let probes: rt.usize = rt.min(self.entries.length, 2); while (true) { if (!(probes > 0)) { b4: { if (self.entries.length >= 4) { - live = []; + const live: rt.Weak[] = []; const taken = self.entries; self.entries = []; - iterS2 = taken; - iterI2 = 0; + const iterS2: rt.Weak[] = taken; + let iterI2: number = 0; while (true) { - _43 = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; + const _43: rt.Weak | rt.Done = iterI2 < iterS2.length ? iterS2[iterI2++] : rt.DONE; if (_43 === rt.DONE) { - _53 = live; + const _53: rt.Weak[] = live; self.entries = _53; self.cursor = 0; break b4; } - entry = _43; + const entry: rt.Weak = _43; if (entry.arc.strong > 0) { live.push(entry); } @@ -64,19 +50,18 @@ export function register(self: WaiterList, waiter: Waiter.Waiter): void { } self.entries.push(weak); break b1; + } + const _23: rt.usize = self.cursor; + const at = rt.idx(self.entries, _23); + if (!(self.entries[at].arc.strong === 0)) { + self.cursor = rt.usizeRem(rt.usizeAdd(self.cursor, 1), self.entries.length); + probes = rt.usizeSub(probes, 1); } else { - _23 = self.cursor; - const at = rt.idx(self.entries, _23); - if (!(self.entries[at].arc.strong === 0)) { - self.cursor = rt.usizeRem(rt.usizeAdd(self.cursor, 1), self.entries.length); - probes = rt.usizeSub(probes, 1); - } else { - _24 = weak; - _27 = self.cursor; - const at2 = rt.idx(self.entries, _27); - self.entries[at2] = _24; - break b2; - } + const _24: rt.Weak = weak; + const _27: rt.usize = self.cursor; + const at2 = rt.idx(self.entries, _27); + self.entries[at2] = _24; + break b2; } } } @@ -99,26 +84,21 @@ export function take(self: WaiterList): WaiterList { /** Wake every live waiter, draining the list. */ export function wake(self: WaiterList): void { - let iterS!: rt.Weak[]; - let iterI!: number; - let _6!: rt.Weak | rt.Done; - let entry!: rt.Weak; - let _10!: rt.Arc | undefined; let waker!: rt.Arc; let unwind: number = 0; try { self.cursor = 0; const taken = self.entries; self.entries = []; - iterS = taken; - iterI = 0; + const iterS: rt.Weak[] = taken; + let iterI: number = 0; while (true) { - _6 = iterI < iterS.length ? iterS[iterI++] : rt.DONE; + const _6: rt.Weak | rt.Done = iterI < iterS.length ? iterS[iterI++] : rt.DONE; if (_6 === rt.DONE) { return; } - entry = _6; - _10 = rt.weakUpgrade(entry); + const entry: rt.Weak = _6; + const _10: rt.Arc | undefined = rt.weakUpgrade(entry); if (_10 !== undefined) { unwind = 15; waker = _10; diff --git a/ts/fixtures/task/expected/kio.ts b/ts/fixtures/task/expected/kio.ts index 6cfbafe5a..e75a807ba 100644 --- a/ts/fixtures/task/expected/kio.ts +++ b/ts/fixtures/task/expected/kio.ts @@ -8,8 +8,7 @@ import type * as Waiter from "./kio.Waiter.ts"; /** A future from a poll function that receives a [`Waiter`]. */ export function wait$recv_closure0_closure0_Option_u64(poll: (a0: Waiter.Waiter) => rt.Poll): Pending.Pending<(a0: Waiter.Waiter) => rt.Poll> { - let _2!: (a0: Waiter.Waiter) => rt.Poll; - _2 = poll; + const _2: (a0: Waiter.Waiter) => rt.Poll = poll; return new Pending.Pending({ poll: _2, park: Park.default$Default() }); } @@ -29,13 +28,11 @@ export class recvFuture { } poll(_2: rt.Context): rt.Poll { - let self!: Consumer.Consumer; - let _7!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { unwind = 12; - self = this.#self; + const self: Consumer.Consumer = this.#self; this.#awaitee = wait$recv_closure0_closure0_Option_u64((waiter: Waiter.Waiter): rt.Poll => { return Consumer.pollRecv(self, waiter); }); @@ -45,7 +42,7 @@ export class recvFuture { rt.asyncFnResumedPanic(); } unwind = 11; - _7 = Pending.poll$Future_recv_closure0_closure0(this.#awaitee, _2); + const _7: rt.Poll = Pending.poll$Future_recv_closure0_closure0(this.#awaitee, _2); if (_7 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); diff --git a/ts/fixtures/task/expected/log.Log.ts b/ts/fixtures/task/expected/log.Log.ts index 3420f67b3..c662d6fcf 100644 --- a/ts/fixtures/task/expected/log.Log.ts +++ b/ts/fixtures/task/expected/log.Log.ts @@ -25,29 +25,22 @@ function new_(): Log { /** Append one event. */ export function note(self: Log, event: string): void { - let _4!: string[]; - let _6!: rt.Mutex; - _6 = self._0.value; - _4 = _6.value; + const _6: rt.Mutex = self._0.value; + const _4: string[] = _6.value; _4.push(event); } /** Every event so far, one per line. */ export function text(self: Log): rt.ByteVec { - let events!: rt.Mutex; - let out!: rt.ByteVec; - let iter!: rt.Iter; - let _13!: string | rt.Done; - let _19!: Uint8Array; - events = self._0.value; - out = new rt.ByteVec(); - iter = rt.iterSlice(events.value); + const events: rt.Mutex = self._0.value; + const out: rt.ByteVec = new rt.ByteVec(); + const iter: rt.Iter = rt.iterSlice(events.value); while (true) { - _13 = iter.next(); + const _13: string | rt.Done = iter.next(); if (_13 === rt.DONE) { return out; } - _19 = rt.stringAsBytes(_13); + const _19: Uint8Array = rt.stringAsBytes(_13); rt.byteVecExtendFromSlice(out, _19); rt.byteVecPush(out, 10); } diff --git a/ts/fixtures/task/expected/model.Channel.ts b/ts/fixtures/task/expected/model.Channel.ts index caa448e84..1c8e7b573 100644 --- a/ts/fixtures/task/expected/model.Channel.ts +++ b/ts/fixtures/task/expected/model.Channel.ts @@ -21,7 +21,6 @@ export class Channel { } export function open(): Channel { - let _0!: Channel; let producer!: Producer.Producer; let consumer_!: Consumer.Consumer; let producers!: Producer.Producer[]; @@ -38,7 +37,7 @@ export function open(): Channel { unwind = 6; _10 = false; producers.push(producer); - _0 = new Channel({ producers, consumer: consumer_ }); + const _0: Channel = new Channel({ producers, consumer: consumer_ }); _10 = false; return _0; } catch (e) { @@ -67,8 +66,7 @@ export function consumer(self: Channel): Consumer.Consumer { /** Send `value` through the first producer, if one is open. */ export function send(self: Channel, value: rt.u64): boolean { - let _3!: Producer.Producer | undefined; - _3 = rt.sliceFirst(self.producers); + const _3: Producer.Producer | undefined = rt.sliceFirst(self.producers); if (_3 === undefined) { return false; } @@ -78,8 +76,7 @@ export function send(self: Channel, value: rt.u64): boolean { /** Drop the last producer, if one is open: the last closes the channel. */ export function close(self: Channel): boolean { - let _2!: Producer.Producer | undefined; - _2 = self.producers.pop(); + const _2: Producer.Producer | undefined = self.producers.pop(); if (_2 === undefined) { return false; } @@ -89,13 +86,11 @@ export function close(self: Channel): boolean { /** Open another producer, if one is open to clone. */ export function cloneProducer(self: Channel): boolean { - let clone!: Producer.Producer; - let _3!: Producer.Producer | undefined; - _3 = rt.sliceFirst(self.producers); + const _3: Producer.Producer | undefined = rt.sliceFirst(self.producers); if (_3 === undefined) { return false; } - clone = Producer.clone$Clone(_3); + const clone: Producer.Producer = Producer.clone$Clone(_3); self.producers.push(clone); return true; } diff --git a/ts/fixtures/task/expected/model.Guard.ts b/ts/fixtures/task/expected/model.Guard.ts index 3204e1ab4..1ef24f8a3 100644 --- a/ts/fixtures/task/expected/model.Guard.ts +++ b/ts/fixtures/task/expected/model.Guard.ts @@ -25,23 +25,20 @@ function new_(id: rt.u32, log: Log.Log): Guard { /** Log `event` as this guard's. */ export function note(self: Guard, event: string): void { - let _5!: string; - let args2!: rt.Fmt[]; const arg = self.id; - args2 = [(f: rt.Formatter) => rt.u32Display(arg, f), (f: rt.Formatter) => rt.fmtPad(f, event)]; - _5 = rt.fmtFormat(["g", args2[0], " ", args2[1]]); + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg, f), (f: rt.Formatter) => rt.fmtPad(f, event)]; + const _5: string = rt.fmtFormat(["g", args2[0], " ", args2[1]]); Log.note(self.log, _5); } /** Log `event`, then drop: `self`, taken by value, drops as the call returns. */ export function finish(self: Guard, event: string): rt.u32 { - let _0!: rt.u32; let unwind: number = 0; try { unwind = 4; note(self, event); unwind = 0; - _0 = self.id; + const _0: rt.u32 = self.id; rt.drop(self); return _0; } catch (e) { @@ -54,11 +51,9 @@ export function finish(self: Guard, event: string): rt.u32 { } export function drop$Drop(self: Guard): void { - let _4!: string; - let args2!: rt.Fmt[]; const arg = ([self.id] as [rt.u32])[0]; - args2 = [(f: rt.Formatter) => rt.u32Display(arg, f)]; - _4 = rt.fmtFormat(["g", args2[0], " drop"]); + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg, f)]; + const _4: string = rt.fmtFormat(["g", args2[0], " drop"]); Log.note(self.log, _4); } diff --git a/ts/fixtures/task/expected/model.ts b/ts/fixtures/task/expected/model.ts index f1c1c3019..cffe63b35 100644 --- a/ts/fixtures/task/expected/model.ts +++ b/ts/fixtures/task/expected/model.ts @@ -76,13 +76,6 @@ export class sumFuture { } poll(_2: rt.Context): rt.Poll { - let _11!: rt.Poll; - let result!: rt.u64 | undefined; - let value!: rt.u64; - let args2!: rt.Fmt[]; - let _32!: string; - let args4!: rt.Fmt[]; - let _47!: rt.u64; let unwind: number = 0; try { let bb0: number = 0; @@ -113,21 +106,21 @@ export class sumFuture { continue l0; case 7: unwind = 31; - _11 = this.#awaitee.poll(_2); + const _11: rt.Poll = this.#awaitee.poll(_2); if (_11 !== rt.Pending) { unwind = 32; - result = _11; + const result: rt.u64 | undefined = _11; rt.drop(this.#awaitee); if (result !== undefined) { - value = result; + const value: rt.u64 = result; if (!(value !== 99)) { const arg2 = ([this.#guard$2.id] as [rt.u32])[0]; - args2 = [(f: rt.Formatter) => rt.u32Display(arg2, f)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg2, f)]; rt.panicFmt(["g", args2[0], " poisoned"]); } else { const arg = this.#guard$2.id; - args4 = [(f: rt.Formatter) => rt.u32Display(arg, f), (f: rt.Formatter) => rt.u64Display(value, f)]; - _32 = rt.fmtFormat(["g", args4[0], " got ", args4[1]]); + const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg, f), (f: rt.Formatter) => rt.u64Display(value, f)]; + const _32: string = rt.fmtFormat(["g", args4[0], " got ", args4[1]]); Log.note(this.#inner.log, _32); this.#total = rt.u64Add(this.#total, value); bb0 = 4; @@ -135,7 +128,7 @@ export class sumFuture { } } else { unwind = 33; - _47 = this.#total; + const _47: rt.u64 = this.#total; rt.drop(this.#inner); unwind = 34; rt.drop(this.#guard$2); @@ -398,34 +391,10 @@ export class blocksFuture { } poll(_2: rt.Context): rt.Poll { - let _18!: rt.u32; - let _32!: rt.Poll; - let result!: rt.u64 | undefined; let _40!: Guard.Guard; - let _46!: Guard.Guard; - let _60!: rt.Poll; let result2!: rt.usize; - let _73!: string; - let _75!: string; - let args2!: rt.Fmt[]; let seen!: rt.Future; - let _86!: rt.u32; - let _88!: string; - let _90!: string; - let _95!: rt.u32; - let _98!: rt.Poll; - let args4!: rt.Fmt[]; - let _114!: rt.Poll; - let _124!: string; - let _126!: string; - let args6!: rt.Fmt[]; - let _133!: rt.Fmt; let _138!: Inner.Inner | undefined; - let _139!: Guard.Guard; - let _146!: Outer.Outer; - let third!: Guard.Guard; - let _161!: rt.Poll; - let result5!: rt.u64; let unwind: number = 0; try { b0: { @@ -453,7 +422,7 @@ export class blocksFuture { unwind = 142; this.#saved$6 = true; rt.drop(new blocksFuture$2(this.#first)); - _18 = rt.u32Rem(this.#guard$2.id, 5); + const _18: rt.u32 = rt.u32Rem(this.#guard$2.id, 5); turns(this.#guard$2.log, _18); temporaries(this.#guard$2.log, this.#guard$2.id); unwind = 130; @@ -478,10 +447,10 @@ export class blocksFuture { break b0; } unwind = 125; - _32 = this.#awaitee.poll(_2); + const _32: rt.Poll = this.#awaitee.poll(_2); if (_32 !== rt.Pending) { unwind = 126; - result = _32; + const result: rt.u64 | undefined = _32; rt.drop(this.#awaitee); this.#saved$11 = false; this.#waited = consume(this.#saved, result); @@ -489,7 +458,7 @@ export class blocksFuture { this.#saved$11 = false; _40 = Guard.new(rt.u32Add(this.#guard$2.id, 910), Log.clone$Clone(this.#guard$2.log)); unwind = 124; - _46 = Guard.new(rt.u32Add(this.#guard$2.id, 920), Log.clone$Clone(this.#guard$2.log)); + const _46: Guard.Guard = Guard.new(rt.u32Add(this.#guard$2.id, 920), Log.clone$Clone(this.#guard$2.log)); unwind = 122; this.#slots = [_40, _46]; this.#saved$2 = Guard.new(rt.u32Add(this.#guard$2.id, 930), Log.clone$Clone(this.#guard$2.log)); @@ -502,7 +471,7 @@ export class blocksFuture { } } unwind = 118; - _60 = this.#awaitee$2.poll(_2); + const _60: rt.Poll = this.#awaitee$2.poll(_2); if (_60 !== rt.Pending) { unwind = 139; result2 = _60; @@ -517,16 +486,16 @@ export class blocksFuture { this.#slots[result2] = this.#saved$2; this.#saved$10 = false; const arg = ([this.#waited] as [rt.u64])[0]; - args2 = [(f: rt.Formatter) => rt.u64Display(arg, f)]; - _75 = rt.fmtFormat(["slot after ", args2[0]]); + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u64Display(arg, f)]; + const _75: string = rt.fmtFormat(["slot after ", args2[0]]); unwind = 117; - _73 = _75; + const _73: string = _75; Guard.note(this.#slots[0], _73); unwind = 137; this.#tally = { n: this.#guard$2.id }; this.#saved$9 = true; seen = new blocksFuture$3(rt.copy(this.#tally)); - _86 = rt.u32Add(this.#tally.n, 1000); + const _86: rt.u32 = rt.u32Add(this.#tally.n, 1000); this.#tally.n = _86; this.#saved$3 = this.#guard$2; this.#saved$4 = this.#tally.n; @@ -538,16 +507,16 @@ export class blocksFuture { } } unwind = 115; - _98 = this.#awaitee$3.poll(_2); + const _98: rt.Poll = this.#awaitee$3.poll(_2); if (_98 !== rt.Pending) { unwind = 137; - _95 = _98; + const _95: rt.u32 = _98; rt.drop(this.#awaitee$3); const arg2 = this.#saved$4; - args4 = [(f: rt.Formatter) => rt.u32Display(arg2, f), (f: rt.Formatter) => rt.u32Display(_95, f)]; - _90 = rt.fmtFormat(["tally ", args4[0], " then ", args4[1]]); + const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg2, f), (f: rt.Formatter) => rt.u32Display(_95, f)]; + const _90: string = rt.fmtFormat(["tally ", args4[0], " then ", args4[1]]); unwind = 114; - _88 = _90; + const _88: string = _90; Guard.note(this.#saved$3, _88); unwind = 137; this.#mark = { n: 1 }; @@ -558,27 +527,27 @@ export class blocksFuture { } } unwind = 113; - _114 = this.#awaitee$4.poll(_2); + const _114: rt.Poll = this.#awaitee$4.poll(_2); if (_114 !== rt.Pending) { unwind = 137; this.#replaced = _114; rt.drop(this.#awaitee$4); const arg3 = this.#replaced; - _133 = (f: rt.Formatter) => rt.u32Display(arg3, f); + const _133: rt.Fmt = (f: rt.Formatter) => rt.u32Display(arg3, f); const arg4 = this.#mark.n; - args6 = [_133, (f: rt.Formatter) => rt.u32Display(arg4, f)]; - _126 = rt.fmtFormat(["mark ", args6[0], " ", args6[1]]); + const args6: rt.Fmt[] = [_133, (f: rt.Formatter) => rt.u32Display(arg4, f)]; + const _126: string = rt.fmtFormat(["mark ", args6[0], " ", args6[1]]); unwind = 112; - _124 = _126; + const _124: string = _126; Guard.note(this.#guard$2, _124); unwind = 111; _138 = undefined; - _139 = Guard.new(rt.u32Add(this.#guard$2.id, 800), Log.clone$Clone(this.#guard$2.log)); + const _139: Guard.Guard = Guard.new(rt.u32Add(this.#guard$2.id, 800), Log.clone$Clone(this.#guard$2.log)); unwind = 137; - _146 = new Outer.Outer({ inner: _138, guard: _139 }); + const _146: Outer.Outer = new Outer.Outer({ inner: _138, guard: _139 }); unwind = 110; this.#nested = new Inner.Inner({ outer: _146 }); - third = Guard.new(rt.u32Add(this.#guard$2.id, 400), Log.clone$Clone(this.#guard$2.log)); + const third: Guard.Guard = Guard.new(rt.u32Add(this.#guard$2.id, 400), Log.clone$Clone(this.#guard$2.log)); if (!this.#moves$2) { this.#chosen = third; } else { @@ -590,7 +559,6 @@ export class blocksFuture { this.#saved$5 = false; rt.drop(new blocksFuture$5(this.#guard$2)); } - unwind = 109; this.#saved$7 = false; this.#saved$6 = false; this.#saved$8 = false; @@ -601,10 +569,10 @@ export class blocksFuture { } } unwind = 108; - _161 = this.#awaitee$5.poll(_2); + const _161: rt.Poll = this.#awaitee$5.poll(_2); if (_161 !== rt.Pending) { unwind = 109; - result5 = _161; + const result5: rt.u64 = _161; rt.drop(this.#awaitee$5); unwind = 110; rt.drop(this.#chosen); @@ -819,12 +787,11 @@ export class blocksFuture$3 { } poll(_2: rt.Context): rt.Poll { - let _0!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { unwind = 3; - _0 = read(this.#tally); + const _0: rt.Poll = read(this.#tally); this.#state = 1; return _0; } @@ -855,14 +822,11 @@ export class blocksFuture$4 { } poll(_2: rt.Context): rt.Poll { - let _0!: rt.Poll; - let _3!: Mark.Mark; - let _4!: Mark.Mark; if (this.#state === 0) { - _3 = { n: 2 }; - _4 = this.#mark; + const _3: Mark.Mark = { n: 2 }; + const _4: Mark.Mark = this.#mark; Object.assign(_4, _3); - _0 = this.#mark.n; + const _0: rt.Poll = this.#mark.n; this.#state = 1; return _0; } @@ -988,8 +952,6 @@ export class blocksFuture$6 { } poll(_2: rt.Context): rt.Poll { - let _17!: rt.Poll; - let result!: rt.u64 | undefined; let _27!: rt.u64; let unwind: number = 0; try { @@ -1006,10 +968,10 @@ export class blocksFuture$6 { rt.asyncFnResumedPanic(); } unwind = 20; - _17 = this.#awaitee.poll(_2); + const _17: rt.Poll = this.#awaitee.poll(_2); if (_17 !== rt.Pending) { unwind = 21; - result = _17; + const result: rt.u64 | undefined = _17; rt.drop(this.#awaitee); if (result === undefined) { _27 = 0; @@ -1089,8 +1051,6 @@ export class slotFuture { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; - let result!: rt.u64 | undefined; let _18!: rt.usize; let unwind: number = 0; try { @@ -1103,10 +1063,10 @@ export class slotFuture { rt.asyncFnResumedPanic(); } unwind = 15; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 16; - result = _6; + const result: rt.u64 | undefined = _6; rt.drop(this.#awaitee); if (result === undefined) { _18 = 0; @@ -1139,51 +1099,35 @@ export class slotFuture { * call, and an iterator's after its loop. */ export function temporaries(log: Log.Log, id: rt.u32): void { - let guard!: (a0: rt.u32) => Guard.Guard; - let _7!: string; let _11!: Guard.Guard; - let args2!: rt.Fmt[]; let matched!: rt.i32; - let _19!: Guard.Guard | undefined; let _24!: Guard.Guard | undefined; - let _35!: string; let _39!: Guard.Guard; - let args4!: rt.Fmt[]; let _57!: Guard.Guard; - let _60!: Guard.Guard; - let args6!: rt.Fmt[]; let head!: Guard.Guard; let rest!: Guard.Guard[]; - let _69!: Guard.Guard[]; let _70!: Guard.Guard; let _73!: Guard.Guard; - let _76!: Guard.Guard; - let args8!: rt.Fmt[]; - let args10!: rt.Fmt[]; - let sum_!: rt.u32; let iter!: Countdown.Countdown; - let _126!: rt.u32 | rt.Done; - let args12!: rt.Fmt[]; let unwind: number = 0; try { - guard = (n2: rt.u32): Guard.Guard => { + const guard: (a0: rt.u32) => Guard.Guard = (n2: rt.u32): Guard.Guard => { return Guard.new(rt.u32Add(id, n2), Log.clone$Clone(log)); }; _11 = guard(1000); unwind = 83; const arg = ([_11.id] as [rt.u32])[0]; - args2 = [(f: rt.Formatter) => rt.u32Display(arg, f)]; - _7 = rt.fmtFormat(["temporary ", args2[0]]); + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg, f)]; + const _7: string = rt.fmtFormat(["temporary ", args2[0]]); unwind = 0; rt.drop(_11); Log.note(log, _7); - _19 = guard(1010); + const _19: Guard.Guard | undefined = guard(1010); if (_19 === undefined) { matched = 0; } else { matched = 1; } - unwind = 0; rt.drop(_19); _24 = guard(1020); if (_24 === undefined) { @@ -1194,53 +1138,52 @@ export function temporaries(log: Log.Log, id: rt.u32): void { } else { rt.drop(_24); } - unwind = 0; _39 = guard(1030); unwind = 81; const arg2 = _39.id; - args4 = [(f: rt.Formatter) => rt.u32Display(arg2, f), (f: rt.Formatter) => rt.i32Display(matched, f)]; - _35 = rt.fmtFormat(["boxed temporary ", args4[0], " ", args4[1]]); + const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg2, f), (f: rt.Formatter) => rt.i32Display(matched, f)]; + const _35: string = rt.fmtFormat(["boxed temporary ", args4[0], " ", args4[1]]); unwind = 0; rt.drop(_39); Log.note(log, _35); _57 = guard(1040); unwind = 80; - _60 = guard(1050); + const _60: Guard.Guard = guard(1050); unwind = 0; const arg3 = ([first([_57, _60] as [Guard.Guard, Guard.Guard])] as [rt.u32])[0]; - args6 = [(f: rt.Formatter) => rt.u32Display(arg3, f)]; + const args6: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg3, f)]; Log.note(log, rt.fmtFormat(["skipped ", args6[0]])); _70 = guard(1060); unwind = 79; _73 = guard(1070); unwind = 78; - _76 = guard(1080); + const _76: Guard.Guard = guard(1080); unwind = 76; - _69 = [_70, _73, _76]; + const _69: Guard.Guard[] = [_70, _73, _76]; head = _69[0]; rest = _69.slice(1, 3); Guard.note(head, "head"); Guard.note(rest[1], "rest"); rt.drop(guard(1090)); const arg4 = ([([] as Guard.Guard[]).length] as [rt.usize])[0]; - args8 = [(f: rt.Formatter) => rt.usizeDisplay(arg4, f)]; + const args8: rt.Fmt[] = [(f: rt.Formatter) => rt.usizeDisplay(arg4, f)]; Log.note(log, rt.fmtFormat(["empty ", args8[0]])); const captured = guard(1100); const arg5 = ([((): rt.u32 => { return Guard.finish(captured, "closure"); })()] as [rt.u32])[0]; - args10 = [(f: rt.Formatter) => rt.u32Display(arg5, f)]; + const args10: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg5, f)]; Log.note(log, rt.fmtFormat(["closed ", args10[0]])); - sum_ = 0; + let sum_: rt.u32 = 0; iter = new Countdown.Countdown({ left: 2, guard: guard(1110) }); while (true) { unwind = 75; - _126 = Countdown.next$Iterator(iter); + const _126: rt.u32 | rt.Done = Countdown.next$Iterator(iter); if (_126 === rt.DONE) { unwind = 76; rt.drop(iter); const arg6 = ([sum_] as [rt.u32])[0]; - args12 = [(f: rt.Formatter) => rt.u32Display(arg6, f)]; + const args12: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg6, f)]; Log.note(log, rt.fmtFormat(["counted ", args12[0]])); unwind = 77; rt.dropAll(rest); @@ -1298,11 +1241,10 @@ export function temporaries(log: Log.Log, id: rt.u32): void { /** The id of the first guard, which it drops; the second drops as the call returns. */ export function first(_1: [Guard.Guard, Guard.Guard]): rt.u32 { - let _0!: rt.u32; let unwind: number = 0; try { unwind = 5; - _0 = Guard.finish(_1[0], "first"); + const _0: rt.u32 = Guard.finish(_1[0], "first"); unwind = 0; rt.drop(_1[1]); return _0; @@ -1321,9 +1263,8 @@ export function read(t: Tally.Tally): rt.u32 { /** `i`, noted as picked. */ export function pick(log: Log.Log, i: rt.usize): rt.usize { - let args2!: rt.Fmt[]; const arg = ([i] as [rt.usize])[0]; - args2 = [(f: rt.Formatter) => rt.usizeDisplay(arg, f)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.usizeDisplay(arg, f)]; Log.note(log, rt.fmtFormat(["pick ", args2[0]])); return i; } @@ -1340,30 +1281,19 @@ export function pick(log: Log.Log, i: rt.usize): rt.usize { export function turns(log: Log.Log, count: rt.u32): void { let pair!: Guard.Guard[]; let _4!: Guard.Guard; - let _8!: Guard.Guard; let kept!: Guard.Guard; let pinned!: Guard.Guard; let held!: Guard.Guard; let _34!: Guard.Guard; - let scoped!: rt.u32; - let _42!: Guard.Guard; - let args2!: rt.Fmt[]; let boxed!: Guard.Guard; - let args4!: rt.Fmt[]; - let _70!: rt.Fmt; - let args6!: rt.Fmt[]; let spares!: Guard.Guard[]; let _91!: Guard.Guard; - let _95!: Guard.Guard; - let _99!: rt.usize; - let left!: rt.u32; let turn!: Guard.Guard; - let _119!: rt.u32; let unwind: number = 0; try { _4 = Guard.new(rt.u32Add(count, 10), Log.clone$Clone(log)); unwind = 94; - _8 = Guard.new(rt.u32Add(count, 20), Log.clone$Clone(log)); + const _8: Guard.Guard = Guard.new(rt.u32Add(count, 20), Log.clone$Clone(log)); unwind = 93; pair = [_4, _8]; kept = pair[0]; @@ -1377,28 +1307,28 @@ export function turns(log: Log.Log, count: rt.u32): void { _34 = Guard.new(rt.u32Add(count, 60), Log.clone$Clone(log)); unwind = 90; Guard.note(_34, "extended"); - _42 = Guard.new(rt.u32Add(count, 90), Log.clone$Clone(log)); - scoped = _42.id; + const _42: Guard.Guard = Guard.new(rt.u32Add(count, 90), Log.clone$Clone(log)); + const scoped: rt.u32 = _42.id; rt.drop(_42); const arg = ([scoped] as [rt.u32])[0]; - args2 = [(f: rt.Formatter) => rt.u32Display(arg, f)]; + const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg, f)]; Log.note(log, rt.fmtFormat(["after ", args2[0]])); boxed = Guard.new(rt.u32Add(count, 100), Log.clone$Clone(log)); unwind = 89; const arg2 = boxed.id; - _70 = (f: rt.Formatter) => rt.u32Display(arg2, f); + const _70: rt.Fmt = (f: rt.Formatter) => rt.u32Display(arg2, f); const arg3 = boxed.id; - args4 = [_70, (f: rt.Formatter) => rt.u32Display(arg3, f)]; + const args4: rt.Fmt[] = [_70, (f: rt.Formatter) => rt.u32Display(arg3, f)]; Log.note(log, rt.fmtFormat(["boxed ", args4[0], " ", args4[1]])); const arg4 = ([Guard.finish(Guard.new(rt.u32Add(count, 110), Log.clone$Clone(log)), "finishing")] as [rt.u32])[0]; - args6 = [(f: rt.Formatter) => rt.u32Display(arg4, f)]; + const args6: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg4, f)]; Log.note(log, rt.fmtFormat(["finished ", args6[0]])); _91 = Guard.new(rt.u32Add(count, 70), Log.clone$Clone(log)); unwind = 88; - _95 = Guard.new(rt.u32Add(count, 80), Log.clone$Clone(log)); + const _95: Guard.Guard = Guard.new(rt.u32Add(count, 80), Log.clone$Clone(log)); unwind = 87; spares = [_91, _95]; - _99 = pick(log, rt.usizeRem(count as rt.usize, 2)); + const _99: rt.usize = pick(log, rt.usizeRem(count as rt.usize, 2)); if (!(_99 < 2)) { rt.panic("index out of bounds: the len is " + 2 + " but the index is " + _99); } @@ -1408,13 +1338,13 @@ export function turns(log: Log.Log, count: rt.u32): void { } else if (!(count < 4)) { Log.note(log, rt.fmtFormat(["many turns"])); } else { - left = count; + let left: rt.u32 = count; while (true) { turn = Guard.new(left, Log.clone$Clone(log)); if (!(left === 1)) { unwind = 86; Guard.note(turn, "turn"); - _119 = rt.u32Sub(left, 1); + const _119: rt.u32 = rt.u32Sub(left, 1); unwind = 87; left = _119; rt.drop(turn); @@ -1524,7 +1454,6 @@ export class drainFuture { let unwind: number = 0; try { if (this.#state === 0) { - unwind = 0; rt.drop(this.#rx); return; } @@ -1553,10 +1482,6 @@ export class drainFuture { poll(_2: rt.Context): rt.Poll { let next!: rt.u64 | undefined; - let _7!: rt.Poll; - let _18!: rt.Poll; - let _29!: rt.Poll; - let _40!: rt.u64; let unwind: number = 0; try { let bb0: number = 0; @@ -1574,13 +1499,15 @@ export class drainFuture { rt.asyncFnResumed(); } else if (this.#state === 2) { rt.asyncFnResumedPanic(); - } else if (this.#state === 3) { - bb0 = 7; - continue l0; - } else if (this.#state === 4) { - bb0 = 15; - continue l0; } else { + if (this.#state === 3) { + bb0 = 7; + continue l0; + } + if (this.#state === 4) { + bb0 = 15; + continue l0; + } bb0 = 22; continue l0; } @@ -1603,7 +1530,7 @@ export class drainFuture { continue l0; case 22: unwind = 33; - _29 = this.#awaitee$3.poll(_2); + const _29: rt.Poll = this.#awaitee$3.poll(_2); if (_29 !== rt.Pending) { unwind = 36; next = _29; @@ -1615,7 +1542,7 @@ export class drainFuture { return rt.Pending; case 15: unwind = 34; - _18 = this.#awaitee$2.poll(_2); + const _18: rt.Poll = this.#awaitee$2.poll(_2); if (_18 !== rt.Pending) { unwind = 36; next = _18; @@ -1627,7 +1554,7 @@ export class drainFuture { return rt.Pending; case 7: unwind = 35; - _7 = this.#awaitee.poll(_2); + const _7: rt.Poll = this.#awaitee.poll(_2); if (_7 !== rt.Pending) { unwind = 36; next = _7; @@ -1640,12 +1567,11 @@ export class drainFuture { case 27: if (next === undefined) { unwind = 37; - _40 = this.#total; + const _40: rt.u64 = this.#total; rt.drop(this.#rx$2); this.#state = 1; return _40; } - unwind = 36; this.#total = rt.u64Add(this.#total, next); bb0 = 1; continue l0; @@ -1689,7 +1615,6 @@ export class level1Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -1701,7 +1626,7 @@ export class level1Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -1739,7 +1664,6 @@ export class level10Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -1751,7 +1675,7 @@ export class level10Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -1789,7 +1713,6 @@ export class level11Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -1801,7 +1724,7 @@ export class level11Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -1839,7 +1762,6 @@ export class level12Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -1851,7 +1773,7 @@ export class level12Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -1889,7 +1811,6 @@ export class level13Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -1901,7 +1822,7 @@ export class level13Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -1939,7 +1860,6 @@ export class level14Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -1951,7 +1871,7 @@ export class level14Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -1989,7 +1909,6 @@ export class level15Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -2001,7 +1920,7 @@ export class level15Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -2039,7 +1958,6 @@ export class level2Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -2051,7 +1969,7 @@ export class level2Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -2089,7 +2007,6 @@ export class level3Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -2101,7 +2018,7 @@ export class level3Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -2139,7 +2056,6 @@ export class level4Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -2151,7 +2067,7 @@ export class level4Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -2189,7 +2105,6 @@ export class level5Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -2201,7 +2116,7 @@ export class level5Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -2239,7 +2154,6 @@ export class level6Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -2251,7 +2165,7 @@ export class level6Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -2289,7 +2203,6 @@ export class level7Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -2301,7 +2214,7 @@ export class level7Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -2339,7 +2252,6 @@ export class level8Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -2351,7 +2263,7 @@ export class level8Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); @@ -2389,7 +2301,6 @@ export class level9Future { } poll(_2: rt.Context): rt.Poll { - let _6!: rt.Poll; let unwind: number = 0; try { if (this.#state === 0) { @@ -2401,7 +2312,7 @@ export class level9Future { rt.asyncFnResumedPanic(); } unwind = 11; - _6 = this.#awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; rt.drop(this.#awaitee); diff --git a/ts/src/lower/mir/cfg.rs b/ts/src/lower/mir/cfg.rs index 6802fc6a6..1e1273306 100644 --- a/ts/src/lower/mir/cfg.rs +++ b/ts/src/lower/mir/cfg.rs @@ -449,6 +449,36 @@ pub fn simplify(stmts: &mut Vec) { ); } +/// After a `then` that never falls through, the `else` is what follows the `if`. Every +/// name a body declares is its own, so nothing moved out can clash. Last, as it leaves +/// the jumps `simplify` strips no longer at the end of their block. +pub fn hoist_else(stmts: &mut Vec) { + let mut i = 0; + while i < stmts.len() { + match &mut stmts[i].kind { + StmtKind::If { then, els, .. } => { + hoist_else(then); + hoist_else(els); + if !els.is_empty() && crate::ts::diverges(then) { + let els = std::mem::take(els); + stmts.splice(i + 1..i + 1, els); + } + } + StmtKind::Block { body, .. } | StmtKind::While { body, .. } => hoist_else(body), + StmtKind::Switch { cases, default, .. } => { + cases.iter_mut().for_each(|(_, body)| hoist_else(body)); + hoist_else(default); + } + StmtKind::Catch { body, handler, .. } => { + hoist_else(body); + hoist_else(handler); + } + _ => {} + } + i += 1; + } +} + /// Whether evaluating `e` does nothing but read. pub fn pure(e: &Expr) -> bool { match e { diff --git a/ts/src/lower/mir/coroutine.rs b/ts/src/lower/mir/coroutine.rs index 5ec28fd4b..a799740c7 100644 --- a/ts/src/lower/mir/coroutine.rs +++ b/ts/src/lower/mir/coroutine.rs @@ -109,7 +109,10 @@ pub fn info<'tcx>(t: &mut Translator<'_, 'tcx>, def_id: DefId, args: GenericArgs let mut saved = IndexVec::new(); for field in layout.field_tys.iter() { // rustc's own locals, such as `__awaitee`, start with `_`. - let name = match field.debuginfo_name.map(|n| n.as_str().trim_start_matches('_').to_string()) { + let name = match field + .debuginfo_name + .map(|n| n.as_str().trim_start_matches('_').to_string()) + { Some(name) if !name.is_empty() => format!("#{}", crate::lower::camel(&name)), _ => "#saved".into(), }; diff --git a/ts/src/lower/mir/mod.rs b/ts/src/lower/mir/mod.rs index 8c7bbed77..398935579 100644 --- a/ts/src/lower/mir/mod.rs +++ b/ts/src/lower/mir/mod.rs @@ -201,8 +201,8 @@ pub struct Fx<'m, 'b, 'a, 'tcx> { noops: FxHashSet<(BasicBlock, usize)>, /// The lengths a bounds check compares with, of the slices whose `rt.idx` it is. idx_of: FxHashMap>, - /// Each block's one predecessor, if it has one. - sole_pred: FxHashMap, + /// Each block's predecessors, but itself. + preds: FxHashMap>, /// What the cleanup variable holds as each block lowered so far leaves. unwind_out: FxHashMap>, /// The halves a `|` joins into a `u64`, by the local of the shift that is its left side. @@ -257,7 +257,7 @@ impl<'m, 'b, 'a, 'tcx> Fx<'m, 'b, 'a, 'tcx> { stepped_vars: FxHashMap::default(), stepped_into: FxHashMap::default(), noops: FxHashSet::default(), - sole_pred: FxHashMap::default(), + preds: FxHashMap::default(), idx_of: FxHashMap::default(), unwind_out: FxHashMap::default(), halves: FxHashMap::default(), @@ -1052,19 +1052,23 @@ impl<'m, 'b, 'a, 'tcx> Fx<'m, 'b, 'a, 'tcx> { .collect(), }; } + // The predecessors that are reached, as blocks only gone past are not. + let mut reached = vec![false; n]; + let mut stack = vec![0]; + while let Some(bb) = stack.pop() { + if !std::mem::replace(&mut reached[bb], true) { + stack.extend(&succs[bb]); + } + } let mut preds: Vec> = vec![Vec::new(); n]; - for (from, tos) in succs.iter().enumerate() { + for (from, tos) in succs.iter().enumerate().filter(|&(from, _)| reached[from]) { for &to in tos { preds[to].push(from); } } for (to, from) in preds.iter().enumerate() { - if let [from] = from[..] - && from != to - { - self.sole_pred - .insert(BasicBlock::from_usize(to), BasicBlock::from_usize(from)); - } + let from = from.iter().filter(|&&f| f != to).map(|&f| BasicBlock::from_usize(f)); + self.preds.insert(BasicBlock::from_usize(to), from.collect()); } let graph = cfg::Graph { succs }; let mut labels = self.labels; @@ -1111,6 +1115,8 @@ impl<'m, 'b, 'a, 'tcx> Fx<'m, 'b, 'a, 'tcx> { if self.zero_sized(self.mir.local_decls[mir::RETURN_PLACE].ty) { cfg::strip_return(&mut out); } + cfg::hoist_else(&mut out); + declare_in_place(&mut out); out } @@ -1634,10 +1640,12 @@ impl<'m, 'b, 'a, 'tcx> Fx<'m, 'b, 'a, 'tcx> { fn block(&mut self, bb: BasicBlock, out: &mut Vec) -> Exit { let mir = self.mir; let data = &mir.basic_blocks[bb]; - // Entered only from its one predecessor, with the cleanup that left it. + // Entered with the cleanup every predecessor left with, once each is lowered. if let Some(unwind) = &mut self.unwind - && let Some(from) = self.sole_pred.get(&bb) - && let Some(&known) = self.unwind_out.get(from) + && let Some(preds) = self.preds.get(&bb) + && let Some((first, rest)) = preds.split_first() + && let Some(&known) = self.unwind_out.get(first) + && rest.iter().all(|p| self.unwind_out.get(p) == Some(&known)) { unwind.known = known; } @@ -2443,6 +2451,157 @@ fn strip_assignments(stmts: &mut Vec, unread: &FxHashSet) { stmts.retain(|s| !matches!(&s.kind, StmtKind::Expr(e) if inert(e))); } +/// Declare each variable declared up front at the assignment that first names it, where +/// everything else that names it follows in the same block: no path reaches those without +/// passing the assignment. `const` if nothing assigns it again. +fn declare_in_place(stmts: &mut Vec) { + let declared: Vec<(String, Type)> = stmts + .iter() + .filter_map(|s| match &s.kind { + StmtKind::Declare { name, ty } => Some((name.clone(), ty.clone())), + _ => None, + }) + .collect(); + for (name, ty) in declared { + let total = list_names(stmts, &name); + let mut writes = 0; + stmts + .iter() + .for_each(|s| visit_stmt(s, &mut |e| writes += writes_of(e, &name))); + if total > 0 && place_declaration(stmts, &name, &ty, total, writes > 1) { + stmts.retain(|s| !matches!(&s.kind, StmtKind::Declare { name: n, .. } if *n == name)); + } + } +} + +/// Turn the statement that first names `name` into its declaration, if it assigns it and +/// all `total` statements naming it follow in its block. +fn place_declaration(stmts: &mut [Stmt], name: &str, ty: &Type, total: usize, mutable: bool) -> bool { + let Some(i) = stmts.iter().position(|s| stmt_names(s, name) > 0) else { + return false; + }; + let assigns = matches!(&stmts[i].kind, StmtKind::Expr(Expr::Assign(target, value)) + if matches!(&**target, Expr::Ident(n) if n == name) && expr_names(value, name) == 0); + if assigns { + if list_names(&stmts[i..], name) != total { + return false; + } + let StmtKind::Expr(Expr::Assign(_, value)) = std::mem::replace(&mut stmts[i].kind, StmtKind::Break(None)) + else { + unreachable!("checked above") + }; + stmts[i].kind = StmtKind::decl(mutable, name, Some(ty.clone()), Some(*value)); + return true; + } + // Else everything naming it must be in one block of this statement. + if stmt_names(&stmts[i], name) != total { + return false; + } + let place = + |body: &mut Vec| list_names(body, name) == total && place_declaration(body, name, ty, total, mutable); + match &mut stmts[i].kind { + StmtKind::If { then, els, .. } => place(then) || place(els), + StmtKind::While { body, .. } | StmtKind::Block { body, .. } => place(body), + StmtKind::Catch { body, handler, .. } => place(body) || place(handler), + StmtKind::Switch { cases, default, .. } => cases.iter_mut().any(|(_, body)| place(body)) || place(default), + _ => false, + } +} + +/// How many times the statements name `name`, read or assigned. +fn list_names(stmts: &[Stmt], name: &str) -> usize { + stmts.iter().map(|s| stmt_names(s, name)).sum() +} + +fn stmt_names(stmt: &Stmt, name: &str) -> usize { + let mut n = 0; + visit_stmt(stmt, &mut |e| n += expr_names(e, name)); + n +} + +fn expr_names(e: &Expr, name: &str) -> usize { + let mut n = 0; + visit_expr(e, &mut |e| n += matches!(e, Expr::Ident(i) if i == name) as usize); + n +} + +/// How many times `e` itself assigns `name`. +fn writes_of(e: &Expr, name: &str) -> usize { + let mut n = 0; + visit_expr(e, &mut |e| { + if let Expr::Assign(target, _) | Expr::Postfix(target, _) = e + && matches!(&**target, Expr::Ident(i) if i == name) + { + n += 1; + } + }); + n +} + +/// Call `f` on each expression the statement holds directly, and in its blocks. +fn visit_stmt(stmt: &Stmt, f: &mut impl FnMut(&Expr)) { + match &stmt.kind { + StmtKind::Expr(e) | StmtKind::Return(Some(e)) | StmtKind::Throw(e) | StmtKind::Decl { init: Some(e), .. } => { + f(e) + } + StmtKind::If { cond, then, els } => { + f(cond); + then.iter().chain(els).for_each(|s| visit_stmt(s, f)); + } + StmtKind::While { cond, body, .. } => { + f(cond); + body.iter().for_each(|s| visit_stmt(s, f)); + } + StmtKind::Block { body, .. } => body.iter().for_each(|s| visit_stmt(s, f)), + StmtKind::Catch { body, handler, .. } => body.iter().chain(handler).for_each(|s| visit_stmt(s, f)), + StmtKind::Switch { + disc, cases, default, .. + } => { + f(disc); + for (value, body) in cases { + f(value); + body.iter().for_each(|s| visit_stmt(s, f)); + } + default.iter().for_each(|s| visit_stmt(s, f)); + } + StmtKind::Return(None) + | StmtKind::Decl { init: None, .. } + | StmtKind::Declare { .. } + | StmtKind::Break(_) + | StmtKind::Continue(_) => {} + } +} + +/// Call `f` on `e` and every expression within it, arrow bodies included. +fn visit_expr(e: &Expr, f: &mut impl FnMut(&Expr)) { + f(e); + match e { + Expr::Ident(_) | Expr::This | Expr::Sym(_) | Expr::Rt(_) | Expr::Lit(_) | Expr::Str(_) => {} + Expr::Array(items) => items.iter().for_each(|e| visit_expr(e, f)), + Expr::Object(props) => props.iter().for_each(|(_, e)| visit_expr(e, f)), + Expr::Member(e, _) + | Expr::Unary(_, e) + | Expr::Located(_, e) + | Expr::As(e, _) + | Expr::Lambda(_, e) + | Expr::Postfix(e, _) => visit_expr(e, f), + Expr::Index(a, b) | Expr::Binary(a, _, b) | Expr::Assign(a, b) => { + visit_expr(a, f); + visit_expr(b, f); + } + Expr::Call(callee, args) | Expr::New(callee, args) => { + visit_expr(callee, f); + args.iter().for_each(|e| visit_expr(e, f)); + } + Expr::Cond(c, a, b) => { + visit_expr(c, f); + visit_expr(a, f); + visit_expr(b, f); + } + Expr::Arrow(_, _, body) => body.iter().for_each(|s| visit_stmt(s, f)), + } +} + /// The operands of an aggregate, from its expression. fn parts_of(value: &Expr) -> Option> { match value { diff --git a/ts/src/print.rs b/ts/src/print.rs index 66f95bef9..38175c36b 100644 --- a/ts/src/print.rs +++ b/ts/src/print.rs @@ -702,21 +702,6 @@ impl Printer<'_> { self.expr(cond, 0); self.write(") {\n"); self.block_body(then); - // After a `then` that never falls through, the `else` is the code that follows, - // unless it declares what the code after the `if` could clash with. - if crate::ts::diverges(then) - && !els.is_empty() - && !els - .iter() - .any(|s| matches!(s.kind, StmtKind::Decl { .. } | StmtKind::Declare { .. })) - { - self.start(); - self.write("}\n"); - for stmt in els { - self.stmt(stmt); - } - return; - } let mut els = els; loop { match els.as_slice() { From cff3b705df9b4ffedf64f30d3ef69c150a8db4b9 Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Mon, 26 Oct 2026 07:35:59 -0700 Subject: [PATCH 04/12] feat(ts): fold a temporary whose only other read is a drop JS can't see Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0115AT2ue6x9cT5e5J9SZtCn --- ts/fixtures/codec/expected/bench.ts | 8 +- .../codec/expected/coding/version.Versions.ts | 4 +- ts/fixtures/codec/expected/harness.ts | 18 +- .../codec/expected/lite/group.Group.ts | 4 +- .../codec/expected/lite/probe.Probe.ts | 4 +- ts/fixtures/lang/expected/collections.ts | 28 +- ts/fixtures/lang/expected/fmt.ts | 252 ++++------ ts/fixtures/lang/expected/generics.ts | 18 +- ts/fixtures/lang/expected/ints.ts | 432 ++++++------------ ts/fixtures/lang/expected/iters.ts | 57 +-- ts/fixtures/lang/expected/shapes.ts | 6 +- ts/fixtures/task/expected/kio.Producer.ts | 3 +- ts/fixtures/task/expected/kio.WaiterList.ts | 3 +- ts/fixtures/task/expected/kio.ts | 3 +- ts/src/lower/mir/mod.rs | 7 +- ts/src/lower/mir/step.rs | 6 +- 16 files changed, 305 insertions(+), 548 deletions(-) diff --git a/ts/fixtures/codec/expected/bench.ts b/ts/fixtures/codec/expected/bench.ts index edc381038..5d3ee3ac7 100644 --- a/ts/fixtures/codec/expected/bench.ts +++ b/ts/fixtures/codec/expected/bench.ts @@ -56,8 +56,7 @@ export function encoded(result: rt.Result, o export function decoded(result: rt.Result, out: rt.ByteVec): void { if (!result.ok) { - const err: DecodeError.DecodeError = result.error; - decodeError(out, err); + decodeError(out, result.error); } } @@ -338,10 +337,9 @@ export function iterate(chain: rt.u8, data: Uint8Array, out: rt.ByteVec): void { return _210 === 255; }) ? 1 : 0); } else if (chain === 2) { - const odd: rt.ByteVec = rt.iterToByteVec(rt.iterFilter(rt.iterSlice(data), (_28: rt.u8): boolean => { + putUsize(out, rt.iterToByteVec(rt.iterFilter(rt.iterSlice(data), (_28: rt.u8): boolean => { return (_28 & 1) === 1; - })); - putUsize(out, odd.length); + })).length); } else if (chain === 3) { putU64(out, rt.iterSum(rt.iterMap(rt.iterSlice(data), (_2: rt.u8): rt.u32 => { return _2 as rt.u32; diff --git a/ts/fixtures/codec/expected/coding/version.Versions.ts b/ts/fixtures/codec/expected/coding/version.Versions.ts index 897318397..6bcead63f 100644 --- a/ts/fixtures/codec/expected/coding/version.Versions.ts +++ b/ts/fixtures/codec/expected/coding/version.Versions.ts @@ -15,9 +15,7 @@ export function decodeSlice$Decode_Form(buf: Uint8Array, version: Form.Form): rt const _6: rt.Result = decode$Decode_Form(r, version); if (_6.ok) { const val: Versions = _6.value; - const value: Versions = val; - const _13: Versions = value; - const _0: rt.Result<[Versions, rt.usize], DecodeError.DecodeError> = rt.Ok([_13, rt.usizeSub(buf.length, Decoder.remaining(r))]); + const _0: rt.Result<[Versions, rt.usize], DecodeError.DecodeError> = rt.Ok([val, rt.usizeSub(buf.length, Decoder.remaining(r))]); return _0; } return _6; diff --git a/ts/fixtures/codec/expected/harness.ts b/ts/fixtures/codec/expected/harness.ts index 89d5d1eb1..e959b70eb 100644 --- a/ts/fixtures/codec/expected/harness.ts +++ b/ts/fixtures/codec/expected/harness.ts @@ -216,8 +216,7 @@ export function decodeScript(data: Uint8Array, out: rt.ByteVec): void { putUsize(out, Decoder.remaining(r)); continue l1; } - const err: DecodeError.DecodeError = _26.error; - decodeFailed(out, err); + decodeFailed(out, _26.error); putUsize(out, Decoder.need(r)); } rt.byteVecPush(out, Decoder.isEmpty(r) ? 1 : 0); @@ -283,8 +282,7 @@ export function decodeStep(r: Decoder.Decoder, step: rt.u8, out: rt.ByteVec): rt } else if (_5 === 6) { const _49: rt.Result = Decoder.string(r); if (_49.ok) { - const s: string = _49.value; - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(s)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_49.value)); } else { return _49; } @@ -387,8 +385,7 @@ export function encodeScript(data: Uint8Array, out: rt.ByteVec): void { } else if (_33 === 6) { const _60: rt.Result = rt.stringFromUtf8(rt.sliceToByteVec(rt.u64ToBeBytes(value))); if (_60.ok) { - const s: string = _60.value; - const _68: string = s; + const _68: string = _60.value; result = Encoder.string(w, _68); } else { result = Encoder.string(w, "not utf-8"); @@ -470,8 +467,7 @@ export function roundtrip$Versions(data: Uint8Array, out: rt.ByteVec): void { encodeFailed(out, _14.error); } } else { - const err2: DecodeError.DecodeError = _8.error; - decodeFailed(out, err2); + decodeFailed(out, _8.error); } } } @@ -495,8 +491,7 @@ export function roundtripLite$Group(data: Uint8Array, out: rt.ByteVec): void { encodeFailed(out, _14.error); } } else { - const err2: DecodeError.DecodeError = _8.error; - decodeFailed(out, err2); + decodeFailed(out, _8.error); } } } @@ -520,8 +515,7 @@ export function roundtripLite$Probe(data: Uint8Array, out: rt.ByteVec): void { encodeFailed(out, _14.error); } } else { - const err2: DecodeError.DecodeError = _8.error; - decodeFailed(out, err2); + decodeFailed(out, _8.error); } } } diff --git a/ts/fixtures/codec/expected/lite/group.Group.ts b/ts/fixtures/codec/expected/lite/group.Group.ts index 87d3ed087..d5b7e21ef 100644 --- a/ts/fixtures/codec/expected/lite/group.Group.ts +++ b/ts/fixtures/codec/expected/lite/group.Group.ts @@ -16,9 +16,7 @@ export function decodeSlice$Decode_Version(buf: Uint8Array, version: Version.Ver const _6: rt.Result = decode$Decode_Version(r, version); if (_6.ok) { const val: Group = _6.value; - const value: Group = val; - const _13: Group = value; - const _0: rt.Result<[Group, rt.usize], DecodeError.DecodeError> = rt.Ok([_13, rt.usizeSub(buf.length, Decoder.remaining(r))]); + const _0: rt.Result<[Group, rt.usize], DecodeError.DecodeError> = rt.Ok([val, rt.usizeSub(buf.length, Decoder.remaining(r))]); return _0; } return _6; diff --git a/ts/fixtures/codec/expected/lite/probe.Probe.ts b/ts/fixtures/codec/expected/lite/probe.Probe.ts index 745354421..b2586ccd5 100644 --- a/ts/fixtures/codec/expected/lite/probe.Probe.ts +++ b/ts/fixtures/codec/expected/lite/probe.Probe.ts @@ -17,9 +17,7 @@ export function decodeSlice$Decode_Version(buf: Uint8Array, version: Version.Ver const _6: rt.Result = decode$Decode_Version(r, version); if (_6.ok) { const val: Probe = _6.value; - const value: Probe = val; - const _13: Probe = value; - const _0: rt.Result<[Probe, rt.usize], DecodeError.DecodeError> = rt.Ok([_13, rt.usizeSub(buf.length, Decoder.remaining(r))]); + const _0: rt.Result<[Probe, rt.usize], DecodeError.DecodeError> = rt.Ok([val, rt.usizeSub(buf.length, Decoder.remaining(r))]); return _0; } return _6; diff --git a/ts/fixtures/lang/expected/collections.ts b/ts/fixtures/lang/expected/collections.ts index 1d10e9b10..63353a2b1 100644 --- a/ts/fixtures/lang/expected/collections.ts +++ b/ts/fixtures/lang/expected/collections.ts @@ -71,8 +71,7 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { const _67: rt.Iter<[rt.u8, rt.u16]> = rt.iterMap(rt.hashIter(map), (_227: [rt.u8, rt.u16]): [rt.u8, rt.u16] => { return [_227[0], _227[1]] as [rt.u8, rt.u16]; }); - const sorted: rt.BTreeMap = rt.btreeExtend(rt.btreeNew(rt.cmp) as rt.BTreeMap, _67, true); - const iter2: rt.Iter<[rt.u8, rt.u16]> = rt.btreeIter(sorted); + const iter2: rt.Iter<[rt.u8, rt.u16]> = rt.btreeIter(rt.btreeExtend(rt.btreeNew(rt.cmp) as rt.BTreeMap, _67, true)); while (true) { const _73: [rt.u8, rt.u16] | rt.Done = iter2.next(); if (_73 === rt.DONE) { @@ -115,8 +114,7 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { const _97: [rt.usize, rt.u8] | rt.Done = iter3.next(); if (_97 === rt.DONE) { const _123: rt.Iter = rt.hashKeys(map2); - const keys: rt.BTreeSet = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _123, true); - const iter4: rt.Iter = rt.btreeKeys(keys); + const iter4: rt.Iter = rt.btreeKeys(rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _123, true)); while (true) { const _129: rt.u64 | rt.Done = iter4.next(); if (_129 === rt.DONE) { @@ -250,8 +248,7 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { const _473: rt.Iter<[Rank.Rank, rt.u16]> = rt.iterMap(rt.hashIter(ranks), (_224: [Rank.Rank, Tally.Tally]): [Rank.Rank, rt.u16] => { return [_224[0], _224[1].n] as [Rank.Rank, rt.u16]; }); - const ranks2: rt.BTreeMap = rt.btreeExtend(rt.btreeNew(Rank.cmp$Ord) as rt.BTreeMap, _473, true); - const iter14: rt.Iter<[Rank.Rank, rt.u16]> = rt.btreeIter(ranks2); + const iter14: rt.Iter<[Rank.Rank, rt.u16]> = rt.btreeIter(rt.btreeExtend(rt.btreeNew(Rank.cmp$Ord) as rt.BTreeMap, _473, true)); while (true) { const _479: [Rank.Rank, rt.u16] | rt.Done = iter14.next(); if (_479 === rt.DONE) { @@ -376,8 +373,7 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { const _529: [string, rt.usize] | rt.Done = iter17.next(); if (_529 === rt.DONE) { rt.byteVecPush(out, rt.iterSum(rt.iterMap(rt.hashDrain(words), (_2: [string, rt.ByteVec]): rt.usize => { - const v3: rt.ByteVec = _2[1]; - return v3.length; + return _2[1].length; }), rt.usizeAdd, 0) & 0xff); rt.byteVecPush(out, rt.hashLen(words) === 0 ? 1 : 0); const clashes: rt.HashMap = rt.hashNew(rt.hashing(Clash.hash$Hash_DefaultHasher, Clash.eq$PartialEq)) as rt.HashMap; @@ -394,8 +390,7 @@ export function hashMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { const _583: rt.Iter = rt.iterMap(rt.hashKeys(clashes), (k8: Clash.Clash): rt.u8 => { return k8._0; }); - const kept: rt.BTreeSet = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _583, true); - rt.iterExtendBytes(out, rt.btreeKeys(kept)); + rt.iterExtendBytes(out, rt.btreeKeys(rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _583, true))); const copy3: rt.HashMap = rt.hashClone(clashes, rt.copy, rt.copy); rt.byteVecPush(out, rt.hashLen(copy3) & 0xff); rt.byteVecPush(out, rt.hashContains(copy3, { _0: 1 }) ? 1 : 0); @@ -494,8 +489,7 @@ export function sets(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { if (_62 === rt.DONE) { rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeFirstKey(sorted), 255) & 0xff); rt.byteVecPush(out, rt.optionUnwrapOr(rt.btreeFirstKey(sorted, true), 255) & 0xff); - const firsts: rt.u16[] = rt.iterToArray(rt.btreeRangeKeys(sorted, new rt.Range(4, 12))); - rt.byteVecPush(out, firsts.length & 0xff); + rt.byteVecPush(out, rt.iterToArray(rt.btreeRangeKeys(sorted, new rt.Range(4, 12))).length & 0xff); rt.hashRetain(hashed, (v3: rt.u16): boolean => { return rt.u16Rem(v3, 3) !== 0; }); @@ -588,8 +582,7 @@ export function sets(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { const _200: rt.Iter = rt.iterMap(rt.iterSlice(data), (_2: rt.u8): rt.u64 => { return wide(_2); }); - const wides: rt.BTreeSet = rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _200, true); - const iter8: rt.Iter = rt.iterRev(rt.btreeKeys(wides)); + const iter8: rt.Iter = rt.iterRev(rt.btreeKeys(rt.btreeExtendKeys(rt.btreeNew(rt.cmp) as rt.BTreeSet, _200, true))); while (true) { const _207: rt.u64 | rt.Done = iter8.next(); if (_207 === rt.DONE) { @@ -791,9 +784,7 @@ export function btreeMaps(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void const b8: rt.u8 = _215; return [{ _0: b8 }, { _0: b8 ^ 90 }] as [Fussy.Fussy, Fussy.Fussy]; }); - const map2: rt.BTreeMap = rt.btreeExtend(rt.btreeNew(Fussy.cmp$Ord) as rt.BTreeMap, _287, true); - const copy: rt.BTreeMap = rt.btreeClone(map2, Fussy.clone$Clone, Fussy.clone$Clone); - const iter10: rt.Iter<[Fussy.Fussy, Fussy.Fussy]> = rt.btreeIter(copy); + const iter10: rt.Iter<[Fussy.Fussy, Fussy.Fussy]> = rt.btreeIter(rt.btreeClone(rt.btreeExtend(rt.btreeNew(Fussy.cmp$Ord) as rt.BTreeMap, _287, true), Fussy.clone$Clone, Fussy.clone$Clone)); while (true) { const _294: [Fussy.Fussy, Fussy.Fussy] | rt.Done = iter10.next(); if (_294 === rt.DONE) { @@ -933,8 +924,7 @@ export function deques(data: Uint8Array, out: rt.ByteVec): void { while (true) { const _83: [rt.u8, rt.u8] | rt.Done = iter2.next(); if (_83 === rt.DONE) { - const drained: rt.ByteVec = rt.iterToByteVec(rt.dequeDrain(q, undefined)); - rt.byteVecExtendFromSlice(out, rt.byteVecView(drained)); + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(rt.dequeDrain(q, undefined)))); rt.byteVecPush(out, q.n === 0 ? 1 : 0); const _101: rt.Iter = rt.iterMap(rt.iterSlice(data), (_2: rt.u8): Tally.Tally => { return { n: _2 as rt.u16 }; diff --git a/ts/fixtures/lang/expected/fmt.ts b/ts/fixtures/lang/expected/fmt.ts index eb457046b..ee0ca36bc 100644 --- a/ts/fixtures/lang/expected/fmt.ts +++ b/ts/fixtures/lang/expected/fmt.ts @@ -32,120 +32,96 @@ export function ints(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.sliceCopyFromSlice(rt.sliceRange(buf, 0, n), rt.sliceRange(data, 0, n)); const v: rt.u8 = rt.u8FromBeBytes(buf); const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(v, f), (f: rt.Formatter) => rt.u8Display(v, f), (f: rt.Formatter) => rt.u8LowerHex(v, f), (f: rt.Formatter) => rt.u8UpperHex(v, f)]; - const _23: string = rt.fmtFormat([args2[0], " ", args2[1], " ", rt.fmtSpec({ width: 5 }, args2[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args2[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args2[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args2[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args2[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args2[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args2[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args2[0]), "|", args2[2], " ", args2[3], " ", rt.fmtSpec({ alternate: true }, args2[2]), " ", rt.fmtSpec({ alternate: true }, args2[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args2[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args2[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args2[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args2[3]), "|", rt.fmtSpec({ alternate: true }, args2[1]), " ", rt.fmtSpec({ width: 3 }, args2[1])]); - put(out, _23); - const _38: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v, f)); - put(out, _38); + put(out, rt.fmtFormat([args2[0], " ", args2[1], " ", rt.fmtSpec({ width: 5 }, args2[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args2[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args2[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args2[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args2[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args2[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args2[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args2[0]), "|", args2[2], " ", args2[3], " ", rt.fmtSpec({ alternate: true }, args2[2]), " ", rt.fmtSpec({ alternate: true }, args2[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args2[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args2[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args2[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args2[3]), "|", rt.fmtSpec({ alternate: true }, args2[1]), " ", rt.fmtSpec({ width: 3 }, args2[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.u8Display(v, f))); } else if (_4 === 1) { const buf2: Uint8Array = rt.bytes(2); const n2: rt.usize = rt.min(data.length, buf2.length); rt.sliceCopyFromSlice(rt.sliceRange(buf2, 0, n2), rt.sliceRange(data, 0, n2)); const v2: rt.u16 = rt.u16FromBeBytes(buf2); const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u16Display(v2, f), (f: rt.Formatter) => rt.u16Display(v2, f), (f: rt.Formatter) => rt.u16LowerHex(v2, f), (f: rt.Formatter) => rt.u16UpperHex(v2, f)]; - const _57: string = rt.fmtFormat([args4[0], " ", args4[1], " ", rt.fmtSpec({ width: 5 }, args4[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args4[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args4[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args4[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args4[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args4[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args4[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args4[0]), "|", args4[2], " ", args4[3], " ", rt.fmtSpec({ alternate: true }, args4[2]), " ", rt.fmtSpec({ alternate: true }, args4[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args4[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args4[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args4[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args4[3]), "|", rt.fmtSpec({ alternate: true }, args4[1]), " ", rt.fmtSpec({ width: 3 }, args4[1])]); - put(out, _57); - const _72: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v2, f)); - put(out, _72); + put(out, rt.fmtFormat([args4[0], " ", args4[1], " ", rt.fmtSpec({ width: 5 }, args4[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args4[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args4[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args4[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args4[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args4[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args4[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args4[0]), "|", args4[2], " ", args4[3], " ", rt.fmtSpec({ alternate: true }, args4[2]), " ", rt.fmtSpec({ alternate: true }, args4[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args4[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args4[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args4[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args4[3]), "|", rt.fmtSpec({ alternate: true }, args4[1]), " ", rt.fmtSpec({ width: 3 }, args4[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.u16Display(v2, f))); } else if (_4 === 2) { const buf3: Uint8Array = rt.bytes(4); const n3: rt.usize = rt.min(data.length, buf3.length); rt.sliceCopyFromSlice(rt.sliceRange(buf3, 0, n3), rt.sliceRange(data, 0, n3)); const v3: rt.u32 = rt.u32FromBeBytes(buf3); const args6: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(v3, f), (f: rt.Formatter) => rt.u32Display(v3, f), (f: rt.Formatter) => rt.u32LowerHex(v3, f), (f: rt.Formatter) => rt.u32UpperHex(v3, f)]; - const _91: string = rt.fmtFormat([args6[0], " ", args6[1], " ", rt.fmtSpec({ width: 5 }, args6[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args6[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args6[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args6[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args6[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args6[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args6[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args6[0]), "|", args6[2], " ", args6[3], " ", rt.fmtSpec({ alternate: true }, args6[2]), " ", rt.fmtSpec({ alternate: true }, args6[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args6[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args6[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args6[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args6[3]), "|", rt.fmtSpec({ alternate: true }, args6[1]), " ", rt.fmtSpec({ width: 3 }, args6[1])]); - put(out, _91); - const _106: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v3, f)); - put(out, _106); + put(out, rt.fmtFormat([args6[0], " ", args6[1], " ", rt.fmtSpec({ width: 5 }, args6[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args6[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args6[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args6[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args6[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args6[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args6[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args6[0]), "|", args6[2], " ", args6[3], " ", rt.fmtSpec({ alternate: true }, args6[2]), " ", rt.fmtSpec({ alternate: true }, args6[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args6[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args6[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args6[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args6[3]), "|", rt.fmtSpec({ alternate: true }, args6[1]), " ", rt.fmtSpec({ width: 3 }, args6[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.u32Display(v3, f))); } else if (_4 === 3) { const buf4: Uint8Array = rt.bytes(8); const n4: rt.usize = rt.min(data.length, buf4.length); rt.sliceCopyFromSlice(rt.sliceRange(buf4, 0, n4), rt.sliceRange(data, 0, n4)); const v4: rt.u64 = rt.u64FromBeBytes(buf4); const args8: rt.Fmt[] = [(f: rt.Formatter) => rt.u64Display(v4, f), (f: rt.Formatter) => rt.u64Display(v4, f), (f: rt.Formatter) => rt.u64LowerHex(v4, f), (f: rt.Formatter) => rt.u64UpperHex(v4, f)]; - const _125: string = rt.fmtFormat([args8[0], " ", args8[1], " ", rt.fmtSpec({ width: 5 }, args8[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args8[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args8[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args8[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args8[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args8[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args8[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args8[0]), "|", args8[2], " ", args8[3], " ", rt.fmtSpec({ alternate: true }, args8[2]), " ", rt.fmtSpec({ alternate: true }, args8[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args8[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args8[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args8[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args8[3]), "|", rt.fmtSpec({ alternate: true }, args8[1]), " ", rt.fmtSpec({ width: 3 }, args8[1])]); - put(out, _125); - const _140: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v4, f)); - put(out, _140); + put(out, rt.fmtFormat([args8[0], " ", args8[1], " ", rt.fmtSpec({ width: 5 }, args8[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args8[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args8[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args8[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args8[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args8[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args8[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args8[0]), "|", args8[2], " ", args8[3], " ", rt.fmtSpec({ alternate: true }, args8[2]), " ", rt.fmtSpec({ alternate: true }, args8[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args8[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args8[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args8[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args8[3]), "|", rt.fmtSpec({ alternate: true }, args8[1]), " ", rt.fmtSpec({ width: 3 }, args8[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.u64Display(v4, f))); } else if (_4 === 4) { const buf5: Uint8Array = rt.bytes(16); const n5: rt.usize = rt.min(data.length, buf5.length); rt.sliceCopyFromSlice(rt.sliceRange(buf5, 0, n5), rt.sliceRange(data, 0, n5)); const v5: rt.u128 = rt.u128FromBeBytes(buf5); const args10: rt.Fmt[] = [(f: rt.Formatter) => rt.u128Display(v5, f), (f: rt.Formatter) => rt.u128Display(v5, f), (f: rt.Formatter) => rt.u128LowerHex(v5, f), (f: rt.Formatter) => rt.u128UpperHex(v5, f)]; - const _159: string = rt.fmtFormat([args10[0], " ", args10[1], " ", rt.fmtSpec({ width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args10[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args10[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args10[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args10[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args10[0]), "|", args10[2], " ", args10[3], " ", rt.fmtSpec({ alternate: true }, args10[2]), " ", rt.fmtSpec({ alternate: true }, args10[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args10[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args10[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args10[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args10[3]), "|", rt.fmtSpec({ alternate: true }, args10[1]), " ", rt.fmtSpec({ width: 3 }, args10[1])]); - put(out, _159); - const _174: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v5, f)); - put(out, _174); + put(out, rt.fmtFormat([args10[0], " ", args10[1], " ", rt.fmtSpec({ width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args10[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args10[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args10[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args10[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args10[0]), "|", args10[2], " ", args10[3], " ", rt.fmtSpec({ alternate: true }, args10[2]), " ", rt.fmtSpec({ alternate: true }, args10[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args10[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args10[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args10[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args10[3]), "|", rt.fmtSpec({ alternate: true }, args10[1]), " ", rt.fmtSpec({ width: 3 }, args10[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.u128Display(v5, f))); } else if (_4 === 5) { const buf6: Uint8Array = rt.bytes(4); const n6: rt.usize = rt.min(data.length, buf6.length); rt.sliceCopyFromSlice(rt.sliceRange(buf6, 0, n6), rt.sliceRange(data, 0, n6)); const v6: rt.usize = rt.usizeFromBeBytes(buf6); const args12: rt.Fmt[] = [(f: rt.Formatter) => rt.usizeDisplay(v6, f), (f: rt.Formatter) => rt.usizeDisplay(v6, f), (f: rt.Formatter) => rt.usizeLowerHex(v6, f), (f: rt.Formatter) => rt.usizeUpperHex(v6, f)]; - const _193: string = rt.fmtFormat([args12[0], " ", args12[1], " ", rt.fmtSpec({ width: 5 }, args12[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args12[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args12[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args12[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args12[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args12[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args12[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args12[0]), "|", args12[2], " ", args12[3], " ", rt.fmtSpec({ alternate: true }, args12[2]), " ", rt.fmtSpec({ alternate: true }, args12[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args12[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args12[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args12[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args12[3]), "|", rt.fmtSpec({ alternate: true }, args12[1]), " ", rt.fmtSpec({ width: 3 }, args12[1])]); - put(out, _193); - const _208: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v6, f)); - put(out, _208); + put(out, rt.fmtFormat([args12[0], " ", args12[1], " ", rt.fmtSpec({ width: 5 }, args12[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args12[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args12[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args12[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args12[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args12[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args12[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args12[0]), "|", args12[2], " ", args12[3], " ", rt.fmtSpec({ alternate: true }, args12[2]), " ", rt.fmtSpec({ alternate: true }, args12[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args12[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args12[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args12[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args12[3]), "|", rt.fmtSpec({ alternate: true }, args12[1]), " ", rt.fmtSpec({ width: 3 }, args12[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v6, f))); } else if (_4 === 6) { const buf7: Uint8Array = Uint8Array.of(0); const n7: rt.usize = rt.min(data.length, buf7.length); rt.sliceCopyFromSlice(rt.sliceRange(buf7, 0, n7), rt.sliceRange(data, 0, n7)); const v7: rt.i8 = rt.i8FromBeBytes(buf7); const args14: rt.Fmt[] = [(f: rt.Formatter) => rt.i8Display(v7, f), (f: rt.Formatter) => rt.i8Display(v7, f), (f: rt.Formatter) => rt.i8LowerHex(v7, f), (f: rt.Formatter) => rt.i8UpperHex(v7, f)]; - const _227: string = rt.fmtFormat([args14[0], " ", args14[1], " ", rt.fmtSpec({ width: 5 }, args14[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args14[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args14[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args14[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args14[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args14[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args14[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args14[0]), "|", args14[2], " ", args14[3], " ", rt.fmtSpec({ alternate: true }, args14[2]), " ", rt.fmtSpec({ alternate: true }, args14[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args14[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args14[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args14[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args14[3]), "|", rt.fmtSpec({ alternate: true }, args14[1]), " ", rt.fmtSpec({ width: 3 }, args14[1])]); - put(out, _227); - const _242: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v7, f)); - put(out, _242); + put(out, rt.fmtFormat([args14[0], " ", args14[1], " ", rt.fmtSpec({ width: 5 }, args14[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args14[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args14[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args14[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args14[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args14[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args14[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args14[0]), "|", args14[2], " ", args14[3], " ", rt.fmtSpec({ alternate: true }, args14[2]), " ", rt.fmtSpec({ alternate: true }, args14[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args14[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args14[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args14[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args14[3]), "|", rt.fmtSpec({ alternate: true }, args14[1]), " ", rt.fmtSpec({ width: 3 }, args14[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.i8Display(v7, f))); } else if (_4 === 7) { const buf8: Uint8Array = rt.bytes(2); const n8: rt.usize = rt.min(data.length, buf8.length); rt.sliceCopyFromSlice(rt.sliceRange(buf8, 0, n8), rt.sliceRange(data, 0, n8)); const v8: rt.i16 = rt.i16FromBeBytes(buf8); const args16: rt.Fmt[] = [(f: rt.Formatter) => rt.i16Display(v8, f), (f: rt.Formatter) => rt.i16Display(v8, f), (f: rt.Formatter) => rt.i16LowerHex(v8, f), (f: rt.Formatter) => rt.i16UpperHex(v8, f)]; - const _261: string = rt.fmtFormat([args16[0], " ", args16[1], " ", rt.fmtSpec({ width: 5 }, args16[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args16[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args16[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args16[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args16[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args16[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args16[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args16[0]), "|", args16[2], " ", args16[3], " ", rt.fmtSpec({ alternate: true }, args16[2]), " ", rt.fmtSpec({ alternate: true }, args16[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args16[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args16[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args16[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args16[3]), "|", rt.fmtSpec({ alternate: true }, args16[1]), " ", rt.fmtSpec({ width: 3 }, args16[1])]); - put(out, _261); - const _276: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v8, f)); - put(out, _276); + put(out, rt.fmtFormat([args16[0], " ", args16[1], " ", rt.fmtSpec({ width: 5 }, args16[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args16[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args16[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args16[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args16[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args16[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args16[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args16[0]), "|", args16[2], " ", args16[3], " ", rt.fmtSpec({ alternate: true }, args16[2]), " ", rt.fmtSpec({ alternate: true }, args16[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args16[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args16[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args16[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args16[3]), "|", rt.fmtSpec({ alternate: true }, args16[1]), " ", rt.fmtSpec({ width: 3 }, args16[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.i16Display(v8, f))); } else if (_4 === 8) { const buf9: Uint8Array = rt.bytes(4); const n9: rt.usize = rt.min(data.length, buf9.length); rt.sliceCopyFromSlice(rt.sliceRange(buf9, 0, n9), rt.sliceRange(data, 0, n9)); const v9: rt.i32 = rt.i32FromBeBytes(buf9); const args18: rt.Fmt[] = [(f: rt.Formatter) => rt.i32Display(v9, f), (f: rt.Formatter) => rt.i32Display(v9, f), (f: rt.Formatter) => rt.i32LowerHex(v9, f), (f: rt.Formatter) => rt.i32UpperHex(v9, f)]; - const _295: string = rt.fmtFormat([args18[0], " ", args18[1], " ", rt.fmtSpec({ width: 5 }, args18[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args18[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args18[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args18[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args18[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args18[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args18[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args18[0]), "|", args18[2], " ", args18[3], " ", rt.fmtSpec({ alternate: true }, args18[2]), " ", rt.fmtSpec({ alternate: true }, args18[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args18[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args18[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args18[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args18[3]), "|", rt.fmtSpec({ alternate: true }, args18[1]), " ", rt.fmtSpec({ width: 3 }, args18[1])]); - put(out, _295); - const _310: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v9, f)); - put(out, _310); + put(out, rt.fmtFormat([args18[0], " ", args18[1], " ", rt.fmtSpec({ width: 5 }, args18[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args18[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args18[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args18[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args18[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args18[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args18[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args18[0]), "|", args18[2], " ", args18[3], " ", rt.fmtSpec({ alternate: true }, args18[2]), " ", rt.fmtSpec({ alternate: true }, args18[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args18[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args18[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args18[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args18[3]), "|", rt.fmtSpec({ alternate: true }, args18[1]), " ", rt.fmtSpec({ width: 3 }, args18[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.i32Display(v9, f))); } else if (_4 === 9) { const buf10: Uint8Array = rt.bytes(8); const n10: rt.usize = rt.min(data.length, buf10.length); rt.sliceCopyFromSlice(rt.sliceRange(buf10, 0, n10), rt.sliceRange(data, 0, n10)); const v10: rt.i64 = rt.i64FromBeBytes(buf10); const args20: rt.Fmt[] = [(f: rt.Formatter) => rt.i64Display(v10, f), (f: rt.Formatter) => rt.i64Display(v10, f), (f: rt.Formatter) => rt.i64LowerHex(v10, f), (f: rt.Formatter) => rt.i64UpperHex(v10, f)]; - const _329: string = rt.fmtFormat([args20[0], " ", args20[1], " ", rt.fmtSpec({ width: 5 }, args20[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args20[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args20[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args20[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args20[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args20[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args20[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args20[0]), "|", args20[2], " ", args20[3], " ", rt.fmtSpec({ alternate: true }, args20[2]), " ", rt.fmtSpec({ alternate: true }, args20[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args20[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args20[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args20[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args20[3]), "|", rt.fmtSpec({ alternate: true }, args20[1]), " ", rt.fmtSpec({ width: 3 }, args20[1])]); - put(out, _329); - const _344: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v10, f)); - put(out, _344); + put(out, rt.fmtFormat([args20[0], " ", args20[1], " ", rt.fmtSpec({ width: 5 }, args20[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args20[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args20[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args20[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args20[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args20[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args20[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args20[0]), "|", args20[2], " ", args20[3], " ", rt.fmtSpec({ alternate: true }, args20[2]), " ", rt.fmtSpec({ alternate: true }, args20[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args20[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args20[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args20[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args20[3]), "|", rt.fmtSpec({ alternate: true }, args20[1]), " ", rt.fmtSpec({ width: 3 }, args20[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.i64Display(v10, f))); } else if (_4 === 10) { const buf11: Uint8Array = rt.bytes(16); const n11: rt.usize = rt.min(data.length, buf11.length); rt.sliceCopyFromSlice(rt.sliceRange(buf11, 0, n11), rt.sliceRange(data, 0, n11)); const v11: rt.i128 = rt.i128FromBeBytes(buf11); const args22: rt.Fmt[] = [(f: rt.Formatter) => rt.i128Display(v11, f), (f: rt.Formatter) => rt.i128Display(v11, f), (f: rt.Formatter) => rt.i128LowerHex(v11, f), (f: rt.Formatter) => rt.i128UpperHex(v11, f)]; - const _363: string = rt.fmtFormat([args22[0], " ", args22[1], " ", rt.fmtSpec({ width: 5 }, args22[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args22[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args22[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args22[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args22[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args22[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args22[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args22[0]), "|", args22[2], " ", args22[3], " ", rt.fmtSpec({ alternate: true }, args22[2]), " ", rt.fmtSpec({ alternate: true }, args22[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args22[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args22[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args22[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args22[3]), "|", rt.fmtSpec({ alternate: true }, args22[1]), " ", rt.fmtSpec({ width: 3 }, args22[1])]); - put(out, _363); - const _378: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v11, f)); - put(out, _378); + put(out, rt.fmtFormat([args22[0], " ", args22[1], " ", rt.fmtSpec({ width: 5 }, args22[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args22[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args22[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args22[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args22[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args22[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args22[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args22[0]), "|", args22[2], " ", args22[3], " ", rt.fmtSpec({ alternate: true }, args22[2]), " ", rt.fmtSpec({ alternate: true }, args22[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args22[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args22[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args22[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args22[3]), "|", rt.fmtSpec({ alternate: true }, args22[1]), " ", rt.fmtSpec({ width: 3 }, args22[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.i128Display(v11, f))); } else { const buf12: Uint8Array = rt.bytes(4); const n12: rt.usize = rt.min(data.length, buf12.length); rt.sliceCopyFromSlice(rt.sliceRange(buf12, 0, n12), rt.sliceRange(data, 0, n12)); const v12: rt.isize = rt.isizeFromBeBytes(buf12); const args24: rt.Fmt[] = [(f: rt.Formatter) => rt.isizeDisplay(v12, f), (f: rt.Formatter) => rt.isizeDisplay(v12, f), (f: rt.Formatter) => rt.isizeLowerHex(v12, f), (f: rt.Formatter) => rt.isizeUpperHex(v12, f)]; - const _397: string = rt.fmtFormat([args24[0], " ", args24[1], " ", rt.fmtSpec({ width: 5 }, args24[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args24[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args24[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args24[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args24[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args24[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args24[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args24[0]), "|", args24[2], " ", args24[3], " ", rt.fmtSpec({ alternate: true }, args24[2]), " ", rt.fmtSpec({ alternate: true }, args24[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args24[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args24[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args24[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args24[3]), "|", rt.fmtSpec({ alternate: true }, args24[1]), " ", rt.fmtSpec({ width: 3 }, args24[1])]); - put(out, _397); - const _412: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v12, f)); - put(out, _412); + put(out, rt.fmtFormat([args24[0], " ", args24[1], " ", rt.fmtSpec({ width: 5 }, args24[0]), "|", rt.fmtSpec({ align: "<", width: 5 }, args24[0]), "|", rt.fmtSpec({ align: "^", width: 7 }, args24[0]), "|", rt.fmtSpec({ align: ">", width: 4 }, args24[0]), "|", rt.fmtSpec({ fill: "*", align: "^", width: 9 }, args24[0]), "|", rt.fmtSpec({ fill: "é", align: ">", width: 6 }, args24[0]), "|", rt.fmtSpec({ zero: true, width: 5 }, args24[0]), "|", rt.fmtSpec({ align: "<", zero: true, width: 5 }, args24[0]), "|", args24[2], " ", args24[3], " ", rt.fmtSpec({ alternate: true }, args24[2]), " ", rt.fmtSpec({ alternate: true }, args24[3]), " ", rt.fmtSpec({ zero: true, width: 8 }, args24[2]), " ", rt.fmtSpec({ alternate: true, zero: true, width: 10 }, args24[2]), " ", rt.fmtSpec({ align: ">", width: 8 }, args24[2]), "|", rt.fmtSpec({ align: "<", alternate: true, width: 6 }, args24[3]), "|", rt.fmtSpec({ alternate: true }, args24[1]), " ", rt.fmtSpec({ width: 3 }, args24[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v12, f))); } } @@ -159,15 +135,17 @@ export function strings(data: Uint8Array, out: rt.ByteVec): void { if (_9 === rt.DONE) { const _36: rt.Result = rt.stringFromUtf8(rt.sliceToByteVec(data)); if (_36.ok) { - const s: string = _36.value; - const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtStr(s, f), (f: rt.Formatter) => rt.fmtPad(f, s)]; - const _42: string = rt.fmtFormat([args4[0], " ", rt.fmtSpec({ align: ">", width: 4 }, args4[1])]); - put(out, _42); + const arg5 = _36.value; + const _48: rt.Fmt = (f: rt.Formatter) => rt.fmtStr(arg5, f); + const arg6 = _36.value; + const args4: rt.Fmt[] = [_48, (f: rt.Formatter) => rt.fmtPad(f, arg6)]; + put(out, rt.fmtFormat([args4[0], " ", rt.fmtSpec({ align: ">", width: 4 }, args4[1])])); } else { - const e: rt.FromUtf8Error = _36.error; - const args6: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtFromUtf8ErrorDisplay(e, f), (f: rt.Formatter) => rt.fmtFromUtf8ErrorDebug(e, f)]; - const _55: string = rt.fmtFormat([args6[0], " ", args6[1], " ", rt.fmtSpec({ alternate: true }, args6[1]), " ", rt.fmtSpec({ align: ">", width: 80 }, args6[0])]); - put(out, _55); + const arg3 = _36.error; + const _61: rt.Fmt = (f: rt.Formatter) => rt.fmtFromUtf8ErrorDisplay(arg3, f); + const arg4 = _36.error; + const args6: rt.Fmt[] = [_61, (f: rt.Formatter) => rt.fmtFromUtf8ErrorDebug(arg4, f)]; + put(out, rt.fmtFormat([args6[0], " ", args6[1], " ", rt.fmtSpec({ alternate: true }, args6[1]), " ", rt.fmtSpec({ align: ">", width: 80 }, args6[0])])); } const _66: rt.u8 | undefined = rt.sliceFirst(data); b2: { @@ -180,24 +158,20 @@ export function strings(data: Uint8Array, out: rt.ByteVec): void { flag = false; } const args8: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtBool(flag, f), (f: rt.Formatter) => rt.fmtBool(flag, f), (f: rt.Formatter) => rt.fmtUnit(undefined, f), (f: rt.Formatter) => rt.fmtUnit(undefined, f)]; - const _76: string = rt.fmtFormat([args8[0], " ", args8[1], " ", rt.fmtSpec({ align: ">", width: 6 }, args8[0]), " ", args8[2], " ", rt.fmtSpec({ alternate: true }, args8[3])]); - put(out, _76); + put(out, rt.fmtFormat([args8[0], " ", args8[1], " ", rt.fmtSpec({ align: ">", width: 6 }, args8[0]), " ", args8[2], " ", rt.fmtSpec({ alternate: true }, args8[3])])); const _94: boolean = flag; - const _93: string = rt.fmtToString((f: rt.Formatter) => rt.fmtBool(_94, f)); - put(out, _93); + put(out, rt.fmtToString((f: rt.Formatter) => rt.fmtBool(_94, f))); const _95: rt.Result = rt.u8TryFrom(rt.i32Sub(data.length | 0, 3)); if (_95.ok) { - const arg5 = ([_95.value] as [rt.u8])[0]; - const args10: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg5, f)]; - const _104: string = rt.fmtFormat([args10[0]]); - put(out, _104); + const arg9 = ([_95.value] as [rt.u8])[0]; + const args10: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg9, f)]; + put(out, rt.fmtFormat([args10[0]])); } else { - const arg3 = _95.error; - const _122: rt.Fmt = (f: rt.Formatter) => rt.fmtTryFromIntErrorDisplay(arg3, f); - const arg4 = _95.error; - const args12: rt.Fmt[] = [_122, (f: rt.Formatter) => rt.fmtTryFromIntErrorDebug(arg4, f)]; - const _116: string = rt.fmtFormat([args12[0], " ", args12[1], " ", rt.fmtSpec({ align: ">", width: 40 }, args12[0]), "|"]); - put(out, _116); + const arg7 = _95.error; + const _122: rt.Fmt = (f: rt.Formatter) => rt.fmtTryFromIntErrorDisplay(arg7, f); + const arg8 = _95.error; + const args12: rt.Fmt[] = [_122, (f: rt.Formatter) => rt.fmtTryFromIntErrorDebug(arg8, f)]; + put(out, rt.fmtFormat([args12[0], " ", args12[1], " ", rt.fmtSpec({ align: ">", width: 40 }, args12[0]), "|"])); } return; } @@ -210,8 +184,7 @@ export function strings(data: Uint8Array, out: rt.ByteVec): void { const _31: rt.Fmt = (f: rt.Formatter) => rt.fmtPad(f, arg); const arg2 = ["", "a", "héllo", "日本語", "tab\tnew\nline\r", "quote\"back\\slash'", "\u0000\u0001\u001f", "€Ÿ ­", "é", "‍ᅟ\u2028 ", "͸􏿽", "😀 🇦", "゙゚ン", "{}"][_15]; const args2: rt.Fmt[] = [_31, (f: rt.Formatter) => rt.fmtStr(arg2, f)]; - const _25: string = rt.fmtFormat([args2[0], "|", rt.fmtSpec({ width: 8 }, args2[0]), "|", rt.fmtSpec({ align: ">", width: 8 }, args2[0]), "|", rt.fmtSpec({ align: "^", width: 8 }, args2[0]), "|", rt.fmtSpec({ fill: "-", align: "<", width: 3 }, args2[0]), "|", args2[1], "|", rt.fmtSpec({ width: 12 }, args2[1]), "|", rt.fmtSpec({ alternate: true }, args2[1]), "|{", args2[0], "}"]); - put(out, _25); + put(out, rt.fmtFormat([args2[0], "|", rt.fmtSpec({ width: 8 }, args2[0]), "|", rt.fmtSpec({ align: ">", width: 8 }, args2[0]), "|", rt.fmtSpec({ align: "^", width: 8 }, args2[0]), "|", rt.fmtSpec({ fill: "-", align: "<", width: 3 }, args2[0]), "|", args2[1], "|", rt.fmtSpec({ width: 12 }, args2[1]), "|", rt.fmtSpec({ alternate: true }, args2[1]), "|{", args2[0], "}"])); } } @@ -273,12 +246,10 @@ export function derived(data: Uint8Array, out: rt.ByteVec): void { const value: Nested.Nested = nested(data); const arg = ([value] as [Nested.Nested])[0]; const args2: rt.Fmt[] = [(f: rt.Formatter) => Nested.fmt$Debug(arg, f)]; - const _8: string = rt.fmtFormat([args2[0]]); - put(out, _8); + put(out, rt.fmtFormat([args2[0]])); const arg2 = ([value] as [Nested.Nested])[0]; const args4: rt.Fmt[] = [(f: rt.Formatter) => Nested.fmt$Debug(arg2, f)]; - const _20: string = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args4[0])]); - put(out, _20); + put(out, rt.fmtFormat([rt.fmtSpec({ alternate: true }, args4[0])])); const _30: rt.u8 = at(0); const _33: boolean = at(1) > 10; const wide: Wide.Wide = { a: _30, b: 300, c: 70000, d: rt.u64Of(18446744073709551615n), e: -1, f: _33 }; @@ -289,35 +260,25 @@ export function derived(data: Uint8Array, out: rt.ByteVec): void { const _58: rt.Fmt = (f: rt.Formatter) => Unit.fmt$Debug(arg3, f); const arg4 = {}; const args6: rt.Fmt[] = [_56, _57, _58, (f: rt.Formatter) => Unit.fmt$Debug(arg4, f)]; - const _47: string = rt.fmtFormat([args6[0], " ", args6[1], " ", args6[2], " ", rt.fmtSpec({ alternate: true }, args6[3])]); - put(out, _47); + put(out, rt.fmtFormat([args6[0], " ", args6[1], " ", args6[2], " ", rt.fmtSpec({ alternate: true }, args6[3])])); const args8: rt.Fmt[] = [(f: rt.Formatter) => Wide.fmt$Debug(wide, f), (f: rt.Formatter) => Six.fmt$Debug(six, f)]; - const _65: string = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args8[0]), " ", rt.fmtSpec({ alternate: true }, args8[1])]); - put(out, _65); + put(out, rt.fmtFormat([rt.fmtSpec({ alternate: true }, args8[0]), " ", rt.fmtSpec({ alternate: true }, args8[1])])); const point: Point.Point = { x: at(2) as rt.i32, y: -1 }; const _89: Pair.Pair = { _0: at(3), _1: -9 }; const args10: rt.Fmt[] = [(f: rt.Formatter) => Point.fmt$Debug(point, f), (f: rt.Formatter) => Pair.fmt$Debug(_89, f)]; - const _84: string = rt.fmtFormat([rt.fmtSpec({ width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "<", width: 4 }, args10[0]), "|", rt.fmtSpec({ alternate: true, width: 4 }, args10[0]), "|", rt.fmtSpec({ align: ">", width: 3 }, args10[1])]); - put(out, _84); - const _100: Kind.Kind = { tag: "Empty" }; - const _101: Kind.Kind = { tag: "One", _0: at(4) }; - const _105: Kind.Kind = { tag: "Braced" }; - const _106: Kind.Kind = { tag: "Bare" }; - const kinds: Kind.Kind[] = [_100, _101, _105, _106, { tag: "Many", count: 0, items: new rt.ByteVec() } as Kind.Kind]; + put(out, rt.fmtFormat([rt.fmtSpec({ width: 5 }, args10[0]), "|", rt.fmtSpec({ align: "<", width: 4 }, args10[0]), "|", rt.fmtSpec({ alternate: true, width: 4 }, args10[0]), "|", rt.fmtSpec({ align: ">", width: 3 }, args10[1])])); + const kinds: Kind.Kind[] = [{ tag: "Empty" } as Kind.Kind, { tag: "One", _0: at(4) } as Kind.Kind, { tag: "Braced" } as Kind.Kind, { tag: "Bare" } as Kind.Kind, { tag: "Many", count: 0, items: new rt.ByteVec() } as Kind.Kind]; const _118: Kind.Kind = kinds[1]; const args12: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtList(kinds, f, (value: Kind.Kind, f: rt.Formatter) => Kind.fmt$Debug(value, f)), (f: rt.Formatter) => Kind.fmt$Debug(_118, f)]; - const _112: string = rt.fmtFormat([args12[0], " ", args12[1]]); - put(out, _112); + put(out, rt.fmtFormat([args12[0], " ", args12[1]])); const arg5 = ([kinds] as [Kind.Kind[]])[0]; const args14: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtList(arg5, f, (value: Kind.Kind, f: rt.Formatter) => Kind.fmt$Debug(value, f))]; - const _130: string = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args14[0])]); - put(out, _130); + put(out, rt.fmtFormat([rt.fmtSpec({ alternate: true }, args14[0])])); const words: rt.u16[] = [at(5) as rt.u16, 65535]; const _153: rt.u8 | undefined = rt.sliceFirst(data); const _155: rt.u8 | undefined = rt.sliceGet(data, 100); const args16: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtList(data, f, rt.u8Display), (f: rt.Formatter) => rt.fmtList(words, f, rt.u16Display), (f: rt.Formatter) => rt.fmtOption(_153, f, rt.u8Display), (f: rt.Formatter) => rt.fmtOption(_155, f, rt.u8Display)]; - const _148: string = rt.fmtFormat([args16[0], " ", args16[1], " ", args16[2], " ", args16[3]]); - put(out, _148); + put(out, rt.fmtFormat([args16[0], " ", args16[1], " ", args16[2], " ", args16[3]])); const arg6 = {}; const _177: rt.Fmt = (f: rt.Formatter) => Braced.fmt$Debug(arg6, f); const arg7 = {}; @@ -326,8 +287,7 @@ export function derived(data: Uint8Array, out: rt.ByteVec): void { const _179: rt.Fmt = (f: rt.Formatter) => Bare.fmt$Debug(arg8, f); const arg9 = {}; const args18: rt.Fmt[] = [_177, _178, _179, (f: rt.Formatter) => Bare.fmt$Debug(arg9, f)]; - const _168: string = rt.fmtFormat([args18[0], " ", rt.fmtSpec({ alternate: true }, args18[1]), " ", args18[2], " ", rt.fmtSpec({ alternate: true }, args18[3])]); - put(out, _168); + put(out, rt.fmtFormat([args18[0], " ", rt.fmtSpec({ alternate: true }, args18[1]), " ", args18[2], " ", rt.fmtSpec({ alternate: true }, args18[3])])); rt.byteVecExtendFromSlice(out, Uint8Array.of(Braced.eq$PartialEq({}, {}) ? 1 : 0, Bare.eq$PartialEq({}, {}) ? 1 : 0)); } @@ -339,47 +299,43 @@ export function written(data: Uint8Array, out: rt.ByteVec): void { }; const hex: Hex.Hex = { _0: rt.u32Mul(at(0) as rt.u32, 4097) }; const args2: rt.Fmt[] = [(f: rt.Formatter) => Hex.fmt$Display(hex, f), (f: rt.Formatter) => Hex.fmt$Debug(hex, f)]; - const _14: string = rt.fmtFormat([args2[0], "|", rt.fmtSpec({ align: ">", width: 12 }, args2[0]), "|", rt.fmtSpec({ alternate: true }, args2[0]), "|", args2[1], "|", rt.fmtSpec({ align: ">", width: 6 }, args2[1]), "|", rt.fmtSpec({ alternate: true }, args2[1])]); - put(out, _14); - const _27: string = rt.fmtToString((f: rt.Formatter) => Hex.fmt$Display(hex, f)); - put(out, _27); + put(out, rt.fmtFormat([args2[0], "|", rt.fmtSpec({ align: ">", width: 12 }, args2[0]), "|", rt.fmtSpec({ alternate: true }, args2[0]), "|", args2[1], "|", rt.fmtSpec({ align: ">", width: 6 }, args2[1]), "|", rt.fmtSpec({ alternate: true }, args2[1])])); + put(out, rt.fmtToString((f: rt.Formatter) => Hex.fmt$Display(hex, f))); const arg = ([{ _0: "pad" }] as [Padded.Padded])[0]; const args4: rt.Fmt[] = [(f: rt.Formatter) => Padded.fmt$Display(arg, f)]; - const _33: string = rt.fmtFormat([args4[0], "|", rt.fmtSpec({ align: ">", width: 6 }, args4[0]), "|", rt.fmtSpec({ fill: "_", align: "^", width: 9 }, args4[0]), "|", rt.fmtSpec({ width: 30 }, args4[0]), "|"]); - put(out, _33); - const manual: Manual.Manual = { id: at(1), list: rt.sliceToVec([1, at(2) as rt.u16]) }; - const empty: Manual.Manual = { id: 0, list: [] }; - const args6: rt.Fmt[] = [(f: rt.Formatter) => Manual.fmt$Debug(manual, f), (f: rt.Formatter) => Manual.fmt$Debug(empty, f)]; - const _59: string = rt.fmtFormat([args6[0], " ", rt.fmtSpec({ alternate: true }, args6[0]), " ", args6[1]]); - put(out, _59); - const seq: Seq.Seq = { _0: rt.sliceToVec([{ _0: at(3), _1: 0 }, { _0: 1, _1: -1 }]) }; - const none: Seq.Seq = { _0: [] }; - const args8: rt.Fmt[] = [(f: rt.Formatter) => Seq.fmt$Debug(seq, f), (f: rt.Formatter) => Seq.fmt$Debug(none, f)]; - const _85: string = rt.fmtFormat([args8[0], " ", rt.fmtSpec({ alternate: true }, args8[0]), " ", args8[1], " ", rt.fmtSpec({ alternate: true }, args8[1])]); - put(out, _85); + put(out, rt.fmtFormat([args4[0], "|", rt.fmtSpec({ align: ">", width: 6 }, args4[0]), "|", rt.fmtSpec({ fill: "_", align: "^", width: 9 }, args4[0]), "|", rt.fmtSpec({ width: 30 }, args4[0]), "|"])); + [{ id: at(1), list: rt.sliceToVec([1, at(2) as rt.u16]) }, { id: 0, list: [] }] as [Manual.Manual, Manual.Manual]; + const arg2 = { id: at(1), list: rt.sliceToVec([1, at(2) as rt.u16]) }; + const _66: rt.Fmt = (f: rt.Formatter) => Manual.fmt$Debug(arg2, f); + const arg3 = { id: 0, list: [] }; + const args6: rt.Fmt[] = [_66, (f: rt.Formatter) => Manual.fmt$Debug(arg3, f)]; + put(out, rt.fmtFormat([args6[0], " ", rt.fmtSpec({ alternate: true }, args6[0]), " ", args6[1]])); + [{ _0: rt.sliceToVec([{ _0: at(3), _1: 0 }, { _0: 1, _1: -1 }]) }, { _0: [] }] as [Seq.Seq, Seq.Seq]; + const arg4 = { _0: rt.sliceToVec([{ _0: at(3), _1: 0 }, { _0: 1, _1: -1 }]) }; + const _92: rt.Fmt = (f: rt.Formatter) => Seq.fmt$Debug(arg4, f); + const arg5 = { _0: [] }; + const args8: rt.Fmt[] = [_92, (f: rt.Formatter) => Seq.fmt$Debug(arg5, f)]; + put(out, rt.fmtFormat([args8[0], " ", rt.fmtSpec({ alternate: true }, args8[0]), " ", args8[1], " ", rt.fmtSpec({ alternate: true }, args8[1])])); const _97: rt.u8 = at(4); if (!(rt.u8Rem(at(5), 2) === 0)) { _100 = undefined; } else { _100 = at(5); } - const arg2 = ([{ _0: _97, _1: _100 }] as [Tup.Tup])[0]; - const args10: rt.Fmt[] = [(f: rt.Formatter) => Tup.fmt$Debug(arg2, f)]; - const _113: string = rt.fmtFormat([args10[0], " ", rt.fmtSpec({ alternate: true }, args10[0])]); - put(out, _113); - const arg3 = ([{ _0: at(6) & (~1 & 0xff) }] as [Fails.Fails])[0]; - const args12: rt.Fmt[] = [(f: rt.Formatter) => Fails.fmt$Display(arg3, f)]; - const _131: string = rt.fmtFormat([args12[0], " ", rt.fmtSpec({ align: ">", width: 9 }, args12[0])]); - put(out, _131); + const arg6 = ([{ _0: _97, _1: _100 }] as [Tup.Tup])[0]; + const args10: rt.Fmt[] = [(f: rt.Formatter) => Tup.fmt$Debug(arg6, f)]; + put(out, rt.fmtFormat([args10[0], " ", rt.fmtSpec({ alternate: true }, args10[0])])); + const arg7 = ([{ _0: at(6) & (~1 & 0xff) }] as [Fails.Fails])[0]; + const args12: rt.Fmt[] = [(f: rt.Formatter) => Fails.fmt$Display(arg7, f)]; + put(out, rt.fmtFormat([args12[0], " ", rt.fmtSpec({ align: ">", width: 9 }, args12[0])])); [at(7), at(8), "named"] as [rt.u8, rt.u8, string]; - const arg4 = at(8); - const _157: rt.Fmt = (f: rt.Formatter) => rt.u8Display(arg4, f); - const arg5 = at(7); - const _158: rt.Fmt = (f: rt.Formatter) => rt.u8Display(arg5, f); - const arg6 = at(7); - const args14: rt.Fmt[] = [_157, _158, (f: rt.Formatter) => rt.u8Display(arg6, f), (f: rt.Formatter) => rt.fmtPad(f, "named")]; - const _143: string = rt.fmtFormat([args14[0], " ", args14[1], " ", args14[2], " named ", rt.fmtSpec({ align: ">", width: 5 }, args14[3])]); - put(out, _143); + const arg8 = at(8); + const _157: rt.Fmt = (f: rt.Formatter) => rt.u8Display(arg8, f); + const arg9 = at(7); + const _158: rt.Fmt = (f: rt.Formatter) => rt.u8Display(arg9, f); + const arg10 = at(7); + const args14: rt.Fmt[] = [_157, _158, (f: rt.Formatter) => rt.u8Display(arg10, f), (f: rt.Formatter) => rt.fmtPad(f, "named")]; + put(out, rt.fmtFormat([args14[0], " ", args14[1], " ", args14[2], " named ", rt.fmtSpec({ align: ">", width: 5 }, args14[3])])); } /** Panics, each with the message native Rust formats. */ @@ -434,8 +390,7 @@ export function panics(kind: rt.u8, rest: Uint8Array, out: rt.ByteVec): void { r = rt.Err({ tag: "Many", count: 1, items: rt.sliceToByteVec(Uint8Array.of(n)) } as Kind.Kind); } const _100: rt.u8 = rt.resultUnwrap(r, (value: Kind.Kind, f: rt.Formatter) => Kind.fmt$Debug(value, f)); - const _98: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_100, f)); - put(out, _98); + put(out, rt.fmtToString((f: rt.Formatter) => rt.u8Display(_100, f))); } else if (_7 === 8) { if (!(n > 128)) { r2 = rt.Err({ _0: n, _1: -2 }); @@ -443,29 +398,23 @@ export function panics(kind: rt.u8, rest: Uint8Array, out: rt.ByteVec): void { r2 = rt.Ok(n); } const _110: rt.u8 = rt.resultExpect(r2, "expected a byte", (value: Pair.Pair, f: rt.Formatter) => Pair.fmt$Debug(value, f)); - const _108: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_110, f)); - put(out, _108); + put(out, rt.fmtToString((f: rt.Formatter) => rt.u8Display(_110, f))); } else if (_7 === 9) { const _121: rt.u8 = rt.resultUnwrapErr(rt.Ok({ x: n as rt.i32, y: 0 }), (value: Point.Point, f: rt.Formatter) => Point.fmt$Debug(value, f)); - const _119: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_121, f)); - put(out, _119); + put(out, rt.fmtToString((f: rt.Formatter) => rt.u8Display(_121, f))); } else if (_7 === 10) { const missing: rt.u8 | undefined = rt.sliceGet(rest, 200); const arg9 = ([n] as [rt.u8])[0]; const args10: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg9, f)]; - const _132: string = rt.fmtFormat(["missing ", args10[0]]); - const _129: rt.u8 = rt.optionExpect(missing, _132); - const _127: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_129, f)); - put(out, _127); + const _129: rt.u8 = rt.optionExpect(missing, rt.fmtFormat(["missing ", args10[0]])); + put(out, rt.fmtToString((f: rt.Formatter) => rt.u8Display(_129, f))); } else if (_7 === 11) { const arg8 = ([{ _0: n }] as [Fails.Fails])[0]; const args12: rt.Fmt[] = [(f: rt.Formatter) => Fails.fmt$Display(arg8, f)]; - const _143: string = rt.fmtFormat([args12[0]]); - put(out, _143); + put(out, rt.fmtFormat([args12[0]])); } else if (_7 === 12) { const _157: Fails.Fails = { _0: n }; - const _155: string = rt.fmtToString((f: rt.Formatter) => Fails.fmt$Display(_157, f)); - put(out, _155); + put(out, rt.fmtToString((f: rt.Formatter) => Fails.fmt$Display(_157, f))); } else if (_7 === 13) { const arg6 = { _0: n as rt.u32 }; const _167: rt.Fmt = (f: rt.Formatter) => Hex.fmt$Display(arg6, f); @@ -481,8 +430,7 @@ export function panics(kind: rt.u8, rest: Uint8Array, out: rt.ByteVec): void { const _196: rt.Fmt = (f: rt.Formatter) => rt.fmtList(_189, f, rt.u8Display); const arg5 = rt.sliceRange(rest, start, end); const args16: rt.Fmt[] = [_196, (f: rt.Formatter) => rt.fmtList(arg5, f, rt.u8Display)]; - const _183: string = rt.fmtFormat([args16[0], " ", args16[1]]); - put(out, _183); + put(out, rt.fmtFormat([args16[0], " ", args16[1]])); } else if (_7 === 15) { const buf: Uint8Array = rt.bytes(3); const _202: Uint8Array = buf; @@ -490,21 +438,18 @@ export function panics(kind: rt.u8, rest: Uint8Array, out: rt.ByteVec): void { rt.sliceCopyFromSlice(_202, rt.sliceRange(rest, 0, part3)); const arg4 = ([buf] as [Uint8Array])[0]; const args18: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtList(arg4, f, rt.u8Display)]; - const _211: string = rt.fmtFormat([args18[0]]); - put(out, _211); + put(out, rt.fmtFormat([args18[0]])); } else if (_7 === 16) { const _221: rt.Result = rt.stringFromUtf8(rt.sliceToByteVec(rest)); if (_221.ok) { - const s: string = _221.value; - const _225: rt.u8 = rt.stringLen(s) & 0xff; + const _225: rt.u8 = rt.stringLen(_221.value) & 0xff; r4 = rt.Ok(_225); } else { const e: rt.FromUtf8Error = _221.error; r4 = rt.Err(e); } const _234: rt.u8 = rt.resultUnwrap(r4, rt.fmtFromUtf8ErrorDebug); - const _232: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(_234, f)); - put(out, _232); + put(out, rt.fmtToString((f: rt.Formatter) => rt.u8Display(_234, f))); } else if (_7 === 17) { const buf2: Uint8Array = Uint8Array.of(1, 2, 3, 4); const part = rt.u8Rem(n, 6) as rt.usize; @@ -514,14 +459,12 @@ export function panics(kind: rt.u8, rest: Uint8Array, out: rt.ByteVec): void { rt.sliceCopyWithin(_244, part, part2, dest); const arg3 = ([buf2] as [Uint8Array])[0]; const args20: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtList(arg3, f, rt.u8Display)]; - const _258: string = rt.fmtFormat([args20[0]]); - put(out, _258); + put(out, rt.fmtFormat([args20[0]])); } else if (_7 === 18) { const _271: rt.usize = rt.u8Rem(n, 8) as rt.usize; rt.idx(rest, _271); const arg2 = rest[_271]; - const _269: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(arg2, f)); - put(out, _269); + put(out, rt.fmtToString((f: rt.Formatter) => rt.u8Display(arg2, f))); } else { if (!(rt.u8Rem(n, 2) === 0)) { r5 = rt.Ok(n); @@ -530,8 +473,7 @@ export function panics(kind: rt.u8, rest: Uint8Array, out: rt.ByteVec): void { } const arg = ([rt.resultUnwrapErr(r5, rt.u8Display)] as [rt.u8])[0]; const args22: rt.Fmt[] = [(f: rt.Formatter) => rt.u8Display(arg, f)]; - const _283: string = rt.fmtFormat([args22[0]]); - put(out, _283); + put(out, rt.fmtFormat([args22[0]])); } } diff --git a/ts/fixtures/lang/expected/generics.ts b/ts/fixtures/lang/expected/generics.ts index 2c01b1f33..5f43d28f9 100644 --- a/ts/fixtures/lang/expected/generics.ts +++ b/ts/fixtures/lang/expected/generics.ts @@ -24,12 +24,10 @@ export function methods(data: Uint8Array, out: rt.ByteVec): void { const meters: Wrap.Wrap = new Wrap.Wrap({ value: { _0: at(3) as rt.u64 }, count: at(4) }); const shape: Wrap.Wrap = Wrap.new$Shape({ tag: "Rect", corner: Wrap.intoInner$Point(point), width: at(5) as rt.u16, height: 3 } as Shape.Shape); const args2: rt.Fmt[] = [(f: rt.Formatter) => Wrap.fmt$Debug_Point(point, f), (f: rt.Formatter) => Wrap.fmt$Debug_u8(byte, f), (f: rt.Formatter) => Wrap.fmt$Debug_Wrap_Pair(nested, f), (f: rt.Formatter) => Wrap.fmt$Debug_Shape(shape, f)]; - const _46: string = rt.fmtFormat([args2[0], " ", args2[1], " ", args2[2], " ", args2[3]]); - put(out, _46); + put(out, rt.fmtFormat([args2[0], " ", args2[1], " ", args2[2], " ", args2[3]])); const arg = ([nested] as [Wrap.Wrap>])[0]; const args4: rt.Fmt[] = [(f: rt.Formatter) => Wrap.fmt$Debug_Wrap_Pair(arg, f)]; - const _64: string = rt.fmtFormat([rt.fmtSpec({ alternate: true }, args4[0])]); - put(out, _64); + put(out, rt.fmtFormat([rt.fmtSpec({ alternate: true }, args4[0])])); rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(Wrap.double$u8(byte))); rt.byteVecPush(out, Wrap.get$u8(byte)); rt.byteVecPush(out, Wrap.get$Pair(Wrap.get$Wrap_Pair(nested))._0); @@ -45,8 +43,7 @@ export function methods(data: Uint8Array, out: rt.ByteVec): void { const _126: rt.Fmt = (f: rt.Formatter) => Wrap.fmt$Debug_Pair(mapped, f); const arg2 = Wrap.eq$PartialEq_Pair(mapped, _119); const args6: rt.Fmt[] = [_126, (f: rt.Formatter) => rt.fmtBool(arg2, f)]; - const _111: string = rt.fmtFormat([args6[0], " ", args6[1]]); - put(out, _111); + put(out, rt.fmtFormat([args6[0], " ", args6[1]])); const iter: rt.Iter> = rt.iterSlice([{ tag: "Left", _0: at(7) } as Either.Either, { tag: "Right", value: Point.new(1, -1) } as Either.Either, { tag: "Neither" } as Either.Either]); while (true) { const _140: Either.Either | rt.Done = iter.next(); @@ -60,15 +57,13 @@ export function methods(data: Uint8Array, out: rt.ByteVec): void { const err: Wrap.Wrap> = new Wrap.Wrap({ value: rt.Err({ tag: "Dot" } as Shape.Shape), count: 2 }); const _193: rt.u8 = rt.optionUnwrapOr(Wrap.get$Option_u8(none), some.count); const args10: rt.Fmt[] = [(f: rt.Formatter) => Wrap.fmt$Debug_Vec_u16(list, f), (f: rt.Formatter) => Wrap.fmt$Debug_Option_u8(none, f), (f: rt.Formatter) => Wrap.fmt$Debug_Option_u8(some, f), (f: rt.Formatter) => Wrap.fmt$Debug_Result_u8_Shape(err, f), (f: rt.Formatter) => rt.u8Display(_193, f)]; - const _188: string = rt.fmtFormat([args10[0], " ", args10[1], " ", args10[2], " ", args10[3], " ", args10[4]]); - put(out, _188); + put(out, rt.fmtFormat([args10[0], " ", args10[1], " ", args10[2], " ", args10[3], " ", args10[4]])); const tagged: Tagged.Tagged, rt.i16> = new Tagged.Tagged({ key: { tag: "Right", value: 500 } as Either.Either, inner: Wrap.new$i16(rt.i16Sub(at(8) as rt.i16, 100)), all: rt.sliceToVec([Wrap.new$i16(-1), Wrap.new$i16(at(9) as rt.i16)]) }); [Tagged.first$Either_u8_u16_i16(tagged), tagged] as [Wrap.Wrap | undefined, Tagged.Tagged, rt.i16>]; const _241: rt.Fmt = (f: rt.Formatter) => Tagged.fmt$Debug_Either_u8_u16_i16(tagged, f); const arg5 = Tagged.first$Either_u8_u16_i16(tagged); const args12: rt.Fmt[] = [_241, (f: rt.Formatter) => rt.fmtOption(arg5, f, (value: Wrap.Wrap, f: rt.Formatter) => Wrap.fmt$Debug_i16(value, f))]; - const _232: string = rt.fmtFormat([args12[0], " ", args12[1]]); - put(out, _232); + put(out, rt.fmtFormat([args12[0], " ", args12[1]])); rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(tagged.inner.value)); rt.byteVecPush(out, rt.optionUnwrapOr(Either.left$u8_u16(tagged.key), 0)); return; @@ -82,8 +77,7 @@ export function methods(data: Uint8Array, out: rt.ByteVec): void { const _163: rt.Fmt = (f: rt.Formatter) => rt.fmtOption(arg3, f, rt.u8Display); const arg4 = Either.left$Point_u8(flipped); const args8: rt.Fmt[] = [_161, _162, _163, (f: rt.Formatter) => rt.fmtOption(arg4, f, (value: Point.Point, f: rt.Formatter) => Point.fmt$Debug(value, f))]; - const _148: string = rt.fmtFormat([args8[0], " ", rt.fmtSpec({ alternate: true }, args8[1]), " ", args8[2], " ", args8[3]]); - put(out, _148); + put(out, rt.fmtFormat([args8[0], " ", rt.fmtSpec({ alternate: true }, args8[1]), " ", args8[2], " ", args8[3]])); } } diff --git a/ts/fixtures/lang/expected/ints.ts b/ts/fixtures/lang/expected/ints.ts index fcabcd0cd..306a990be 100644 --- a/ts/fixtures/lang/expected/ints.ts +++ b/ts/fixtures/lang/expected/ints.ts @@ -1466,63 +1466,51 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): if (_25 === 0) { const v2: rt.u8 = v; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v2)); - const _35: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v2, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_35)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u8Display(v2, f)))); } else if (_25 === 1) { const v3: rt.u16 = v as rt.u16; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v3)); - const _45: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v3, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_45)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u16Display(v3, f)))); } else if (_25 === 2) { const v4: rt.u32 = v as rt.u32; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v4)); - const _55: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v4, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_55)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u32Display(v4, f)))); } else if (_25 === 3) { const v5: rt.u64 = v as rt.u64; rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v5)); - const _65: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v5, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_65)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u64Display(v5, f)))); } else if (_25 === 4) { const v6: rt.u128 = v as rt.u128; rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v6)); - const _75: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v6, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_75)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u128Display(v6, f)))); } else if (_25 === 5) { const v7: rt.usize = v as rt.usize; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v7)); - const _85: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v7, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_85)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v7, f)))); } else if (_25 === 6) { const v8: rt.i8 = (v << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v8)); - const _95: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v8, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_95)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i8Display(v8, f)))); } else if (_25 === 7) { const v9: rt.i16 = v as rt.i16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v9)); - const _105: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v9, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_105)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i16Display(v9, f)))); } else if (_25 === 8) { const v10: rt.i32 = v as rt.i32; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v10)); - const _115: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v10, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_115)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i32Display(v10, f)))); } else if (_25 === 9) { const v11: rt.i64 = v as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v11)); - const _125: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v11, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_125)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i64Display(v11, f)))); } else if (_25 === 10) { const v12: rt.i128 = v as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v12)); - const _135: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v12, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_135)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i128Display(v12, f)))); } else { const v13: rt.isize = v as rt.isize; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v13)); - const _145: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v13, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_145)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v13, f)))); } } else if (_5 === 1) { const buf2: Uint8Array = rt.bytes(2); @@ -1533,63 +1521,51 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): if (_165 === 0) { const v15: rt.u8 = v14 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v15)); - const _175: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v15, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_175)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u8Display(v15, f)))); } else if (_165 === 1) { const v16: rt.u16 = v14; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v16)); - const _185: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v16, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_185)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u16Display(v16, f)))); } else if (_165 === 2) { const v17: rt.u32 = v14 as rt.u32; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v17)); - const _195: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v17, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_195)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u32Display(v17, f)))); } else if (_165 === 3) { const v18: rt.u64 = v14 as rt.u64; rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v18)); - const _205: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v18, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_205)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u64Display(v18, f)))); } else if (_165 === 4) { const v19: rt.u128 = v14 as rt.u128; rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v19)); - const _215: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v19, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_215)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u128Display(v19, f)))); } else if (_165 === 5) { const v20: rt.usize = v14 as rt.usize; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v20)); - const _225: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v20, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_225)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v20, f)))); } else if (_165 === 6) { const v21: rt.i8 = (v14 << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v21)); - const _235: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v21, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_235)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i8Display(v21, f)))); } else if (_165 === 7) { const v22: rt.i16 = (v14 << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v22)); - const _245: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v22, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_245)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i16Display(v22, f)))); } else if (_165 === 8) { const v23: rt.i32 = v14 as rt.i32; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v23)); - const _255: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v23, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_255)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i32Display(v23, f)))); } else if (_165 === 9) { const v24: rt.i64 = v14 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v24)); - const _265: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v24, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_265)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i64Display(v24, f)))); } else if (_165 === 10) { const v25: rt.i128 = v14 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v25)); - const _275: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v25, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_275)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i128Display(v25, f)))); } else { const v26: rt.isize = v14 as rt.isize; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v26)); - const _285: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v26, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_285)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v26, f)))); } } else if (_5 === 2) { const buf3: Uint8Array = rt.bytes(4); @@ -1600,63 +1576,51 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): if (_305 === 0) { const v28: rt.u8 = v27 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v28)); - const _315: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v28, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_315)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u8Display(v28, f)))); } else if (_305 === 1) { const v29: rt.u16 = v27 & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v29)); - const _325: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v29, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_325)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u16Display(v29, f)))); } else if (_305 === 2) { const v30: rt.u32 = v27; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v30)); - const _335: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v30, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_335)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u32Display(v30, f)))); } else if (_305 === 3) { const v31: rt.u64 = v27 as rt.u64; rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v31)); - const _345: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v31, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_345)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u64Display(v31, f)))); } else if (_305 === 4) { const v32: rt.u128 = v27 as rt.u128; rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v32)); - const _355: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v32, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_355)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u128Display(v32, f)))); } else if (_305 === 5) { const v33: rt.usize = v27 as rt.usize; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v33)); - const _365: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v33, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_365)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v33, f)))); } else if (_305 === 6) { const v34: rt.i8 = (v27 << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v34)); - const _375: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v34, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_375)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i8Display(v34, f)))); } else if (_305 === 7) { const v35: rt.i16 = (v27 << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v35)); - const _385: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v35, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_385)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i16Display(v35, f)))); } else if (_305 === 8) { const v36: rt.i32 = v27 | 0; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v36)); - const _395: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v36, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_395)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i32Display(v36, f)))); } else if (_305 === 9) { const v37: rt.i64 = v27 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v37)); - const _405: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v37, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_405)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i64Display(v37, f)))); } else if (_305 === 10) { const v38: rt.i128 = v27 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v38)); - const _415: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v38, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_415)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i128Display(v38, f)))); } else { const v39: rt.isize = v27 | 0; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v39)); - const _425: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v39, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_425)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v39, f)))); } } else if (_5 === 3) { const buf4: Uint8Array = rt.bytes(8); @@ -1667,63 +1631,51 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): if (_445 === 0) { const v41: rt.u8 = rt.u64Low(v40) & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v41)); - const _455: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v41, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_455)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u8Display(v41, f)))); } else if (_445 === 1) { const v42: rt.u16 = rt.u64Low(v40) & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v42)); - const _465: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v42, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_465)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u16Display(v42, f)))); } else if (_445 === 2) { const v43: rt.u32 = rt.u64Low(v40); rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v43)); - const _475: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v43, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_475)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u32Display(v43, f)))); } else if (_445 === 3) { const v44: rt.u64 = v40; rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v44)); - const _485: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v44, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_485)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u64Display(v44, f)))); } else if (_445 === 4) { const v45: rt.u128 = rt.u128Cast(v40); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v45)); - const _495: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v45, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_495)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u128Display(v45, f)))); } else if (_445 === 5) { const v46: rt.usize = rt.u64Low(v40); rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v46)); - const _505: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v46, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_505)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v46, f)))); } else if (_445 === 6) { const v47: rt.i8 = (rt.u64Low(v40) << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v47)); - const _515: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v47, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_515)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i8Display(v47, f)))); } else if (_445 === 7) { const v48: rt.i16 = (rt.u64Low(v40) << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v48)); - const _525: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v48, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_525)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i16Display(v48, f)))); } else if (_445 === 8) { const v49: rt.i32 = rt.u64Low(v40) | 0; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v49)); - const _535: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v49, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_535)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i32Display(v49, f)))); } else if (_445 === 9) { const v50: rt.i64 = rt.i64Cast(v40); rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v50)); - const _545: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v50, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_545)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i64Display(v50, f)))); } else if (_445 === 10) { const v51: rt.i128 = rt.i128Cast(v40); rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v51)); - const _555: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v51, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_555)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i128Display(v51, f)))); } else { const v52: rt.isize = rt.u64Low(v40) | 0; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v52)); - const _565: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v52, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_565)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v52, f)))); } } else if (_5 === 4) { const buf5: Uint8Array = rt.bytes(16); @@ -1734,63 +1686,51 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): if (_585 === 0) { const v54: rt.u8 = rt.u128Low(v53) & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v54)); - const _595: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v54, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_595)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u8Display(v54, f)))); } else if (_585 === 1) { const v55: rt.u16 = rt.u128Low(v53) & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v55)); - const _605: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v55, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_605)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u16Display(v55, f)))); } else if (_585 === 2) { const v56: rt.u32 = rt.u128Low(v53); rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v56)); - const _615: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v56, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_615)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u32Display(v56, f)))); } else if (_585 === 3) { const v57: rt.u64 = rt.u64Cast(v53); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v57)); - const _625: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v57, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_625)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u64Display(v57, f)))); } else if (_585 === 4) { const v58: rt.u128 = v53; rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v58)); - const _635: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v58, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_635)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u128Display(v58, f)))); } else if (_585 === 5) { const v59: rt.usize = rt.u128Low(v53); rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v59)); - const _645: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v59, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_645)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v59, f)))); } else if (_585 === 6) { const v60: rt.i8 = (rt.u128Low(v53) << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v60)); - const _655: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v60, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_655)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i8Display(v60, f)))); } else if (_585 === 7) { const v61: rt.i16 = (rt.u128Low(v53) << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v61)); - const _665: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v61, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_665)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i16Display(v61, f)))); } else if (_585 === 8) { const v62: rt.i32 = rt.u128Low(v53) | 0; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v62)); - const _675: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v62, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_675)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i32Display(v62, f)))); } else if (_585 === 9) { const v63: rt.i64 = rt.i64Cast(v53); rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v63)); - const _685: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v63, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_685)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i64Display(v63, f)))); } else if (_585 === 10) { const v64: rt.i128 = rt.i128Cast(v53); rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v64)); - const _695: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v64, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_695)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i128Display(v64, f)))); } else { const v65: rt.isize = rt.u128Low(v53) | 0; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v65)); - const _705: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v65, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_705)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v65, f)))); } } else if (_5 === 5) { const buf6: Uint8Array = rt.bytes(4); @@ -1801,63 +1741,51 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): if (_725 === 0) { const v67: rt.u8 = v66 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v67)); - const _735: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v67, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_735)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u8Display(v67, f)))); } else if (_725 === 1) { const v68: rt.u16 = v66 & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v68)); - const _745: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v68, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_745)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u16Display(v68, f)))); } else if (_725 === 2) { const v69: rt.u32 = v66 as rt.u32; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v69)); - const _755: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v69, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_755)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u32Display(v69, f)))); } else if (_725 === 3) { const v70: rt.u64 = v66 as rt.u64; rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v70)); - const _765: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v70, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_765)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u64Display(v70, f)))); } else if (_725 === 4) { const v71: rt.u128 = v66 as rt.u128; rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v71)); - const _775: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v71, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_775)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u128Display(v71, f)))); } else if (_725 === 5) { const v72: rt.usize = v66; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v72)); - const _785: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v72, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_785)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v72, f)))); } else if (_725 === 6) { const v73: rt.i8 = (v66 << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v73)); - const _795: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v73, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_795)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i8Display(v73, f)))); } else if (_725 === 7) { const v74: rt.i16 = (v66 << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v74)); - const _805: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v74, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_805)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i16Display(v74, f)))); } else if (_725 === 8) { const v75: rt.i32 = v66 | 0; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v75)); - const _815: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v75, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_815)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i32Display(v75, f)))); } else if (_725 === 9) { const v76: rt.i64 = v66 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v76)); - const _825: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v76, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_825)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i64Display(v76, f)))); } else if (_725 === 10) { const v77: rt.i128 = v66 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v77)); - const _835: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v77, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_835)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i128Display(v77, f)))); } else { const v78: rt.isize = v66 | 0; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v78)); - const _845: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v78, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_845)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v78, f)))); } } else if (_5 === 6) { const buf7: Uint8Array = Uint8Array.of(0); @@ -1868,63 +1796,51 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): if (_865 === 0) { const v80: rt.u8 = v79 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v80)); - const _875: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v80, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_875)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u8Display(v80, f)))); } else if (_865 === 1) { const v81: rt.u16 = v79 & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v81)); - const _885: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v81, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_885)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u16Display(v81, f)))); } else if (_865 === 2) { const v82: rt.u32 = v79 >>> 0; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v82)); - const _895: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v82, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_895)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u32Display(v82, f)))); } else if (_865 === 3) { const v83: rt.u64 = rt.u64Cast(v79); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v83)); - const _905: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v83, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_905)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u64Display(v83, f)))); } else if (_865 === 4) { const v84: rt.u128 = rt.u128Cast(v79); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v84)); - const _915: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v84, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_915)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u128Display(v84, f)))); } else if (_865 === 5) { const v85: rt.usize = v79 >>> 0; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v85)); - const _925: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v85, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_925)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v85, f)))); } else if (_865 === 6) { const v86: rt.i8 = v79; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v86)); - const _935: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v86, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_935)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i8Display(v86, f)))); } else if (_865 === 7) { const v87: rt.i16 = v79 as rt.i16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v87)); - const _945: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v87, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_945)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i16Display(v87, f)))); } else if (_865 === 8) { const v88: rt.i32 = v79 as rt.i32; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v88)); - const _955: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v88, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_955)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i32Display(v88, f)))); } else if (_865 === 9) { const v89: rt.i64 = v79 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v89)); - const _965: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v89, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_965)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i64Display(v89, f)))); } else if (_865 === 10) { const v90: rt.i128 = v79 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v90)); - const _975: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v90, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_975)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i128Display(v90, f)))); } else { const v91: rt.isize = v79 as rt.isize; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v91)); - const _985: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v91, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_985)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v91, f)))); } } else if (_5 === 7) { const buf8: Uint8Array = rt.bytes(2); @@ -1935,63 +1851,51 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): if (_1005 === 0) { const v93: rt.u8 = v92 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v93)); - const _1015: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v93, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1015)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u8Display(v93, f)))); } else if (_1005 === 1) { const v94: rt.u16 = v92 & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v94)); - const _1025: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v94, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1025)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u16Display(v94, f)))); } else if (_1005 === 2) { const v95: rt.u32 = v92 >>> 0; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v95)); - const _1035: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v95, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1035)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u32Display(v95, f)))); } else if (_1005 === 3) { const v96: rt.u64 = rt.u64Cast(v92); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v96)); - const _1045: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v96, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1045)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u64Display(v96, f)))); } else if (_1005 === 4) { const v97: rt.u128 = rt.u128Cast(v92); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v97)); - const _1055: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v97, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1055)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u128Display(v97, f)))); } else if (_1005 === 5) { const v98: rt.usize = v92 >>> 0; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v98)); - const _1065: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v98, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1065)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v98, f)))); } else if (_1005 === 6) { const v99: rt.i8 = (v92 << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v99)); - const _1075: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v99, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1075)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i8Display(v99, f)))); } else if (_1005 === 7) { const v100: rt.i16 = v92; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v100)); - const _1085: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v100, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1085)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i16Display(v100, f)))); } else if (_1005 === 8) { const v101: rt.i32 = v92 as rt.i32; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v101)); - const _1095: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v101, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1095)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i32Display(v101, f)))); } else if (_1005 === 9) { const v102: rt.i64 = v92 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v102)); - const _1105: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v102, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1105)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i64Display(v102, f)))); } else if (_1005 === 10) { const v103: rt.i128 = v92 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v103)); - const _1115: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v103, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1115)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i128Display(v103, f)))); } else { const v104: rt.isize = v92 as rt.isize; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v104)); - const _1125: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v104, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1125)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v104, f)))); } } else if (_5 === 8) { const buf9: Uint8Array = rt.bytes(4); @@ -2002,63 +1906,51 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): if (_1145 === 0) { const v106: rt.u8 = v105 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v106)); - const _1155: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v106, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1155)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u8Display(v106, f)))); } else if (_1145 === 1) { const v107: rt.u16 = v105 & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v107)); - const _1165: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v107, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1165)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u16Display(v107, f)))); } else if (_1145 === 2) { const v108: rt.u32 = v105 >>> 0; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v108)); - const _1175: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v108, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1175)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u32Display(v108, f)))); } else if (_1145 === 3) { const v109: rt.u64 = rt.u64Cast(v105); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v109)); - const _1185: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v109, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1185)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u64Display(v109, f)))); } else if (_1145 === 4) { const v110: rt.u128 = rt.u128Cast(v105); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v110)); - const _1195: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v110, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1195)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u128Display(v110, f)))); } else if (_1145 === 5) { const v111: rt.usize = v105 >>> 0; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v111)); - const _1205: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v111, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1205)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v111, f)))); } else if (_1145 === 6) { const v112: rt.i8 = (v105 << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v112)); - const _1215: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v112, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1215)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i8Display(v112, f)))); } else if (_1145 === 7) { const v113: rt.i16 = (v105 << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v113)); - const _1225: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v113, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1225)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i16Display(v113, f)))); } else if (_1145 === 8) { const v114: rt.i32 = v105; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v114)); - const _1235: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v114, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1235)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i32Display(v114, f)))); } else if (_1145 === 9) { const v115: rt.i64 = v105 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v115)); - const _1245: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v115, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1245)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i64Display(v115, f)))); } else if (_1145 === 10) { const v116: rt.i128 = v105 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v116)); - const _1255: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v116, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1255)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i128Display(v116, f)))); } else { const v117: rt.isize = v105 as rt.isize; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v117)); - const _1265: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v117, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1265)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v117, f)))); } } else if (_5 === 9) { const buf10: Uint8Array = rt.bytes(8); @@ -2069,63 +1961,51 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): if (_1285 === 0) { const v119: rt.u8 = rt.i64Low(v118) & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v119)); - const _1295: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v119, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1295)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u8Display(v119, f)))); } else if (_1285 === 1) { const v120: rt.u16 = rt.i64Low(v118) & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v120)); - const _1305: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v120, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1305)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u16Display(v120, f)))); } else if (_1285 === 2) { const v121: rt.u32 = rt.i64Low(v118); rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v121)); - const _1315: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v121, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1315)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u32Display(v121, f)))); } else if (_1285 === 3) { const v122: rt.u64 = rt.u64Cast(v118); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v122)); - const _1325: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v122, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1325)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u64Display(v122, f)))); } else if (_1285 === 4) { const v123: rt.u128 = rt.u128Cast(v118); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v123)); - const _1335: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v123, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1335)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u128Display(v123, f)))); } else if (_1285 === 5) { const v124: rt.usize = rt.i64Low(v118); rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v124)); - const _1345: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v124, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1345)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v124, f)))); } else if (_1285 === 6) { const v125: rt.i8 = (rt.i64Low(v118) << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v125)); - const _1355: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v125, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1355)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i8Display(v125, f)))); } else if (_1285 === 7) { const v126: rt.i16 = (rt.i64Low(v118) << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v126)); - const _1365: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v126, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1365)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i16Display(v126, f)))); } else if (_1285 === 8) { const v127: rt.i32 = rt.i64Low(v118) | 0; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v127)); - const _1375: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v127, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1375)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i32Display(v127, f)))); } else if (_1285 === 9) { const v128: rt.i64 = v118; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v128)); - const _1385: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v128, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1385)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i64Display(v128, f)))); } else if (_1285 === 10) { const v129: rt.i128 = rt.i128Cast(v118); rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v129)); - const _1395: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v129, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1395)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i128Display(v129, f)))); } else { const v130: rt.isize = rt.i64Low(v118) | 0; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v130)); - const _1405: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v130, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1405)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v130, f)))); } } else if (_5 === 10) { const buf11: Uint8Array = rt.bytes(16); @@ -2136,63 +2016,51 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): if (_1425 === 0) { const v132: rt.u8 = rt.i128Low(v131) & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v132)); - const _1435: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v132, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1435)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u8Display(v132, f)))); } else if (_1425 === 1) { const v133: rt.u16 = rt.i128Low(v131) & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v133)); - const _1445: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v133, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1445)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u16Display(v133, f)))); } else if (_1425 === 2) { const v134: rt.u32 = rt.i128Low(v131); rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v134)); - const _1455: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v134, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1455)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u32Display(v134, f)))); } else if (_1425 === 3) { const v135: rt.u64 = rt.u64Cast(v131); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v135)); - const _1465: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v135, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1465)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u64Display(v135, f)))); } else if (_1425 === 4) { const v136: rt.u128 = rt.u128Cast(v131); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v136)); - const _1475: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v136, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1475)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u128Display(v136, f)))); } else if (_1425 === 5) { const v137: rt.usize = rt.i128Low(v131); rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v137)); - const _1485: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v137, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1485)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v137, f)))); } else if (_1425 === 6) { const v138: rt.i8 = (rt.i128Low(v131) << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v138)); - const _1495: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v138, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1495)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i8Display(v138, f)))); } else if (_1425 === 7) { const v139: rt.i16 = (rt.i128Low(v131) << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v139)); - const _1505: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v139, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1505)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i16Display(v139, f)))); } else if (_1425 === 8) { const v140: rt.i32 = rt.i128Low(v131) | 0; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v140)); - const _1515: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v140, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1515)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i32Display(v140, f)))); } else if (_1425 === 9) { const v141: rt.i64 = rt.i64Cast(v131); rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v141)); - const _1525: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v141, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1525)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i64Display(v141, f)))); } else if (_1425 === 10) { const v142: rt.i128 = v131; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v142)); - const _1535: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v142, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1535)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i128Display(v142, f)))); } else { const v143: rt.isize = rt.i128Low(v131) | 0; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v143)); - const _1545: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v143, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1545)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v143, f)))); } } else { const buf12: Uint8Array = rt.bytes(4); @@ -2203,63 +2071,51 @@ export function cast(from: rt.u8, to: rt.u8, data: Uint8Array, out: rt.ByteVec): if (_1565 === 0) { const v145: rt.u8 = v144 & 0xff; rt.byteVecExtendFromSlice(out, rt.u8ToBeBytes(v145)); - const _1575: string = rt.fmtToString((f: rt.Formatter) => rt.u8Display(v145, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1575)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u8Display(v145, f)))); } else if (_1565 === 1) { const v146: rt.u16 = v144 & 0xffff; rt.byteVecExtendFromSlice(out, rt.u16ToBeBytes(v146)); - const _1585: string = rt.fmtToString((f: rt.Formatter) => rt.u16Display(v146, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1585)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u16Display(v146, f)))); } else if (_1565 === 2) { const v147: rt.u32 = v144 >>> 0; rt.byteVecExtendFromSlice(out, rt.u32ToBeBytes(v147)); - const _1595: string = rt.fmtToString((f: rt.Formatter) => rt.u32Display(v147, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1595)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u32Display(v147, f)))); } else if (_1565 === 3) { const v148: rt.u64 = rt.u64Cast(v144); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(v148)); - const _1605: string = rt.fmtToString((f: rt.Formatter) => rt.u64Display(v148, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1605)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u64Display(v148, f)))); } else if (_1565 === 4) { const v149: rt.u128 = rt.u128Cast(v144); rt.byteVecExtendFromSlice(out, rt.u128ToBeBytes(v149)); - const _1615: string = rt.fmtToString((f: rt.Formatter) => rt.u128Display(v149, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1615)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.u128Display(v149, f)))); } else if (_1565 === 5) { const v150: rt.usize = v144 >>> 0; rt.byteVecExtendFromSlice(out, rt.usizeToBeBytes(v150)); - const _1625: string = rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v150, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1625)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.usizeDisplay(v150, f)))); } else if (_1565 === 6) { const v151: rt.i8 = (v144 << 24) >> 24; rt.byteVecExtendFromSlice(out, rt.i8ToBeBytes(v151)); - const _1635: string = rt.fmtToString((f: rt.Formatter) => rt.i8Display(v151, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1635)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i8Display(v151, f)))); } else if (_1565 === 7) { const v152: rt.i16 = (v144 << 16) >> 16; rt.byteVecExtendFromSlice(out, rt.i16ToBeBytes(v152)); - const _1645: string = rt.fmtToString((f: rt.Formatter) => rt.i16Display(v152, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1645)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i16Display(v152, f)))); } else if (_1565 === 8) { const v153: rt.i32 = v144 as rt.i32; rt.byteVecExtendFromSlice(out, rt.i32ToBeBytes(v153)); - const _1655: string = rt.fmtToString((f: rt.Formatter) => rt.i32Display(v153, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1655)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i32Display(v153, f)))); } else if (_1565 === 9) { const v154: rt.i64 = v144 as rt.i64; rt.byteVecExtendFromSlice(out, rt.i64ToBeBytes(v154)); - const _1665: string = rt.fmtToString((f: rt.Formatter) => rt.i64Display(v154, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1665)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i64Display(v154, f)))); } else if (_1565 === 10) { const v155: rt.i128 = v144 as rt.i128; rt.byteVecExtendFromSlice(out, rt.i128ToBeBytes(v155)); - const _1675: string = rt.fmtToString((f: rt.Formatter) => rt.i128Display(v155, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1675)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.i128Display(v155, f)))); } else { const v156: rt.isize = v144; rt.byteVecExtendFromSlice(out, rt.isizeToBeBytes(v156)); - const _1685: string = rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v156, f)); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_1685)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtToString((f: rt.Formatter) => rt.isizeDisplay(v156, f)))); } } } diff --git a/ts/fixtures/lang/expected/iters.ts b/ts/fixtures/lang/expected/iters.ts index 50f7fa499..fda298c02 100644 --- a/ts/fixtures/lang/expected/iters.ts +++ b/ts/fixtures/lang/expected/iters.ts @@ -16,12 +16,11 @@ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { b0: { const _4: rt.u8 = rt.u8Rem(kind, 8); if (_4 === 0) { - const doubled: rt.ByteVec = rt.iterToByteVec(rt.iterFilter(rt.iterMap(rt.iterSlice(data), (_216: rt.u8): rt.u8 => { + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(rt.iterFilter(rt.iterMap(rt.iterSlice(data), (_216: rt.u8): rt.u8 => { return rt.u8Div(_216, 2); }), (b11: rt.u8): boolean => { return rt.u8Rem(b11, 3) !== 0; - })); - rt.byteVecExtendFromSlice(out, rt.byteVecView(doubled)); + })))); const iterS: rt.u16[] = rt.iterToArray(rt.iterFilterMap(rt.iterSlice(data), (_217: rt.u8): rt.u16 | undefined => { const b12: rt.u8 = _217; return rt.thenSome(b12 < 100, rt.u16Mul(b12 as rt.u16, 200)); @@ -57,12 +56,10 @@ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { } if (_4 === 2) { const _56: [Uint8Array, Uint8Array] = rt.sliceSplitAt(data, rt.usizeDiv(data.length, 2)); - const zipped: rt.ByteVec = rt.iterToByteVec(rt.iterMap(rt.iterZip(rt.iterSlice(_56[0]), rt.iterRev(rt.iterSlice(_56[1]))), (_215: [rt.u8, rt.u8]): rt.u8 => { + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(rt.iterMap(rt.iterZip(rt.iterSlice(_56[0]), rt.iterRev(rt.iterSlice(_56[1]))), (_215: [rt.u8, rt.u8]): rt.u8 => { return _215[0] ^ _215[1]; - })); - rt.byteVecExtendFromSlice(out, rt.byteVecView(zipped)); - const chained: rt.ByteVec = rt.iterToByteVec(rt.iterRev(rt.iterChain(rt.iterSlice(_56[0]), rt.iterSlice(_56[1])))); - rt.byteVecExtendFromSlice(out, rt.byteVecView(chained)); + })))); + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(rt.iterRev(rt.iterChain(rt.iterSlice(_56[0]), rt.iterSlice(_56[1])))))); } else if (_4 === 3) { const taken: rt.ByteVec = rt.iterToByteVec(rt.iterTakeWhile(rt.iterSlice(data), (_212: rt.u8): boolean => { return _212 !== 0; @@ -78,10 +75,9 @@ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { rt.byteVecExtendFromSlice(out, rt.byteVecView(mapped)); } else if (_4 === 4) { const words: rt.ByteVec[] = chunksByZero$ChunksByZero_u8s(data); - const flat: rt.ByteVec = rt.iterToByteVec(rt.iterFlatMap(rt.iterSlice(words), (w: rt.ByteVec): rt.Iter => { + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(rt.iterFlatMap(rt.iterSlice(words), (w: rt.ByteVec): rt.Iter => { return rt.iterRev(rt.iterSlice(rt.byteVecView(w))); - })); - rt.byteVecExtendFromSlice(out, rt.byteVecView(flat)); + })))); rt.iterExtendBytes(out, rt.iterRev(rt.iterFlatten(rt.iterMap(rt.iterSlice(words), (w2: rt.ByteVec): rt.Iter => { return rt.iterMap(rt.iterSlice(rt.byteVecView(w2)), (_211: rt.u8): rt.u8 => { return rt.u8WrappingAdd(_211, 3); @@ -116,8 +112,7 @@ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { } if (_4 === 6) { const it2: rt.Iter = rt.iterSlice(data); - const firsts: rt.ByteVec = rt.iterToByteVec(rt.iterTake(it2, 2)); - rt.byteVecExtendFromSlice(out, rt.byteVecView(firsts)); + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(rt.iterTake(it2, 2)))); rt.byteVecPush(out, it2.len() & 0xff); const _152: rt.u8 | undefined = rt.iterToOption(it2.nextBack()); if (_152 === undefined) { @@ -125,8 +120,7 @@ export function adaptors(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void { } else { rt.byteVecPush(out, _152); } - const rest: rt.ByteVec = rt.iterToByteVec(rt.iterStepBy(rt.iterRev(it2), 3)); - rt.byteVecExtendFromSlice(out, rt.byteVecView(rest)); + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(rt.iterStepBy(rt.iterRev(it2), 3)))); } else { const pairs: Uint8Array[] = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (_2: rt.u8): Uint8Array => { const b3: rt.u8 = _2; @@ -311,8 +305,7 @@ export function consumers(kind: rt.u8, data: Uint8Array, out: rt.ByteVec): void return rt.Ok(b3); }), (values__: rt.Iter) => rt.iterToByteVec(values__)); if (parsed.ok) { - const v: rt.ByteVec = parsed.value; - rt.byteVecExtendFromSlice(out, rt.byteVecView(v)); + rt.byteVecExtendFromSlice(out, rt.byteVecView(parsed.value)); } else { rt.byteVecPush(out, parsed.error); } @@ -356,8 +349,7 @@ export function ranges(data: Uint8Array, out: rt.ByteVec): void { if (_47 === rt.DONE) { const _56: rt.Range = new rt.Range(a, b); rt.byteVecPush(out, rt.optionUnwrapOr(rt.iterNth(_56, 5), 238)); - const top: rt.ByteVec = rt.iterToByteVec(new rt.RangeInclusive(rt.max(a, 250), 255, rt.u8Step)); - rt.byteVecExtendFromSlice(out, rt.byteVecView(top)); + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(new rt.RangeInclusive(rt.max(a, 250), 255, rt.u8Step)))); const inclusive: rt.RangeInclusive = new rt.RangeInclusive(a, b, rt.u8Step); rt.byteVecPush(out, rt.rangeInclusiveStart(inclusive)); rt.byteVecPush(out, rt.rangeInclusiveEnd(inclusive)); @@ -509,13 +501,12 @@ export function options(data: Uint8Array, out: rt.ByteVec): void { while (true) { const _15: rt.u8 | undefined | rt.Done = iter.next(); if (_15 === rt.DONE) { - const flat: rt.ByteVec = rt.iterToByteVec(rt.iterFlatten(rt.iterMap(rt.iterSlice(data), (b4: rt.u8): rt.u8 | undefined => { + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(rt.iterFlatten(rt.iterMap(rt.iterSlice(data), (b4: rt.u8): rt.u8 | undefined => { if (!(rt.u8Rem(b4, 3) === 0)) { return b4; } return undefined; - }), (value: rt.u8 | undefined) => rt.iterOption(value))); - rt.byteVecExtendFromSlice(out, rt.byteVecView(flat)); + }), (value: rt.u8 | undefined) => rt.iterOption(value))))); rt.byteVecPush(out, rt.iterCount(rt.iterFilter(rt.iterSlice(all), (o: rt.u8 | undefined): boolean => { return o !== undefined; })) & 0xff); @@ -534,11 +525,10 @@ export function options(data: Uint8Array, out: rt.ByteVec): void { rt.iterEmpty(); rt.iterExtendBytes(out, rt.iterChain(_57, rt.iterEmpty())); let n: rt.u8 = 0; - const counted: rt.ByteVec = rt.iterToByteVec(rt.iterFromFn((): rt.u8 | undefined => { + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(rt.iterFromFn((): rt.u8 | undefined => { n = rt.u8Add(n, 1); return rt.thenSome(n < 4, n); - })); - rt.byteVecExtendFromSlice(out, rt.byteVecView(counted)); + })))); const iter3: Gaps.Gaps = { data, at: 0 }; while (true) { const _70: rt.u8 | undefined | rt.Done = Gaps.next$Iterator(iter3); @@ -595,14 +585,11 @@ export function own(data: Uint8Array, out: rt.ByteVec): void { } } rt.byteVecPush(out, down.left); - const evens: rt.ByteVec = rt.iterToByteVec(rt.iterFrom({ inner: rt.iterSlice(data) }, (it: Evens.Evens) => Evens.next$Iterator(it))); - rt.byteVecExtendFromSlice(out, rt.byteVecView(evens)); + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(rt.iterFrom({ inner: rt.iterSlice(data) }, (it: Evens.Evens) => Evens.next$Iterator(it))))); const byRef: Evens.Evens = { inner: rt.iterSlice(rt.sliceRange(data, rt.min(data.length, 1))) }; - const firsts: rt.ByteVec = rt.iterToByteVec(rt.iterTake(rt.iterFrom(byRef, (it: Evens.Evens) => Evens.next$Iterator(it)), 2)); - rt.byteVecExtendFromSlice(out, rt.byteVecView(firsts)); + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(rt.iterTake(rt.iterFrom(byRef, (it: Evens.Evens) => Evens.next$Iterator(it)), 2)))); rt.byteVecPush(out, rt.iterCount(rt.iterFrom(byRef, (it: Evens.Evens) => Evens.next$Iterator(it))) & 0xff); - const halves: rt.ByteVec = rt.iterToByteVec(rt.iterFrom(new Halving.Halving({ value: left }), (it: Halving.Halving) => Halving.next$Iterator_u8(it))); - rt.byteVecExtendFromSlice(out, rt.byteVecView(halves)); + rt.byteVecExtendFromSlice(out, rt.byteVecView(rt.iterToByteVec(rt.iterFrom(new Halving.Halving({ value: left }), (it: Halving.Halving) => Halving.next$Iterator_u8(it))))); rt.byteVecExtendFromSlice(out, rt.u64ToBeBytes(rt.iterSum(rt.iterFrom(new Halving.Halving({ value: rt.u64Mul(left as rt.u64, 4294967297) }), (it: Halving.Halving) => Halving.next$Iterator_u64(it)), rt.u64Add, 0))); return; } @@ -643,8 +630,7 @@ export function values(data: Uint8Array, out: rt.ByteVec): void { const _39: rt.Fmt = (f: rt.Formatter) => Doubled.fmt$Debug(arg, f); const arg2 = { _0: rt.sliceRange(data, 0, rt.min(data.length, 2)) }; const args2: rt.Fmt[] = [_39, (f: rt.Formatter) => Doubled.fmt$Debug(arg2, f)]; - const printed: string = rt.fmtFormat([args2[0], "|", rt.fmtSpec({ alternate: true }, args2[1])]); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(printed)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtFormat([args2[0], "|", rt.fmtSpec({ alternate: true }, args2[1])]))); const tags: Tag.Tag[] = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (_2: rt.u8): Tag.Tag => { const b3: rt.u8 = _2; return { bytes: rt.sliceToByteVec(Uint8Array.of(b3, ~b3 & 0xff)) }; @@ -667,10 +653,9 @@ export function values(data: Uint8Array, out: rt.ByteVec): void { rt.iterExtendBytes(out, rt.iterMap(rt.iterMap(rt.iterSlice(bumps), rt.copy), (b6: Bumped.Bumped): rt.u8 => { return b6._0; })); - const wrapped: Wrapper.Wrapper[] = rt.iterToArray(rt.iterMap(rt.iterSlice(data), (_23: rt.u8): Wrapper.Wrapper => { + rt.iterExtendBytes(out, rt.iterMap(rt.iterMap(rt.iterSlice(rt.iterToArray(rt.iterMap(rt.iterSlice(data), (_23: rt.u8): Wrapper.Wrapper => { return new Wrapper.Wrapper({ _0: _23 }); - })); - rt.iterExtendBytes(out, rt.iterMap(rt.iterMap(rt.iterSlice(wrapped), Wrapper.clone$Clone_Bumped), (w: Wrapper.Wrapper): rt.u8 => { + }))), Wrapper.clone$Clone_Bumped), (w: Wrapper.Wrapper): rt.u8 => { return w._0._0; })); return; diff --git a/ts/fixtures/lang/expected/shapes.ts b/ts/fixtures/lang/expected/shapes.ts index 52aa193f7..ddac758e9 100644 --- a/ts/fixtures/lang/expected/shapes.ts +++ b/ts/fixtures/lang/expected/shapes.ts @@ -245,8 +245,7 @@ export function order(data: Uint8Array, out: rt.ByteVec): void { const _102: Shape.Shape = taken; const _103: rt.usize = sum; const args2: rt.Fmt[] = [(f: rt.Formatter) => Shape.fmt$Debug(rect, f), (f: rt.Formatter) => Shape.fmt$Debug(line, f), (f: rt.Formatter) => Pair.fmt$Debug(pair, f), (f: rt.Formatter) => Point.fmt$Debug(read, f), (f: rt.Formatter) => Moved.fmt$Debug(updated, f), (f: rt.Formatter) => Shape.fmt$Debug(_102, f), (f: rt.Formatter) => rt.usizeDisplay(_64, f), (f: rt.Formatter) => rt.usizeDisplay(_63, f), (f: rt.Formatter) => rt.usizeDisplay(_103, f), (f: rt.Formatter) => rt.fmtList(_82, f, rt.u8Display)]; - const text: string = rt.fmtFormat([args2[0], " ", args2[1], " ", args2[2], " ", args2[3], " ", args2[4], " ", args2[5], " ", args2[6], " ", args2[7], " ", args2[8], " ", args2[9]]); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(text)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtFormat([args2[0], " ", args2[1], " ", args2[2], " ", args2[3], " ", args2[4], " ", args2[5], " ", args2[6], " ", args2[7], " ", args2[8], " ", args2[9]]))); indexed(data, out); return; } @@ -1049,8 +1048,7 @@ export function patterns(data: Uint8Array, out: rt.ByteVec): void { rt.byteVecExtendFromSlice(out, Uint8Array.of(a2, b3, (parsed as { ok: true; value: rt.u8 }).value, early(a2))); const arg = ([parsed] as [rt.Result])[0]; const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.fmtResult(arg, f, rt.u8Display, (value: Void.Void, f: rt.Formatter) => Void.fmt$Debug(value, f))]; - const _166: string = rt.fmtFormat([args2[0]]); - rt.byteVecExtendFromSlice(out, rt.stringAsBytes(_166)); + rt.byteVecExtendFromSlice(out, rt.stringAsBytes(rt.fmtFormat([args2[0]]))); return; } b2: { diff --git a/ts/fixtures/task/expected/kio.Producer.ts b/ts/fixtures/task/expected/kio.Producer.ts index 433a1bbfa..8a6bf4134 100644 --- a/ts/fixtures/task/expected/kio.Producer.ts +++ b/ts/fixtures/task/expected/kio.Producer.ts @@ -20,8 +20,7 @@ export class Producer { } function new_(): Producer { - const _2: rt.u64[] = []; - return new Producer({ state: new rt.Arc(new rt.Mutex({ queue: _2, closed: false, producers: 1, waiters: WaiterList.new() })) }); + return new Producer({ state: new rt.Arc(new rt.Mutex({ queue: [], closed: false, producers: 1, waiters: WaiterList.new() })) }); } /** Queue `value` and wake every consumer, after releasing the lock. */ diff --git a/ts/fixtures/task/expected/kio.WaiterList.ts b/ts/fixtures/task/expected/kio.WaiterList.ts index 88457120c..07264c8ef 100644 --- a/ts/fixtures/task/expected/kio.WaiterList.ts +++ b/ts/fixtures/task/expected/kio.WaiterList.ts @@ -97,8 +97,7 @@ export function wake(self: WaiterList): void { if (_6 === rt.DONE) { return; } - const entry: rt.Weak = _6; - const _10: rt.Arc | undefined = rt.weakUpgrade(entry); + const _10: rt.Arc | undefined = rt.weakUpgrade(_6); if (_10 !== undefined) { unwind = 15; waker = _10; diff --git a/ts/fixtures/task/expected/kio.ts b/ts/fixtures/task/expected/kio.ts index e75a807ba..d6d5ca6dc 100644 --- a/ts/fixtures/task/expected/kio.ts +++ b/ts/fixtures/task/expected/kio.ts @@ -8,8 +8,7 @@ import type * as Waiter from "./kio.Waiter.ts"; /** A future from a poll function that receives a [`Waiter`]. */ export function wait$recv_closure0_closure0_Option_u64(poll: (a0: Waiter.Waiter) => rt.Poll): Pending.Pending<(a0: Waiter.Waiter) => rt.Poll> { - const _2: (a0: Waiter.Waiter) => rt.Poll = poll; - return new Pending.Pending({ poll: _2, park: Park.default$Default() }); + return new Pending.Pending({ poll, park: Park.default$Default() }); } export class recvFuture { diff --git a/ts/src/lower/mir/mod.rs b/ts/src/lower/mir/mod.rs index 398935579..b01f367fe 100644 --- a/ts/src/lower/mir/mod.rs +++ b/ts/src/lower/mir/mod.rs @@ -317,7 +317,12 @@ impl<'m, 'b, 'a, 'tcx> Fx<'m, 'b, 'a, 'tcx> { match &term.kind { TerminatorKind::SwitchInt { discr, .. } => self.operand_use(discr), TerminatorKind::Return => self.uses[mir::RETURN_PLACE] += 1, - TerminatorKind::Drop { place, .. } => self.place_use(*place), + // A drop JS can't see reads nothing. + TerminatorKind::Drop { place, .. } => { + if self.b.t.drops(place.ty(&mir.local_decls, self.tcx).ty) { + self.place_use(*place); + } + } TerminatorKind::Call { func, args, diff --git a/ts/src/lower/mir/step.rs b/ts/src/lower/mir/step.rs index 773174e46..823dcda9e 100644 --- a/ts/src/lower/mir/step.rs +++ b/ts/src/lower/mir/step.rs @@ -87,7 +87,11 @@ impl<'tcx> Fx<'_, '_, '_, 'tcx> { } } match &data.terminator().kind { - TerminatorKind::Drop { place, .. } if let Some(local) = place.as_local() => { + // Counted as `uses` counts it: only a drop JS sees. + TerminatorKind::Drop { place, .. } + if let Some(local) = place.as_local() + && self.b.t.drops(mir.local_decls[local].ty) => + { *reads.entry(local).or_default() += 1; } TerminatorKind::Call { From 4e47257872b9aef31ea2105a309d56385c10d4b1 Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Mon, 26 Oct 2026 07:47:30 -0700 Subject: [PATCH 05/12] chore(quest): rewrite ts-mir-size to what remains Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0115AT2ue6x9cT5e5J9SZtCn --- quest/m2/ts-mir-size.md | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/quest/m2/ts-mir-size.md b/quest/m2/ts-mir-size.md index 7c30a0e17..d30c1a9b4 100644 --- a/quest/m2/ts-mir-size.md +++ b/quest/m2/ts-mir-size.md @@ -3,23 +3,25 @@ ## Goal [rust2-ts](/ts/README.md)'s bundles on `just ts bench` are no larger than the THIR -lowering's were, without giving up the speed MIR gained: the codec's at most 27483 -bytes minified and 8437 gzipped, and the async handoff's at most 10901 and 3446. +lowering's were, without giving up the speed MIR gained: the codec's at most 30629 +bytes minified and 9422 gzipped, and the async handoff's at most 10949 and 3458. ## Plan -At the move to MIR, the codec's bundle was 27750 bytes minified and 8876 gzipped (+1%, -+5%), and the async handoff's 18258 and 3993 (+67%, +16%), against THIR's numbers -above. Each candidate is measured on the bench's sizes and timings before it lands: +The codec's bundle is 29996 bytes minified and 9545 gzipped (+1.3% gzipped), and the +async handoff's 15119 and 3756 (+38%, +8.6%), against THIR's numbers above, built from +the same fixtures. Each candidate is measured on the bench's sizes and timings before +it lands: -- A coroutine's class, about 520 bytes minified each against about 140 for a THIR - generator: a base class in the runtime for the state and `poll` scaffolding, fields - only for what lives across an `.await`, and a resume function structured where the - graph allows (a dispatch at each loop header it enters) rather than a `switch` over - every block. Generators stay out: they measured 1.4-5.5x slower on the handoff. -- Tuple temporaries a destructuring `const [a, b] = ..` would avoid, and the `let` - list at the top of each function, where a local assigned once could be declared at - its assignment. +- A coroutine's class, about 330 bytes minified each against about 140 for a THIR + generator, for the drop, the checks for a resume after it finished, and the + `try`/`catch` that poisons it and drops what it holds on a panic, where a THIR + generator had a `finally` and the runtime's one `Async` class: a base class in the + runtime for that scaffolding, or one field for saved locals that are never live at + once (the layout's `storage_conflicts`), each timed on V8 and JSC, since both change + what a field holds. Generators and closures stay out: they measured 1.4-5.5x and + 1.3-1.8x slower on the handoff. +- The handoff's code outside the classes, about 140 bytes gzipped over THIR's. - The codec's `fill`, `encodeFrames`, and `decodeSplit`, whose blocks nest deeper than THIR's loops did. From 31e49b6a60423a6550b75f552cddcb448f358bfb Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Mon, 26 Oct 2026 07:47:50 -0700 Subject: [PATCH 06/12] docs(ts): the bundle size cost MIR has left Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0115AT2ue6x9cT5e5J9SZtCn --- ts/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/README.md b/ts/README.md index 4516f2aa5..29570f608 100644 --- a/ts/README.md +++ b/ts/README.md @@ -255,8 +255,8 @@ they need. the coroutine transform's state machines, a class each. Against the THIR lowering it replaced, MIR closes about 1,100 of the 1,400 drop refusals in moq-net's census, and runs `just ts bench`'s codec 2-6% faster at the geometric mean and the async handoff - 1.4-5.9x faster at depths 1 to 16 in Node, Bun, and Chrome, for 4% more gzip on the - codec's bundle and 16% on the async fixture's + 1.4-5.9x faster at depths 1 to 16 in Node, Bun, and Chrome, for 1% more gzip on the + codec's bundle and 9% on the async fixture's ([size](/quest/m2/ts-mir-size.md)). Blocks become nested blocks, loops, and `if`s by Ramsey's "Beyond Relooper", except a coroutine's resume function, which enters loops in the middle and becomes a loop over a `switch` on the next block. Temporaries From 8853eb068a33c83de8179889d3fe214ec04ebd3c Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Mon, 26 Oct 2026 09:01:42 -0700 Subject: [PATCH 07/12] fix(ts): public coroutine fields, which keep Node's async handoff as fast A `this.#field` access is two bytecodes in V8 to a public field's one, so each level's `poll` grew 19% and Node 24 inlined fewer of them, 5% slower at depth 16. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0115AT2ue6x9cT5e5J9SZtCn --- ts/fixtures/task/expected/kio.ts | 34 +- ts/fixtures/task/expected/model.ts | 1336 ++++++++++++++-------------- ts/src/lower/mir/coroutine.rs | 10 +- ts/src/print.rs | 6 +- ts/src/program.rs | 5 +- 5 files changed, 693 insertions(+), 698 deletions(-) diff --git a/ts/fixtures/task/expected/kio.ts b/ts/fixtures/task/expected/kio.ts index d6d5ca6dc..1381b58ac 100644 --- a/ts/fixtures/task/expected/kio.ts +++ b/ts/fixtures/task/expected/kio.ts @@ -12,52 +12,52 @@ export function wait$recv_closure0_closure0_Option_u64(poll: (a0: Waiter.Waiter) } export class recvFuture { - #state: number = 0; - #self: Consumer.Consumer; - #awaitee!: Pending.Pending<(a0: Waiter.Waiter) => rt.Poll>; + state: number = 0; + self: Consumer.Consumer; + awaitee!: Pending.Pending<(a0: Waiter.Waiter) => rt.Poll>; constructor(self: Consumer.Consumer) { - this.#self = self; + this.self = self; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - const self: Consumer.Consumer = this.#self; - this.#awaitee = wait$recv_closure0_closure0_Option_u64((waiter: Waiter.Waiter): rt.Poll => { + const self: Consumer.Consumer = this.self; + this.awaitee = wait$recv_closure0_closure0_Option_u64((waiter: Waiter.Waiter): rt.Poll => { return Consumer.pollRecv(self, waiter); }); - } else if (this.#state === 1) { + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _7: rt.Poll = Pending.poll$Future_recv_closure0_closure0(this.#awaitee, _2); + const _7: rt.Poll = Pending.poll$Future_recv_closure0_closure0(this.awaitee, _2); if (_7 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _7; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } diff --git a/ts/fixtures/task/expected/model.ts b/ts/fixtures/task/expected/model.ts index cffe63b35..6d8b1f21b 100644 --- a/ts/fixtures/task/expected/model.ts +++ b/ts/fixtures/task/expected/model.ts @@ -20,37 +20,37 @@ export function sum(rx: Consumer.Consumer, guard: Guard.Guard): rt.Future; + state: number = 0; + rx: Consumer.Consumer; + guard: Guard.Guard; + _rx!: Consumer.Consumer; + _guard!: Guard.Guard; + inner!: Guard.Guard; + total!: rt.u64; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer, guard: Guard.Guard) { - this.#rx = rx; - this.#guard = guard; + this.rx = rx; + this.guard = guard; } [Symbol.dispose](): void { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 17; - rt.drop(this.#rx); + rt.drop(this.rx); unwind = 0; - rt.drop(this.#guard); - } else if (this.#state === 3) { + rt.drop(this.guard); + } else if (this.state === 3) { unwind = 10; - rt.drop(this.#awaitee); + rt.drop(this.awaitee); unwind = 12; - rt.drop(this.#inner); + rt.drop(this.inner); unwind = 13; - rt.drop(this.#guard$2); + rt.drop(this._guard); unwind = 0; - rt.drop(this.#rx$2); + rt.drop(this._rx); } } catch (e) { b0: { @@ -59,17 +59,17 @@ export class sumFuture { throw e; } if (unwind === 10) { - rt.drop(this.#inner); + rt.drop(this.inner); } else if (unwind !== 12) { if (unwind === 13) { break b1; } - rt.drop(this.#guard); + rt.drop(this.guard); break b0; } - rt.drop(this.#guard$2); + rt.drop(this._guard); } - rt.drop(this.#rx$2); + rt.drop(this._rx); } throw e; } @@ -82,18 +82,18 @@ export class sumFuture { l0: while (true) { switch (bb0) { case 0: - if (this.#state === 0) { + if (this.state === 0) { unwind = 33; - this.#rx$2 = this.#rx; - this.#guard$2 = this.#guard; - this.#inner = Guard.new(rt.u32Add(this.#guard$2.id, 100), Log.clone$Clone(this.#guard$2.log)); - this.#total = 0; + this._rx = this.rx; + this._guard = this.guard; + this.inner = Guard.new(rt.u32Add(this._guard.id, 100), Log.clone$Clone(this._guard.log)); + this.total = 0; bb0 = 4; continue l0; } - if (this.#state === 1) { + if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } else { bb0 = 7; @@ -101,44 +101,44 @@ export class sumFuture { } case 4: unwind = 32; - this.#awaitee = new recvFuture(this.#rx$2); + this.awaitee = new recvFuture(this._rx); bb0 = 7; continue l0; case 7: unwind = 31; - const _11: rt.Poll = this.#awaitee.poll(_2); + const _11: rt.Poll = this.awaitee.poll(_2); if (_11 !== rt.Pending) { unwind = 32; const result: rt.u64 | undefined = _11; - rt.drop(this.#awaitee); + rt.drop(this.awaitee); if (result !== undefined) { const value: rt.u64 = result; if (!(value !== 99)) { - const arg2 = ([this.#guard$2.id] as [rt.u32])[0]; + const arg2 = ([this._guard.id] as [rt.u32])[0]; const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg2, f)]; rt.panicFmt(["g", args2[0], " poisoned"]); } else { - const arg = this.#guard$2.id; + const arg = this._guard.id; const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg, f), (f: rt.Formatter) => rt.u64Display(value, f)]; const _32: string = rt.fmtFormat(["g", args4[0], " got ", args4[1]]); - Log.note(this.#inner.log, _32); - this.#total = rt.u64Add(this.#total, value); + Log.note(this.inner.log, _32); + this.total = rt.u64Add(this.total, value); bb0 = 4; continue l0; } } else { unwind = 33; - const _47: rt.u64 = this.#total; - rt.drop(this.#inner); + const _47: rt.u64 = this.total; + rt.drop(this.inner); unwind = 34; - rt.drop(this.#guard$2); + rt.drop(this._guard); unwind = 35; - rt.drop(this.#rx$2); - this.#state = 1; + rt.drop(this._rx); + this.state = 1; return _47; } } else { - this.#state = 3; + this.state = 3; return rt.Pending; } } @@ -151,7 +151,7 @@ export class sumFuture { throw e; } if (unwind === 31) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } else if (unwind !== 32) { if (unwind === 33) { break b3; @@ -161,13 +161,13 @@ export class sumFuture { } break b1; } - rt.drop(this.#inner); + rt.drop(this.inner); } - rt.drop(this.#guard$2); + rt.drop(this._guard); } - rt.drop(this.#rx$2); + rt.drop(this._rx); } - this.#state = 2; + this.state = 2; throw e; } } @@ -186,43 +186,43 @@ export function blocks(rx: Consumer.Consumer, guard: Guard.Guard, moves: boolean } export class blocksFuture { - #state: number = 0; - #rx: Consumer.Consumer; - #guard: Guard.Guard; - #moves: boolean; - #rx$2!: Consumer.Consumer; - #guard$2!: Guard.Guard; - #moves$2!: boolean; - #first!: Guard.Guard; - #second!: Guard.Guard; - #waited!: rt.u64; - #saved!: Guard.Guard; - #awaitee!: rt.Future; - #slots!: Guard.Guard[]; - #saved$2!: Guard.Guard; - #awaitee$2!: rt.Future; - #tally!: Tally.Tally; - #saved$3!: Guard.Guard; - #saved$4!: rt.u32; - #awaitee$3!: rt.Future; - #mark!: Mark.Mark; - #replaced!: rt.u32; - #awaitee$4!: rt.Future; - #nested!: Inner.Inner; - #chosen!: Guard.Guard; - #awaitee$5!: rt.Future; - #saved$5!: boolean; - #saved$6!: boolean; - #saved$7!: boolean; - #saved$8!: boolean; - #saved$9!: boolean; - #saved$10!: boolean; - #saved$11!: boolean; + state: number = 0; + rx: Consumer.Consumer; + guard: Guard.Guard; + moves: boolean; + _rx!: Consumer.Consumer; + _guard!: Guard.Guard; + _moves!: boolean; + first!: Guard.Guard; + second!: Guard.Guard; + waited!: rt.u64; + saved!: Guard.Guard; + awaitee!: rt.Future; + slots!: Guard.Guard[]; + _saved!: Guard.Guard; + _awaitee!: rt.Future; + tally!: Tally.Tally; + _saved$2!: Guard.Guard; + _saved$3!: rt.u32; + _awaitee$2!: rt.Future; + mark!: Mark.Mark; + replaced!: rt.u32; + _awaitee$3!: rt.Future; + nested!: Inner.Inner; + chosen!: Guard.Guard; + _awaitee$4!: rt.Future; + _saved$4!: boolean; + _saved$5!: boolean; + _saved$6!: boolean; + _saved$7!: boolean; + _saved$8!: boolean; + _saved$9!: boolean; + _saved$10!: boolean; constructor(rx: Consumer.Consumer, guard: Guard.Guard, moves: boolean) { - this.#rx = rx; - this.#guard = guard; - this.#moves = moves; + this.rx = rx; + this.guard = guard; + this.moves = moves; } [Symbol.dispose](): void { @@ -230,70 +230,70 @@ export class blocksFuture { try { b0: { b1: { - if (this.#state === 0) { + if (this.state === 0) { unwind = 82; - rt.drop(this.#rx); + rt.drop(this.rx); unwind = 0; - rt.drop(this.#guard); + rt.drop(this.guard); return; } - if (this.#state === 3) { + if (this.state === 3) { unwind = 56; - rt.drop(this.#awaitee); + rt.drop(this.awaitee); unwind = 57; - rt.drop(this.#saved); - this.#saved$11 = false; + rt.drop(this.saved); + this._saved$10 = false; break b0; } - if (this.#state === 4) { + if (this.state === 4) { unwind = 51; - rt.drop(this.#awaitee$2); + rt.drop(this._awaitee); unwind = 52; - rt.drop(this.#saved$2); - this.#saved$10 = false; + rt.drop(this._saved); + this._saved$9 = false; break b1; } - if (this.#state === 5) { + if (this.state === 5) { unwind = 47; - rt.drop(this.#awaitee$3); - } else if (this.#state === 6) { + rt.drop(this._awaitee$2); + } else if (this.state === 6) { unwind = 44; - rt.drop(this.#awaitee$4); - } else if (this.#state === 7) { + rt.drop(this._awaitee$3); + } else if (this.state === 7) { unwind = 37; - rt.drop(this.#awaitee$5); + rt.drop(this._awaitee$4); unwind = 40; - rt.drop(this.#chosen); + rt.drop(this.chosen); unwind = 42; - rt.drop(this.#nested); + rt.drop(this.nested); } else { return; } - this.#saved$9 = false; + this._saved$8 = false; } unwind = 55; - rt.dropAll(this.#slots); + rt.dropAll(this.slots); } - if (this.#saved$6) { + if (this._saved$5) { unwind = 60; - rt.drop(this.#second); + rt.drop(this.second); } - this.#saved$6 = false; - if (this.#saved$7) { + this._saved$5 = false; + if (this._saved$6) { unwind = 61; - rt.drop(this.#first); + rt.drop(this.first); } - this.#saved$7 = false; - if (this.#saved$5) { + this._saved$6 = false; + if (this._saved$4) { unwind = 62; - rt.drop(this.#guard$2); + rt.drop(this._guard); } - this.#saved$5 = false; - if (this.#saved$8) { + this._saved$4 = false; + if (this._saved$7) { unwind = 0; - rt.drop(this.#rx$2); + rt.drop(this._rx); } - this.#saved$8 = false; + this._saved$7 = false; } catch (e) { b8: { b9: { @@ -311,7 +311,7 @@ export class blocksFuture { throw e; } if (unwind === 37) { - rt.drop(this.#chosen); + rt.drop(this.chosen); break b18; } if (unwind === 40) { @@ -327,7 +327,7 @@ export class blocksFuture { break b15; } if (unwind === 51) { - rt.drop(this.#saved$2); + rt.drop(this._saved); break b19; } if (unwind === 52) { @@ -337,7 +337,7 @@ export class blocksFuture { break b13; } if (unwind === 56) { - rt.drop(this.#saved); + rt.drop(this.saved); } else if (unwind !== 57) { if (unwind === 60) { break b11; @@ -348,43 +348,43 @@ export class blocksFuture { if (unwind === 62) { break b9; } - rt.drop(this.#guard); + rt.drop(this.guard); break b8; } - this.#saved$11 = false; + this._saved$10 = false; break b12; } - this.#saved$10 = false; + this._saved$9 = false; break b14; } - rt.drop(this.#nested); + rt.drop(this.nested); } } } - this.#saved$9 = false; + this._saved$8 = false; } - rt.dropAll(this.#slots); + rt.dropAll(this.slots); } } - if (this.#saved$6) { - rt.drop(this.#second); + if (this._saved$5) { + rt.drop(this.second); } } - this.#saved$6 = false; - if (this.#saved$7) { - rt.drop(this.#first); + this._saved$5 = false; + if (this._saved$6) { + rt.drop(this.first); } } - this.#saved$7 = false; - if (this.#saved$5) { - rt.drop(this.#guard$2); + this._saved$6 = false; + if (this._saved$4) { + rt.drop(this._guard); } } - this.#saved$5 = false; - if (this.#saved$8) { - rt.drop(this.#rx$2); + this._saved$4 = false; + if (this._saved$7) { + rt.drop(this._rx); } - this.#saved$8 = false; + this._saved$7 = false; } throw e; } @@ -401,198 +401,198 @@ export class blocksFuture { b1: { b2: { b3: { - if (this.#state === 0) { + if (this.state === 0) { unwind = 132; - this.#saved$8 = false; - this.#saved$5 = false; - this.#saved$7 = false; - this.#saved$6 = false; - this.#saved$11 = false; - this.#saved$10 = false; - this.#saved$9 = false; - this.#saved$8 = true; - this.#rx$2 = this.#rx; - this.#saved$5 = true; - this.#guard$2 = this.#guard; - this.#moves$2 = this.#moves; - this.#first = Guard.new(rt.u32Add(this.#guard$2.id, 200), Log.clone$Clone(this.#guard$2.log)); + this._saved$7 = false; + this._saved$4 = false; + this._saved$6 = false; + this._saved$5 = false; + this._saved$10 = false; + this._saved$9 = false; + this._saved$8 = false; + this._saved$7 = true; + this._rx = this.rx; + this._saved$4 = true; + this._guard = this.guard; + this._moves = this.moves; + this.first = Guard.new(rt.u32Add(this._guard.id, 200), Log.clone$Clone(this._guard.log)); unwind = 131; - this.#saved$7 = true; - this.#second = Guard.new(rt.u32Add(this.#guard$2.id, 300), Log.clone$Clone(this.#guard$2.log)); + this._saved$6 = true; + this.second = Guard.new(rt.u32Add(this._guard.id, 300), Log.clone$Clone(this._guard.log)); unwind = 142; - this.#saved$6 = true; - rt.drop(new blocksFuture$2(this.#first)); - const _18: rt.u32 = rt.u32Rem(this.#guard$2.id, 5); - turns(this.#guard$2.log, _18); - temporaries(this.#guard$2.log, this.#guard$2.id); + this._saved$5 = true; + rt.drop(new blocksFuture$2(this.first)); + const _18: rt.u32 = rt.u32Rem(this._guard.id, 5); + turns(this._guard.log, _18); + temporaries(this._guard.log, this._guard.id); unwind = 130; - this.#saved = Guard.new(rt.u32Add(this.#guard$2.id, 900), Log.clone$Clone(this.#guard$2.log)); + this.saved = Guard.new(rt.u32Add(this._guard.id, 900), Log.clone$Clone(this._guard.log)); unwind = 128; - this.#saved$11 = true; - this.#awaitee = new recvFuture(this.#rx$2); - } else if (this.#state === 1) { + this._saved$10 = true; + this.awaitee = new recvFuture(this._rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); - } else if (this.#state !== 3) { - if (this.#state === 4) { + } else if (this.state !== 3) { + if (this.state === 4) { break b3; } - if (this.#state === 5) { + if (this.state === 5) { break b2; } - if (this.#state === 6) { + if (this.state === 6) { break b1; } break b0; } unwind = 125; - const _32: rt.Poll = this.#awaitee.poll(_2); + const _32: rt.Poll = this.awaitee.poll(_2); if (_32 !== rt.Pending) { unwind = 126; const result: rt.u64 | undefined = _32; - rt.drop(this.#awaitee); - this.#saved$11 = false; - this.#waited = consume(this.#saved, result); + rt.drop(this.awaitee); + this._saved$10 = false; + this.waited = consume(this.saved, result); unwind = 142; - this.#saved$11 = false; - _40 = Guard.new(rt.u32Add(this.#guard$2.id, 910), Log.clone$Clone(this.#guard$2.log)); + this._saved$10 = false; + _40 = Guard.new(rt.u32Add(this._guard.id, 910), Log.clone$Clone(this._guard.log)); unwind = 124; - const _46: Guard.Guard = Guard.new(rt.u32Add(this.#guard$2.id, 920), Log.clone$Clone(this.#guard$2.log)); + const _46: Guard.Guard = Guard.new(rt.u32Add(this._guard.id, 920), Log.clone$Clone(this._guard.log)); unwind = 122; - this.#slots = [_40, _46]; - this.#saved$2 = Guard.new(rt.u32Add(this.#guard$2.id, 930), Log.clone$Clone(this.#guard$2.log)); + this.slots = [_40, _46]; + this._saved = Guard.new(rt.u32Add(this._guard.id, 930), Log.clone$Clone(this._guard.log)); unwind = 120; - this.#saved$10 = true; - this.#awaitee$2 = new slotFuture(this.#rx$2); + this._saved$9 = true; + this._awaitee = new slotFuture(this._rx); } else { - this.#state = 3; + this.state = 3; return rt.Pending; } } unwind = 118; - const _60: rt.Poll = this.#awaitee$2.poll(_2); + const _60: rt.Poll = this._awaitee.poll(_2); if (_60 !== rt.Pending) { unwind = 139; result2 = _60; - rt.drop(this.#awaitee$2); + rt.drop(this._awaitee); if (!(result2 < 2)) { rt.panic("index out of bounds: the len is " + 2 + " but the index is " + result2); } unwind = 44; - rt.drop(this.#slots[result2]); + rt.drop(this.slots[result2]); unwind = 123; - this.#saved$10 = false; - this.#slots[result2] = this.#saved$2; - this.#saved$10 = false; - const arg = ([this.#waited] as [rt.u64])[0]; + this._saved$9 = false; + this.slots[result2] = this._saved; + this._saved$9 = false; + const arg = ([this.waited] as [rt.u64])[0]; const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u64Display(arg, f)]; const _75: string = rt.fmtFormat(["slot after ", args2[0]]); unwind = 117; const _73: string = _75; - Guard.note(this.#slots[0], _73); + Guard.note(this.slots[0], _73); unwind = 137; - this.#tally = { n: this.#guard$2.id }; - this.#saved$9 = true; - seen = new blocksFuture$3(rt.copy(this.#tally)); - const _86: rt.u32 = rt.u32Add(this.#tally.n, 1000); - this.#tally.n = _86; - this.#saved$3 = this.#guard$2; - this.#saved$4 = this.#tally.n; - this.#saved$9 = false; - this.#awaitee$3 = seen; + this.tally = { n: this._guard.id }; + this._saved$8 = true; + seen = new blocksFuture$3(rt.copy(this.tally)); + const _86: rt.u32 = rt.u32Add(this.tally.n, 1000); + this.tally.n = _86; + this._saved$2 = this._guard; + this._saved$3 = this.tally.n; + this._saved$8 = false; + this._awaitee$2 = seen; } else { - this.#state = 4; + this.state = 4; return rt.Pending; } } unwind = 115; - const _98: rt.Poll = this.#awaitee$3.poll(_2); + const _98: rt.Poll = this._awaitee$2.poll(_2); if (_98 !== rt.Pending) { unwind = 137; const _95: rt.u32 = _98; - rt.drop(this.#awaitee$3); - const arg2 = this.#saved$4; + rt.drop(this._awaitee$2); + const arg2 = this._saved$3; const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg2, f), (f: rt.Formatter) => rt.u32Display(_95, f)]; const _90: string = rt.fmtFormat(["tally ", args4[0], " then ", args4[1]]); unwind = 114; const _88: string = _90; - Guard.note(this.#saved$3, _88); + Guard.note(this._saved$2, _88); unwind = 137; - this.#mark = { n: 1 }; - this.#awaitee$4 = new blocksFuture$4(this.#mark); + this.mark = { n: 1 }; + this._awaitee$3 = new blocksFuture$4(this.mark); } else { - this.#state = 5; + this.state = 5; return rt.Pending; } } unwind = 113; - const _114: rt.Poll = this.#awaitee$4.poll(_2); + const _114: rt.Poll = this._awaitee$3.poll(_2); if (_114 !== rt.Pending) { unwind = 137; - this.#replaced = _114; - rt.drop(this.#awaitee$4); - const arg3 = this.#replaced; + this.replaced = _114; + rt.drop(this._awaitee$3); + const arg3 = this.replaced; const _133: rt.Fmt = (f: rt.Formatter) => rt.u32Display(arg3, f); - const arg4 = this.#mark.n; + const arg4 = this.mark.n; const args6: rt.Fmt[] = [_133, (f: rt.Formatter) => rt.u32Display(arg4, f)]; const _126: string = rt.fmtFormat(["mark ", args6[0], " ", args6[1]]); unwind = 112; const _124: string = _126; - Guard.note(this.#guard$2, _124); + Guard.note(this._guard, _124); unwind = 111; _138 = undefined; - const _139: Guard.Guard = Guard.new(rt.u32Add(this.#guard$2.id, 800), Log.clone$Clone(this.#guard$2.log)); + const _139: Guard.Guard = Guard.new(rt.u32Add(this._guard.id, 800), Log.clone$Clone(this._guard.log)); unwind = 137; const _146: Outer.Outer = new Outer.Outer({ inner: _138, guard: _139 }); unwind = 110; - this.#nested = new Inner.Inner({ outer: _146 }); - const third: Guard.Guard = Guard.new(rt.u32Add(this.#guard$2.id, 400), Log.clone$Clone(this.#guard$2.log)); - if (!this.#moves$2) { - this.#chosen = third; + this.nested = new Inner.Inner({ outer: _146 }); + const third: Guard.Guard = Guard.new(rt.u32Add(this._guard.id, 400), Log.clone$Clone(this._guard.log)); + if (!this._moves) { + this.chosen = third; } else { - this.#chosen = third; + this.chosen = third; } unwind = 109; - Guard.note(this.#chosen, "chosen"); - if (this.#moves$2) { - this.#saved$5 = false; - rt.drop(new blocksFuture$5(this.#guard$2)); + Guard.note(this.chosen, "chosen"); + if (this._moves) { + this._saved$4 = false; + rt.drop(new blocksFuture$5(this._guard)); } - this.#saved$7 = false; - this.#saved$6 = false; - this.#saved$8 = false; - this.#awaitee$5 = new blocksFuture$6(this.#first, this.#second, this.#rx$2); + this._saved$6 = false; + this._saved$5 = false; + this._saved$7 = false; + this._awaitee$4 = new blocksFuture$6(this.first, this.second, this._rx); } else { - this.#state = 6; + this.state = 6; return rt.Pending; } } unwind = 108; - const _161: rt.Poll = this.#awaitee$5.poll(_2); + const _161: rt.Poll = this._awaitee$4.poll(_2); if (_161 !== rt.Pending) { unwind = 109; const result5: rt.u64 = _161; - rt.drop(this.#awaitee$5); + rt.drop(this._awaitee$4); unwind = 110; - rt.drop(this.#chosen); + rt.drop(this.chosen); unwind = 137; - rt.drop(this.#nested); + rt.drop(this.nested); unwind = 142; - this.#saved$9 = false; - rt.dropAll(this.#slots); - this.#saved$6 = false; - this.#saved$7 = false; - if (this.#saved$5) { + this._saved$8 = false; + rt.dropAll(this.slots); + this._saved$5 = false; + this._saved$6 = false; + if (this._saved$4) { unwind = 133; - rt.drop(this.#guard$2); + rt.drop(this._guard); } - this.#saved$5 = false; - this.#saved$8 = false; - this.#state = 1; + this._saved$4 = false; + this._saved$7 = false; + this.state = 1; return result5; } - this.#state = 7; + this.state = 7; return rt.Pending; } catch (e) { b8: { @@ -608,12 +608,12 @@ export class blocksFuture { throw e; } if (unwind === 44) { - this.#saved$10 = false; - this.#slots[result2] = this.#saved$2; + this._saved$9 = false; + this.slots[result2] = this._saved; break b13; } if (unwind === 108) { - rt.drop(this.#awaitee$5); + rt.drop(this._awaitee$4); break b16; } if (unwind === 109) { @@ -630,30 +630,30 @@ export class blocksFuture { break b14; } if (unwind === 113) { - rt.drop(this.#awaitee$4); + rt.drop(this._awaitee$3); break b14; } if (unwind === 114) { break b14; } if (unwind === 115) { - rt.drop(this.#awaitee$3); + rt.drop(this._awaitee$2); break b14; } if (unwind === 117) { break b12; } if (unwind === 118) { - rt.drop(this.#awaitee$2); + rt.drop(this._awaitee); break b13; } if (unwind === 120) { - rt.drop(this.#saved$2); - this.#saved$10 = false; + rt.drop(this._saved); + this._saved$9 = false; break b12; } if (unwind === 122) { - this.#saved$10 = false; + this._saved$9 = false; break b12; } if (unwind === 123) { @@ -664,15 +664,15 @@ export class blocksFuture { break b11; } if (unwind === 125) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } else if (unwind !== 126) { if (unwind === 128) { - rt.drop(this.#saved); - this.#saved$11 = false; + rt.drop(this.saved); + this._saved$10 = false; break b11; } if (unwind === 130) { - this.#saved$11 = false; + this._saved$10 = false; break b11; } if (unwind === 131) { @@ -692,60 +692,60 @@ export class blocksFuture { } break b11; } - if (this.#saved$11) { - rt.drop(this.#saved); + if (this._saved$10) { + rt.drop(this.saved); } - this.#saved$11 = false; + this._saved$10 = false; break b11; } - rt.drop(this.#chosen); + rt.drop(this.chosen); } - rt.drop(this.#nested); + rt.drop(this.nested); } - if (this.#saved$9) { + if (this._saved$8) { rt.drop(seen); } - this.#saved$9 = false; + this._saved$8 = false; break b12; } - if (this.#saved$10) { - rt.drop(this.#saved$2); + if (this._saved$9) { + rt.drop(this._saved); } - this.#saved$10 = false; + this._saved$9 = false; } - rt.dropAll(this.#slots); + rt.dropAll(this.slots); } - if (this.#saved$6) { - rt.drop(this.#second); + if (this._saved$5) { + rt.drop(this.second); } } - this.#saved$6 = false; - if (this.#saved$7) { - rt.drop(this.#first); + this._saved$5 = false; + if (this._saved$6) { + rt.drop(this.first); } } - this.#saved$7 = false; - if (this.#saved$5) { - rt.drop(this.#guard$2); + this._saved$6 = false; + if (this._saved$4) { + rt.drop(this._guard); } } - this.#saved$5 = false; - if (this.#saved$8) { - rt.drop(this.#rx$2); + this._saved$4 = false; + if (this._saved$7) { + rt.drop(this._rx); } - this.#saved$8 = false; - this.#state = 2; + this._saved$7 = false; + this.state = 2; throw e; } } } export class blocksFuture$2 { - #state: number = 0; - #first: Guard.Guard; + state: number = 0; + first: Guard.Guard; constructor(first: Guard.Guard) { - this.#first = first; + this.first = first; } [Symbol.dispose](): void { @@ -754,13 +754,13 @@ export class blocksFuture$2 { poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 3; - Guard.note(this.#first, "borrowed"); - this.#state = 1; + Guard.note(this.first, "borrowed"); + this.state = 1; return undefined; } - if (this.#state === 1) { + if (this.state === 1) { rt.asyncFnResumed(); } else { rt.asyncFnResumedPanic(); @@ -769,18 +769,18 @@ export class blocksFuture$2 { if (unwind === 0) { throw e; } - this.#state = 2; + this.state = 2; throw e; } } } export class blocksFuture$3 { - #state: number = 0; - #tally: Tally.Tally; + state: number = 0; + tally: Tally.Tally; constructor(tally: Tally.Tally) { - this.#tally = tally; + this.tally = tally; } [Symbol.dispose](): void { @@ -789,13 +789,13 @@ export class blocksFuture$3 { poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 3; - const _0: rt.Poll = read(this.#tally); - this.#state = 1; + const _0: rt.Poll = read(this.tally); + this.state = 1; return _0; } - if (this.#state === 1) { + if (this.state === 1) { rt.asyncFnResumed(); } else { rt.asyncFnResumedPanic(); @@ -804,30 +804,30 @@ export class blocksFuture$3 { if (unwind === 0) { throw e; } - this.#state = 2; + this.state = 2; throw e; } } } export class blocksFuture$4 { - #state: number = 0; - #mark: Mark.Mark; + state: number = 0; + mark: Mark.Mark; constructor(mark: Mark.Mark) { - this.#mark = mark; + this.mark = mark; } [Symbol.dispose](): void { } poll(_2: rt.Context): rt.Poll { - if (this.#state === 0) { + if (this.state === 0) { const _3: Mark.Mark = { n: 2 }; - const _4: Mark.Mark = this.#mark; + const _4: Mark.Mark = this.mark; Object.assign(_4, _3); - const _0: rt.Poll = this.#mark.n; - this.#state = 1; + const _0: rt.Poll = this.mark.n; + this.state = 1; return _0; } rt.asyncFnResumed(); @@ -835,31 +835,31 @@ export class blocksFuture$4 { } export class blocksFuture$5 { - #state: number = 0; - #guard: Guard.Guard; + state: number = 0; + guard: Guard.Guard; constructor(guard: Guard.Guard) { - this.#guard = guard; + this.guard = guard; } [Symbol.dispose](): void { - if (this.#state === 0) { - rt.drop(this.#guard); + if (this.state === 0) { + rt.drop(this.guard); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 4; - Guard.note(this.#guard, "moved"); + Guard.note(this.guard, "moved"); unwind = 5; - rt.drop(this.#guard); - this.#state = 1; + rt.drop(this.guard); + this.state = 1; return undefined; } - if (this.#state === 1) { + if (this.state === 1) { rt.asyncFnResumed(); } else { rt.asyncFnResumedPanic(); @@ -869,49 +869,49 @@ export class blocksFuture$5 { throw e; } if (unwind === 4) { - rt.drop(this.#guard); + rt.drop(this.guard); } - this.#state = 2; + this.state = 2; throw e; } } } export class blocksFuture$6 { - #state: number = 0; - #first: Guard.Guard; - #second: Guard.Guard; - #rx: Consumer.Consumer; - #held!: Guard.Guard; - #awaitee!: rt.Future; + state: number = 0; + first: Guard.Guard; + second: Guard.Guard; + rx: Consumer.Consumer; + held!: Guard.Guard; + awaitee!: rt.Future; constructor(first: Guard.Guard, second: Guard.Guard, rx: Consumer.Consumer) { - this.#first = first; - this.#second = second; - this.#rx = rx; + this.first = first; + this.second = second; + this.rx = rx; } [Symbol.dispose](): void { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 22; - rt.drop(this.#first); + rt.drop(this.first); unwind = 21; - rt.drop(this.#second); + rt.drop(this.second); unwind = 0; - rt.drop(this.#rx); - } else if (this.#state === 3) { + rt.drop(this.rx); + } else if (this.state === 3) { unwind = 8; - rt.drop(this.#awaitee); + rt.drop(this.awaitee); unwind = 10; - rt.drop(this.#held); + rt.drop(this.held); unwind = 14; - rt.drop(this.#first); + rt.drop(this.first); unwind = 13; - rt.drop(this.#second); + rt.drop(this.second); unwind = 0; - rt.drop(this.#rx); + rt.drop(this.rx); } } catch (e) { b0: { @@ -921,7 +921,7 @@ export class blocksFuture$6 { throw e; } if (unwind === 8) { - rt.drop(this.#held); + rt.drop(this.held); break b1; } if (unwind === 10) { @@ -931,21 +931,21 @@ export class blocksFuture$6 { break b2; } if (unwind === 14) { - rt.drop(this.#second); + rt.drop(this.second); break b2; } if (unwind !== 21) { - rt.drop(this.#second); + rt.drop(this.second); } - rt.drop(this.#rx); + rt.drop(this.rx); break b0; } - rt.drop(this.#rx); + rt.drop(this.rx); break b0; } - rt.drop(this.#first); - rt.drop(this.#second); - rt.drop(this.#rx); + rt.drop(this.first); + rt.drop(this.second); + rt.drop(this.rx); } throw e; } @@ -955,41 +955,41 @@ export class blocksFuture$6 { let _27!: rt.u64; let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 30; - Guard.note(this.#first, "reads"); - Guard.note(this.#second, "reads"); - this.#held = Guard.new(rt.u32Add(this.#second.id, 100), Log.clone$Clone(this.#second.log)); + Guard.note(this.first, "reads"); + Guard.note(this.second, "reads"); + this.held = Guard.new(rt.u32Add(this.second.id, 100), Log.clone$Clone(this.second.log)); unwind = 21; - this.#awaitee = new recvFuture(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new recvFuture(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 20; - const _17: rt.Poll = this.#awaitee.poll(_2); + const _17: rt.Poll = this.awaitee.poll(_2); if (_17 !== rt.Pending) { unwind = 21; const result: rt.u64 | undefined = _17; - rt.drop(this.#awaitee); + rt.drop(this.awaitee); if (result === undefined) { _27 = 0; } else { _27 = result; } unwind = 30; - rt.drop(this.#held); + rt.drop(this.held); unwind = 24; - rt.drop(this.#first); + rt.drop(this.first); unwind = 23; - rt.drop(this.#second); + rt.drop(this.second); unwind = 22; - rt.drop(this.#rx); - this.#state = 1; + rt.drop(this.rx); + this.state = 1; return _27; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { b2: { @@ -999,7 +999,7 @@ export class blocksFuture$6 { throw e; } if (unwind === 20) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); break b4; } if (unwind === 21) { @@ -1010,21 +1010,21 @@ export class blocksFuture$6 { } if (unwind !== 23) { if (unwind === 24) { - rt.drop(this.#second); + rt.drop(this.second); } else { break b3; } } - rt.drop(this.#rx); + rt.drop(this.rx); break b2; } - rt.drop(this.#held); + rt.drop(this.held); } - rt.drop(this.#first); - rt.drop(this.#second); - rt.drop(this.#rx); + rt.drop(this.first); + rt.drop(this.second); + rt.drop(this.rx); } - this.#state = 2; + this.state = 2; throw e; } } @@ -1036,17 +1036,17 @@ export function consume(guard: Guard.Guard, v: rt.u64 | undefined): rt.u64 { } export class slotFuture { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } @@ -1054,38 +1054,38 @@ export class slotFuture { let _18!: rt.usize; let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 16; - this.#awaitee = new recvFuture(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new recvFuture(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 15; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 16; const result: rt.u64 | undefined = _6; - rt.drop(this.#awaitee); + rt.drop(this.awaitee); if (result === undefined) { _18 = 0; } else { _18 = rt.usizeRem(rt.u64Low(result), 2); } - this.#state = 1; + this.state = 1; return _18; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 15) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } @@ -1435,47 +1435,47 @@ export function drain(rx: Consumer.Consumer, depth: rt.u32): rt.Future { } export class drainFuture { - #state: number = 0; - #rx: Consumer.Consumer; - #depth: rt.u32; - #rx$2!: Consumer.Consumer; - #depth$2!: rt.u32; - #total!: rt.u64; - #awaitee!: rt.Future; - #awaitee$2!: rt.Future; - #awaitee$3!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + depth: rt.u32; + _rx!: Consumer.Consumer; + _depth!: rt.u32; + total!: rt.u64; + awaitee!: rt.Future; + _awaitee!: rt.Future; + _awaitee$2!: rt.Future; constructor(rx: Consumer.Consumer, depth: rt.u32) { - this.#rx = rx; - this.#depth = depth; + this.rx = rx; + this.depth = depth; } [Symbol.dispose](): void { let unwind: number = 0; try { - if (this.#state === 0) { - rt.drop(this.#rx); + if (this.state === 0) { + rt.drop(this.rx); return; } - if (this.#state === 3) { + if (this.state === 3) { unwind = 19; - rt.drop(this.#awaitee); - } else if (this.#state === 4) { + rt.drop(this.awaitee); + } else if (this.state === 4) { unwind = 17; - rt.drop(this.#awaitee$2); - } else if (this.#state === 5) { + rt.drop(this._awaitee); + } else if (this.state === 5) { unwind = 15; - rt.drop(this.#awaitee$3); + rt.drop(this._awaitee$2); } else { return; } unwind = 0; - rt.drop(this.#rx$2); + rt.drop(this._rx); } catch (e) { if (unwind === 0) { throw e; } - rt.drop(this.#rx$2); + rt.drop(this._rx); throw e; } } @@ -1488,23 +1488,23 @@ export class drainFuture { l0: while (true) { switch (bb0) { case 0: - if (this.#state === 0) { - this.#rx$2 = this.#rx; - this.#depth$2 = this.#depth; - this.#total = 0; + if (this.state === 0) { + this._rx = this.rx; + this._depth = this.depth; + this.total = 0; bb0 = 1; continue l0; } - if (this.#state === 1) { + if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } else { - if (this.#state === 3) { + if (this.state === 3) { bb0 = 7; continue l0; } - if (this.#state === 4) { + if (this.state === 4) { bb0 = 15; continue l0; } @@ -1512,67 +1512,67 @@ export class drainFuture { continue l0; } case 1: - if (this.#depth$2 === 1) { + if (this._depth === 1) { unwind = 36; - this.#awaitee = new recvFuture(this.#rx$2); + this.awaitee = new recvFuture(this._rx); bb0 = 7; continue l0; } - if (this.#depth$2 === 4) { + if (this._depth === 4) { unwind = 36; - this.#awaitee$2 = new level3Future(this.#rx$2); + this._awaitee = new level3Future(this._rx); bb0 = 15; continue l0; } unwind = 36; - this.#awaitee$3 = new level15Future(this.#rx$2); + this._awaitee$2 = new level15Future(this._rx); bb0 = 22; continue l0; case 22: unwind = 33; - const _29: rt.Poll = this.#awaitee$3.poll(_2); + const _29: rt.Poll = this._awaitee$2.poll(_2); if (_29 !== rt.Pending) { unwind = 36; next = _29; - rt.drop(this.#awaitee$3); + rt.drop(this._awaitee$2); bb0 = 27; continue l0; } - this.#state = 5; + this.state = 5; return rt.Pending; case 15: unwind = 34; - const _18: rt.Poll = this.#awaitee$2.poll(_2); + const _18: rt.Poll = this._awaitee.poll(_2); if (_18 !== rt.Pending) { unwind = 36; next = _18; - rt.drop(this.#awaitee$2); + rt.drop(this._awaitee); bb0 = 27; continue l0; } - this.#state = 4; + this.state = 4; return rt.Pending; case 7: unwind = 35; - const _7: rt.Poll = this.#awaitee.poll(_2); + const _7: rt.Poll = this.awaitee.poll(_2); if (_7 !== rt.Pending) { unwind = 36; next = _7; - rt.drop(this.#awaitee); + rt.drop(this.awaitee); bb0 = 27; continue l0; } - this.#state = 3; + this.state = 3; return rt.Pending; case 27: if (next === undefined) { unwind = 37; - const _40: rt.u64 = this.#total; - rt.drop(this.#rx$2); - this.#state = 1; + const _40: rt.u64 = this.total; + rt.drop(this._rx); + this.state = 1; return _40; } - this.#total = rt.u64Add(this.#total, next); + this.total = rt.u64Add(this.total, next); bb0 = 1; continue l0; } @@ -1583,752 +1583,752 @@ export class drainFuture { throw e; } if (unwind === 33) { - rt.drop(this.#awaitee$3); + rt.drop(this._awaitee$2); } else if (unwind === 34) { - rt.drop(this.#awaitee$2); + rt.drop(this._awaitee); } else if (unwind === 35) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } else if (unwind !== 36) { break b1; } - rt.drop(this.#rx$2); + rt.drop(this._rx); } - this.#state = 2; + this.state = 2; throw e; } } } export class level1Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new recvFuture(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new recvFuture(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level10Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level9Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level9Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level11Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level10Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level10Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level12Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level11Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level11Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level13Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level12Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level12Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level14Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level13Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level13Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level15Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level14Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level14Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level2Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level1Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level1Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level3Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level2Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level2Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level4Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level3Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level3Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level5Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level4Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level4Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level6Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level5Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level5Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level7Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level6Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level6Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level8Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level7Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level7Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } } export class level9Future { - #state: number = 0; - #rx: Consumer.Consumer; - #awaitee!: rt.Future; + state: number = 0; + rx: Consumer.Consumer; + awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.#rx = rx; + this.rx = rx; } [Symbol.dispose](): void { - if (this.#state === 3) { - rt.drop(this.#awaitee); + if (this.state === 3) { + rt.drop(this.awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.#state === 0) { + if (this.state === 0) { unwind = 12; - this.#awaitee = new level8Future(this.#rx); - } else if (this.#state === 1) { + this.awaitee = new level8Future(this.rx); + } else if (this.state === 1) { rt.asyncFnResumed(); - } else if (this.#state === 2) { + } else if (this.state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.#awaitee.poll(_2); + const _6: rt.Poll = this.awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.#awaitee); - this.#state = 1; + rt.drop(this.awaitee); + this.state = 1; return _6; } - this.#state = 3; + this.state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.#awaitee); + rt.drop(this.awaitee); } - this.#state = 2; + this.state = 2; throw e; } } diff --git a/ts/src/lower/mir/coroutine.rs b/ts/src/lower/mir/coroutine.rs index a799740c7..642d87de0 100644 --- a/ts/src/lower/mir/coroutine.rs +++ b/ts/src/lower/mir/coroutine.rs @@ -61,9 +61,7 @@ pub fn info<'tcx>(t: &mut Translator<'_, 'tcx>, def_id: DefId, args: GenericArgs alias: None, }); let mut fields = Vec::new(); - // Private, as only the class's own methods read its fields, which a minifier can then - // rename. - let state = t.program.field(sym, "#state".into()); + let state = t.program.field(sym, "state".into()); fields.push(ts::Field { id: state, ty: Type::Builtin("number"), @@ -81,7 +79,7 @@ pub fn info<'tcx>(t: &mut Translator<'_, 'tcx>, def_id: DefId, args: GenericArgs }; let mut upvars = Vec::new(); for (i, ty) in coroutine.upvar_tys().iter().enumerate() { - let name = format!("#{}", names.get(i).cloned().unwrap_or_else(|| format!("u{i}"))); + let name = names.get(i).cloned().unwrap_or_else(|| format!("u{i}")); let id = t.program.field(sym, name); upvars.push(id); let ty = t.ty(ty, span); @@ -113,8 +111,8 @@ pub fn info<'tcx>(t: &mut Translator<'_, 'tcx>, def_id: DefId, args: GenericArgs .debuginfo_name .map(|n| n.as_str().trim_start_matches('_').to_string()) { - Some(name) if !name.is_empty() => format!("#{}", crate::lower::camel(&name)), - _ => "#saved".into(), + Some(name) if !name.is_empty() => crate::lower::camel(&name), + _ => "saved".into(), }; let id = t.program.field(sym, name); saved.push(id); diff --git a/ts/src/print.rs b/ts/src/print.rs index 38175c36b..c2a6e8216 100644 --- a/ts/src/print.rs +++ b/ts/src/print.rs @@ -513,17 +513,15 @@ impl Printer<'_> { match ctor { Ctor::Unit => {} Ctor::Positional => { - // A private field's parameter is its name without the `#`. - let param = |name: &str| name.trim_start_matches('#').to_string(); let params: Vec = (names.iter().zip(fields)) - .map(|(name, field)| format!("{}: {}", param(name), self.ty(&field.ty))) + .map(|(name, field)| format!("{name}: {}", self.ty(&field.ty))) .collect(); self.newline(); self.start(); self.write(&format!("constructor({}) {{\n", params.join(", "))); for name in &names { self.start(); - self.write(&format!("{INDENT}this.{name} = {};\n", param(name))); + self.write(&format!("{INDENT}this.{name} = {name};\n")); } self.start(); self.write("}\n"); diff --git a/ts/src/program.rs b/ts/src/program.rs index 0a64ba56c..7b773a3a9 100644 --- a/ts/src/program.rs +++ b/ts/src/program.rs @@ -156,9 +156,8 @@ impl Program { } if let Scope::Owner(owner) = scope { for field in self.fields.iter_mut().filter(|f| f.owner == owner) { - let base = match taken.contains(&field.base) && !field.base.starts_with('#') { - // A name a class already defines: the field gives way. A private name - // can only clash with another field's, which `unique` numbers. + let base = match taken.contains(&field.base) { + // A name a class already defines: the field gives way. true => format!("_{}", field.base), false => field.base.clone(), }; From 394e8b5b90f5018830f330575540377667b83195 Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Mon, 26 Oct 2026 09:07:59 -0700 Subject: [PATCH 08/12] docs(ts): sizes with public coroutine fields, and why Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0115AT2ue6x9cT5e5J9SZtCn --- quest/m2/ts-mir-size.md | 12 +++++++----- ts/README.md | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/quest/m2/ts-mir-size.md b/quest/m2/ts-mir-size.md index d30c1a9b4..c326913fd 100644 --- a/quest/m2/ts-mir-size.md +++ b/quest/m2/ts-mir-size.md @@ -9,18 +9,20 @@ bytes minified and 9422 gzipped, and the async handoff's at most 10949 and 3458. ## Plan The codec's bundle is 29996 bytes minified and 9545 gzipped (+1.3% gzipped), and the -async handoff's 15119 and 3756 (+38%, +8.6%), against THIR's numbers above, built from +async handoff's 16197 and 3788 (+48%, +9.5%), against THIR's numbers above, built from the same fixtures. Each candidate is measured on the bench's sizes and timings before it lands: -- A coroutine's class, about 330 bytes minified each against about 140 for a THIR +- A coroutine's class, about 410 bytes minified each against about 140 for a THIR generator, for the drop, the checks for a resume after it finished, and the `try`/`catch` that poisons it and drops what it holds on a panic, where a THIR generator had a `finally` and the runtime's one `Async` class: a base class in the runtime for that scaffolding, or one field for saved locals that are never live at - once (the layout's `storage_conflicts`), each timed on V8 and JSC, since both change - what a field holds. Generators and closures stay out: they measured 1.4-5.5x and - 1.3-1.8x slower on the handoff. + once (the layout's `storage_conflicts`). Each is timed on V8 and JSC with the bundle + minified, since what a `poll` compiles to decides how many levels V8 inlines: private + fields (`#state`) cut 1078 bytes minified and 32 gzipped but grew each `poll`'s + bytecode 19%, and Node 24 ran depth 16 5% slower. Generators and closures stay out: + they measured 1.4-5.5x and 1.3-1.8x slower on the handoff. - The handoff's code outside the classes, about 140 bytes gzipped over THIR's. - The codec's `fill`, `encodeFrames`, and `decodeSplit`, whose blocks nest deeper than THIR's loops did. diff --git a/ts/README.md b/ts/README.md index 29570f608..c09029a26 100644 --- a/ts/README.md +++ b/ts/README.md @@ -256,7 +256,7 @@ they need. replaced, MIR closes about 1,100 of the 1,400 drop refusals in moq-net's census, and runs `just ts bench`'s codec 2-6% faster at the geometric mean and the async handoff 1.4-5.9x faster at depths 1 to 16 in Node, Bun, and Chrome, for 1% more gzip on the - codec's bundle and 9% on the async fixture's + codec's bundle and 10% on the async fixture's ([size](/quest/m2/ts-mir-size.md)). Blocks become nested blocks, loops, and `if`s by Ramsey's "Beyond Relooper", except a coroutine's resume function, which enters loops in the middle and becomes a loop over a `switch` on the next block. Temporaries From dd5a163f61c56779f321fb7bf4e6785f74d87d1d Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Mon, 26 Oct 2026 09:31:01 -0700 Subject: [PATCH 09/12] feat(ts): private coroutine fields The translator targets browsers, so a minifier renaming the fields wins over Node's inlining budget at the deepest nesting. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0115AT2ue6x9cT5e5J9SZtCn --- ts/fixtures/task/expected/kio.ts | 34 +- ts/fixtures/task/expected/model.ts | 1336 ++++++++++++++-------------- ts/src/lower/mir/coroutine.rs | 10 +- ts/src/print.rs | 6 +- ts/src/program.rs | 5 +- 5 files changed, 698 insertions(+), 693 deletions(-) diff --git a/ts/fixtures/task/expected/kio.ts b/ts/fixtures/task/expected/kio.ts index 1381b58ac..d6d5ca6dc 100644 --- a/ts/fixtures/task/expected/kio.ts +++ b/ts/fixtures/task/expected/kio.ts @@ -12,52 +12,52 @@ export function wait$recv_closure0_closure0_Option_u64(poll: (a0: Waiter.Waiter) } export class recvFuture { - state: number = 0; - self: Consumer.Consumer; - awaitee!: Pending.Pending<(a0: Waiter.Waiter) => rt.Poll>; + #state: number = 0; + #self: Consumer.Consumer; + #awaitee!: Pending.Pending<(a0: Waiter.Waiter) => rt.Poll>; constructor(self: Consumer.Consumer) { - this.self = self; + this.#self = self; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - const self: Consumer.Consumer = this.self; - this.awaitee = wait$recv_closure0_closure0_Option_u64((waiter: Waiter.Waiter): rt.Poll => { + const self: Consumer.Consumer = this.#self; + this.#awaitee = wait$recv_closure0_closure0_Option_u64((waiter: Waiter.Waiter): rt.Poll => { return Consumer.pollRecv(self, waiter); }); - } else if (this.state === 1) { + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _7: rt.Poll = Pending.poll$Future_recv_closure0_closure0(this.awaitee, _2); + const _7: rt.Poll = Pending.poll$Future_recv_closure0_closure0(this.#awaitee, _2); if (_7 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _7; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } diff --git a/ts/fixtures/task/expected/model.ts b/ts/fixtures/task/expected/model.ts index 9312f1c0f..4e4ce8e1a 100644 --- a/ts/fixtures/task/expected/model.ts +++ b/ts/fixtures/task/expected/model.ts @@ -21,37 +21,37 @@ export function sum(rx: Consumer.Consumer, guard: Guard.Guard): rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #guard: Guard.Guard; + #rx$2!: Consumer.Consumer; + #guard$2!: Guard.Guard; + #inner!: Guard.Guard; + #total!: rt.u64; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer, guard: Guard.Guard) { - this.rx = rx; - this.guard = guard; + this.#rx = rx; + this.#guard = guard; } [Symbol.dispose](): void { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 17; - rt.drop(this.rx); + rt.drop(this.#rx); unwind = 0; - rt.drop(this.guard); - } else if (this.state === 3) { + rt.drop(this.#guard); + } else if (this.#state === 3) { unwind = 10; - rt.drop(this.awaitee); + rt.drop(this.#awaitee); unwind = 12; - rt.drop(this.inner); + rt.drop(this.#inner); unwind = 13; - rt.drop(this._guard); + rt.drop(this.#guard$2); unwind = 0; - rt.drop(this._rx); + rt.drop(this.#rx$2); } } catch (e) { b0: { @@ -60,17 +60,17 @@ export class sumFuture { throw e; } if (unwind === 10) { - rt.drop(this.inner); + rt.drop(this.#inner); } else if (unwind !== 12) { if (unwind === 13) { break b1; } - rt.drop(this.guard); + rt.drop(this.#guard); break b0; } - rt.drop(this._guard); + rt.drop(this.#guard$2); } - rt.drop(this._rx); + rt.drop(this.#rx$2); } throw e; } @@ -83,18 +83,18 @@ export class sumFuture { l0: while (true) { switch (bb0) { case 0: - if (this.state === 0) { + if (this.#state === 0) { unwind = 33; - this._rx = this.rx; - this._guard = this.guard; - this.inner = Guard.new(rt.u32Add(this._guard.id, 100), Log.clone$Clone(this._guard.log)); - this.total = 0; + this.#rx$2 = this.#rx; + this.#guard$2 = this.#guard; + this.#inner = Guard.new(rt.u32Add(this.#guard$2.id, 100), Log.clone$Clone(this.#guard$2.log)); + this.#total = 0; bb0 = 4; continue l0; } - if (this.state === 1) { + if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } else { bb0 = 7; @@ -102,44 +102,44 @@ export class sumFuture { } case 4: unwind = 32; - this.awaitee = new recvFuture(this._rx); + this.#awaitee = new recvFuture(this.#rx$2); bb0 = 7; continue l0; case 7: unwind = 31; - const _11: rt.Poll = this.awaitee.poll(_2); + const _11: rt.Poll = this.#awaitee.poll(_2); if (_11 !== rt.Pending) { unwind = 32; const result: rt.u64 | undefined = _11; - rt.drop(this.awaitee); + rt.drop(this.#awaitee); if (result !== undefined) { const value: rt.u64 = result; if (!(value !== 99)) { - const arg2 = ([this._guard.id] as [rt.u32])[0]; + const arg2 = ([this.#guard$2.id] as [rt.u32])[0]; const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg2, f)]; rt.panicFmt(["g", args2[0], " poisoned"]); } else { - const arg = this._guard.id; + const arg = this.#guard$2.id; const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg, f), (f: rt.Formatter) => rt.u64Display(value, f)]; const _32: string = rt.fmtFormat(["g", args4[0], " got ", args4[1]]); - Log.note(this.inner.log, _32); - this.total = rt.u64Add(this.total, value); + Log.note(this.#inner.log, _32); + this.#total = rt.u64Add(this.#total, value); bb0 = 4; continue l0; } } else { unwind = 33; - const _47: rt.u64 = this.total; - rt.drop(this.inner); + const _47: rt.u64 = this.#total; + rt.drop(this.#inner); unwind = 34; - rt.drop(this._guard); + rt.drop(this.#guard$2); unwind = 35; - rt.drop(this._rx); - this.state = 1; + rt.drop(this.#rx$2); + this.#state = 1; return _47; } } else { - this.state = 3; + this.#state = 3; return rt.Pending; } } @@ -152,7 +152,7 @@ export class sumFuture { throw e; } if (unwind === 31) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } else if (unwind !== 32) { if (unwind === 33) { break b3; @@ -162,13 +162,13 @@ export class sumFuture { } break b1; } - rt.drop(this.inner); + rt.drop(this.#inner); } - rt.drop(this._guard); + rt.drop(this.#guard$2); } - rt.drop(this._rx); + rt.drop(this.#rx$2); } - this.state = 2; + this.#state = 2; throw e; } } @@ -187,43 +187,43 @@ export function blocks(rx: Consumer.Consumer, guard: Guard.Guard, moves: boolean } export class blocksFuture { - state: number = 0; - rx: Consumer.Consumer; - guard: Guard.Guard; - moves: boolean; - _rx!: Consumer.Consumer; - _guard!: Guard.Guard; - _moves!: boolean; - first!: Guard.Guard; - second!: Guard.Guard; - waited!: rt.u64; - saved!: Guard.Guard; - awaitee!: rt.Future; - slots!: Guard.Guard[]; - _saved!: Guard.Guard; - _awaitee!: rt.Future; - tally!: Tally.Tally; - _saved$2!: Guard.Guard; - _saved$3!: rt.u32; - _awaitee$2!: rt.Future; - mark!: Mark.Mark; - replaced!: rt.u32; - _awaitee$3!: rt.Future; - nested!: Inner.Inner; - chosen!: Guard.Guard; - _awaitee$4!: rt.Future; - _saved$4!: boolean; - _saved$5!: boolean; - _saved$6!: boolean; - _saved$7!: boolean; - _saved$8!: boolean; - _saved$9!: boolean; - _saved$10!: boolean; + #state: number = 0; + #rx: Consumer.Consumer; + #guard: Guard.Guard; + #moves: boolean; + #rx$2!: Consumer.Consumer; + #guard$2!: Guard.Guard; + #moves$2!: boolean; + #first!: Guard.Guard; + #second!: Guard.Guard; + #waited!: rt.u64; + #saved!: Guard.Guard; + #awaitee!: rt.Future; + #slots!: Guard.Guard[]; + #saved$2!: Guard.Guard; + #awaitee$2!: rt.Future; + #tally!: Tally.Tally; + #saved$3!: Guard.Guard; + #saved$4!: rt.u32; + #awaitee$3!: rt.Future; + #mark!: Mark.Mark; + #replaced!: rt.u32; + #awaitee$4!: rt.Future; + #nested!: Inner.Inner; + #chosen!: Guard.Guard; + #awaitee$5!: rt.Future; + #saved$5!: boolean; + #saved$6!: boolean; + #saved$7!: boolean; + #saved$8!: boolean; + #saved$9!: boolean; + #saved$10!: boolean; + #saved$11!: boolean; constructor(rx: Consumer.Consumer, guard: Guard.Guard, moves: boolean) { - this.rx = rx; - this.guard = guard; - this.moves = moves; + this.#rx = rx; + this.#guard = guard; + this.#moves = moves; } [Symbol.dispose](): void { @@ -231,70 +231,70 @@ export class blocksFuture { try { b0: { b1: { - if (this.state === 0) { + if (this.#state === 0) { unwind = 82; - rt.drop(this.rx); + rt.drop(this.#rx); unwind = 0; - rt.drop(this.guard); + rt.drop(this.#guard); return; } - if (this.state === 3) { + if (this.#state === 3) { unwind = 56; - rt.drop(this.awaitee); + rt.drop(this.#awaitee); unwind = 57; - rt.drop(this.saved); - this._saved$10 = false; + rt.drop(this.#saved); + this.#saved$11 = false; break b0; } - if (this.state === 4) { + if (this.#state === 4) { unwind = 51; - rt.drop(this._awaitee); + rt.drop(this.#awaitee$2); unwind = 52; - rt.drop(this._saved); - this._saved$9 = false; + rt.drop(this.#saved$2); + this.#saved$10 = false; break b1; } - if (this.state === 5) { + if (this.#state === 5) { unwind = 47; - rt.drop(this._awaitee$2); - } else if (this.state === 6) { + rt.drop(this.#awaitee$3); + } else if (this.#state === 6) { unwind = 44; - rt.drop(this._awaitee$3); - } else if (this.state === 7) { + rt.drop(this.#awaitee$4); + } else if (this.#state === 7) { unwind = 37; - rt.drop(this._awaitee$4); + rt.drop(this.#awaitee$5); unwind = 40; - rt.drop(this.chosen); + rt.drop(this.#chosen); unwind = 42; - rt.drop(this.nested); + rt.drop(this.#nested); } else { return; } - this._saved$8 = false; + this.#saved$9 = false; } unwind = 55; - rt.dropAll(this.slots); + rt.dropAll(this.#slots); } - if (this._saved$5) { + if (this.#saved$6) { unwind = 60; - rt.drop(this.second); + rt.drop(this.#second); } - this._saved$5 = false; - if (this._saved$6) { + this.#saved$6 = false; + if (this.#saved$7) { unwind = 61; - rt.drop(this.first); + rt.drop(this.#first); } - this._saved$6 = false; - if (this._saved$4) { + this.#saved$7 = false; + if (this.#saved$5) { unwind = 62; - rt.drop(this._guard); + rt.drop(this.#guard$2); } - this._saved$4 = false; - if (this._saved$7) { + this.#saved$5 = false; + if (this.#saved$8) { unwind = 0; - rt.drop(this._rx); + rt.drop(this.#rx$2); } - this._saved$7 = false; + this.#saved$8 = false; } catch (e) { b8: { b9: { @@ -312,7 +312,7 @@ export class blocksFuture { throw e; } if (unwind === 37) { - rt.drop(this.chosen); + rt.drop(this.#chosen); break b18; } if (unwind === 40) { @@ -328,7 +328,7 @@ export class blocksFuture { break b15; } if (unwind === 51) { - rt.drop(this._saved); + rt.drop(this.#saved$2); break b19; } if (unwind === 52) { @@ -338,7 +338,7 @@ export class blocksFuture { break b13; } if (unwind === 56) { - rt.drop(this.saved); + rt.drop(this.#saved); } else if (unwind !== 57) { if (unwind === 60) { break b11; @@ -349,43 +349,43 @@ export class blocksFuture { if (unwind === 62) { break b9; } - rt.drop(this.guard); + rt.drop(this.#guard); break b8; } - this._saved$10 = false; + this.#saved$11 = false; break b12; } - this._saved$9 = false; + this.#saved$10 = false; break b14; } - rt.drop(this.nested); + rt.drop(this.#nested); } } } - this._saved$8 = false; + this.#saved$9 = false; } - rt.dropAll(this.slots); + rt.dropAll(this.#slots); } } - if (this._saved$5) { - rt.drop(this.second); + if (this.#saved$6) { + rt.drop(this.#second); } } - this._saved$5 = false; - if (this._saved$6) { - rt.drop(this.first); + this.#saved$6 = false; + if (this.#saved$7) { + rt.drop(this.#first); } } - this._saved$6 = false; - if (this._saved$4) { - rt.drop(this._guard); + this.#saved$7 = false; + if (this.#saved$5) { + rt.drop(this.#guard$2); } } - this._saved$4 = false; - if (this._saved$7) { - rt.drop(this._rx); + this.#saved$5 = false; + if (this.#saved$8) { + rt.drop(this.#rx$2); } - this._saved$7 = false; + this.#saved$8 = false; } throw e; } @@ -402,198 +402,198 @@ export class blocksFuture { b1: { b2: { b3: { - if (this.state === 0) { + if (this.#state === 0) { unwind = 132; - this._saved$7 = false; - this._saved$4 = false; - this._saved$6 = false; - this._saved$5 = false; - this._saved$10 = false; - this._saved$9 = false; - this._saved$8 = false; - this._saved$7 = true; - this._rx = this.rx; - this._saved$4 = true; - this._guard = this.guard; - this._moves = this.moves; - this.first = Guard.new(rt.u32Add(this._guard.id, 200), Log.clone$Clone(this._guard.log)); + this.#saved$8 = false; + this.#saved$5 = false; + this.#saved$7 = false; + this.#saved$6 = false; + this.#saved$11 = false; + this.#saved$10 = false; + this.#saved$9 = false; + this.#saved$8 = true; + this.#rx$2 = this.#rx; + this.#saved$5 = true; + this.#guard$2 = this.#guard; + this.#moves$2 = this.#moves; + this.#first = Guard.new(rt.u32Add(this.#guard$2.id, 200), Log.clone$Clone(this.#guard$2.log)); unwind = 131; - this._saved$6 = true; - this.second = Guard.new(rt.u32Add(this._guard.id, 300), Log.clone$Clone(this._guard.log)); + this.#saved$7 = true; + this.#second = Guard.new(rt.u32Add(this.#guard$2.id, 300), Log.clone$Clone(this.#guard$2.log)); unwind = 142; - this._saved$5 = true; - rt.drop(new blocksFuture$2(this.first)); - const _18: rt.u32 = rt.u32Rem(this._guard.id, 5); - turns(this._guard.log, _18); - temporaries(this._guard.log, this._guard.id); + this.#saved$6 = true; + rt.drop(new blocksFuture$2(this.#first)); + const _18: rt.u32 = rt.u32Rem(this.#guard$2.id, 5); + turns(this.#guard$2.log, _18); + temporaries(this.#guard$2.log, this.#guard$2.id); unwind = 130; - this.saved = Guard.new(rt.u32Add(this._guard.id, 900), Log.clone$Clone(this._guard.log)); + this.#saved = Guard.new(rt.u32Add(this.#guard$2.id, 900), Log.clone$Clone(this.#guard$2.log)); unwind = 128; - this._saved$10 = true; - this.awaitee = new recvFuture(this._rx); - } else if (this.state === 1) { + this.#saved$11 = true; + this.#awaitee = new recvFuture(this.#rx$2); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); - } else if (this.state !== 3) { - if (this.state === 4) { + } else if (this.#state !== 3) { + if (this.#state === 4) { break b3; } - if (this.state === 5) { + if (this.#state === 5) { break b2; } - if (this.state === 6) { + if (this.#state === 6) { break b1; } break b0; } unwind = 125; - const _32: rt.Poll = this.awaitee.poll(_2); + const _32: rt.Poll = this.#awaitee.poll(_2); if (_32 !== rt.Pending) { unwind = 126; const result: rt.u64 | undefined = _32; - rt.drop(this.awaitee); - this._saved$10 = false; - this.waited = consume(this.saved, result); + rt.drop(this.#awaitee); + this.#saved$11 = false; + this.#waited = consume(this.#saved, result); unwind = 142; - this._saved$10 = false; - _40 = Guard.new(rt.u32Add(this._guard.id, 910), Log.clone$Clone(this._guard.log)); + this.#saved$11 = false; + _40 = Guard.new(rt.u32Add(this.#guard$2.id, 910), Log.clone$Clone(this.#guard$2.log)); unwind = 124; - const _46: Guard.Guard = Guard.new(rt.u32Add(this._guard.id, 920), Log.clone$Clone(this._guard.log)); + const _46: Guard.Guard = Guard.new(rt.u32Add(this.#guard$2.id, 920), Log.clone$Clone(this.#guard$2.log)); unwind = 122; - this.slots = [_40, _46]; - this._saved = Guard.new(rt.u32Add(this._guard.id, 930), Log.clone$Clone(this._guard.log)); + this.#slots = [_40, _46]; + this.#saved$2 = Guard.new(rt.u32Add(this.#guard$2.id, 930), Log.clone$Clone(this.#guard$2.log)); unwind = 120; - this._saved$9 = true; - this._awaitee = new slotFuture(this._rx); + this.#saved$10 = true; + this.#awaitee$2 = new slotFuture(this.#rx$2); } else { - this.state = 3; + this.#state = 3; return rt.Pending; } } unwind = 118; - const _60: rt.Poll = this._awaitee.poll(_2); + const _60: rt.Poll = this.#awaitee$2.poll(_2); if (_60 !== rt.Pending) { unwind = 139; result2 = _60; - rt.drop(this._awaitee); + rt.drop(this.#awaitee$2); if (!(result2 < 2)) { rt.panic("index out of bounds: the len is " + 2 + " but the index is " + result2); } unwind = 44; - rt.drop(this.slots[result2]); + rt.drop(this.#slots[result2]); unwind = 123; - this._saved$9 = false; - this.slots[result2] = this._saved; - this._saved$9 = false; - const arg = ([this.waited] as [rt.u64])[0]; + this.#saved$10 = false; + this.#slots[result2] = this.#saved$2; + this.#saved$10 = false; + const arg = ([this.#waited] as [rt.u64])[0]; const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u64Display(arg, f)]; const _75: string = rt.fmtFormat(["slot after ", args2[0]]); unwind = 117; const _73: string = _75; - Guard.note(this.slots[0], _73); + Guard.note(this.#slots[0], _73); unwind = 137; - this.tally = { n: this._guard.id }; - this._saved$8 = true; - seen = new blocksFuture$3(rt.copy(this.tally)); - const _86: rt.u32 = rt.u32Add(this.tally.n, 1000); - this.tally.n = _86; - this._saved$2 = this._guard; - this._saved$3 = this.tally.n; - this._saved$8 = false; - this._awaitee$2 = seen; + this.#tally = { n: this.#guard$2.id }; + this.#saved$9 = true; + seen = new blocksFuture$3(rt.copy(this.#tally)); + const _86: rt.u32 = rt.u32Add(this.#tally.n, 1000); + this.#tally.n = _86; + this.#saved$3 = this.#guard$2; + this.#saved$4 = this.#tally.n; + this.#saved$9 = false; + this.#awaitee$3 = seen; } else { - this.state = 4; + this.#state = 4; return rt.Pending; } } unwind = 115; - const _98: rt.Poll = this._awaitee$2.poll(_2); + const _98: rt.Poll = this.#awaitee$3.poll(_2); if (_98 !== rt.Pending) { unwind = 137; const _95: rt.u32 = _98; - rt.drop(this._awaitee$2); - const arg2 = this._saved$3; + rt.drop(this.#awaitee$3); + const arg2 = this.#saved$4; const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg2, f), (f: rt.Formatter) => rt.u32Display(_95, f)]; const _90: string = rt.fmtFormat(["tally ", args4[0], " then ", args4[1]]); unwind = 114; const _88: string = _90; - Guard.note(this._saved$2, _88); + Guard.note(this.#saved$3, _88); unwind = 137; - this.mark = { n: 1 }; - this._awaitee$3 = new blocksFuture$4(this.mark); + this.#mark = { n: 1 }; + this.#awaitee$4 = new blocksFuture$4(this.#mark); } else { - this.state = 5; + this.#state = 5; return rt.Pending; } } unwind = 113; - const _114: rt.Poll = this._awaitee$3.poll(_2); + const _114: rt.Poll = this.#awaitee$4.poll(_2); if (_114 !== rt.Pending) { unwind = 137; - this.replaced = _114; - rt.drop(this._awaitee$3); - const arg3 = this.replaced; + this.#replaced = _114; + rt.drop(this.#awaitee$4); + const arg3 = this.#replaced; const _133: rt.Fmt = (f: rt.Formatter) => rt.u32Display(arg3, f); - const arg4 = this.mark.n; + const arg4 = this.#mark.n; const args6: rt.Fmt[] = [_133, (f: rt.Formatter) => rt.u32Display(arg4, f)]; const _126: string = rt.fmtFormat(["mark ", args6[0], " ", args6[1]]); unwind = 112; const _124: string = _126; - Guard.note(this._guard, _124); + Guard.note(this.#guard$2, _124); unwind = 111; _138 = undefined; - const _139: Guard.Guard = Guard.new(rt.u32Add(this._guard.id, 800), Log.clone$Clone(this._guard.log)); + const _139: Guard.Guard = Guard.new(rt.u32Add(this.#guard$2.id, 800), Log.clone$Clone(this.#guard$2.log)); unwind = 137; const _146: Outer.Outer = new Outer.Outer({ inner: _138, guard: _139 }); unwind = 110; - this.nested = new Inner.Inner({ outer: _146 }); - const third: Guard.Guard = Guard.new(rt.u32Add(this._guard.id, 400), Log.clone$Clone(this._guard.log)); - if (!this._moves) { - this.chosen = third; + this.#nested = new Inner.Inner({ outer: _146 }); + const third: Guard.Guard = Guard.new(rt.u32Add(this.#guard$2.id, 400), Log.clone$Clone(this.#guard$2.log)); + if (!this.#moves$2) { + this.#chosen = third; } else { - this.chosen = third; + this.#chosen = third; } unwind = 109; - Guard.note(this.chosen, "chosen"); - if (this._moves) { - this._saved$4 = false; - rt.drop(new blocksFuture$5(this._guard)); + Guard.note(this.#chosen, "chosen"); + if (this.#moves$2) { + this.#saved$5 = false; + rt.drop(new blocksFuture$5(this.#guard$2)); } - this._saved$6 = false; - this._saved$5 = false; - this._saved$7 = false; - this._awaitee$4 = new blocksFuture$6(this.first, this.second, this._rx); + this.#saved$7 = false; + this.#saved$6 = false; + this.#saved$8 = false; + this.#awaitee$5 = new blocksFuture$6(this.#first, this.#second, this.#rx$2); } else { - this.state = 6; + this.#state = 6; return rt.Pending; } } unwind = 108; - const _161: rt.Poll = this._awaitee$4.poll(_2); + const _161: rt.Poll = this.#awaitee$5.poll(_2); if (_161 !== rt.Pending) { unwind = 109; const result5: rt.u64 = _161; - rt.drop(this._awaitee$4); + rt.drop(this.#awaitee$5); unwind = 110; - rt.drop(this.chosen); + rt.drop(this.#chosen); unwind = 137; - rt.drop(this.nested); + rt.drop(this.#nested); unwind = 142; - this._saved$8 = false; - rt.dropAll(this.slots); - this._saved$5 = false; - this._saved$6 = false; - if (this._saved$4) { + this.#saved$9 = false; + rt.dropAll(this.#slots); + this.#saved$6 = false; + this.#saved$7 = false; + if (this.#saved$5) { unwind = 133; - rt.drop(this._guard); + rt.drop(this.#guard$2); } - this._saved$4 = false; - this._saved$7 = false; - this.state = 1; + this.#saved$5 = false; + this.#saved$8 = false; + this.#state = 1; return result5; } - this.state = 7; + this.#state = 7; return rt.Pending; } catch (e) { b8: { @@ -609,12 +609,12 @@ export class blocksFuture { throw e; } if (unwind === 44) { - this._saved$9 = false; - this.slots[result2] = this._saved; + this.#saved$10 = false; + this.#slots[result2] = this.#saved$2; break b13; } if (unwind === 108) { - rt.drop(this._awaitee$4); + rt.drop(this.#awaitee$5); break b16; } if (unwind === 109) { @@ -631,30 +631,30 @@ export class blocksFuture { break b14; } if (unwind === 113) { - rt.drop(this._awaitee$3); + rt.drop(this.#awaitee$4); break b14; } if (unwind === 114) { break b14; } if (unwind === 115) { - rt.drop(this._awaitee$2); + rt.drop(this.#awaitee$3); break b14; } if (unwind === 117) { break b12; } if (unwind === 118) { - rt.drop(this._awaitee); + rt.drop(this.#awaitee$2); break b13; } if (unwind === 120) { - rt.drop(this._saved); - this._saved$9 = false; + rt.drop(this.#saved$2); + this.#saved$10 = false; break b12; } if (unwind === 122) { - this._saved$9 = false; + this.#saved$10 = false; break b12; } if (unwind === 123) { @@ -665,15 +665,15 @@ export class blocksFuture { break b11; } if (unwind === 125) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } else if (unwind !== 126) { if (unwind === 128) { - rt.drop(this.saved); - this._saved$10 = false; + rt.drop(this.#saved); + this.#saved$11 = false; break b11; } if (unwind === 130) { - this._saved$10 = false; + this.#saved$11 = false; break b11; } if (unwind === 131) { @@ -693,60 +693,60 @@ export class blocksFuture { } break b11; } - if (this._saved$10) { - rt.drop(this.saved); + if (this.#saved$11) { + rt.drop(this.#saved); } - this._saved$10 = false; + this.#saved$11 = false; break b11; } - rt.drop(this.chosen); + rt.drop(this.#chosen); } - rt.drop(this.nested); + rt.drop(this.#nested); } - if (this._saved$8) { + if (this.#saved$9) { rt.drop(seen); } - this._saved$8 = false; + this.#saved$9 = false; break b12; } - if (this._saved$9) { - rt.drop(this._saved); + if (this.#saved$10) { + rt.drop(this.#saved$2); } - this._saved$9 = false; + this.#saved$10 = false; } - rt.dropAll(this.slots); + rt.dropAll(this.#slots); } - if (this._saved$5) { - rt.drop(this.second); + if (this.#saved$6) { + rt.drop(this.#second); } } - this._saved$5 = false; - if (this._saved$6) { - rt.drop(this.first); + this.#saved$6 = false; + if (this.#saved$7) { + rt.drop(this.#first); } } - this._saved$6 = false; - if (this._saved$4) { - rt.drop(this._guard); + this.#saved$7 = false; + if (this.#saved$5) { + rt.drop(this.#guard$2); } } - this._saved$4 = false; - if (this._saved$7) { - rt.drop(this._rx); + this.#saved$5 = false; + if (this.#saved$8) { + rt.drop(this.#rx$2); } - this._saved$7 = false; - this.state = 2; + this.#saved$8 = false; + this.#state = 2; throw e; } } } export class blocksFuture$2 { - state: number = 0; - first: Guard.Guard; + #state: number = 0; + #first: Guard.Guard; constructor(first: Guard.Guard) { - this.first = first; + this.#first = first; } [Symbol.dispose](): void { @@ -755,13 +755,13 @@ export class blocksFuture$2 { poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 3; - Guard.note(this.first, "borrowed"); - this.state = 1; + Guard.note(this.#first, "borrowed"); + this.#state = 1; return undefined; } - if (this.state === 1) { + if (this.#state === 1) { rt.asyncFnResumed(); } else { rt.asyncFnResumedPanic(); @@ -770,18 +770,18 @@ export class blocksFuture$2 { if (unwind === 0) { throw e; } - this.state = 2; + this.#state = 2; throw e; } } } export class blocksFuture$3 { - state: number = 0; - tally: Tally.Tally; + #state: number = 0; + #tally: Tally.Tally; constructor(tally: Tally.Tally) { - this.tally = tally; + this.#tally = tally; } [Symbol.dispose](): void { @@ -790,13 +790,13 @@ export class blocksFuture$3 { poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 3; - const _0: rt.Poll = read(this.tally); - this.state = 1; + const _0: rt.Poll = read(this.#tally); + this.#state = 1; return _0; } - if (this.state === 1) { + if (this.#state === 1) { rt.asyncFnResumed(); } else { rt.asyncFnResumedPanic(); @@ -805,30 +805,30 @@ export class blocksFuture$3 { if (unwind === 0) { throw e; } - this.state = 2; + this.#state = 2; throw e; } } } export class blocksFuture$4 { - state: number = 0; - mark: Mark.Mark; + #state: number = 0; + #mark: Mark.Mark; constructor(mark: Mark.Mark) { - this.mark = mark; + this.#mark = mark; } [Symbol.dispose](): void { } poll(_2: rt.Context): rt.Poll { - if (this.state === 0) { + if (this.#state === 0) { const _3: Mark.Mark = { n: 2 }; - const _4: Mark.Mark = this.mark; + const _4: Mark.Mark = this.#mark; Object.assign(_4, _3); - const _0: rt.Poll = this.mark.n; - this.state = 1; + const _0: rt.Poll = this.#mark.n; + this.#state = 1; return _0; } rt.asyncFnResumed(); @@ -836,31 +836,31 @@ export class blocksFuture$4 { } export class blocksFuture$5 { - state: number = 0; - guard: Guard.Guard; + #state: number = 0; + #guard: Guard.Guard; constructor(guard: Guard.Guard) { - this.guard = guard; + this.#guard = guard; } [Symbol.dispose](): void { - if (this.state === 0) { - rt.drop(this.guard); + if (this.#state === 0) { + rt.drop(this.#guard); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 4; - Guard.note(this.guard, "moved"); + Guard.note(this.#guard, "moved"); unwind = 5; - rt.drop(this.guard); - this.state = 1; + rt.drop(this.#guard); + this.#state = 1; return undefined; } - if (this.state === 1) { + if (this.#state === 1) { rt.asyncFnResumed(); } else { rt.asyncFnResumedPanic(); @@ -870,49 +870,49 @@ export class blocksFuture$5 { throw e; } if (unwind === 4) { - rt.drop(this.guard); + rt.drop(this.#guard); } - this.state = 2; + this.#state = 2; throw e; } } } export class blocksFuture$6 { - state: number = 0; - first: Guard.Guard; - second: Guard.Guard; - rx: Consumer.Consumer; - held!: Guard.Guard; - awaitee!: rt.Future; + #state: number = 0; + #first: Guard.Guard; + #second: Guard.Guard; + #rx: Consumer.Consumer; + #held!: Guard.Guard; + #awaitee!: rt.Future; constructor(first: Guard.Guard, second: Guard.Guard, rx: Consumer.Consumer) { - this.first = first; - this.second = second; - this.rx = rx; + this.#first = first; + this.#second = second; + this.#rx = rx; } [Symbol.dispose](): void { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 22; - rt.drop(this.first); + rt.drop(this.#first); unwind = 21; - rt.drop(this.second); + rt.drop(this.#second); unwind = 0; - rt.drop(this.rx); - } else if (this.state === 3) { + rt.drop(this.#rx); + } else if (this.#state === 3) { unwind = 8; - rt.drop(this.awaitee); + rt.drop(this.#awaitee); unwind = 10; - rt.drop(this.held); + rt.drop(this.#held); unwind = 14; - rt.drop(this.first); + rt.drop(this.#first); unwind = 13; - rt.drop(this.second); + rt.drop(this.#second); unwind = 0; - rt.drop(this.rx); + rt.drop(this.#rx); } } catch (e) { b0: { @@ -922,7 +922,7 @@ export class blocksFuture$6 { throw e; } if (unwind === 8) { - rt.drop(this.held); + rt.drop(this.#held); break b1; } if (unwind === 10) { @@ -932,21 +932,21 @@ export class blocksFuture$6 { break b2; } if (unwind === 14) { - rt.drop(this.second); + rt.drop(this.#second); break b2; } if (unwind !== 21) { - rt.drop(this.second); + rt.drop(this.#second); } - rt.drop(this.rx); + rt.drop(this.#rx); break b0; } - rt.drop(this.rx); + rt.drop(this.#rx); break b0; } - rt.drop(this.first); - rt.drop(this.second); - rt.drop(this.rx); + rt.drop(this.#first); + rt.drop(this.#second); + rt.drop(this.#rx); } throw e; } @@ -956,41 +956,41 @@ export class blocksFuture$6 { let _27!: rt.u64; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 30; - Guard.note(this.first, "reads"); - Guard.note(this.second, "reads"); - this.held = Guard.new(rt.u32Add(this.second.id, 100), Log.clone$Clone(this.second.log)); + Guard.note(this.#first, "reads"); + Guard.note(this.#second, "reads"); + this.#held = Guard.new(rt.u32Add(this.#second.id, 100), Log.clone$Clone(this.#second.log)); unwind = 21; - this.awaitee = new recvFuture(this.rx); - } else if (this.state === 1) { + this.#awaitee = new recvFuture(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 20; - const _17: rt.Poll = this.awaitee.poll(_2); + const _17: rt.Poll = this.#awaitee.poll(_2); if (_17 !== rt.Pending) { unwind = 21; const result: rt.u64 | undefined = _17; - rt.drop(this.awaitee); + rt.drop(this.#awaitee); if (result === undefined) { _27 = 0; } else { _27 = result; } unwind = 30; - rt.drop(this.held); + rt.drop(this.#held); unwind = 24; - rt.drop(this.first); + rt.drop(this.#first); unwind = 23; - rt.drop(this.second); + rt.drop(this.#second); unwind = 22; - rt.drop(this.rx); - this.state = 1; + rt.drop(this.#rx); + this.#state = 1; return _27; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { b2: { @@ -1000,7 +1000,7 @@ export class blocksFuture$6 { throw e; } if (unwind === 20) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); break b4; } if (unwind === 21) { @@ -1011,21 +1011,21 @@ export class blocksFuture$6 { } if (unwind !== 23) { if (unwind === 24) { - rt.drop(this.second); + rt.drop(this.#second); } else { break b3; } } - rt.drop(this.rx); + rt.drop(this.#rx); break b2; } - rt.drop(this.held); + rt.drop(this.#held); } - rt.drop(this.first); - rt.drop(this.second); - rt.drop(this.rx); + rt.drop(this.#first); + rt.drop(this.#second); + rt.drop(this.#rx); } - this.state = 2; + this.#state = 2; throw e; } } @@ -1037,17 +1037,17 @@ export function consume(guard: Guard.Guard, v: rt.u64 | undefined): rt.u64 { } export class slotFuture { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } @@ -1055,38 +1055,38 @@ export class slotFuture { let _18!: rt.usize; let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 16; - this.awaitee = new recvFuture(this.rx); - } else if (this.state === 1) { + this.#awaitee = new recvFuture(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 15; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 16; const result: rt.u64 | undefined = _6; - rt.drop(this.awaitee); + rt.drop(this.#awaitee); if (result === undefined) { _18 = 0; } else { _18 = rt.usizeRem(rt.u64Low(result), 2); } - this.state = 1; + this.#state = 1; return _18; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 15) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } @@ -1504,47 +1504,47 @@ export function drain(rx: Consumer.Consumer, depth: rt.u32): rt.Future { } export class drainFuture { - state: number = 0; - rx: Consumer.Consumer; - depth: rt.u32; - _rx!: Consumer.Consumer; - _depth!: rt.u32; - total!: rt.u64; - awaitee!: rt.Future; - _awaitee!: rt.Future; - _awaitee$2!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #depth: rt.u32; + #rx$2!: Consumer.Consumer; + #depth$2!: rt.u32; + #total!: rt.u64; + #awaitee!: rt.Future; + #awaitee$2!: rt.Future; + #awaitee$3!: rt.Future; constructor(rx: Consumer.Consumer, depth: rt.u32) { - this.rx = rx; - this.depth = depth; + this.#rx = rx; + this.#depth = depth; } [Symbol.dispose](): void { let unwind: number = 0; try { - if (this.state === 0) { - rt.drop(this.rx); + if (this.#state === 0) { + rt.drop(this.#rx); return; } - if (this.state === 3) { + if (this.#state === 3) { unwind = 19; - rt.drop(this.awaitee); - } else if (this.state === 4) { + rt.drop(this.#awaitee); + } else if (this.#state === 4) { unwind = 17; - rt.drop(this._awaitee); - } else if (this.state === 5) { + rt.drop(this.#awaitee$2); + } else if (this.#state === 5) { unwind = 15; - rt.drop(this._awaitee$2); + rt.drop(this.#awaitee$3); } else { return; } unwind = 0; - rt.drop(this._rx); + rt.drop(this.#rx$2); } catch (e) { if (unwind === 0) { throw e; } - rt.drop(this._rx); + rt.drop(this.#rx$2); throw e; } } @@ -1557,23 +1557,23 @@ export class drainFuture { l0: while (true) { switch (bb0) { case 0: - if (this.state === 0) { - this._rx = this.rx; - this._depth = this.depth; - this.total = 0; + if (this.#state === 0) { + this.#rx$2 = this.#rx; + this.#depth$2 = this.#depth; + this.#total = 0; bb0 = 1; continue l0; } - if (this.state === 1) { + if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } else { - if (this.state === 3) { + if (this.#state === 3) { bb0 = 7; continue l0; } - if (this.state === 4) { + if (this.#state === 4) { bb0 = 15; continue l0; } @@ -1581,67 +1581,67 @@ export class drainFuture { continue l0; } case 1: - if (this._depth === 1) { + if (this.#depth$2 === 1) { unwind = 36; - this.awaitee = new recvFuture(this._rx); + this.#awaitee = new recvFuture(this.#rx$2); bb0 = 7; continue l0; } - if (this._depth === 4) { + if (this.#depth$2 === 4) { unwind = 36; - this._awaitee = new level3Future(this._rx); + this.#awaitee$2 = new level3Future(this.#rx$2); bb0 = 15; continue l0; } unwind = 36; - this._awaitee$2 = new level15Future(this._rx); + this.#awaitee$3 = new level15Future(this.#rx$2); bb0 = 22; continue l0; case 22: unwind = 33; - const _29: rt.Poll = this._awaitee$2.poll(_2); + const _29: rt.Poll = this.#awaitee$3.poll(_2); if (_29 !== rt.Pending) { unwind = 36; next = _29; - rt.drop(this._awaitee$2); + rt.drop(this.#awaitee$3); bb0 = 27; continue l0; } - this.state = 5; + this.#state = 5; return rt.Pending; case 15: unwind = 34; - const _18: rt.Poll = this._awaitee.poll(_2); + const _18: rt.Poll = this.#awaitee$2.poll(_2); if (_18 !== rt.Pending) { unwind = 36; next = _18; - rt.drop(this._awaitee); + rt.drop(this.#awaitee$2); bb0 = 27; continue l0; } - this.state = 4; + this.#state = 4; return rt.Pending; case 7: unwind = 35; - const _7: rt.Poll = this.awaitee.poll(_2); + const _7: rt.Poll = this.#awaitee.poll(_2); if (_7 !== rt.Pending) { unwind = 36; next = _7; - rt.drop(this.awaitee); + rt.drop(this.#awaitee); bb0 = 27; continue l0; } - this.state = 3; + this.#state = 3; return rt.Pending; case 27: if (next === undefined) { unwind = 37; - const _40: rt.u64 = this.total; - rt.drop(this._rx); - this.state = 1; + const _40: rt.u64 = this.#total; + rt.drop(this.#rx$2); + this.#state = 1; return _40; } - this.total = rt.u64Add(this.total, next); + this.#total = rt.u64Add(this.#total, next); bb0 = 1; continue l0; } @@ -1652,752 +1652,752 @@ export class drainFuture { throw e; } if (unwind === 33) { - rt.drop(this._awaitee$2); + rt.drop(this.#awaitee$3); } else if (unwind === 34) { - rt.drop(this._awaitee); + rt.drop(this.#awaitee$2); } else if (unwind === 35) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } else if (unwind !== 36) { break b1; } - rt.drop(this._rx); + rt.drop(this.#rx$2); } - this.state = 2; + this.#state = 2; throw e; } } } export class level1Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new recvFuture(this.rx); - } else if (this.state === 1) { + this.#awaitee = new recvFuture(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level10Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level9Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level9Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level11Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level10Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level10Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level12Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level11Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level11Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level13Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level12Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level12Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level14Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level13Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level13Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level15Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level14Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level14Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level2Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level1Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level1Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level3Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level2Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level2Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level4Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level3Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level3Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level5Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level4Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level4Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level6Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level5Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level5Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level7Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level6Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level6Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level8Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level7Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level7Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } } export class level9Future { - state: number = 0; - rx: Consumer.Consumer; - awaitee!: rt.Future; + #state: number = 0; + #rx: Consumer.Consumer; + #awaitee!: rt.Future; constructor(rx: Consumer.Consumer) { - this.rx = rx; + this.#rx = rx; } [Symbol.dispose](): void { - if (this.state === 3) { - rt.drop(this.awaitee); + if (this.#state === 3) { + rt.drop(this.#awaitee); } } poll(_2: rt.Context): rt.Poll { let unwind: number = 0; try { - if (this.state === 0) { + if (this.#state === 0) { unwind = 12; - this.awaitee = new level8Future(this.rx); - } else if (this.state === 1) { + this.#awaitee = new level8Future(this.#rx); + } else if (this.#state === 1) { rt.asyncFnResumed(); - } else if (this.state === 2) { + } else if (this.#state === 2) { rt.asyncFnResumedPanic(); } unwind = 11; - const _6: rt.Poll = this.awaitee.poll(_2); + const _6: rt.Poll = this.#awaitee.poll(_2); if (_6 !== rt.Pending) { unwind = 12; - rt.drop(this.awaitee); - this.state = 1; + rt.drop(this.#awaitee); + this.#state = 1; return _6; } - this.state = 3; + this.#state = 3; return rt.Pending; } catch (e) { if (unwind === 0) { throw e; } if (unwind === 11) { - rt.drop(this.awaitee); + rt.drop(this.#awaitee); } - this.state = 2; + this.#state = 2; throw e; } } diff --git a/ts/src/lower/mir/coroutine.rs b/ts/src/lower/mir/coroutine.rs index b949a1348..8e2970389 100644 --- a/ts/src/lower/mir/coroutine.rs +++ b/ts/src/lower/mir/coroutine.rs @@ -61,7 +61,9 @@ pub fn info<'tcx>(t: &mut Translator<'_, 'tcx>, def_id: DefId, args: GenericArgs alias: None, }); let mut fields = Vec::new(); - let state = t.program.field(sym, "state".into()); + // Private, as only the class's own methods read its fields, which a minifier can then + // rename. + let state = t.program.field(sym, "#state".into()); fields.push(ts::Field { id: state, ty: Type::Builtin("number"), @@ -79,7 +81,7 @@ pub fn info<'tcx>(t: &mut Translator<'_, 'tcx>, def_id: DefId, args: GenericArgs }; let mut upvars = Vec::new(); for (i, ty) in coroutine.upvar_tys().iter().enumerate() { - let name = names.get(i).cloned().unwrap_or_else(|| format!("u{i}")); + let name = format!("#{}", names.get(i).cloned().unwrap_or_else(|| format!("u{i}"))); let id = t.program.field(sym, name); upvars.push(id); let ty = t.ty(ty, span); @@ -111,8 +113,8 @@ pub fn info<'tcx>(t: &mut Translator<'_, 'tcx>, def_id: DefId, args: GenericArgs .debuginfo_name .map(|n| n.as_str().trim_start_matches('_').to_string()) { - Some(name) if !name.is_empty() => crate::lower::camel(&name), - _ => "saved".into(), + Some(name) if !name.is_empty() => format!("#{}", crate::lower::camel(&name)), + _ => "#saved".into(), }; let id = t.program.field(sym, name); saved.push(id); diff --git a/ts/src/print.rs b/ts/src/print.rs index c2a6e8216..38175c36b 100644 --- a/ts/src/print.rs +++ b/ts/src/print.rs @@ -513,15 +513,17 @@ impl Printer<'_> { match ctor { Ctor::Unit => {} Ctor::Positional => { + // A private field's parameter is its name without the `#`. + let param = |name: &str| name.trim_start_matches('#').to_string(); let params: Vec = (names.iter().zip(fields)) - .map(|(name, field)| format!("{name}: {}", self.ty(&field.ty))) + .map(|(name, field)| format!("{}: {}", param(name), self.ty(&field.ty))) .collect(); self.newline(); self.start(); self.write(&format!("constructor({}) {{\n", params.join(", "))); for name in &names { self.start(); - self.write(&format!("{INDENT}this.{name} = {name};\n")); + self.write(&format!("{INDENT}this.{name} = {};\n", param(name))); } self.start(); self.write("}\n"); diff --git a/ts/src/program.rs b/ts/src/program.rs index 7b773a3a9..0a64ba56c 100644 --- a/ts/src/program.rs +++ b/ts/src/program.rs @@ -156,8 +156,9 @@ impl Program { } if let Scope::Owner(owner) = scope { for field in self.fields.iter_mut().filter(|f| f.owner == owner) { - let base = match taken.contains(&field.base) { - // A name a class already defines: the field gives way. + let base = match taken.contains(&field.base) && !field.base.starts_with('#') { + // A name a class already defines: the field gives way. A private name + // can only clash with another field's, which `unique` numbers. true => format!("_{}", field.base), false => field.base.clone(), }; From 3356958ee05a000ca8847f22934aac2c67f46f6d Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Mon, 26 Oct 2026 09:43:18 -0700 Subject: [PATCH 10/12] docs: the translator targets browsers; sizes with private coroutine fields Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0115AT2ue6x9cT5e5J9SZtCn --- quest/m2/README.md | 5 +++++ quest/m2/ts-mir-size.md | 15 +++++++-------- ts/README.md | 6 ++++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/quest/m2/README.md b/quest/m2/README.md index a2d3b0856..d4e125e24 100644 --- a/quest/m2/README.md +++ b/quest/m2/README.md @@ -16,6 +16,11 @@ Decided with the maintainer on 2026-10-24: the translator's output ranks correct then speed, then the size of the consumer's final tree-shaken, minified JS; readability is not a goal, and types must be solid at the API boundary ([design](/ts/README.md#design)). +Decided with the maintainer on 2026-10-26: the translator targets browsers. A native +runtime such as Node or Bun calls Rust through [rust2-ffi](/ffi/README.md), so Node and +Bun matter only as proxies for V8 and JavaScriptCore, and a speed call that splits them +from the browsers goes to the browsers. + The fork's feature quests folded into the [exporter](/quest/m1/ffi-export.md); [m1](/quest/m1/README.md#plan) records why. diff --git a/quest/m2/ts-mir-size.md b/quest/m2/ts-mir-size.md index c326913fd..d14cf2f8f 100644 --- a/quest/m2/ts-mir-size.md +++ b/quest/m2/ts-mir-size.md @@ -8,21 +8,20 @@ bytes minified and 9422 gzipped, and the async handoff's at most 10949 and 3458. ## Plan -The codec's bundle is 29996 bytes minified and 9545 gzipped (+1.3% gzipped), and the -async handoff's 16197 and 3788 (+48%, +9.5%), against THIR's numbers above, built from +The codec's bundle is 30000 bytes minified and 9540 gzipped (+1.3% gzipped), and the +async handoff's 15119 and 3757 (+38%, +8.6%), against THIR's numbers above, built from the same fixtures. Each candidate is measured on the bench's sizes and timings before it lands: -- A coroutine's class, about 410 bytes minified each against about 140 for a THIR +- A coroutine's class, about 360 bytes minified each against about 140 for a THIR generator, for the drop, the checks for a resume after it finished, and the `try`/`catch` that poisons it and drops what it holds on a panic, where a THIR generator had a `finally` and the runtime's one `Async` class: a base class in the runtime for that scaffolding, or one field for saved locals that are never live at - once (the layout's `storage_conflicts`). Each is timed on V8 and JSC with the bundle - minified, since what a `poll` compiles to decides how many levels V8 inlines: private - fields (`#state`) cut 1078 bytes minified and 32 gzipped but grew each `poll`'s - bytecode 19%, and Node 24 ran depth 16 5% slower. Generators and closures stay out: - they measured 1.4-5.5x and 1.3-1.8x slower on the handoff. + once (the layout's `storage_conflicts`). Each is timed in Chrome, which decides, with + the bundle minified, since what a `poll` compiles to decides how many levels V8 + inlines: private fields cost Node 24 5% at depth 16 that way. Generators and closures + stay out: they measured 1.4-5.5x and 1.3-1.8x slower on the handoff. - The handoff's code outside the classes, about 140 bytes gzipped over THIR's. - The codec's `fill`, `encodeFrames`, and `decodeSplit`, whose blocks nest deeper than THIR's loops did. diff --git a/ts/README.md b/ts/README.md index 7452ac31f..cac71fd3a 100644 --- a/ts/README.md +++ b/ts/README.md @@ -1,6 +1,6 @@ # rust2-ts -A rustc driver that translates a subset of Rust to TypeScript with source maps. No WASM: the output is plain ES modules that Node, Bun, and bundlers run as is. +A rustc driver that translates a subset of Rust to TypeScript with source maps, for the browser. No WASM: the output is plain ES modules that bundlers take as is. A native runtime calls Rust through [rust2-ffi](/ffi/README.md) instead. ```bash rust2-ts --config ts.toml (--out dir | --census file.md) [--manifest-path Cargo.toml] [-- cargo args] @@ -173,6 +173,8 @@ Imports name the `.ts` file, which Node, Bun, and bundlers run as is. A `tsc` bu Output is ranked correctness first, speed second, and bundle size third: the consumer's final JS, after their bundler tree-shakes and minifies it, so type-only constructs such as brand casts and annotations are free. Readable output is not a goal. +Speed is a browser's: `just ts bench` runs Node and Bun only as stand-ins for V8 and +JavaScriptCore, and where they disagree with Chrome, Chrome decides. It stays `.ts`, so `tsc` keeps checking the internals, and minifying is the consumer's bundler's job. Types must be solid at the API boundary: the `roots` items and `printable` types use Rust's branded types (`rt.u64`), while internals cast as freely as @@ -260,7 +262,7 @@ they need. replaced, MIR closes about 1,100 of the 1,400 drop refusals in moq-net's census, and runs `just ts bench`'s codec 2-6% faster at the geometric mean and the async handoff 1.4-5.9x faster at depths 1 to 16 in Node, Bun, and Chrome, for 1% more gzip on the - codec's bundle and 10% on the async fixture's + codec's bundle and 9% on the async fixture's ([size](/quest/m2/ts-mir-size.md)). Blocks become nested blocks, loops, and `if`s by Ramsey's "Beyond Relooper", except a coroutine's resume function, which enters loops in the middle and becomes a loop over a `switch` on the next block. Temporaries From 1e1b578043dfb51e277a68a692226239e3a77d68 Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Mon, 26 Oct 2026 10:03:39 -0700 Subject: [PATCH 11/12] fix(ts): name coroutine fields and parameters JS accepts, and count arrow reads `#constructor` is the one private name JS forbids, and a class's constructor is strict code, where `eval` and `arguments` can't be parameters. A read inside an arrow's statement, below its top expression, went uncounted, so a declaration could move into a block the arrow is outside. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0115AT2ue6x9cT5e5J9SZtCn --- ts/fixtures/task/expected/model.ts | 87 ++++++++++++++++-------------- ts/fixtures/task/src/model.rs | 11 ++-- ts/src/lower/mir/mod.rs | 48 +++++++++++++++-- ts/src/print.rs | 19 ++++--- ts/src/program.rs | 15 +++--- 5 files changed, 118 insertions(+), 62 deletions(-) diff --git a/ts/fixtures/task/expected/model.ts b/ts/fixtures/task/expected/model.ts index 4e4ce8e1a..fd5775046 100644 --- a/ts/fixtures/task/expected/model.ts +++ b/ts/fixtures/task/expected/model.ts @@ -395,7 +395,7 @@ export class blocksFuture { let _40!: Guard.Guard; let result2!: rt.usize; let seen!: rt.Future; - let _138!: Inner.Inner | undefined; + let _141!: Inner.Inner | undefined; let unwind: number = 0; try { b0: { @@ -465,17 +465,17 @@ export class blocksFuture { this.#saved$2 = Guard.new(rt.u32Add(this.#guard$2.id, 930), Log.clone$Clone(this.#guard$2.log)); unwind = 120; this.#saved$10 = true; - this.#awaitee$2 = new slotFuture(this.#rx$2); + this.#awaitee$2 = new slotFuture(this.#rx$2, this.#slots.length); } else { this.#state = 3; return rt.Pending; } } unwind = 118; - const _60: rt.Poll = this.#awaitee$2.poll(_2); - if (_60 !== rt.Pending) { + const _63: rt.Poll = this.#awaitee$2.poll(_2); + if (_63 !== rt.Pending) { unwind = 139; - result2 = _60; + result2 = _63; rt.drop(this.#awaitee$2); if (!(result2 < 2)) { rt.panic("index out of bounds: the len is " + 2 + " but the index is " + result2); @@ -488,16 +488,16 @@ export class blocksFuture { this.#saved$10 = false; const arg = ([this.#waited] as [rt.u64])[0]; const args2: rt.Fmt[] = [(f: rt.Formatter) => rt.u64Display(arg, f)]; - const _75: string = rt.fmtFormat(["slot after ", args2[0]]); + const _78: string = rt.fmtFormat(["slot after ", args2[0]]); unwind = 117; - const _73: string = _75; - Guard.note(this.#slots[0], _73); + const _76: string = _78; + Guard.note(this.#slots[0], _76); unwind = 137; this.#tally = { n: this.#guard$2.id }; this.#saved$9 = true; seen = new blocksFuture$3(rt.copy(this.#tally)); - const _86: rt.u32 = rt.u32Add(this.#tally.n, 1000); - this.#tally.n = _86; + const _89: rt.u32 = rt.u32Add(this.#tally.n, 1000); + this.#tally.n = _89; this.#saved$3 = this.#guard$2; this.#saved$4 = this.#tally.n; this.#saved$9 = false; @@ -508,17 +508,17 @@ export class blocksFuture { } } unwind = 115; - const _98: rt.Poll = this.#awaitee$3.poll(_2); - if (_98 !== rt.Pending) { + const _101: rt.Poll = this.#awaitee$3.poll(_2); + if (_101 !== rt.Pending) { unwind = 137; - const _95: rt.u32 = _98; + const _98: rt.u32 = _101; rt.drop(this.#awaitee$3); const arg2 = this.#saved$4; - const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg2, f), (f: rt.Formatter) => rt.u32Display(_95, f)]; - const _90: string = rt.fmtFormat(["tally ", args4[0], " then ", args4[1]]); + const args4: rt.Fmt[] = [(f: rt.Formatter) => rt.u32Display(arg2, f), (f: rt.Formatter) => rt.u32Display(_98, f)]; + const _93: string = rt.fmtFormat(["tally ", args4[0], " then ", args4[1]]); unwind = 114; - const _88: string = _90; - Guard.note(this.#saved$3, _88); + const _91: string = _93; + Guard.note(this.#saved$3, _91); unwind = 137; this.#mark = { n: 1 }; this.#awaitee$4 = new blocksFuture$4(this.#mark); @@ -528,26 +528,26 @@ export class blocksFuture { } } unwind = 113; - const _114: rt.Poll = this.#awaitee$4.poll(_2); - if (_114 !== rt.Pending) { + const _117: rt.Poll = this.#awaitee$4.poll(_2); + if (_117 !== rt.Pending) { unwind = 137; - this.#replaced = _114; + this.#replaced = _117; rt.drop(this.#awaitee$4); const arg3 = this.#replaced; - const _133: rt.Fmt = (f: rt.Formatter) => rt.u32Display(arg3, f); + const _136: rt.Fmt = (f: rt.Formatter) => rt.u32Display(arg3, f); const arg4 = this.#mark.n; - const args6: rt.Fmt[] = [_133, (f: rt.Formatter) => rt.u32Display(arg4, f)]; - const _126: string = rt.fmtFormat(["mark ", args6[0], " ", args6[1]]); + const args6: rt.Fmt[] = [_136, (f: rt.Formatter) => rt.u32Display(arg4, f)]; + const _129: string = rt.fmtFormat(["mark ", args6[0], " ", args6[1]]); unwind = 112; - const _124: string = _126; - Guard.note(this.#guard$2, _124); + const _127: string = _129; + Guard.note(this.#guard$2, _127); unwind = 111; - _138 = undefined; - const _139: Guard.Guard = Guard.new(rt.u32Add(this.#guard$2.id, 800), Log.clone$Clone(this.#guard$2.log)); + _141 = undefined; + const _142: Guard.Guard = Guard.new(rt.u32Add(this.#guard$2.id, 800), Log.clone$Clone(this.#guard$2.log)); unwind = 137; - const _146: Outer.Outer = new Outer.Outer({ inner: _138, guard: _139 }); + const _149: Outer.Outer = new Outer.Outer({ inner: _141, guard: _142 }); unwind = 110; - this.#nested = new Inner.Inner({ outer: _146 }); + this.#nested = new Inner.Inner({ outer: _149 }); const third: Guard.Guard = Guard.new(rt.u32Add(this.#guard$2.id, 400), Log.clone$Clone(this.#guard$2.log)); if (!this.#moves$2) { this.#chosen = third; @@ -570,10 +570,10 @@ export class blocksFuture { } } unwind = 108; - const _161: rt.Poll = this.#awaitee$5.poll(_2); - if (_161 !== rt.Pending) { + const _164: rt.Poll = this.#awaitee$5.poll(_2); + if (_164 !== rt.Pending) { unwind = 109; - const result5: rt.u64 = _161; + const result5: rt.u64 = _164; rt.drop(this.#awaitee$5); unwind = 110; rt.drop(this.#chosen); @@ -624,7 +624,7 @@ export class blocksFuture { break b15; } if (unwind === 111) { - rt.drop(_138); + rt.drop(_141); break b14; } if (unwind === 112) { @@ -1038,11 +1038,14 @@ export function consume(guard: Guard.Guard, v: rt.u64 | undefined): rt.u64 { export class slotFuture { #state: number = 0; - #rx: Consumer.Consumer; + #_constructor: Consumer.Consumer; + #eval: rt.usize; + #eval$2!: rt.usize; #awaitee!: rt.Future; - constructor(rx: Consumer.Consumer) { - this.#rx = rx; + constructor(_constructor: Consumer.Consumer, eval_: rt.usize) { + this.#_constructor = _constructor; + this.#eval = eval_; } [Symbol.dispose](): void { @@ -1052,12 +1055,14 @@ export class slotFuture { } poll(_2: rt.Context): rt.Poll { - let _18!: rt.usize; + let _19!: rt.usize; let unwind: number = 0; try { if (this.#state === 0) { unwind = 16; - this.#awaitee = new recvFuture(this.#rx); + const constructor: Consumer.Consumer = this.#_constructor; + this.#eval$2 = this.#eval; + this.#awaitee = new recvFuture(constructor); } else if (this.#state === 1) { rt.asyncFnResumed(); } else if (this.#state === 2) { @@ -1070,12 +1075,12 @@ export class slotFuture { const result: rt.u64 | undefined = _6; rt.drop(this.#awaitee); if (result === undefined) { - _18 = 0; + _19 = 0; } else { - _18 = rt.usizeRem(rt.u64Low(result), 2); + _19 = rt.usizeRem(rt.u64Low(result), this.#eval$2); } this.#state = 1; - return _18; + return _19; } this.#state = 3; return rt.Pending; diff --git a/ts/fixtures/task/src/model.rs b/ts/fixtures/task/src/model.rs index f6f565984..bee6ac41d 100644 --- a/ts/fixtures/task/src/model.rs +++ b/ts/fixtures/task/src/model.rs @@ -126,7 +126,7 @@ pub async fn blocks(mut rx: Consumer, guard: Guard, moves: bool) -> u64 { Guard::new(guard.id + 910, guard.log.clone()), Guard::new(guard.id + 920, guard.log.clone()), ]; - slots[slot(&mut rx).await] = Guard::new(guard.id + 930, guard.log.clone()); + slots[slot(&mut rx, slots.len()).await] = Guard::new(guard.id + 930, guard.log.clone()); slots[0].note(&format!("slot after {waited}")); let mut tally = Tally { n: guard.id }; let seen = async move { read(tally) }; @@ -177,10 +177,11 @@ fn consume(guard: Guard, v: Option) -> u64 { u64::from(guard.finish("consumed")) + v.unwrap_or(0) } -/// The slot the next value picks. -async fn slot(rx: &mut Consumer) -> usize { - match rx.recv().await { - Some(v) => v as usize % 2, +/// The slot the next value picks, of `eval`. Its captures take names a class or strict +/// code reserves. +async fn slot(constructor: &mut Consumer, eval: usize) -> usize { + match constructor.recv().await { + Some(v) => v as usize % eval, None => 0, } } diff --git a/ts/src/lower/mir/mod.rs b/ts/src/lower/mir/mod.rs index e27ad510d..82a17c70a 100644 --- a/ts/src/lower/mir/mod.rs +++ b/ts/src/lower/mir/mod.rs @@ -2568,7 +2568,7 @@ fn writes_of(e: &Expr, name: &str) -> usize { } /// Call `f` on each expression the statement holds directly, and in its blocks. -fn visit_stmt(stmt: &Stmt, f: &mut impl FnMut(&Expr)) { +fn visit_stmt(stmt: &Stmt, f: &mut dyn FnMut(&Expr)) { match &stmt.kind { StmtKind::Expr(e) | StmtKind::Return(Some(e)) | StmtKind::Throw(e) | StmtKind::Decl { init: Some(e), .. } => { f(e) @@ -2602,7 +2602,7 @@ fn visit_stmt(stmt: &Stmt, f: &mut impl FnMut(&Expr)) { } /// Call `f` on `e` and every expression within it, arrow bodies included. -fn visit_expr(e: &Expr, f: &mut impl FnMut(&Expr)) { +fn visit_expr(e: &Expr, f: &mut dyn FnMut(&Expr)) { f(e); match e { Expr::Ident(_) | Expr::This | Expr::Sym(_) | Expr::Rt(_) | Expr::Lit(_) | Expr::Str(_) => {} @@ -2627,7 +2627,7 @@ fn visit_expr(e: &Expr, f: &mut impl FnMut(&Expr)) { visit_expr(a, f); visit_expr(b, f); } - Expr::Arrow(_, _, body) => body.iter().for_each(|s| visit_stmt(s, f)), + Expr::Arrow(_, _, body) => body.iter().for_each(|s| visit_stmt(s, &mut |e| visit_expr(e, f))), } } @@ -2971,3 +2971,45 @@ pub(super) fn small_range<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> bool { if crate::lower::library::Std::of(tcx, adt.did()) == Some(crate::lower::library::Std::Range) && crate::lower::num::Int::of(args.type_at(0)).is_some_and(|i| !i.big())) } + +#[cfg(test)] +mod tests { + use super::*; + + /// A variable an arrow reads below the top of one of its statements stays declared + /// where the arrow can see it, not at an assignment in a block the arrow is outside. + #[test] + fn declare_counts_arrow_reads() { + let found = || Expr::ident("found"); + let assign = StmtKind::Expr(found().assign(Expr::lit("1"))).at(None); + let read = StmtKind::Return(Some(Expr::ident("f").call(vec![found()]))).at(None); + let arrow = Expr::Arrow(Vec::new(), Type::Builtin("number"), vec![read]); + let then = vec![assign, StmtKind::Break(None).at(None)]; + let cond = Expr::ident("c"); + let body = vec![ + StmtKind::If { + cond, + then, + els: Vec::new(), + } + .at(None), + ]; + let ty = Type::Builtin("number"); + let mut stmts = vec![ + StmtKind::Declare { + name: "found".into(), + ty, + } + .at(None), + StmtKind::While { + label: None, + cond: Expr::lit("true"), + body, + } + .at(None), + StmtKind::Expr(arrow.call(Vec::new())).at(None), + ]; + declare_in_place(&mut stmts); + assert!(matches!(&stmts[0].kind, StmtKind::Declare { name, .. } if name == "found")); + } +} diff --git a/ts/src/print.rs b/ts/src/print.rs index 38175c36b..af1c3d6d6 100644 --- a/ts/src/print.rs +++ b/ts/src/print.rs @@ -6,7 +6,7 @@ use std::path::{Component, Path, PathBuf}; use oxc_sourcemap::SourceMapBuilder; -use crate::program::{HEADER, ModPath, Program, SymKind, is_type_module, module_file}; +use crate::program::{HEADER, ModPath, Program, SymKind, is_type_module, module_file, unique}; use crate::ts::{Ctor, Expr, FieldInit, Function, Item, Key, Loc, Param, Stmt, StmtKind, SymId, Type}; pub struct Printed { @@ -513,17 +513,22 @@ impl Printer<'_> { match ctor { Ctor::Unit => {} Ctor::Positional => { - // A private field's parameter is its name without the `#`. - let param = |name: &str| name.trim_start_matches('#').to_string(); - let params: Vec = (names.iter().zip(fields)) - .map(|(name, field)| format!("{}: {}", param(name), self.ty(&field.ty))) + // Each field's parameter is its name without the `#`, escaped where + // strict code reserves it, and numbered where escaping made it another's. + let mut taken = HashSet::new(); + let args: Vec = names + .iter() + .map(|name| unique(&mut taken, &crate::lower::escape(name.trim_start_matches('#')))) + .collect(); + let params: Vec = (args.iter().zip(fields)) + .map(|(arg, field)| format!("{arg}: {}", self.ty(&field.ty))) .collect(); self.newline(); self.start(); self.write(&format!("constructor({}) {{\n", params.join(", "))); - for name in &names { + for (name, arg) in names.iter().zip(&args) { self.start(); - self.write(&format!("{INDENT}this.{name} = {};\n", param(name))); + self.write(&format!("{INDENT}this.{name} = {arg};\n")); } self.start(); self.write("}\n"); diff --git a/ts/src/program.rs b/ts/src/program.rs index 0a64ba56c..f861d7bde 100644 --- a/ts/src/program.rs +++ b/ts/src/program.rs @@ -156,11 +156,14 @@ impl Program { } if let Scope::Owner(owner) = scope { for field in self.fields.iter_mut().filter(|f| f.owner == owner) { - let base = match taken.contains(&field.base) && !field.base.starts_with('#') { - // A name a class already defines: the field gives way. A private name - // can only clash with another field's, which `unique` numbers. - true => format!("_{}", field.base), - false => field.base.clone(), + let base = match field.base.strip_prefix('#') { + // The one private name JS forbids. + Some("constructor") => "#_constructor".to_string(), + // Any other can only clash with another field's, which `unique` numbers. + Some(_) => field.base.clone(), + // A name a class already defines: the field gives way. + None if taken.contains(&field.base) => format!("_{}", field.base), + None => field.base.clone(), }; field.name = unique(&mut taken, &base); } @@ -216,7 +219,7 @@ enum Scope { } /// `base`, or the first of `base$2`, `base$3`, and on that is not taken. -fn unique(taken: &mut HashSet, base: &str) -> String { +pub(crate) fn unique(taken: &mut HashSet, base: &str) -> String { let mut name = base.to_string(); let mut n = 2; while taken.contains(&name) { From 0b66bee6d61de78044580a6424d0bef791ccd8ae Mon Sep 17 00:00:00 2001 From: Luke Curley <432854+kixelated@users.noreply.github.com> Date: Mon, 26 Oct 2026 10:05:48 -0700 Subject: [PATCH 12/12] docs(ts): Bun stands in for Safari's engine, so only Node yields to Chrome Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0115AT2ue6x9cT5e5J9SZtCn --- ts/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/README.md b/ts/README.md index cac71fd3a..40cbda962 100644 --- a/ts/README.md +++ b/ts/README.md @@ -174,7 +174,7 @@ Output is ranked correctness first, speed second, and bundle size third: the consumer's final JS, after their bundler tree-shakes and minifies it, so type-only constructs such as brand casts and annotations are free. Readable output is not a goal. Speed is a browser's: `just ts bench` runs Node and Bun only as stand-ins for V8 and -JavaScriptCore, and where they disagree with Chrome, Chrome decides. +JavaScriptCore, as Safari runs it, and where Node disagrees with Chrome, Chrome decides. It stays `.ts`, so `tsc` keeps checking the internals, and minifying is the consumer's bundler's job. Types must be solid at the API boundary: the `roots` items and `printable` types use Rust's branded types (`rt.u64`), while internals cast as freely as