Hojun-Cho
0e72556120
The f32 coda of Drew's strconv 5-fold plan — f64tos shipped in fold-5a (0e66073); this completes the plan. Re-lands the f32-exclusive Ryū path that fold-5a removed under the dead-code rule (it was #143-blocked): pow5fac32/pow5multiple32/pow2multiple32, mulshift32, mulpow5inv_divpow2/ mulpow5_divpow2, decf32, f32todecf32 (ftos_ryu.ha), and the f32tos driver (ftos.ha:448). Plus F32_POW5_*_BITCOUNT in ftos_data.ww. The f32 path REUSES the shared u64 core (mulshiftall64/u128mul/u128rshift/ log*) and f64computeinvpow5/f64computepow5 — and thus the f64 SPLIT2 tables — exactly as ftos_ryu.ha does; there are no separate f32 tables. Unblocked by #143 (aff7725): f32tos calls math.f32bits(n), passing an f32 arg, which now spills MOVSS (4B) in both stages. Verified: f32tos's arg push/pop is MOVSS, w6c vs w6c_ww 0-diff on the strconv-embedding combined.ww (w6c/wwdump/smoke regenerated). Dodges (cgen bugs still deferred, each cited at-site): decf32.exponent:i64 sidesteps the #169 narrow-second-field struct-return unpack (byte-id gate-confirmed, not an ABI guarantee); #168 div/mod local-bind on the two `%10` sites; *decimal pointer field reads (#170); [32]u8 buffer reuses f64tos's byte-id-clean band over Hare's [14] (#43). mulshift32's U32_MAX bound inlines the literal — ww's types.U32_MAX is package-private (#172). Test: ftostest.ww gains f32 vectors — the tcs G/void rows (shared f32/f64 shortest), the f32-exclusive tcsf32 extremes (1e-45 / 1.1754944e-38 / 3.4028235e38, full 24-bit mantissa), specials, a negative-normal, and 33554432 (the sole e2>=0/q<=9 runtime cover). make test 187/187 incl 908_ftos_run + 990-997 byte-id + combined_ww_fresh.
165 lines
6.3 KiB
Plaintext
165 lines
6.3 KiB
Plaintext
// ftostest — exercises lib/strconv/ftos.ww (Hare ftos.ha / ftos_ryu.ha
|
|
// Ryū port). Run with `out/bin/ww run lib/strconv/test/ftostest.ww`.
|
|
// Same signalled-then-os.exit(signalled+10) pattern as stoftest/
|
|
// decimaltest: a non-zero exit names the failing @test (1..N → 11..N+10).
|
|
//
|
|
// Ports ref/hare/strconv/+test/ftos_test.ha's ffmt::G / prec=void /
|
|
// fflags::NONE rows (the f64tos cases) verbatim — these are exactly
|
|
// strconv.f64tos's output. encode_f_dec is covered by 13.37/1100/0.011/…
|
|
// and encode_e_dec by 1e4/1.1e4/1e-3/1.1e-3/1e-4. nan/±infinity via
|
|
// math.f64frombits of the IEEE bit patterns (ww math has no f64 NAN/INF
|
|
// const — see math/floats.ww).
|
|
//
|
|
// f32tos (fold-5b, task #67) is exercised by f32tos_fixed/_scientific/
|
|
// _extremes/_special below. The G/void rows mirror ftos_test.ha's tcs (the
|
|
// "pass for both f32 and f64" set, lines 9/183); the _extremes rows mirror
|
|
// tcsf32 (ftos_test.ha:218-221, the f32-EXCLUSIVE denormal/min/max — full
|
|
// f32 mantissa). f32 values use the `f32` literal suffix or f32frombits.
|
|
//
|
|
// Lives in lib/strconv/test/ so `import strconv` resolves to the
|
|
// DIRECTORY (full package), not the strconv.ww FILE — same rationale as
|
|
// stoftest/decimaltest.
|
|
|
|
package strconv;
|
|
|
|
import strconv;
|
|
import os;
|
|
import math;
|
|
|
|
let signalled: i32 = 0;
|
|
fn fail() void = { os.exit(signalled + 10); };
|
|
|
|
fn streq(a: str, b: str) bool = {
|
|
if (a.len != b.len) { return false; };
|
|
let k: i32 = 0i32;
|
|
for (k < a.len) {
|
|
if (a[k] != b[k]) { return false; };
|
|
k += 1i32;
|
|
};
|
|
return true;
|
|
};
|
|
|
|
fn chk(n: f64, want: str) bool = {
|
|
return streq(f64tos(n), want);
|
|
};
|
|
|
|
// ftos_test.ha:57-64 (G/void/NONE-equivalent) — fixed-point renders.
|
|
@test fn f64tos_fixed() void = {
|
|
if (!chk(13.37, "13.37")) { fail(); };
|
|
if (!chk(12345.0, "12345")) { fail(); };
|
|
if (!chk(1100.0, "1100")) { fail(); };
|
|
if (!chk(100.0, "100")) { fail(); };
|
|
if (!chk(10.0, "10")) { fail(); };
|
|
if (!chk(1.0, "1")) { fail(); };
|
|
if (!chk(0.3, "0.3")) { fail(); };
|
|
if (!chk(0.1, "0.1")) { fail(); };
|
|
if (!chk(0.01, "0.01")) { fail(); };
|
|
if (!chk(0.011, "0.011")) { fail(); };
|
|
if (!chk(1.414, "1.414")) { fail(); };
|
|
if (!chk(-6345.972, "-6345.972")) { fail(); };
|
|
};
|
|
|
|
// ftos_test.ha:78-90 — scientific renders (the shortest-G E-dispatch).
|
|
@test fn f64tos_scientific() void = {
|
|
if (!chk(10000.0, "1e4")) { fail(); };
|
|
if (!chk(11000.0, "1.1e4")) { fail(); };
|
|
if (!chk(1000.0, "1e3")) { fail(); };
|
|
if (!chk(0.001, "1e-3")) { fail(); };
|
|
if (!chk(0.0011, "1.1e-3")) { fail(); };
|
|
if (!chk(0.0001, "1e-4")) { fail(); };
|
|
// dp=-2 < -1 → G dispatches to E (ftos_test.ha:62 is the ffmt::F row;
|
|
// shortest-G of 0.0031415 is scientific).
|
|
if (!chk(0.0031415, "3.1415e-3")) { fail(); };
|
|
};
|
|
|
|
// ftos_test.ha:12/16/27 — zero, ±infinity, nan.
|
|
@test fn f64tos_special() void = {
|
|
if (!chk(0.0, "0")) { fail(); };
|
|
// sign bit via (1u64 << 63), not the 0x8000000000000000 literal:
|
|
// wwstage mis-emits the I64_MIN-magnitude literal (#144 family).
|
|
let negzero: f64 = math.f64frombits(1u64 << 63u64);
|
|
if (!chk(negzero, "-0")) { fail(); };
|
|
let inf: f64 = math.f64frombits(0x7FF0000000000000u64);
|
|
if (!chk(inf, "infinity")) { fail(); };
|
|
let ninf: f64 = math.f64frombits(0xFFF0000000000000u64);
|
|
if (!chk(ninf, "-infinity")) { fail(); };
|
|
let nan: f64 = math.f64frombits(0x7FF8000000000000u64);
|
|
if (!chk(nan, "nan")) { fail(); };
|
|
};
|
|
|
|
fn chkf32(n: f32, want: str) bool = {
|
|
return streq(f32tos(n), want);
|
|
};
|
|
|
|
// ftos_test.ha tcs G/void rows (the "pass for both f32 and f64" set) —
|
|
// fixed-point renders. 1.0/1.5/0.1/100/0.5 are the fold-5a probe's 5/5
|
|
// value-validated f32todecf32 pairs.
|
|
@test fn f32tos_fixed() void = {
|
|
if (!chkf32(13.37f32, "13.37")) { fail(); };
|
|
if (!chkf32(-13.37f32, "-13.37")) { fail(); }; // sign prefix + encode_f at o=1
|
|
// 2^25: the smallest f32 with e2 >= 0 (q == 0) — the ONLY runtime cover
|
|
// of f32todecf32's e2>=0 / q<=9 trailing-zero block (the f32-specific
|
|
// `q <= 9` + pow5multiple32 arm). External shortest-round-trip check.
|
|
if (!chkf32(33554432.0f32, "33554432")) { fail(); };
|
|
if (!chkf32(12345.0f32, "12345")) { fail(); };
|
|
if (!chkf32(1100.0f32, "1100")) { fail(); };
|
|
if (!chkf32(100.0f32, "100")) { fail(); };
|
|
if (!chkf32(10.0f32, "10")) { fail(); };
|
|
if (!chkf32(1.0f32, "1")) { fail(); };
|
|
if (!chkf32(1.5f32, "1.5")) { fail(); };
|
|
if (!chkf32(0.5f32, "0.5")) { fail(); };
|
|
if (!chkf32(0.1f32, "0.1")) { fail(); };
|
|
if (!chkf32(0.01f32, "0.01")) { fail(); };
|
|
if (!chkf32(0.011f32, "0.011")) { fail(); };
|
|
};
|
|
|
|
// ftos_test.ha tcs G/void rows — scientific (shortest-G E-dispatch).
|
|
@test fn f32tos_scientific() void = {
|
|
if (!chkf32(10000.0f32, "1e4")) { fail(); };
|
|
if (!chkf32(11000.0f32, "1.1e4")) { fail(); };
|
|
if (!chkf32(1000.0f32, "1e3")) { fail(); };
|
|
if (!chkf32(0.001f32, "1e-3")) { fail(); };
|
|
if (!chkf32(0.0011f32, "1.1e-3")) { fail(); };
|
|
if (!chkf32(0.0001f32, "1e-4")) { fail(); };
|
|
};
|
|
|
|
// ftos_test.ha:218-221 (tcsf32) — the f32-EXCLUSIVE denormal/min-normal/
|
|
// max-normal rows (distinct outputs from f64): exercise the full f32
|
|
// mantissa (8 sig digits) + 2-digit exponent. Built via f32frombits of the
|
|
// IEEE-754 bit patterns (ww math has no F32_MIN_*/MAX_NORMAL const).
|
|
@test fn f32tos_extremes() void = {
|
|
let minsub: f32 = math.f32frombits(1u32); // 2^-149
|
|
if (!chkf32(minsub, "1e-45")) { fail(); };
|
|
let minnorm: f32 = math.f32frombits(0x00800000u32); // 2^-126
|
|
if (!chkf32(minnorm, "1.1754944e-38")) { fail(); };
|
|
let maxnorm: f32 = math.f32frombits(0x7F7FFFFFu32);
|
|
if (!chkf32(maxnorm, "3.4028235e38")) { fail(); };
|
|
};
|
|
|
|
// ftos_test.ha:11/15/26 — zero, ±infinity, nan (f32 bit patterns).
|
|
@test fn f32tos_special() void = {
|
|
if (!chkf32(0.0f32, "0")) { fail(); };
|
|
// sign bit via (1u32 << 31), mirroring the f64 test's I64_MIN-literal
|
|
// avoidance (#144 family).
|
|
let negzero: f32 = math.f32frombits(1u32 << 31u32);
|
|
if (!chkf32(negzero, "-0")) { fail(); };
|
|
let inf: f32 = math.f32frombits(0x7F800000u32);
|
|
if (!chkf32(inf, "infinity")) { fail(); };
|
|
let ninf: f32 = math.f32frombits(0xFF800000u32);
|
|
if (!chkf32(ninf, "-infinity")) { fail(); };
|
|
let nan: f32 = math.f32frombits(0x7FC00000u32);
|
|
if (!chkf32(nan, "nan")) { fail(); };
|
|
};
|
|
|
|
export fn main() i32 = {
|
|
signalled = 1; f64tos_fixed();
|
|
signalled = 2; f64tos_scientific();
|
|
signalled = 3; f64tos_special();
|
|
signalled = 4; f32tos_fixed();
|
|
signalled = 5; f32tos_scientific();
|
|
signalled = 6; f32tos_extremes();
|
|
signalled = 7; f32tos_special();
|
|
os.exit(0);
|
|
return 0;
|
|
};
|