mirror of
https://github.com/ziglang/zig.git
synced 2026-01-10 17:35:12 +00:00
Blind translation
This commit is contained in:
Benjamin Feng
parent
ae3fb6df00
commit
278b9ec1aa
@ -69,19 +69,17 @@ fn peekIsAlign(comptime fmt: []const u8) bool {
|
||||
///
|
||||
/// If a formatted user type contains a function of the type
|
||||
/// ```
|
||||
/// fn format(value: ?, comptime fmt: []const u8, options: std.fmt.FormatOptions, context: var, comptime Errors: type, comptime output: fn (@TypeOf(context), []const u8) Errors!void) Errors!void
|
||||
/// fn format(value: ?, comptime fmt: []const u8, options: std.fmtstream.FormatOptions, out_stream: var) !void
|
||||
/// ```
|
||||
/// with `?` being the type formatted, this function will be called instead of the default implementation.
|
||||
/// This allows user types to be formatted in a logical manner instead of dumping all fields of the type.
|
||||
///
|
||||
/// A user type may be a `struct`, `vector`, `union` or `enum` type.
|
||||
pub fn format(
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
out_stream: var,
|
||||
comptime fmt: []const u8,
|
||||
args: var,
|
||||
) Errors!void {
|
||||
) !void {
|
||||
const ArgSetType = u32;
|
||||
if (@typeInfo(@TypeOf(args)) != .Struct) {
|
||||
@compileError("Expected tuple or struct argument, found " ++ @typeName(@TypeOf(args)));
|
||||
@ -138,7 +136,7 @@ pub fn format(
|
||||
.Start => switch (c) {
|
||||
'{' => {
|
||||
if (start_index < i) {
|
||||
try output(context, fmt[start_index..i]);
|
||||
try out_stream.writeAll(fmt[start_index..i]);
|
||||
}
|
||||
|
||||
start_index = i;
|
||||
@ -150,7 +148,7 @@ pub fn format(
|
||||
},
|
||||
'}' => {
|
||||
if (start_index < i) {
|
||||
try output(context, fmt[start_index..i]);
|
||||
try out_stream.writeAll(fmt[start_index..i]);
|
||||
}
|
||||
state = .CloseBrace;
|
||||
},
|
||||
@ -185,9 +183,7 @@ pub fn format(
|
||||
args[arg_to_print],
|
||||
fmt[0..0],
|
||||
options,
|
||||
context,
|
||||
Errors,
|
||||
output,
|
||||
out_stream,
|
||||
default_max_depth,
|
||||
);
|
||||
|
||||
@ -218,9 +214,7 @@ pub fn format(
|
||||
args[arg_to_print],
|
||||
fmt[specifier_start..i],
|
||||
options,
|
||||
context,
|
||||
Errors,
|
||||
output,
|
||||
out_stream,
|
||||
default_max_depth,
|
||||
);
|
||||
state = .Start;
|
||||
@ -265,9 +259,7 @@ pub fn format(
|
||||
args[arg_to_print],
|
||||
fmt[specifier_start..specifier_end],
|
||||
options,
|
||||
context,
|
||||
Errors,
|
||||
output,
|
||||
out_stream,
|
||||
default_max_depth,
|
||||
);
|
||||
state = .Start;
|
||||
@ -293,9 +285,7 @@ pub fn format(
|
||||
args[arg_to_print],
|
||||
fmt[specifier_start..specifier_end],
|
||||
options,
|
||||
context,
|
||||
Errors,
|
||||
output,
|
||||
out_stream,
|
||||
default_max_depth,
|
||||
);
|
||||
state = .Start;
|
||||
@ -316,7 +306,7 @@ pub fn format(
|
||||
}
|
||||
}
|
||||
if (start_index < fmt.len) {
|
||||
try output(context, fmt[start_index..]);
|
||||
try out_stream.writeAll(fmt[start_index..]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -324,121 +314,119 @@ pub fn formatType(
|
||||
value: var,
|
||||
comptime fmt: []const u8,
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
out_stream: var,
|
||||
max_depth: usize,
|
||||
) Errors!void {
|
||||
) !void {
|
||||
if (comptime std.mem.eql(u8, fmt, "*")) {
|
||||
try output(context, @typeName(@TypeOf(value).Child));
|
||||
try output(context, "@");
|
||||
try formatInt(@ptrToInt(value), 16, false, FormatOptions{}, context, Errors, output);
|
||||
try out_stream.writeAll(@typeName(@TypeOf(value).Child));
|
||||
try out_stream.writeAll("@");
|
||||
try formatInt(@ptrToInt(value), 16, false, FormatOptions{}, out_stream);
|
||||
return;
|
||||
}
|
||||
|
||||
const T = @TypeOf(value);
|
||||
switch (@typeInfo(T)) {
|
||||
.ComptimeInt, .Int, .Float => {
|
||||
return formatValue(value, fmt, options, context, Errors, output);
|
||||
return formatValue(value, fmt, options, out_stream);
|
||||
},
|
||||
.Void => {
|
||||
return output(context, "void");
|
||||
return out_stream.writeAll("void");
|
||||
},
|
||||
.Bool => {
|
||||
return output(context, if (value) "true" else "false");
|
||||
return out_stream.writeAll(if (value) "true" else "false");
|
||||
},
|
||||
.Optional => {
|
||||
if (value) |payload| {
|
||||
return formatType(payload, fmt, options, context, Errors, output, max_depth);
|
||||
return formatType(payload, fmt, options, out_stream, max_depth);
|
||||
} else {
|
||||
return output(context, "null");
|
||||
return out_stream.writeAll("null");
|
||||
}
|
||||
},
|
||||
.ErrorUnion => {
|
||||
if (value) |payload| {
|
||||
return formatType(payload, fmt, options, context, Errors, output, max_depth);
|
||||
return formatType(payload, fmt, options, out_stream, max_depth);
|
||||
} else |err| {
|
||||
return formatType(err, fmt, options, context, Errors, output, max_depth);
|
||||
return formatType(err, fmt, options, out_stream, max_depth);
|
||||
}
|
||||
},
|
||||
.ErrorSet => {
|
||||
try output(context, "error.");
|
||||
return output(context, @errorName(value));
|
||||
try out_stream.writeAll("error.");
|
||||
return out_stream.writeAll(@errorName(value));
|
||||
},
|
||||
.Enum => |enumInfo| {
|
||||
if (comptime std.meta.trait.hasFn("format")(T)) {
|
||||
return value.format(fmt, options, context, Errors, output);
|
||||
return value.format(fmt, options, out_stream);
|
||||
}
|
||||
|
||||
try output(context, @typeName(T));
|
||||
try out_stream.writeAll(@typeName(T));
|
||||
if (enumInfo.is_exhaustive) {
|
||||
try output(context, ".");
|
||||
try output(context, @tagName(value));
|
||||
try out_stream.writeAll(".");
|
||||
try out_stream.writeAll(@tagName(value));
|
||||
} else {
|
||||
// TODO: when @tagName works on exhaustive enums print known enum strings
|
||||
try output(context, "(");
|
||||
try formatType(@enumToInt(value), fmt, options, context, Errors, output, max_depth);
|
||||
try output(context, ")");
|
||||
try out_stream.writeAll("(");
|
||||
try formatType(@enumToInt(value), fmt, options, out_stream, max_depth);
|
||||
try out_stream.writeAll(")");
|
||||
}
|
||||
},
|
||||
.Union => {
|
||||
if (comptime std.meta.trait.hasFn("format")(T)) {
|
||||
return value.format(fmt, options, context, Errors, output);
|
||||
return value.format(fmt, options, out_stream);
|
||||
}
|
||||
|
||||
try output(context, @typeName(T));
|
||||
try out_stream.writeAll(@typeName(T));
|
||||
if (max_depth == 0) {
|
||||
return output(context, "{ ... }");
|
||||
return out_stream.writeAll("{ ... }");
|
||||
}
|
||||
const info = @typeInfo(T).Union;
|
||||
if (info.tag_type) |UnionTagType| {
|
||||
try output(context, "{ .");
|
||||
try output(context, @tagName(@as(UnionTagType, value)));
|
||||
try output(context, " = ");
|
||||
try out_stream.writeAll("{ .");
|
||||
try out_stream.writeAll(@tagName(@as(UnionTagType, value)));
|
||||
try out_stream.writeAll(" = ");
|
||||
inline for (info.fields) |u_field| {
|
||||
if (@enumToInt(@as(UnionTagType, value)) == u_field.enum_field.?.value) {
|
||||
try formatType(@field(value, u_field.name), fmt, options, context, Errors, output, max_depth - 1);
|
||||
try formatType(@field(value, u_field.name), fmt, options, out_stream, max_depth - 1);
|
||||
}
|
||||
}
|
||||
try output(context, " }");
|
||||
try out_stream.writeAll(" }");
|
||||
} else {
|
||||
try format(context, Errors, output, "@{x}", .{@ptrToInt(&value)});
|
||||
try format(out_stream, "@{x}", .{@ptrToInt(&value)});
|
||||
}
|
||||
},
|
||||
.Struct => |StructT| {
|
||||
if (comptime std.meta.trait.hasFn("format")(T)) {
|
||||
return value.format(fmt, options, context, Errors, output);
|
||||
return value.format(fmt, options, out_stream);
|
||||
}
|
||||
|
||||
try output(context, @typeName(T));
|
||||
try out_stream.writeAll(@typeName(T));
|
||||
if (max_depth == 0) {
|
||||
return output(context, "{ ... }");
|
||||
return out_stream.writeAll("{ ... }");
|
||||
}
|
||||
try output(context, "{");
|
||||
try out_stream.writeAll("{");
|
||||
inline for (StructT.fields) |f, i| {
|
||||
if (i == 0) {
|
||||
try output(context, " .");
|
||||
try out_stream.writeAll(" .");
|
||||
} else {
|
||||
try output(context, ", .");
|
||||
try out_stream.writeAll(", .");
|
||||
}
|
||||
try output(context, f.name);
|
||||
try output(context, " = ");
|
||||
try formatType(@field(value, f.name), fmt, options, context, Errors, output, max_depth - 1);
|
||||
try out_stream.writeAll(f.name);
|
||||
try out_stream.writeAll(" = ");
|
||||
try formatType(@field(value, f.name), fmt, options, out_stream, max_depth - 1);
|
||||
}
|
||||
try output(context, " }");
|
||||
try out_stream.writeAll(" }");
|
||||
},
|
||||
.Pointer => |ptr_info| switch (ptr_info.size) {
|
||||
.One => switch (@typeInfo(ptr_info.child)) {
|
||||
.Array => |info| {
|
||||
if (info.child == u8) {
|
||||
return formatText(value, fmt, options, context, Errors, output);
|
||||
return formatText(value, fmt, options, out_stream);
|
||||
}
|
||||
return format(context, Errors, output, "{}@{x}", .{ @typeName(T.Child), @ptrToInt(value) });
|
||||
return format(out_stream, "{}@{x}", .{ @typeName(T.Child), @ptrToInt(value) });
|
||||
},
|
||||
.Enum, .Union, .Struct => {
|
||||
return formatType(value.*, fmt, options, context, Errors, output, max_depth);
|
||||
return formatType(value.*, fmt, options, out_stream, max_depth);
|
||||
},
|
||||
else => return format(context, Errors, output, "{}@{x}", .{ @typeName(T.Child), @ptrToInt(value) }),
|
||||
else => return format(out_stream, "{}@{x}", .{ @typeName(T.Child), @ptrToInt(value) }),
|
||||
},
|
||||
.Many, .C => {
|
||||
if (ptr_info.sentinel) |sentinel| {
|
||||
@ -446,19 +434,19 @@ pub fn formatType(
|
||||
}
|
||||
if (ptr_info.child == u8) {
|
||||
if (fmt.len > 0 and fmt[0] == 's') {
|
||||
return formatText(mem.span(value), fmt, options, context, Errors, output);
|
||||
return formatText(mem.span(value), fmt, options, out_stream);
|
||||
}
|
||||
}
|
||||
return format(context, Errors, output, "{}@{x}", .{ @typeName(T.Child), @ptrToInt(value) });
|
||||
return format(out_stream, "{}@{x}", .{ @typeName(T.Child), @ptrToInt(value) });
|
||||
},
|
||||
.Slice => {
|
||||
if (fmt.len > 0 and ((fmt[0] == 'x') or (fmt[0] == 'X'))) {
|
||||
return formatText(value, fmt, options, context, Errors, output);
|
||||
return formatText(value, fmt, options, out_stream);
|
||||
}
|
||||
if (ptr_info.child == u8) {
|
||||
return formatText(value, fmt, options, context, Errors, output);
|
||||
return formatText(value, fmt, options, out_stream);
|
||||
}
|
||||
return format(context, Errors, output, "{}@{x}", .{ @typeName(ptr_info.child), @ptrToInt(value.ptr) });
|
||||
return format(out_stream, "{}@{x}", .{ @typeName(ptr_info.child), @ptrToInt(value.ptr) });
|
||||
},
|
||||
},
|
||||
.Array => |info| {
|
||||
@ -473,24 +461,24 @@ pub fn formatType(
|
||||
.sentinel = null,
|
||||
},
|
||||
});
|
||||
return formatType(@as(Slice, &value), fmt, options, context, Errors, output, max_depth);
|
||||
return formatType(@as(Slice, &value), fmt, options, out_stream, max_depth);
|
||||
},
|
||||
.Vector => {
|
||||
const len = @typeInfo(T).Vector.len;
|
||||
try output(context, "{ ");
|
||||
try out_stream.writeAll("{ ");
|
||||
var i: usize = 0;
|
||||
while (i < len) : (i += 1) {
|
||||
try formatValue(value[i], fmt, options, context, Errors, output);
|
||||
try formatValue(value[i], fmt, options, out_stream);
|
||||
if (i < len - 1) {
|
||||
try output(context, ", ");
|
||||
try out_stream.writeAll(", ");
|
||||
}
|
||||
}
|
||||
try output(context, " }");
|
||||
try out_stream.writeAll(" }");
|
||||
},
|
||||
.Fn => {
|
||||
return format(context, Errors, output, "{}@{x}", .{ @typeName(T), @ptrToInt(value) });
|
||||
return format(out_stream, "{}@{x}", .{ @typeName(T), @ptrToInt(value) });
|
||||
},
|
||||
.Type => return output(context, @typeName(T)),
|
||||
.Type => return out_stream.writeAll(@typeName(T)),
|
||||
.EnumLiteral => {
|
||||
const buffer = [_]u8{'.'} ++ @tagName(value);
|
||||
return formatType(buffer, fmt, options, context, Errors, output, max_depth);
|
||||
@ -503,21 +491,19 @@ fn formatValue(
|
||||
value: var,
|
||||
comptime fmt: []const u8,
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
out_stream: var,
|
||||
) !void {
|
||||
if (comptime std.mem.eql(u8, fmt, "B")) {
|
||||
return formatBytes(value, options, 1000, context, Errors, output);
|
||||
return formatBytes(value, options, 1000, out_stream);
|
||||
} else if (comptime std.mem.eql(u8, fmt, "Bi")) {
|
||||
return formatBytes(value, options, 1024, context, Errors, output);
|
||||
return formatBytes(value, options, 1024, out_stream);
|
||||
}
|
||||
|
||||
const T = @TypeOf(value);
|
||||
switch (@typeInfo(T)) {
|
||||
.Float => return formatFloatValue(value, fmt, options, context, Errors, output),
|
||||
.Int, .ComptimeInt => return formatIntValue(value, fmt, options, context, Errors, output),
|
||||
.Bool => return output(context, if (value) "true" else "false"),
|
||||
.Float => return formatFloatValue(value, fmt, options, out_stream),
|
||||
.Int, .ComptimeInt => return formatIntValue(value, fmt, options, out_stream),
|
||||
.Bool => return out_stream.writeAll(if (value) "true" else "false"),
|
||||
else => comptime unreachable,
|
||||
}
|
||||
}
|
||||
@ -526,10 +512,8 @@ pub fn formatIntValue(
|
||||
value: var,
|
||||
comptime fmt: []const u8,
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
out_stream: var,
|
||||
) !void {
|
||||
comptime var radix = 10;
|
||||
comptime var uppercase = false;
|
||||
|
||||
@ -544,7 +528,7 @@ pub fn formatIntValue(
|
||||
uppercase = false;
|
||||
} else if (comptime std.mem.eql(u8, fmt, "c")) {
|
||||
if (@TypeOf(int_value).bit_count <= 8) {
|
||||
return formatAsciiChar(@as(u8, int_value), options, context, Errors, output);
|
||||
return formatAsciiChar(@as(u8, int_value), options, out_stream);
|
||||
} else {
|
||||
@compileError("Cannot print integer that is larger than 8 bits as a ascii");
|
||||
}
|
||||
@ -561,21 +545,19 @@ pub fn formatIntValue(
|
||||
@compileError("Unknown format string: '" ++ fmt ++ "'");
|
||||
}
|
||||
|
||||
return formatInt(int_value, radix, uppercase, options, context, Errors, output);
|
||||
return formatInt(int_value, radix, uppercase, options, out_stream);
|
||||
}
|
||||
|
||||
fn formatFloatValue(
|
||||
value: var,
|
||||
comptime fmt: []const u8,
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
out_stream: var,
|
||||
) !void {
|
||||
if (fmt.len == 0 or comptime std.mem.eql(u8, fmt, "e")) {
|
||||
return formatFloatScientific(value, options, context, Errors, output);
|
||||
return formatFloatScientific(value, options, out_stream);
|
||||
} else if (comptime std.mem.eql(u8, fmt, "d")) {
|
||||
return formatFloatDecimal(value, options, context, Errors, output);
|
||||
return formatFloatDecimal(value, options, out_stream);
|
||||
} else {
|
||||
@compileError("Unknown format string: '" ++ fmt ++ "'");
|
||||
}
|
||||
@ -585,17 +567,15 @@ pub fn formatText(
|
||||
bytes: []const u8,
|
||||
comptime fmt: []const u8,
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
out_stream: var,
|
||||
) !void {
|
||||
if (fmt.len == 0) {
|
||||
return output(context, bytes);
|
||||
return out_stream.writeAll(bytes);
|
||||
} else if (comptime std.mem.eql(u8, fmt, "s")) {
|
||||
return formatBuf(bytes, options, context, Errors, output);
|
||||
return formatBuf(bytes, options, out_stream);
|
||||
} else if (comptime (std.mem.eql(u8, fmt, "x") or std.mem.eql(u8, fmt, "X"))) {
|
||||
for (bytes) |c| {
|
||||
try formatInt(c, 16, fmt[0] == 'X', FormatOptions{ .width = 2, .fill = '0' }, context, Errors, output);
|
||||
try formatInt(c, 16, fmt[0] == 'X', FormatOptions{ .width = 2, .fill = '0' }, out_stream);
|
||||
}
|
||||
return;
|
||||
} else {
|
||||
@ -606,27 +586,23 @@ pub fn formatText(
|
||||
pub fn formatAsciiChar(
|
||||
c: u8,
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
return output(context, @as(*const [1]u8, &c)[0..]);
|
||||
out_stream: var,
|
||||
) !void {
|
||||
return out_stream.writeAll(@as(*const [1]u8, &c)[0..]);
|
||||
}
|
||||
|
||||
pub fn formatBuf(
|
||||
buf: []const u8,
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
try output(context, buf);
|
||||
out_stream: var,
|
||||
) !void {
|
||||
try out_stream.writeAll(buf);
|
||||
|
||||
const width = options.width orelse 0;
|
||||
var leftover_padding = if (width > buf.len) (width - buf.len) else return;
|
||||
const pad_byte: u8 = options.fill;
|
||||
while (leftover_padding > 0) : (leftover_padding -= 1) {
|
||||
try output(context, @as(*const [1]u8, &pad_byte)[0..1]);
|
||||
try out_stream.writeAll(@as(*const [1]u8, &pad_byte)[0..1]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -636,40 +612,38 @@ pub fn formatBuf(
|
||||
pub fn formatFloatScientific(
|
||||
value: var,
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
out_stream: var,
|
||||
) !void {
|
||||
var x = @floatCast(f64, value);
|
||||
|
||||
// Errol doesn't handle these special cases.
|
||||
if (math.signbit(x)) {
|
||||
try output(context, "-");
|
||||
try out_stream.writeAll("-");
|
||||
x = -x;
|
||||
}
|
||||
|
||||
if (math.isNan(x)) {
|
||||
return output(context, "nan");
|
||||
return out_stream.writeAll("nan");
|
||||
}
|
||||
if (math.isPositiveInf(x)) {
|
||||
return output(context, "inf");
|
||||
return out_stream.writeAll("inf");
|
||||
}
|
||||
if (x == 0.0) {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
|
||||
if (options.precision) |precision| {
|
||||
if (precision != 0) {
|
||||
try output(context, ".");
|
||||
try out_stream.writeAll(".");
|
||||
var i: usize = 0;
|
||||
while (i < precision) : (i += 1) {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
try output(context, ".0");
|
||||
try out_stream.writeAll(".0");
|
||||
}
|
||||
|
||||
try output(context, "e+00");
|
||||
try out_stream.writeAll("e+00");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -679,50 +653,50 @@ pub fn formatFloatScientific(
|
||||
if (options.precision) |precision| {
|
||||
errol.roundToPrecision(&float_decimal, precision, errol.RoundMode.Scientific);
|
||||
|
||||
try output(context, float_decimal.digits[0..1]);
|
||||
try out_stream.writeAll(float_decimal.digits[0..1]);
|
||||
|
||||
// {e0} case prints no `.`
|
||||
if (precision != 0) {
|
||||
try output(context, ".");
|
||||
try out_stream.writeAll(".");
|
||||
|
||||
var printed: usize = 0;
|
||||
if (float_decimal.digits.len > 1) {
|
||||
const num_digits = math.min(float_decimal.digits.len, precision + 1);
|
||||
try output(context, float_decimal.digits[1..num_digits]);
|
||||
try out_stream.writeAll(float_decimal.digits[1..num_digits]);
|
||||
printed += num_digits - 1;
|
||||
}
|
||||
|
||||
while (printed < precision) : (printed += 1) {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
try output(context, float_decimal.digits[0..1]);
|
||||
try output(context, ".");
|
||||
try out_stream.writeAll(float_decimal.digits[0..1]);
|
||||
try out_stream.writeAll(".");
|
||||
if (float_decimal.digits.len > 1) {
|
||||
const num_digits = if (@TypeOf(value) == f32) math.min(@as(usize, 9), float_decimal.digits.len) else float_decimal.digits.len;
|
||||
|
||||
try output(context, float_decimal.digits[1..num_digits]);
|
||||
try out_stream.writeAll(float_decimal.digits[1..num_digits]);
|
||||
} else {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
}
|
||||
}
|
||||
|
||||
try output(context, "e");
|
||||
try out_stream.writeAll("e");
|
||||
const exp = float_decimal.exp - 1;
|
||||
|
||||
if (exp >= 0) {
|
||||
try output(context, "+");
|
||||
try out_stream.writeAll("+");
|
||||
if (exp > -10 and exp < 10) {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
}
|
||||
try formatInt(exp, 10, false, FormatOptions{ .width = 0 }, context, Errors, output);
|
||||
try formatInt(exp, 10, false, FormatOptions{ .width = 0 }, out_stream);
|
||||
} else {
|
||||
try output(context, "-");
|
||||
try out_stream.writeAll("-");
|
||||
if (exp > -10 and exp < 10) {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
}
|
||||
try formatInt(-exp, 10, false, FormatOptions{ .width = 0 }, context, Errors, output);
|
||||
try formatInt(-exp, 10, false, FormatOptions{ .width = 0 }, out_stream);
|
||||
}
|
||||
}
|
||||
|
||||
@ -731,36 +705,34 @@ pub fn formatFloatScientific(
|
||||
pub fn formatFloatDecimal(
|
||||
value: var,
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
out_stream: var,
|
||||
) !void {
|
||||
var x = @as(f64, value);
|
||||
|
||||
// Errol doesn't handle these special cases.
|
||||
if (math.signbit(x)) {
|
||||
try output(context, "-");
|
||||
try out_stream.writeAll("-");
|
||||
x = -x;
|
||||
}
|
||||
|
||||
if (math.isNan(x)) {
|
||||
return output(context, "nan");
|
||||
return out_stream.writeAll("nan");
|
||||
}
|
||||
if (math.isPositiveInf(x)) {
|
||||
return output(context, "inf");
|
||||
return out_stream.writeAll("inf");
|
||||
}
|
||||
if (x == 0.0) {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
|
||||
if (options.precision) |precision| {
|
||||
if (precision != 0) {
|
||||
try output(context, ".");
|
||||
try out_stream.writeAll(".");
|
||||
var i: usize = 0;
|
||||
while (i < precision) : (i += 1) {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
}
|
||||
} else {
|
||||
try output(context, ".0");
|
||||
try out_stream.writeAll(".0");
|
||||
}
|
||||
}
|
||||
|
||||
@ -782,14 +754,14 @@ pub fn formatFloatDecimal(
|
||||
|
||||
if (num_digits_whole > 0) {
|
||||
// We may have to zero pad, for instance 1e4 requires zero padding.
|
||||
try output(context, float_decimal.digits[0..num_digits_whole_no_pad]);
|
||||
try out_stream.writeAll(float_decimal.digits[0..num_digits_whole_no_pad]);
|
||||
|
||||
var i = num_digits_whole_no_pad;
|
||||
while (i < num_digits_whole) : (i += 1) {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
}
|
||||
} else {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
}
|
||||
|
||||
// {.0} special case doesn't want a trailing '.'
|
||||
@ -797,7 +769,7 @@ pub fn formatFloatDecimal(
|
||||
return;
|
||||
}
|
||||
|
||||
try output(context, ".");
|
||||
try out_stream.writeAll(".");
|
||||
|
||||
// Keep track of fractional count printed for case where we pre-pad then post-pad with 0's.
|
||||
var printed: usize = 0;
|
||||
@ -809,7 +781,7 @@ pub fn formatFloatDecimal(
|
||||
|
||||
var i: usize = 0;
|
||||
while (i < zeros_to_print) : (i += 1) {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
printed += 1;
|
||||
}
|
||||
|
||||
@ -821,14 +793,14 @@ pub fn formatFloatDecimal(
|
||||
// Remaining fractional portion, zero-padding if insufficient.
|
||||
assert(precision >= printed);
|
||||
if (num_digits_whole_no_pad + precision - printed < float_decimal.digits.len) {
|
||||
try output(context, float_decimal.digits[num_digits_whole_no_pad .. num_digits_whole_no_pad + precision - printed]);
|
||||
try out_stream.writeAll(float_decimal.digits[num_digits_whole_no_pad .. num_digits_whole_no_pad + precision - printed]);
|
||||
return;
|
||||
} else {
|
||||
try output(context, float_decimal.digits[num_digits_whole_no_pad..]);
|
||||
try out_stream.writeAll(float_decimal.digits[num_digits_whole_no_pad..]);
|
||||
printed += float_decimal.digits.len - num_digits_whole_no_pad;
|
||||
|
||||
while (printed < precision) : (printed += 1) {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@ -840,14 +812,14 @@ pub fn formatFloatDecimal(
|
||||
|
||||
if (num_digits_whole > 0) {
|
||||
// We may have to zero pad, for instance 1e4 requires zero padding.
|
||||
try output(context, float_decimal.digits[0..num_digits_whole_no_pad]);
|
||||
try out_stream.writeAll(float_decimal.digits[0..num_digits_whole_no_pad]);
|
||||
|
||||
var i = num_digits_whole_no_pad;
|
||||
while (i < num_digits_whole) : (i += 1) {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
}
|
||||
} else {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
}
|
||||
|
||||
// Omit `.` if no fractional portion
|
||||
@ -855,7 +827,7 @@ pub fn formatFloatDecimal(
|
||||
return;
|
||||
}
|
||||
|
||||
try output(context, ".");
|
||||
try out_stream.writeAll(".");
|
||||
|
||||
// Zero-fill until we reach significant digits or run out of precision.
|
||||
if (float_decimal.exp < 0) {
|
||||
@ -863,11 +835,11 @@ pub fn formatFloatDecimal(
|
||||
|
||||
var i: usize = 0;
|
||||
while (i < zero_digit_count) : (i += 1) {
|
||||
try output(context, "0");
|
||||
try out_stream.writeAll("0");
|
||||
}
|
||||
}
|
||||
|
||||
try output(context, float_decimal.digits[num_digits_whole_no_pad..]);
|
||||
try out_stream.writeAll(float_decimal.digits[num_digits_whole_no_pad..]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -875,12 +847,10 @@ pub fn formatBytes(
|
||||
value: var,
|
||||
options: FormatOptions,
|
||||
comptime radix: usize,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
out_stream: var,
|
||||
) !void {
|
||||
if (value == 0) {
|
||||
return output(context, "0B");
|
||||
return out_stream.writeAll("0B");
|
||||
}
|
||||
|
||||
const mags_si = " kMGTPEZY";
|
||||
@ -897,10 +867,10 @@ pub fn formatBytes(
|
||||
else => unreachable,
|
||||
};
|
||||
|
||||
try formatFloatDecimal(new_value, options, context, Errors, output);
|
||||
try formatFloatDecimal(new_value, options, out_stream);
|
||||
|
||||
if (suffix == ' ') {
|
||||
return output(context, "B");
|
||||
return out_stream.writeAll("B");
|
||||
}
|
||||
|
||||
const buf = switch (radix) {
|
||||
@ -908,7 +878,7 @@ pub fn formatBytes(
|
||||
1024 => &[_]u8{ suffix, 'i', 'B' },
|
||||
else => unreachable,
|
||||
};
|
||||
return output(context, buf);
|
||||
return out_stream.writeAll(buf);
|
||||
}
|
||||
|
||||
pub fn formatInt(
|
||||
@ -916,10 +886,8 @@ pub fn formatInt(
|
||||
base: u8,
|
||||
uppercase: bool,
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
out_stream: var,
|
||||
) !void {
|
||||
const int_value = if (@TypeOf(value) == comptime_int) blk: {
|
||||
const Int = math.IntFittingRange(value, value);
|
||||
break :blk @as(Int, value);
|
||||
@ -927,9 +895,9 @@ pub fn formatInt(
|
||||
value;
|
||||
|
||||
if (@TypeOf(int_value).is_signed) {
|
||||
return formatIntSigned(int_value, base, uppercase, options, context, Errors, output);
|
||||
return formatIntSigned(int_value, base, uppercase, options, out_stream);
|
||||
} else {
|
||||
return formatIntUnsigned(int_value, base, uppercase, options, context, Errors, output);
|
||||
return formatIntUnsigned(int_value, base, uppercase, options, out_stream);
|
||||
}
|
||||
}
|
||||
|
||||
@ -938,10 +906,8 @@ fn formatIntSigned(
|
||||
base: u8,
|
||||
uppercase: bool,
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
out_stream: var,
|
||||
) !void {
|
||||
const new_options = FormatOptions{
|
||||
.width = if (options.width) |w| (if (w == 0) 0 else w - 1) else null,
|
||||
.precision = options.precision,
|
||||
@ -950,15 +916,15 @@ fn formatIntSigned(
|
||||
const bit_count = @typeInfo(@TypeOf(value)).Int.bits;
|
||||
const Uint = std.meta.IntType(false, bit_count);
|
||||
if (value < 0) {
|
||||
try output(context, "-");
|
||||
try out_stream.writeAll("-");
|
||||
const new_value = math.absCast(value);
|
||||
return formatIntUnsigned(new_value, base, uppercase, new_options, context, Errors, output);
|
||||
return formatIntUnsigned(new_value, base, uppercase, new_options, out_stream);
|
||||
} else if (options.width == null or options.width.? == 0) {
|
||||
return formatIntUnsigned(@intCast(Uint, value), base, uppercase, options, context, Errors, output);
|
||||
return formatIntUnsigned(@intCast(Uint, value), base, uppercase, options, out_stream);
|
||||
} else {
|
||||
try output(context, "+");
|
||||
try out_stream.writeAll("+");
|
||||
const new_value = @intCast(Uint, value);
|
||||
return formatIntUnsigned(new_value, base, uppercase, new_options, context, Errors, output);
|
||||
return formatIntUnsigned(new_value, base, uppercase, new_options, out_stream);
|
||||
}
|
||||
}
|
||||
|
||||
@ -967,10 +933,8 @@ fn formatIntUnsigned(
|
||||
base: u8,
|
||||
uppercase: bool,
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
out_stream: var,
|
||||
) !void {
|
||||
assert(base >= 2);
|
||||
var buf: [math.max(@TypeOf(value).bit_count, 1)]u8 = undefined;
|
||||
const min_int_bits = comptime math.max(@TypeOf(value).bit_count, @TypeOf(base).bit_count);
|
||||
@ -994,16 +958,16 @@ fn formatIntUnsigned(
|
||||
const zero_byte: u8 = options.fill;
|
||||
var leftover_padding = padding - index;
|
||||
while (true) {
|
||||
try output(context, @as(*const [1]u8, &zero_byte)[0..]);
|
||||
try out_stream.writeAll(@as(*const [1]u8, &zero_byte)[0..]);
|
||||
leftover_padding -= 1;
|
||||
if (leftover_padding == 0) break;
|
||||
}
|
||||
mem.set(u8, buf[0..index], options.fill);
|
||||
return output(context, &buf);
|
||||
return out_stream.writeAll(&buf);
|
||||
} else {
|
||||
const padded_buf = buf[index - padding ..];
|
||||
mem.set(u8, padded_buf[0..padding], options.fill);
|
||||
return output(context, padded_buf);
|
||||
return out_stream.writeAll(padded_buf);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1451,12 +1415,12 @@ test "custom" {
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
comptime output: fn (@TypeOf(context), []const u8) !void,
|
||||
) !void {
|
||||
if (fmt.len == 0 or comptime std.mem.eql(u8, fmt, "p")) {
|
||||
return std.fmt.format(context, Errors, output, "({d:.3},{d:.3})", .{ self.x, self.y });
|
||||
return std.fmtstream.format(out_stream, "({d:.3},{d:.3})", .{ self.x, self.y });
|
||||
} else if (comptime std.mem.eql(u8, fmt, "d")) {
|
||||
return std.fmt.format(context, Errors, output, "{d:.3}x{d:.3}", .{ self.x, self.y });
|
||||
return std.fmtstream.format(out_stream, "{d:.3}x{d:.3}", .{ self.x, self.y });
|
||||
} else {
|
||||
@compileError("Unknown format character: '" ++ fmt ++ "'");
|
||||
}
|
||||
@ -1658,10 +1622,10 @@ test "formatType max_depth" {
|
||||
options: FormatOptions,
|
||||
context: var,
|
||||
comptime Errors: type,
|
||||
comptime output: fn (@TypeOf(context), []const u8) Errors!void,
|
||||
) Errors!void {
|
||||
comptime output: fn (@TypeOf(context), []const u8) !void,
|
||||
) !void {
|
||||
if (fmt.len == 0) {
|
||||
return std.fmt.format(context, Errors, output, "({d:.3},{d:.3})", .{ self.x, self.y });
|
||||
return std.fmtstream.format(out_stream, "({d:.3},{d:.3})", .{ self.x, self.y });
|
||||
} else {
|
||||
@compileError("Unknown format string: '" ++ fmt ++ "'");
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user