hl-valdemar/brolang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

richer formatting

Browse Source
This commit is contained in:
Valdemar Høgsvig Lorenzen
2026-07-15 20:38:54 +02:00
parent 1165cfb7c0
commit c4fa8e930f
9 changed files with 807 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
std/io/io.bro
+166 -26
View File
@@ -75,12 +75,12 @@ write_all func(writer Writer, bytes []u8) void ! WriteError {
return
}
hide write_decimal_signed func(writer Writer, value i64) void ! WriteError {
buffer [21]mut u8 = undefined
hide write_integer_signed func(writer Writer, value i64, base u64, uppercase bool) void ! WriteError {
buffer [65]mut u8 = undefined
end usize = buffer.len
current i64 = value
while true {
digit_value i64 :: rem!(current, 10)
digit_value i64 :: rem!(current, i64(base))
digit u8 = 0
if digit_value < 0 {
digit = u8(-digit_value)
@@ -88,8 +88,14 @@ hide write_decimal_signed func(writer Writer, value i64) void ! WriteError {
digit = u8(digit_value)
}
end -= 1
buffer[end] = '0' + digit
current = divtrunc!(current, 10)
if digit < 10 {
buffer[end] = '0' + digit
} else if uppercase {
buffer[end] = 'A' + digit - 10
} else {
buffer[end] = 'a' + digit - 10
}
current = divtrunc!(current, i64(base))
if current == 0 {
break
}
@@ -102,15 +108,21 @@ hide write_decimal_signed func(writer Writer, value i64) void ! WriteError {
return
}
hide write_decimal_unsigned func(writer Writer, value u64) void ! WriteError {
buffer [21]mut u8 = undefined
hide write_integer_unsigned func(writer Writer, value u64, base u64, uppercase bool) void ! WriteError {
buffer [65]mut u8 = undefined
end usize = buffer.len
current u64 = value
while true {
digit u8 :: u8(rem!(current, 10))
digit u8 :: u8(rem!(current, base))
end -= 1
buffer[end] = '0' + digit
current = divtrunc!(current, 10)
if digit < 10 {
buffer[end] = '0' + digit
} else if uppercase {
buffer[end] = 'A' + digit - 10
} else {
buffer[end] = 'a' + digit - 10
}
current = divtrunc!(current, base)
if current == 0 {
break
}
@@ -122,8 +134,15 @@ hide write_decimal_unsigned func(writer Writer, value u64) void ! WriteError {
hide FormatTokenKind :: enum {
unused
literal
default
string
decimal
binary
octal
hex_lower
hex_upper
character
scientific
}
hide FormatToken :: struct {
@@ -171,16 +190,32 @@ hide parse_format func($N usize, $format []u8, $Args type) [N]mut FormatToken {
literal_start = cursor
continue
}
if cursor + 2 >= format.len or format[cursor + 2] != '}' {
compile_error!("io.print format expects '{s}' or '{d}'")
}
kind FormatTokenKind = .unused
if next == 's' {
kind = .string
} else if next == 'd' {
kind = .decimal
} else {
compile_error!("io.print format has an unknown specifier")
kind FormatTokenKind = .default
width usize = 2
if next != '}' {
if cursor + 2 >= format.len or format[cursor + 2] != '}' {
compile_error!("io.print format expects a one-character specifier")
}
width = 3
if next == 's' {
kind = .string
} else if next == 'd' {
kind = .decimal
} else if next == 'b' {
kind = .binary
} else if next == 'o' {
kind = .octal
} else if next == 'x' {
kind = .hex_lower
} else if next == 'X' {
kind = .hex_upper
} else if next == 'c' {
kind = .character
} else if next == 'e' {
kind = .scientific
} else {
compile_error!("io.print format has an unknown specifier")
}
}
if argument_count >= field_count {
compile_error!("io.print format argument count does not match the tuple")
@@ -193,7 +228,7 @@ hide parse_format func($N usize, $format []u8, $Args type) [N]mut FormatToken {
}
token_count += 1
argument_count += 1
cursor += 3
cursor += width
literal_start = cursor
continue
}
@@ -229,14 +264,91 @@ hide format_field_name func($T type, index usize) []u8 {
}
}
hide write_decimal func(writer Writer, $T type, value T) void ! WriteError {
hide write_integer func(writer Writer, $T type, value T, base u64, uppercase bool) void ! WriteError {
match typeinfo!(T) {
.integer: if minval!(T) < 0 {
try write_decimal_signed(writer, i64(value))
try write_integer_signed(writer, i64(value), base, uppercase)
} else {
try write_decimal_unsigned(writer, u64(value))
try write_integer_unsigned(writer, u64(value), base, uppercase)
}
else: compile_error!("io.print '{d}' requires an integer argument")
else: compile_error!("io.print integer format requires an integer argument")
}
return
}
# ponytail: libc keeps float formatting small; replace it with a native shortest-roundtrip writer if locale independence matters.
hide write_float func(writer Writer, $T type, value T, scientific bool) void ! WriteError {
match typeinfo!(T) {
.float: {
buffer [64]mut u8 = undefined
count c_int = 0
if sizeof!(T) == 4 {
if scientific {
count = c.snprintf(ptrcast!(c_char, (&buffer).ptr), c_ulong(buffer.len), "%.8e", value)
} else {
count = c.snprintf(ptrcast!(c_char, (&buffer).ptr), c_ulong(buffer.len), "%.9g", value)
}
} else if scientific {
count = c.snprintf(ptrcast!(c_char, (&buffer).ptr), c_ulong(buffer.len), "%.16e", value)
} else {
count = c.snprintf(ptrcast!(c_char, (&buffer).ptr), c_ulong(buffer.len), "%.17g", value)
}
if count < 0 or usize(count) >= buffer.len {
return .write_failed
}
try write_all(writer, buffer[0..usize(count)])
}
else: compile_error!("io.print float format requires a float argument")
}
return
}
hide write_decimal func(writer Writer, $T type, value T) void ! WriteError {
match typeinfo!(T) {
.integer: try write_integer(writer, value, 10, false)
.float: try write_float(writer, value, false)
else: compile_error!("io.print '{d}' requires an integer or float argument")
}
return
}
hide write_character func(writer Writer, $T type, value T) void ! WriteError {
match typeinfo!(T) {
.integer: {
if minval!(T) < 0 or maxval!(T) > 255 {
compile_error!("io.print '{c}' requires an unsigned integer that fits in u8")
}
buffer [1]u8 = [u8(value)]
try write_all(writer, buffer[..])
}
else: compile_error!("io.print '{c}' requires an unsigned integer that fits in u8")
}
return
}
hide write_default func(writer Writer, $T type, value T) void ! WriteError {
match typeinfo!(T) {
.bool: if value {
try write_all(writer, "true")
} else {
try write_all(writer, "false")
}
.integer: try write_integer(writer, value, 10, false)
.float: try write_float(writer, value, false)
.array: try write_all(writer, value)
.pointer: try write_all(writer, value)
.slice: try write_all(writer, value)
.enum |enum_info|: {
inline for enum_info.fields |field| {
if value == field!(T, field.name) {
try write_all(writer, ".")
try write_all(writer, field.name)
return
}
}
return .write_failed
}
else: compile_error!("io.print '{}' does not support this argument type")
}
return
}
@@ -259,7 +371,35 @@ print func(
try write_all(writer, field!(args, token.field))
continue
}
try write_decimal(writer, field!(args, token.field))
if (token.kind == .default) {
try write_default(writer, field!(args, token.field))
continue
}
if (token.kind == .decimal) {
try write_decimal(writer, field!(args, token.field))
continue
}
if (token.kind == .binary) {
try write_integer(writer, field!(args, token.field), 2, false)
continue
}
if (token.kind == .octal) {
try write_integer(writer, field!(args, token.field), 8, false)
continue
}
if (token.kind == .hex_lower) {
try write_integer(writer, field!(args, token.field), 16, false)
continue
}
if (token.kind == .hex_upper) {
try write_integer(writer, field!(args, token.field), 16, true)
continue
}
if (token.kind == .character) {
try write_character(writer, field!(args, token.field))
continue
}
try write_float(writer, field!(args, token.field), true)
}
return
}