test: prove ordinary import binding modes

This commit is contained in:
2026-08-14 10:56:54 +09:00
parent 792b6ecbe5
commit 10e02a00ee
20 changed files with 1284 additions and 672 deletions

View File

@@ -28,25 +28,25 @@ fn fstreq(a: str, b: str) bool = {
};
fn chk(n: f64, want: str) bool = {
return fstreq(f64tos(n), want);
return fstreq(strconv.f64tos(n), want);
};
// rt64 — bit-exact round-trip: render then parse back must reproduce the
// exact bits. The parse-back re-runs strconv's decimal slow path.
fn rt64(x: f64) bool = {
match (stof64(f64tos(x), base.DEC)) {
match (strconv.stof64(strconv.f64tos(x), strconv.base.DEC)) {
case let v: f64 => { return math.f64bits(v) == math.f64bits(x); };
case let e: invalid => { return false; };
case let e: overflow => { return false; };
case let e: strconv.invalid => { return false; };
case let e: strconv.overflow => { return false; };
};
return false;
};
fn rt32(x: f32) bool = {
match (stof32(f32tos(x), base.DEC)) {
match (strconv.stof32(strconv.f32tos(x), strconv.base.DEC)) {
case let v: f32 => { return math.f32bits(v) == math.f32bits(x); };
case let e: invalid => { return false; };
case let e: overflow => { return false; };
case let e: strconv.invalid => { return false; };
case let e: strconv.overflow => { return false; };
};
return false;
};
@@ -96,7 +96,7 @@ fn rt32(x: f32) bool = {
};
fn chkf32(n: f32, want: str) bool = {
return fstreq(f32tos(n), want);
return fstreq(strconv.f32tos(n), want);
};
// ftos_test.ha tcs G/void rows (the "pass for both f32 and f64" set) —

View File

@@ -14,177 +14,177 @@ package strconv_test;
import strconv;
fn cki(id: i32, s: str, b: base, want: i64) void = {
match (stoi64(s, b)) {
fn cki(id: i32, s: str, b: strconv.base, want: i64) void = {
match (strconv.stoi64(s, b)) {
case let v: i64 => assert(!(v != want));
case let e: invalid => abort();
case let e: overflow => abort();
case let e: strconv.invalid => abort();
case let e: strconv.overflow => abort();
};
};
fn cki_inv(id: i32, s: str, b: base, idx: i32) void = {
match (stoi64(s, b)) {
fn cki_inv(id: i32, s: str, b: strconv.base, idx: i32) void = {
match (strconv.stoi64(s, b)) {
case let v: i64 => abort();
case let e: invalid => assert(!(e: i32 != idx));
case let e: overflow => abort();
case let e: strconv.invalid => assert(!(e: i32 != idx));
case let e: strconv.overflow => abort();
};
};
fn cki_ovf(id: i32, s: str, b: base) void = {
match (stoi64(s, b)) {
fn cki_ovf(id: i32, s: str, b: strconv.base) void = {
match (strconv.stoi64(s, b)) {
case let v: i64 => abort();
case let e: invalid => abort();
case let e: overflow => { };
case let e: strconv.invalid => abort();
case let e: strconv.overflow => { };
};
};
fn cku(id: i32, s: str, b: base, want: u64) void = {
match (stou64(s, b)) {
fn cku(id: i32, s: str, b: strconv.base, want: u64) void = {
match (strconv.stou64(s, b)) {
case let v: u64 => assert(!(v != want));
case let e: invalid => abort();
case let e: overflow => abort();
case let e: strconv.invalid => abort();
case let e: strconv.overflow => abort();
};
};
fn cku_inv(id: i32, s: str, b: base, idx: i32) void = {
match (stou64(s, b)) {
fn cku_inv(id: i32, s: str, b: strconv.base, idx: i32) void = {
match (strconv.stou64(s, b)) {
case let v: u64 => abort();
case let e: invalid => assert(!(e: i32 != idx));
case let e: overflow => abort();
case let e: strconv.invalid => assert(!(e: i32 != idx));
case let e: strconv.overflow => abort();
};
};
fn cku_ovf(id: i32, s: str, b: base) void = {
match (stou64(s, b)) {
fn cku_ovf(id: i32, s: str, b: strconv.base) void = {
match (strconv.stou64(s, b)) {
case let v: u64 => abort();
case let e: invalid => abort();
case let e: overflow => { };
case let e: strconv.invalid => abort();
case let e: strconv.overflow => { };
};
};
fn cki32_ovf(id: i32, s: str, b: base) void = {
match (stoi32(s, b)) {
fn cki32_ovf(id: i32, s: str, b: strconv.base) void = {
match (strconv.stoi32(s, b)) {
case let v: i32 => abort();
case let e: invalid => abort();
case let e: overflow => { };
case let e: strconv.invalid => abort();
case let e: strconv.overflow => { };
};
};
fn cki32(id: i32, s: str, b: base, want: i32) void = {
match (stoi32(s, b)) {
fn cki32(id: i32, s: str, b: strconv.base, want: i32) void = {
match (strconv.stoi32(s, b)) {
case let v: i32 => assert(!(v != want));
case let e: invalid => abort();
case let e: overflow => abort();
case let e: strconv.invalid => abort();
case let e: strconv.overflow => abort();
};
};
fn ck_int(id: i32, s: str, b: base, want: int) void = {
match (stoi(s, b)) {
fn ck_int(id: i32, s: str, b: strconv.base, want: int) void = {
match (strconv.stoi(s, b)) {
case let v: int => assert(!(v != want));
case let e: invalid => abort();
case let e: overflow => abort();
case let e: strconv.invalid => abort();
case let e: strconv.overflow => abort();
};
};
fn ck_uint(id: i32, s: str, b: base, want: uint) void = {
match (stou(s, b)) {
fn ck_uint(id: i32, s: str, b: strconv.base, want: uint) void = {
match (strconv.stou(s, b)) {
case let v: uint => assert(!(v != want));
case let e: invalid => abort();
case let e: overflow => abort();
case let e: strconv.invalid => abort();
case let e: strconv.overflow => abort();
};
};
fn ck_size(id: i32, s: str, b: base, want: size) void = {
match (stoz(s, b)) {
fn ck_size(id: i32, s: str, b: strconv.base, want: size) void = {
match (strconv.stoz(s, b)) {
case let v: size => assert(!(v != want));
case let e: invalid => abort();
case let e: overflow => abort();
case let e: strconv.invalid => abort();
case let e: strconv.overflow => abort();
};
};
fn ck_int_ovf(id: i32, s: str, b: base) void = {
match (stoi(s, b)) {
fn ck_int_ovf(id: i32, s: str, b: strconv.base) void = {
match (strconv.stoi(s, b)) {
case let v: int => abort();
case let e: invalid => abort();
case let e: overflow => { };
case let e: strconv.invalid => abort();
case let e: strconv.overflow => { };
};
};
fn ck_uint_ovf(id: i32, s: str, b: base) void = {
match (stou(s, b)) {
fn ck_uint_ovf(id: i32, s: str, b: strconv.base) void = {
match (strconv.stou(s, b)) {
case let v: uint => abort();
case let e: invalid => abort();
case let e: overflow => { };
case let e: strconv.invalid => abort();
case let e: strconv.overflow => { };
};
};
// ref/hare/strconv/stoi.ha:56-79.
@test fn test_stoi64() void = {
cki_inv(1, "", base.DEC, 0);
cki_inv(2, "abc", base.DEC, 0);
cki_inv(3, "1a", base.DEC, 1);
cki_inv(4, "+", base.DEC, 1);
cki_inv(5, "-+", base.DEC, 1);
cki_inv(6, "-z", base.DEC, 1);
cki_inv(1, "", strconv.base.DEC, 0);
cki_inv(2, "abc", strconv.base.DEC, 0);
cki_inv(3, "1a", strconv.base.DEC, 1);
cki_inv(4, "+", strconv.base.DEC, 1);
cki_inv(5, "-+", strconv.base.DEC, 1);
cki_inv(6, "-z", strconv.base.DEC, 1);
cki_ovf(7, "9223372036854775808", base.DEC);
cki_ovf(8, "-9223372036854775809", base.DEC);
cki_ovf(7, "9223372036854775808", strconv.base.DEC);
cki_ovf(8, "-9223372036854775809", strconv.base.DEC);
// The last multiply wraps to a value larger than its prefix, so a
// post-arithmetic `n < old` check misses this overflow.
cki_ovf(19, "21000000000000000000", base.DEC);
cki_ovf(19, "21000000000000000000", strconv.base.DEC);
cki(9, "0", base.DEC, 0);
cki(10, "1", base.DEC, 1);
cki(11, "+1", base.DEC, 1);
cki(12, "-1", base.DEC, -1);
cki(13, "9223372036854775807", base.DEC, 9223372036854775807i64);
cki(9, "0", strconv.base.DEC, 0);
cki(10, "1", strconv.base.DEC, 1);
cki(11, "+1", strconv.base.DEC, 1);
cki(12, "-1", strconv.base.DEC, -1);
cki(13, "9223372036854775807", strconv.base.DEC, 9223372036854775807i64);
// I64_MIN. Spelled -I64_MAX-1 (Hare's own two's-complement identity,
// stoi64 comment in stoi.ha:11) because the wwstage mis-lexes the
// direct literal -9223372036854775808 (and types.I64_MIN) to 0 —
// proj #245. The INPUT string is unaffected; stoi64 parses it to the
// correct value on both stages. This isolates the parse test from #245.
cki(14, "-9223372036854775808", base.DEC, -9223372036854775807i64 - 1i64);
cki(14, "-9223372036854775808", strconv.base.DEC, -9223372036854775807i64 - 1i64);
// width wrapper boundaries (ref/hare/strconv/stoi.ha:74-78).
cki32_ovf(15, "2147483648", base.DEC);
cki32_ovf(16, "-2147483649", base.DEC);
cki32(17, "2147483647", base.DEC, 2147483647i32);
cki32(18, "-2147483648", base.DEC, -2147483648i32);
cki32_ovf(15, "2147483648", strconv.base.DEC);
cki32_ovf(16, "-2147483649", strconv.base.DEC);
cki32(17, "2147483647", strconv.base.DEC, 2147483647i32);
cki32(18, "-2147483648", strconv.base.DEC, -2147483648i32);
};
// ref/hare/strconv/stoi.ha:81-86.
@test fn test_stoi64_bases() void = {
cki(20, "-7f", base.HEX, -127i64); // -0x7f
cki(21, "7F", base.HEX, 127i64); // 0x7f
cki(22, "37", base.OCT, 31i64); // 0o37
cki(23, "-110101", base.BIN, -53i64); // -0b110101
cki(20, "-7f", strconv.base.HEX, -127i64); // -0x7f
cki(21, "7F", strconv.base.HEX, 127i64); // 0x7f
cki(22, "37", strconv.base.OCT, 31i64); // 0o37
cki(23, "-110101", strconv.base.BIN, -53i64); // -0b110101
};
// ref/hare/strconv/stou.ha:116-130.
@test fn test_stou64() void = {
cku_inv(30, "", base.DEC, 0);
cku_inv(31, "+", base.DEC, 1);
cku_inv(32, "+a", base.DEC, 1);
cku_inv(33, "abc", base.DEC, 0);
cku_inv(34, "1a", base.DEC, 1);
cku_inv(30, "", strconv.base.DEC, 0);
cku_inv(31, "+", strconv.base.DEC, 1);
cku_inv(32, "+a", strconv.base.DEC, 1);
cku_inv(33, "abc", strconv.base.DEC, 0);
cku_inv(34, "1a", strconv.base.DEC, 1);
cku_ovf(35, "18446744073709551616", base.DEC);
cku_ovf(36, "184467440737095516150", base.DEC);
cku_ovf(37, "-1", base.DEC);
cku_ovf(46, "21000000000000000000", base.DEC);
cku_ovf(35, "18446744073709551616", strconv.base.DEC);
cku_ovf(36, "184467440737095516150", strconv.base.DEC);
cku_ovf(37, "-1", strconv.base.DEC);
cku_ovf(46, "21000000000000000000", strconv.base.DEC);
cku(38, "0", base.DEC, 0u64);
cku(39, "1", base.DEC, 1u64);
cku(40, "18446744073709551615", base.DEC, 18446744073709551615u64);
cku(38, "0", strconv.base.DEC, 0u64);
cku(39, "1", strconv.base.DEC, 1u64);
cku(40, "18446744073709551615", strconv.base.DEC, 18446744073709551615u64);
};
// ref/hare/strconv/stou.ha:132-138.
@test fn test_stou64_bases() void = {
cku(41, "f", base.HEX_LOWER, 15u64); // 0xf
cku(42, "7f", base.HEX, 127u64); // 0x7f
cku(43, "7F", base.HEX, 127u64); // 0x7f
cku(44, "37", base.OCT, 31u64); // 0o37
cku(45, "110101", base.BIN, 53u64); // 0b110101
cku(41, "f", strconv.base.HEX_LOWER, 15u64); // 0xf
cku(42, "7f", strconv.base.HEX, 127u64); // 0x7f
cku(43, "7F", strconv.base.HEX, 127u64); // 0x7f
cku(44, "37", strconv.base.OCT, 31u64); // 0o37
cku(45, "110101", strconv.base.BIN, 53u64); // 0b110101
};
// stoi / stou / stoz — int/uint/size machine-word wrappers
@@ -192,102 +192,102 @@ fn ck_uint_ovf(id: i32, s: str, b: base) void = {
// 8B, so the iN/uN clamp is a no-op: the full i64/u64 range parses with
// no spurious overflow. That no-clamp fidelity is what these check.
@test fn test_stoi_stou_stoz() void = {
ck_int(50, "0", base.DEC, 0);
ck_int(51, "-1", base.DEC, -1);
ck_int(52, "9223372036854775807", base.DEC, 9223372036854775807i64: int); // I64_MAX fits int
ck_int_ovf(53, "9223372036854775808", base.DEC);
ck_int_ovf(54, "-9223372036854775809", base.DEC);
ck_int(50, "0", strconv.base.DEC, 0);
ck_int(51, "-1", strconv.base.DEC, -1);
ck_int(52, "9223372036854775807", strconv.base.DEC, 9223372036854775807i64: int); // I64_MAX fits int
ck_int_ovf(53, "9223372036854775808", strconv.base.DEC);
ck_int_ovf(54, "-9223372036854775809", strconv.base.DEC);
ck_uint(55, "0", base.DEC, 0u64: uint);
ck_uint(56, "18446744073709551615", base.DEC, 18446744073709551615u64: uint); // U64_MAX fits uint
ck_uint_ovf(57, "18446744073709551616", base.DEC);
ck_uint_ovf(58, "-1", base.DEC);
ck_uint(55, "0", strconv.base.DEC, 0u64: uint);
ck_uint(56, "18446744073709551615", strconv.base.DEC, 18446744073709551615u64: uint); // U64_MAX fits uint
ck_uint_ovf(57, "18446744073709551616", strconv.base.DEC);
ck_uint_ovf(58, "-1", strconv.base.DEC);
ck_size(59, "0", base.DEC, 0u64: size);
ck_size(60, "18446744073709551615", base.DEC, 18446744073709551615u64: size); // U64_MAX fits size
ck_size(59, "0", strconv.base.DEC, 0u64: size);
ck_size(60, "18446744073709551615", strconv.base.DEC, 18446744073709551615u64: size); // U64_MAX fits size
// bases route through the same parseint core.
ck_int(61, "-7f", base.HEX, -127i64: int); // -0x7f
ck_uint(62, "110101", base.BIN, 53u64: uint); // 0b110101
ck_int(61, "-7f", strconv.base.HEX, -127i64: int); // -0x7f
ck_uint(62, "110101", strconv.base.BIN, 53u64: uint); // 0b110101
};
@test fn test_narrow_parse_boundaries() void = {
match (stoi16("32767", base.DEC)) {
match (strconv.stoi16("32767", strconv.base.DEC)) {
case let v: i16 => assert(v == 32767i16);
case let e: invalid => abort();
case let e: overflow => abort();
case let e: strconv.invalid => abort();
case let e: strconv.overflow => abort();
};
match (stoi16("-32768", base.DEC)) {
match (strconv.stoi16("-32768", strconv.base.DEC)) {
case let v: i16 => assert(v == -32768i16);
case let e: invalid => abort();
case let e: overflow => abort();
case let e: strconv.invalid => abort();
case let e: strconv.overflow => abort();
};
match (stoi16("32768", base.DEC)) {
match (strconv.stoi16("32768", strconv.base.DEC)) {
case let v: i16 => abort();
case let e: invalid => abort();
case let e: overflow => { };
case let e: strconv.invalid => abort();
case let e: strconv.overflow => { };
};
match (stoi16("-32769", base.DEC)) {
match (strconv.stoi16("-32769", strconv.base.DEC)) {
case let v: i16 => abort();
case let e: invalid => abort();
case let e: overflow => { };
case let e: strconv.invalid => abort();
case let e: strconv.overflow => { };
};
match (stoi8("127", base.DEC)) {
match (strconv.stoi8("127", strconv.base.DEC)) {
case let v: i8 => assert(v == 127i8);
case let e: invalid => abort();
case let e: overflow => abort();
case let e: strconv.invalid => abort();
case let e: strconv.overflow => abort();
};
match (stoi8("-128", base.DEC)) {
match (strconv.stoi8("-128", strconv.base.DEC)) {
case let v: i8 => assert(v == -128i8);
case let e: invalid => abort();
case let e: overflow => abort();
case let e: strconv.invalid => abort();
case let e: strconv.overflow => abort();
};
match (stoi8("128", base.DEC)) {
match (strconv.stoi8("128", strconv.base.DEC)) {
case let v: i8 => abort();
case let e: invalid => abort();
case let e: overflow => { };
case let e: strconv.invalid => abort();
case let e: strconv.overflow => { };
};
match (stoi8("-129", base.DEC)) {
match (strconv.stoi8("-129", strconv.base.DEC)) {
case let v: i8 => abort();
case let e: invalid => abort();
case let e: overflow => { };
case let e: strconv.invalid => abort();
case let e: strconv.overflow => { };
};
match (stou16("65535", base.DEC)) {
match (strconv.stou16("65535", strconv.base.DEC)) {
case let v: u16 => assert(v == 65535u16);
case let e: invalid => abort();
case let e: overflow => abort();
case let e: strconv.invalid => abort();
case let e: strconv.overflow => abort();
};
match (stou16("65536", base.DEC)) {
match (strconv.stou16("65536", strconv.base.DEC)) {
case let v: u16 => abort();
case let e: invalid => abort();
case let e: overflow => { };
case let e: strconv.invalid => abort();
case let e: strconv.overflow => { };
};
match (stou8("255", base.DEC)) {
match (strconv.stou8("255", strconv.base.DEC)) {
case let v: u8 => assert(v == 255u8);
case let e: invalid => abort();
case let e: overflow => abort();
case let e: strconv.invalid => abort();
case let e: strconv.overflow => abort();
};
match (stou8("256", base.DEC)) {
match (strconv.stou8("256", strconv.base.DEC)) {
case let v: u8 => abort();
case let e: invalid => abort();
case let e: overflow => { };
case let e: strconv.invalid => abort();
case let e: strconv.overflow => { };
};
};
@test fn test_strerror_static() void = {
let inv: invalid = 0: invalid;
let ie: error = inv;
let ia: str = strerror(ie);
let ib: str = strerror(ie);
let inv: strconv.invalid = 0: strconv.invalid;
let ie: strconv.error = inv;
let ia: str = strconv.strerror(ie);
let ib: str = strconv.strerror(ie);
assert(ia.ptr == ib.ptr);
assert(streq(ia, "input is not a valid number"));
let ov: overflow;
let oe: error = ov;
let oa: str = strerror(oe);
let ob: str = strerror(oe);
let ov: strconv.overflow;
let oe: strconv.error = ov;
let oa: str = strconv.strerror(oe);
let ob: str = strconv.strerror(oe);
assert(oa.ptr == ob.ptr);
assert(streq(oa, "input number doesn't fit target type"));
};
@@ -314,48 +314,48 @@ fn cks(id: i32, got: str, want: str) void = {
// ref/hare/strconv/utos.ha:74-83.
@test fn test_u64tos_bases() void = {
cks(70, u64tos(26u64, base.BIN), "11010"); // 0b11010
cks(71, u64tos(342391u64, base.OCT), "1234567"); // 0o1234567
cks(72, u64tos(123456789u64, base.DEC), "123456789");
cks(73, u64tos(81985529216486895u64, base.HEX), "123456789ABCDEF"); // 0x123456789ABCDEF
cks(74, u64tos(81985529216486895u64, base.HEX_UPPER), "123456789ABCDEF");
cks(75, u64tos(81985529216486895u64, base.HEX_LOWER), "123456789abcdef");
cks(76, u64tos(18446744073709551615u64, base.BIN), // U64_MAX
cks(70, strconv.u64tos(26u64, strconv.base.BIN), "11010"); // 0b11010
cks(71, strconv.u64tos(342391u64, strconv.base.OCT), "1234567"); // 0o1234567
cks(72, strconv.u64tos(123456789u64, strconv.base.DEC), "123456789");
cks(73, strconv.u64tos(81985529216486895u64, strconv.base.HEX), "123456789ABCDEF"); // 0x123456789ABCDEF
cks(74, strconv.u64tos(81985529216486895u64, strconv.base.HEX_UPPER), "123456789ABCDEF");
cks(75, strconv.u64tos(81985529216486895u64, strconv.base.HEX_LOWER), "123456789abcdef");
cks(76, strconv.u64tos(18446744073709551615u64, strconv.base.BIN), // U64_MAX
"1111111111111111111111111111111111111111111111111111111111111111");
};
// ref/hare/strconv/utos.ha:85-103.
@test fn test_u64tos() void = {
cks(77, u64tos(1234u64, base.DEC), "1234");
cks(78, u64tos(4321u64, base.DEC), "4321");
cks(79, u64tos(0u64, base.DEC), "0"); // U64_MIN
cks(80, u64tos(18446744073709551615u64, base.DEC), "18446744073709551615"); // U64_MAX
cks(77, strconv.u64tos(1234u64, strconv.base.DEC), "1234");
cks(78, strconv.u64tos(4321u64, strconv.base.DEC), "4321");
cks(79, strconv.u64tos(0u64, strconv.base.DEC), "0"); // U64_MIN
cks(80, strconv.u64tos(18446744073709551615u64, strconv.base.DEC), "18446744073709551615"); // U64_MAX
};
// ref/hare/strconv/itos.ha:54-63.
@test fn test_i64tos_bases() void = {
cks(81, i64tos(26i64, base.BIN), "11010");
cks(82, i64tos(342391i64, base.OCT), "1234567");
cks(83, i64tos(123456789i64, base.DEC), "123456789");
cks(84, i64tos(81985529216486895i64, base.HEX), "123456789ABCDEF");
cks(85, i64tos(81985529216486895i64, base.HEX_UPPER), "123456789ABCDEF");
cks(86, i64tos(81985529216486895i64, base.HEX_LOWER), "123456789abcdef");
cks(81, strconv.i64tos(26i64, strconv.base.BIN), "11010");
cks(82, strconv.i64tos(342391i64, strconv.base.OCT), "1234567");
cks(83, strconv.i64tos(123456789i64, strconv.base.DEC), "123456789");
cks(84, strconv.i64tos(81985529216486895i64, strconv.base.HEX), "123456789ABCDEF");
cks(85, strconv.i64tos(81985529216486895i64, strconv.base.HEX_UPPER), "123456789ABCDEF");
cks(86, strconv.i64tos(81985529216486895i64, strconv.base.HEX_LOWER), "123456789abcdef");
// I64_MIN binary = '1' + 63 zeros, prefixed '-'. Spelled -I64_MAX-1
// (proj #245: wwstage mis-lexes the direct 2^63 / types.I64_MIN literal).
cks(87, i64tos(-9223372036854775807i64 - 1i64, base.BIN),
cks(87, strconv.i64tos(-9223372036854775807i64 - 1i64, strconv.base.BIN),
"-1000000000000000000000000000000000000000000000000000000000000000");
};
// ref/hare/strconv/itos.ha:65-87.
@test fn test_i64tos() void = {
cks(88, i64tos(1234i64, base.DEC), "1234");
cks(89, i64tos(4321i64, base.DEC), "4321");
cks(90, i64tos(-1337i64, base.DEC), "-1337");
cks(91, i64tos(0i64, base.DEC), "0");
cks(92, i64tos(9223372036854775807i64, base.DEC), "9223372036854775807"); // I64_MAX
cks(88, strconv.i64tos(1234i64, strconv.base.DEC), "1234");
cks(89, strconv.i64tos(4321i64, strconv.base.DEC), "4321");
cks(90, strconv.i64tos(-1337i64, strconv.base.DEC), "-1337");
cks(91, strconv.i64tos(0i64, strconv.base.DEC), "0");
cks(92, strconv.i64tos(9223372036854775807i64, strconv.base.DEC), "9223372036854775807"); // I64_MAX
// drew probe-1: NEG-of-I64_MIN + i64→u64 reinterpret preserves the
// two's-complement bit pattern. I64_MIN spelled -I64_MAX-1 (proj #245).
cks(93, i64tos(-9223372036854775807i64 - 1i64, base.DEC),
cks(93, strconv.i64tos(-9223372036854775807i64 - 1i64, strconv.base.DEC),
"-9223372036854775808");
};
@@ -363,11 +363,11 @@ fn cks(id: i32, got: str, want: str) void = {
// all 8B, so the full i64/u64 range renders untruncated. ww-authored
// (Hare's wrappers are trivial aliases): itos.ha:37-52, utos.ha:44-72.
@test fn test_word_wrappers() void = {
cks(94, itos(-1337, base.DEC), "-1337");
cks(95, itos(9223372036854775807i64: int, base.DEC), "9223372036854775807");
cks(96, utos(18446744073709551615u64: uint, base.DEC), "18446744073709551615");
cks(97, ztos(255u64: size, base.HEX), "FF");
cks(98, uptrtos(4096u64: uintptr, base.DEC), "4096");
cks(99, i32tos(-2147483648i32, base.DEC), "-2147483648");
cks(100, u8tos(255u8, base.HEX_LOWER), "ff");
cks(94, strconv.itos(-1337, strconv.base.DEC), "-1337");
cks(95, strconv.itos(9223372036854775807i64: int, strconv.base.DEC), "9223372036854775807");
cks(96, strconv.utos(18446744073709551615u64: uint, strconv.base.DEC), "18446744073709551615");
cks(97, strconv.ztos(255u64: size, strconv.base.HEX), "FF");
cks(98, strconv.uptrtos(4096u64: uintptr, strconv.base.DEC), "4096");
cks(99, strconv.i32tos(-2147483648i32, strconv.base.DEC), "-2147483648");
cks(100, strconv.u8tos(255u8, strconv.base.HEX_LOWER), "ff");
};

View File

@@ -12,75 +12,75 @@ import strconv;
import math;
fn chk64(s: str, b: base, want: f64) bool = {
match (stof64(s, b)) {
fn chk64(s: str, b: strconv.base, want: f64) bool = {
match (strconv.stof64(s, b)) {
case let v: f64 => { return math.f64bits(v) == math.f64bits(want); };
case let e: invalid => { return false; };
case let e: overflow => { return false; };
case let e: strconv.invalid => { return false; };
case let e: strconv.overflow => { return false; };
};
return false;
};
fn chk32(s: str, b: base, want: f32) bool = {
match (stof32(s, b)) {
fn chk32(s: str, b: strconv.base, want: f32) bool = {
match (strconv.stof32(s, b)) {
case let v: f32 => { return math.f32bits(v) == math.f32bits(want); };
case let e: invalid => { return false; };
case let e: overflow => { return false; };
case let e: strconv.invalid => { return false; };
case let e: strconv.overflow => { return false; };
};
return false;
};
fn ovf64(s: str, b: base) bool = {
match (stof64(s, b)) {
fn ovf64(s: str, b: strconv.base) bool = {
match (strconv.stof64(s, b)) {
case let v: f64 => { return false; };
case let e: invalid => { return false; };
case let e: overflow => { return true; };
case let e: strconv.invalid => { return false; };
case let e: strconv.overflow => { return true; };
};
return false;
};
fn ovf32(s: str, b: base) bool = {
match (stof32(s, b)) {
fn ovf32(s: str, b: strconv.base) bool = {
match (strconv.stof32(s, b)) {
case let v: f32 => { return false; };
case let e: invalid => { return false; };
case let e: overflow => { return true; };
case let e: strconv.invalid => { return false; };
case let e: strconv.overflow => { return true; };
};
return false;
};
// inv64 — the invalid byte-index, or -1 if not invalid.
fn inv64(s: str) i32 = {
match (stof64(s, base.DEC)) {
match (strconv.stof64(s, strconv.base.DEC)) {
case let v: f64 => { return -1; };
case let e: invalid => { return (e: i32); };
case let e: overflow => { return -1; };
case let e: strconv.invalid => { return (e: i32); };
case let e: strconv.overflow => { return -1; };
};
return -1;
};
fn inv32(s: str) i32 = {
match (stof32(s, base.DEC)) {
match (strconv.stof32(s, strconv.base.DEC)) {
case let v: f32 => { return -1; };
case let e: invalid => { return (e: i32); };
case let e: overflow => { return -1; };
case let e: strconv.invalid => { return (e: i32); };
case let e: strconv.overflow => { return -1; };
};
return -1;
};
fn nan64(s: str) bool = {
match (stof64(s, base.DEC)) {
match (strconv.stof64(s, strconv.base.DEC)) {
case let v: f64 => { return math.isnan(v); };
case let e: invalid => { return false; };
case let e: overflow => { return false; };
case let e: strconv.invalid => { return false; };
case let e: strconv.overflow => { return false; };
};
return false;
};
fn nan32(s: str) bool = {
match (stof32(s, base.DEC)) {
match (strconv.stof32(s, strconv.base.DEC)) {
case let v: f32 => { return math.isnan((v: f64)); };
case let e: invalid => { return false; };
case let e: overflow => { return false; };
case let e: strconv.invalid => { return false; };
case let e: strconv.overflow => { return false; };
};
return false;
};
@@ -93,20 +93,20 @@ fn nan32(s: str) bool = {
let nzero: f64 = math.f64frombits(1u64 << 63u64); // -0.0 (1<<63 dodges the I64_MIN-literal emit bug #144)
let subn: f64 = math.f64frombits(0x0000000000000001u64); // 5e-324
assert(!(!chk64("0", base.DEC, 0.0)));
assert(!(!chk64("200", base.DEC, 200.0)));
assert(!(!chk64("12345", base.DEC, 12345.0)));
assert(!(!chk64("+112233445566778899", base.DEC, 1.122334455667789e17)));
assert(!(!chk64("3.14", base.DEC, 3.14)));
assert(!(!chk64("2.99792458E+8", base.DEC, 299792458.0)));
assert(!(!chk64("6.022e23", base.DEC, 6.022e23)));
assert(!(!ovf64("1e310", base.DEC)));
assert(!(!chk64("9007199254740991", base.DEC, 9007199254740991.0)));
assert(!(!chk64("90071992547409915", base.DEC, 90071992547409920.0)));
assert(!(!chk64("90071992547409925", base.DEC, 90071992547409920.0)));
assert(!(!chk64("2.2250738585072014e-308", base.DEC, 2.2250738585072014e-308)));
assert(!(!chk64("-1e-324", base.DEC, nzero)));
assert(!(!chk64("5e-324", base.DEC, subn)));
assert(!(!chk64("0", strconv.base.DEC, 0.0)));
assert(!(!chk64("200", strconv.base.DEC, 200.0)));
assert(!(!chk64("12345", strconv.base.DEC, 12345.0)));
assert(!(!chk64("+112233445566778899", strconv.base.DEC, 1.122334455667789e17)));
assert(!(!chk64("3.14", strconv.base.DEC, 3.14)));
assert(!(!chk64("2.99792458E+8", strconv.base.DEC, 299792458.0)));
assert(!(!chk64("6.022e23", strconv.base.DEC, 6.022e23)));
assert(!(!ovf64("1e310", strconv.base.DEC)));
assert(!(!chk64("9007199254740991", strconv.base.DEC, 9007199254740991.0)));
assert(!(!chk64("90071992547409915", strconv.base.DEC, 90071992547409920.0)));
assert(!(!chk64("90071992547409925", strconv.base.DEC, 90071992547409920.0)));
assert(!(!chk64("2.2250738585072014e-308", strconv.base.DEC, 2.2250738585072014e-308)));
assert(!(!chk64("-1e-324", strconv.base.DEC, nzero)));
assert(!(!chk64("5e-324", strconv.base.DEC, subn)));
// Decimal-engine edge probes migrated here when the white-box
// decimaltest.ww retired (#16): the external-test idiom can't reach
@@ -117,20 +117,20 @@ fn nan32(s: str) bool = {
// Micro-gap (rule-7, honest): decimal_shift's k=0 early-return no-op
// is a trivial guard, not reached transitively by any slow-path input
// — consciously un-migrated, not silently dropped.
assert(!(!chk64("9999999999999999", base.DEC, 1.0e16)));
assert(!(!chk64("100000000000000000001", base.DEC, 1.0e20)));
assert(!(!chk64("9999999999999999", strconv.base.DEC, 1.0e16)));
assert(!(!chk64("100000000000000000001", strconv.base.DEC, 1.0e20)));
assert(!(inv64("") != 0));
assert(!(inv64("0ZO") != 1));
assert(!(inv64("1.23ezz") != 5));
assert(!(!chk64("Infinity", base.DEC, inf)));
assert(!(!chk64("+Infinity", base.DEC, inf)));
assert(!(!chk64("-Infinity", base.DEC, ninf)));
assert(!(!chk64("infinity", base.DEC, inf)));
assert(!(!chk64("inFinIty", base.DEC, inf)));
assert(!(!chk64("-infinity", base.DEC, ninf)));
assert(!(!chk64("-infiNity", base.DEC, ninf)));
assert(!(!chk64("Infinity", strconv.base.DEC, inf)));
assert(!(!chk64("+Infinity", strconv.base.DEC, inf)));
assert(!(!chk64("-Infinity", strconv.base.DEC, ninf)));
assert(!(!chk64("infinity", strconv.base.DEC, inf)));
assert(!(!chk64("inFinIty", strconv.base.DEC, inf)));
assert(!(!chk64("-infinity", strconv.base.DEC, ninf)));
assert(!(!chk64("-infiNity", strconv.base.DEC, ninf)));
assert(!(!nan64("NaN")));
assert(!(!nan64("nan")));
assert(!(!nan64("naN")));
@@ -144,34 +144,34 @@ fn nan32(s: str) bool = {
let nzero: f32 = math.f32frombits(0x80000000u32); // -0.0
let subn: f32 = math.f32frombits(0x00000001u32); // 1e-45
assert(!(!chk32("0", base.DEC, 0.0f32)));
assert(!(!chk32("1e10", base.DEC, 1.0e10f32)));
assert(!(!chk32("299792458", base.DEC, 299792458.0f32)));
assert(!(!chk32("6.022e23", base.DEC, 6.022e23f32)));
assert(!(!ovf32("1e40", base.DEC)));
assert(!(!chk32("16777215", base.DEC, 16777215.0f32)));
assert(!(!chk32("167772155", base.DEC, 167772160.0f32)));
assert(!(!chk32("167772145", base.DEC, 167772140.0f32)));
assert(!(!chk32("6.62607015e-34", base.DEC, 6.62607015e-34f32)));
assert(!(!chk32("1.1754944e-38", base.DEC, 1.1754944e-38f32)));
assert(!(!chk32("-1e-50", base.DEC, nzero)));
assert(!(!chk32("1e-45", base.DEC, subn)));
assert(!(!chk32("0", strconv.base.DEC, 0.0f32)));
assert(!(!chk32("1e10", strconv.base.DEC, 1.0e10f32)));
assert(!(!chk32("299792458", strconv.base.DEC, 299792458.0f32)));
assert(!(!chk32("6.022e23", strconv.base.DEC, 6.022e23f32)));
assert(!(!ovf32("1e40", strconv.base.DEC)));
assert(!(!chk32("16777215", strconv.base.DEC, 16777215.0f32)));
assert(!(!chk32("167772155", strconv.base.DEC, 167772160.0f32)));
assert(!(!chk32("167772145", strconv.base.DEC, 167772140.0f32)));
assert(!(!chk32("6.62607015e-34", strconv.base.DEC, 6.62607015e-34f32)));
assert(!(!chk32("1.1754944e-38", strconv.base.DEC, 1.1754944e-38f32)));
assert(!(!chk32("-1e-50", strconv.base.DEC, nzero)));
assert(!(!chk32("1e-45", strconv.base.DEC, subn)));
assert(!(inv32("") != 0));
assert(!(inv32("0ZO") != 1));
assert(!(inv32("1.23e-zz") != 6));
assert(!(!chk32("Infinity", base.DEC, inf)));
assert(!(!chk32("+Infinity", base.DEC, inf)));
assert(!(!chk32("-Infinity", base.DEC, ninf)));
assert(!(!chk32("infinity", base.DEC, inf)));
assert(!(!chk32("inFinIty", base.DEC, inf)));
assert(!(!chk32("-infinity", base.DEC, ninf)));
assert(!(!chk32("-infiniTy", base.DEC, ninf)));
assert(!(!chk32("Infinity", strconv.base.DEC, inf)));
assert(!(!chk32("+Infinity", strconv.base.DEC, inf)));
assert(!(!chk32("-Infinity", strconv.base.DEC, ninf)));
assert(!(!chk32("infinity", strconv.base.DEC, inf)));
assert(!(!chk32("inFinIty", strconv.base.DEC, inf)));
assert(!(!chk32("-infinity", strconv.base.DEC, ninf)));
assert(!(!chk32("-infiniTy", strconv.base.DEC, ninf)));
assert(!(!nan32("NaN")));
assert(!(!nan32("nan")));
assert(!(!nan32("naN")));
assert(!(!chk32("9.19100241453305036800e+20", base.DEC, 9.19100241453305036800e+20f32)));
assert(!(!chk32("9.19100241453305036800e+20", strconv.base.DEC, 9.19100241453305036800e+20f32)));
};
// ref/hare/strconv/stof.ha:590. Hex-float surface-form literals (0x1.fp-2,
@@ -179,36 +179,36 @@ fn nan32(s: str) bool = {
// has no hex-float literal lexer / no F*_MAX_NORMAL math consts.
@test fn stof64_hex() void = {
assert(!(!chk64("0p0", base.HEX, 0.0)));
assert(!(!chk64("1p0", base.HEX, 1.0)));
assert(!(!chk64("-1p0", base.HEX_LOWER, -1.0)));
assert(!(!chk64("0p0", strconv.base.HEX, 0.0)));
assert(!(!chk64("1p0", strconv.base.HEX, 1.0)));
assert(!(!chk64("-1p0", strconv.base.HEX_LOWER, -1.0)));
// 0x1.fp-2 = 1.9375 * 2^-2 = 0.484375 (exact).
assert(!(!chk64("1.fp-2", base.HEX, 0.484375)));
assert(!(!chk64("1.fp-2", strconv.base.HEX, 0.484375)));
// F64_MAX_NORMAL.
if (!chk64("1.fffffffffffffp+1023", base.HEX,
if (!chk64("1.fffffffffffffp+1023", strconv.base.HEX,
math.f64frombits(0x7FEFFFFFFFFFFFFFu64))) { abort(); };
// F64_MIN_NORMAL.
if (!chk64("1.0000000000000p-1022", base.HEX,
if (!chk64("1.0000000000000p-1022", strconv.base.HEX,
math.f64frombits(0x0010000000000000u64))) { abort(); };
// F64_MIN_SUBNORMAL.
if (!chk64("0.0000000000001p-1022", base.HEX,
if (!chk64("0.0000000000001p-1022", strconv.base.HEX,
math.f64frombits(0x0000000000000001u64))) { abort(); };
assert(!(!ovf64("1p+1024", base.HEX)));
assert(!(!chk64("0.00000000000001p-1022", base.HEX, 0.0)));
assert(!(!ovf64("1p+1024", strconv.base.HEX)));
assert(!(!chk64("0.00000000000001p-1022", strconv.base.HEX, 0.0)));
};
@test fn stof32_hex() void = {
assert(!(!chk32("0p0", base.HEX, 0.0f32)));
assert(!(!chk32("1p0", base.HEX, 1.0f32)));
assert(!(!chk32("-1p0", base.HEX, -1.0f32)));
assert(!(!chk32("1.fp-2", base.HEX, 0.484375f32)));
assert(!(!chk32("0p0", strconv.base.HEX, 0.0f32)));
assert(!(!chk32("1p0", strconv.base.HEX, 1.0f32)));
assert(!(!chk32("-1p0", strconv.base.HEX, -1.0f32)));
assert(!(!chk32("1.fp-2", strconv.base.HEX, 0.484375f32)));
// F32_MAX_NORMAL.
if (!chk32("1.fffffd586b834p+127", base.HEX,
if (!chk32("1.fffffd586b834p+127", strconv.base.HEX,
math.f32frombits(0x7F7FFFFFu32))) { abort(); };
// F32_MIN_NORMAL.
assert(!(!chk32("1.0p-126", base.HEX, math.f32frombits(0x00800000u32))));
assert(!(!chk32("1.0p-126", strconv.base.HEX, math.f32frombits(0x00800000u32))));
// F32_MIN_SUBNORMAL.
assert(!(!chk32("1.6p-150", base.HEX, math.f32frombits(0x00000001u32))));
assert(!(!ovf32("1.0p+128", base.HEX)));
assert(!(!chk32("1.0p-151", base.HEX, 0.0f32)));
assert(!(!chk32("1.6p-150", strconv.base.HEX, math.f32frombits(0x00000001u32))));
assert(!(!ovf32("1.0p+128", strconv.base.HEX)));
assert(!(!chk32("1.0p-151", strconv.base.HEX, 0.0f32)));
};