mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-02 20:58:15 +00:00
Clean up fmt usage with io.Writer and strings.Builder
This commit is contained in:
gingerBill
+134
-129
@@ -378,67 +378,70 @@ write_type :: proc{
|
||||
write_type_writer,
|
||||
};
|
||||
|
||||
write_type_builder :: proc(buf: ^strings.Builder, ti: ^Type_Info) {
|
||||
write_type_writer(strings.to_writer(buf), ti);
|
||||
write_type_builder :: proc(buf: ^strings.Builder, ti: ^Type_Info) -> int {
|
||||
return write_type_writer(strings.to_writer(buf), ti);
|
||||
}
|
||||
write_type_writer :: proc(w: io.Writer, ti: ^Type_Info) {
|
||||
write_type_writer :: proc(w: io.Writer, ti: ^Type_Info) -> (n: int) {
|
||||
using strings;
|
||||
if ti == nil {
|
||||
write_string(w, "nil");
|
||||
return;
|
||||
return write_string(w, "nil");
|
||||
}
|
||||
|
||||
_n1 :: proc(err: io.Error) -> int { return 1 if err == nil else 0; };
|
||||
_n2 :: proc(n: int, _: io.Error) -> int { return n; };
|
||||
_n :: proc{_n1, _n2};
|
||||
|
||||
switch info in ti.variant {
|
||||
case Type_Info_Named:
|
||||
write_string(w, info.name);
|
||||
return write_string(w, info.name);
|
||||
case Type_Info_Integer:
|
||||
switch ti.id {
|
||||
case int: write_string(w, "int");
|
||||
case uint: write_string(w, "uint");
|
||||
case uintptr: write_string(w, "uintptr");
|
||||
case int: return write_string(w, "int");
|
||||
case uint: return write_string(w, "uint");
|
||||
case uintptr: return write_string(w, "uintptr");
|
||||
case:
|
||||
io.write_byte(w, 'i' if info.signed else 'u');
|
||||
io.write_i64(w, i64(8*ti.size), 10);
|
||||
n += _n(io.write_byte(w, 'i' if info.signed else 'u'));
|
||||
n += _n(io.write_i64(w, i64(8*ti.size), 10));
|
||||
switch info.endianness {
|
||||
case .Platform: // Okay
|
||||
case .Little: write_string(w, "le");
|
||||
case .Big: write_string(w, "be");
|
||||
case .Little: n += write_string(w, "le");
|
||||
case .Big: n += write_string(w, "be");
|
||||
}
|
||||
}
|
||||
case Type_Info_Rune:
|
||||
io.write_string(w, "rune");
|
||||
n += _n(io.write_string(w, "rune"));
|
||||
case Type_Info_Float:
|
||||
io.write_byte(w, 'f');
|
||||
io.write_i64(w, i64(8*ti.size), 10);
|
||||
n += _n(io.write_byte(w, 'f'));
|
||||
n += _n(io.write_i64(w, i64(8*ti.size), 10));
|
||||
switch info.endianness {
|
||||
case .Platform: // Okay
|
||||
case .Little: write_string(w, "le");
|
||||
case .Big: write_string(w, "be");
|
||||
case .Little: n += write_string(w, "le");
|
||||
case .Big: n += write_string(w, "be");
|
||||
}
|
||||
case Type_Info_Complex:
|
||||
io.write_string(w, "complex");
|
||||
io.write_i64(w, i64(8*ti.size), 10);
|
||||
n += _n(io.write_string(w, "complex"));
|
||||
n += _n(io.write_i64(w, i64(8*ti.size), 10));
|
||||
case Type_Info_Quaternion:
|
||||
io.write_string(w, "quaternion");
|
||||
io.write_i64(w, i64(8*ti.size), 10);
|
||||
n += _n(io.write_string(w, "quaternion"));
|
||||
n += _n(io.write_i64(w, i64(8*ti.size), 10));
|
||||
case Type_Info_String:
|
||||
if info.is_cstring {
|
||||
write_string(w, "cstring");
|
||||
n += write_string(w, "cstring");
|
||||
} else {
|
||||
write_string(w, "string");
|
||||
n += write_string(w, "string");
|
||||
}
|
||||
case Type_Info_Boolean:
|
||||
switch ti.id {
|
||||
case bool: write_string(w, "bool");
|
||||
case bool: n += write_string(w, "bool");
|
||||
case:
|
||||
io.write_byte(w, 'b');
|
||||
io.write_i64(w, i64(8*ti.size), 10);
|
||||
n += _n(io.write_byte(w, 'b'));
|
||||
n += _n(io.write_i64(w, i64(8*ti.size), 10));
|
||||
}
|
||||
case Type_Info_Any:
|
||||
write_string(w, "any");
|
||||
n += write_string(w, "any");
|
||||
|
||||
case Type_Info_Type_Id:
|
||||
write_string(w, "typeid");
|
||||
n += write_string(w, "typeid");
|
||||
|
||||
case Type_Info_Pointer:
|
||||
if info.elem == nil {
|
||||
@@ -448,186 +451,188 @@ write_type_writer :: proc(w: io.Writer, ti: ^Type_Info) {
|
||||
write_type(w, info.elem);
|
||||
}
|
||||
case Type_Info_Procedure:
|
||||
write_string(w, "proc");
|
||||
n += write_string(w, "proc");
|
||||
if info.params == nil {
|
||||
write_string(w, "()");
|
||||
n += write_string(w, "()");
|
||||
} else {
|
||||
t := info.params.variant.(Type_Info_Tuple);
|
||||
write_string(w, "(");
|
||||
n += write_string(w, "(");
|
||||
for t, i in t.types {
|
||||
if i > 0 {
|
||||
write_string(w, ", ");
|
||||
n += write_string(w, ", ");
|
||||
}
|
||||
write_type(w, t);
|
||||
n += write_type(w, t);
|
||||
}
|
||||
write_string(w, ")");
|
||||
n += write_string(w, ")");
|
||||
}
|
||||
if info.results != nil {
|
||||
write_string(w, " -> ");
|
||||
write_type(w, info.results);
|
||||
n += write_string(w, " -> ");
|
||||
n += write_type(w, info.results);
|
||||
}
|
||||
case Type_Info_Tuple:
|
||||
count := len(info.names);
|
||||
if count != 1 { write_string(w, "("); }
|
||||
if count != 1 { n += write_string(w, "("); }
|
||||
for name, i in info.names {
|
||||
if i > 0 { write_string(w, ", "); }
|
||||
if i > 0 { n += write_string(w, ", "); }
|
||||
|
||||
t := info.types[i];
|
||||
|
||||
if len(name) > 0 {
|
||||
write_string(w, name);
|
||||
write_string(w, ": ");
|
||||
n += write_string(w, name);
|
||||
n += write_string(w, ": ");
|
||||
}
|
||||
write_type(w, t);
|
||||
n += write_type(w, t);
|
||||
}
|
||||
if count != 1 { write_string(w, ")"); }
|
||||
if count != 1 { n += write_string(w, ")"); }
|
||||
|
||||
case Type_Info_Array:
|
||||
io.write_string(w, "[");
|
||||
io.write_i64(w, i64(info.count), 10);
|
||||
io.write_string(w, "]");
|
||||
write_type(w, info.elem);
|
||||
n += _n(io.write_string(w, "["));
|
||||
n += _n(io.write_i64(w, i64(info.count), 10));
|
||||
n += _n(io.write_string(w, "]"));
|
||||
n += write_type(w, info.elem);
|
||||
|
||||
case Type_Info_Enumerated_Array:
|
||||
write_string(w, "[");
|
||||
write_type(w, info.index);
|
||||
write_string(w, "]");
|
||||
write_type(w, info.elem);
|
||||
n += write_string(w, "[");
|
||||
n += write_type(w, info.index);
|
||||
n += write_string(w, "]");
|
||||
n += write_type(w, info.elem);
|
||||
|
||||
case Type_Info_Dynamic_Array:
|
||||
io.write_string(w, "[dynamic]");
|
||||
write_type(w, info.elem);
|
||||
n += _n(io.write_string(w, "[dynamic]"));
|
||||
n += write_type(w, info.elem);
|
||||
case Type_Info_Slice:
|
||||
io.write_string(w, "[]");
|
||||
write_type(w, info.elem);
|
||||
n += _n(io.write_string(w, "[]"));
|
||||
n += write_type(w, info.elem);
|
||||
|
||||
case Type_Info_Map:
|
||||
io.write_string(w, "map[");
|
||||
write_type(w, info.key);
|
||||
io.write_byte(w, ']');
|
||||
write_type(w, info.value);
|
||||
n += _n(io.write_string(w, "map["));
|
||||
n += write_type(w, info.key);
|
||||
n += _n(io.write_byte(w, ']'));
|
||||
n += write_type(w, info.value);
|
||||
|
||||
case Type_Info_Struct:
|
||||
switch info.soa_kind {
|
||||
case .None: // Ignore
|
||||
case .Fixed:
|
||||
io.write_string(w, "#soa[");
|
||||
io.write_i64(w, i64(info.soa_len));
|
||||
io.write_byte(w, ']');
|
||||
write_type(w, info.soa_base_type);
|
||||
n += _n(io.write_string(w, "#soa["));
|
||||
n += _n(io.write_i64(w, i64(info.soa_len)));
|
||||
n += _n(io.write_byte(w, ']'));
|
||||
n += write_type(w, info.soa_base_type);
|
||||
return;
|
||||
case .Slice:
|
||||
io.write_string(w, "#soa[]");
|
||||
write_type(w, info.soa_base_type);
|
||||
n += _n(io.write_string(w, "#soa[]"));
|
||||
n += write_type(w, info.soa_base_type);
|
||||
return;
|
||||
case .Dynamic:
|
||||
io.write_string(w, "#soa[dynamic]");
|
||||
write_type(w, info.soa_base_type);
|
||||
n += _n(io.write_string(w, "#soa[dynamic]"));
|
||||
n += write_type(w, info.soa_base_type);
|
||||
return;
|
||||
}
|
||||
|
||||
write_string(w, "struct ");
|
||||
if info.is_packed { write_string(w, "#packed "); }
|
||||
if info.is_raw_union { write_string(w, "#raw_union "); }
|
||||
n += write_string(w, "struct ");
|
||||
if info.is_packed { n += write_string(w, "#packed "); }
|
||||
if info.is_raw_union { n += write_string(w, "#raw_union "); }
|
||||
if info.custom_align {
|
||||
io.write_string(w, "#align ");
|
||||
io.write_i64(w, i64(ti.align), 10);
|
||||
io.write_byte(w, ' ');
|
||||
n += _n(io.write_string(w, "#align "));
|
||||
n += _n(io.write_i64(w, i64(ti.align), 10));
|
||||
n += _n(io.write_byte(w, ' '));
|
||||
}
|
||||
io.write_byte(w, '{');
|
||||
n += _n(io.write_byte(w, '{'));
|
||||
for name, i in info.names {
|
||||
if i > 0 { write_string(w, ", "); }
|
||||
io.write_string(w, name);
|
||||
io.write_string(w, ": ");
|
||||
write_type(w, info.types[i]);
|
||||
if i > 0 { n += write_string(w, ", "); }
|
||||
n += _n(io.write_string(w, name));
|
||||
n += _n(io.write_string(w, ": "));
|
||||
n += write_type(w, info.types[i]);
|
||||
}
|
||||
io.write_byte(w, '}');
|
||||
n += _n(io.write_byte(w, '}'));
|
||||
|
||||
case Type_Info_Union:
|
||||
write_string(w, "union ");
|
||||
n += write_string(w, "union ");
|
||||
if info.custom_align {
|
||||
write_string(w, "#align ");
|
||||
io.write_i64(w, i64(ti.align), 10);
|
||||
io.write_byte(w, ' ');
|
||||
n += write_string(w, "#align ");
|
||||
n += _n(io.write_i64(w, i64(ti.align), 10));
|
||||
n += _n(io.write_byte(w, ' '));
|
||||
}
|
||||
io.write_byte(w, '{');
|
||||
n += _n(io.write_byte(w, '{'));
|
||||
for variant, i in info.variants {
|
||||
if i > 0 { write_string(w, ", "); }
|
||||
write_type(w, variant);
|
||||
if i > 0 { n += write_string(w, ", "); }
|
||||
n += write_type(w, variant);
|
||||
}
|
||||
io.write_byte(w, '}');
|
||||
n += _n(io.write_byte(w, '}'));
|
||||
|
||||
case Type_Info_Enum:
|
||||
write_string(w, "enum ");
|
||||
write_type(w, info.base);
|
||||
write_string(w, " {");
|
||||
n += write_string(w, "enum ");
|
||||
n += write_type(w, info.base);
|
||||
n += write_string(w, " {");
|
||||
for name, i in info.names {
|
||||
if i > 0 { write_string(w, ", "); }
|
||||
write_string(w, name);
|
||||
if i > 0 { n += write_string(w, ", "); }
|
||||
n += write_string(w, name);
|
||||
}
|
||||
io.write_byte(w, '}');
|
||||
n += _n(io.write_byte(w, '}'));
|
||||
|
||||
case Type_Info_Bit_Field:
|
||||
write_string(w, "bit_field ");
|
||||
n += write_string(w, "bit_field ");
|
||||
if ti.align != 1 {
|
||||
write_string(w, "#align ");
|
||||
io.write_i64(w, i64(ti.align), 10);
|
||||
io.write_byte(w, ' ');
|
||||
n += write_string(w, "#align ");
|
||||
n += _n(io.write_i64(w, i64(ti.align), 10));
|
||||
n += _n(io.write_byte(w, ' '));
|
||||
}
|
||||
write_string(w, " {");
|
||||
n += write_string(w, " {");
|
||||
for name, i in info.names {
|
||||
if i > 0 { write_string(w, ", "); }
|
||||
write_string(w, name);
|
||||
write_string(w, ": ");
|
||||
io.write_i64(w, i64(info.bits[i]), 10);
|
||||
if i > 0 { n += write_string(w, ", "); }
|
||||
n += write_string(w, name);
|
||||
n += write_string(w, ": ");
|
||||
n += _n(io.write_i64(w, i64(info.bits[i]), 10));
|
||||
}
|
||||
io.write_byte(w, '}');
|
||||
n += _n(io.write_byte(w, '}'));
|
||||
|
||||
case Type_Info_Bit_Set:
|
||||
write_string(w, "bit_set[");
|
||||
n += write_string(w, "bit_set[");
|
||||
switch {
|
||||
case is_enum(info.elem):
|
||||
write_type(w, info.elem);
|
||||
n += write_type(w, info.elem);
|
||||
case is_rune(info.elem):
|
||||
write_encoded_rune(w, rune(info.lower));
|
||||
write_string(w, "..");
|
||||
write_encoded_rune(w, rune(info.upper));
|
||||
n += write_encoded_rune(w, rune(info.lower));
|
||||
n += write_string(w, "..");
|
||||
n += write_encoded_rune(w, rune(info.upper));
|
||||
case:
|
||||
io.write_i64(w, info.lower, 10);
|
||||
write_string(w, "..");
|
||||
io.write_i64(w, info.upper, 10);
|
||||
n += _n(io.write_i64(w, info.lower, 10));
|
||||
n += write_string(w, "..");
|
||||
n += _n(io.write_i64(w, info.upper, 10));
|
||||
}
|
||||
if info.underlying != nil {
|
||||
write_string(w, "; ");
|
||||
write_type(w, info.underlying);
|
||||
n += write_string(w, "; ");
|
||||
n += write_type(w, info.underlying);
|
||||
}
|
||||
io.write_byte(w, ']');
|
||||
n += _n(io.write_byte(w, ']'));
|
||||
|
||||
case Type_Info_Opaque:
|
||||
write_string(w, "opaque ");
|
||||
write_type(w, info.elem);
|
||||
n += write_string(w, "opaque ");
|
||||
n += write_type(w, info.elem);
|
||||
|
||||
case Type_Info_Simd_Vector:
|
||||
if info.is_x86_mmx {
|
||||
write_string(w, "intrinsics.x86_mmx");
|
||||
n += write_string(w, "intrinsics.x86_mmx");
|
||||
} else {
|
||||
write_string(w, "#simd[");
|
||||
io.write_i64(w, i64(info.count));
|
||||
io.write_byte(w, ']');
|
||||
write_type(w, info.elem);
|
||||
n += write_string(w, "#simd[");
|
||||
n += _n(io.write_i64(w, i64(info.count)));
|
||||
n += _n(io.write_byte(w, ']'));
|
||||
n += write_type(w, info.elem);
|
||||
}
|
||||
|
||||
case Type_Info_Relative_Pointer:
|
||||
write_string(w, "#relative(");
|
||||
write_type(w, info.base_integer);
|
||||
write_string(w, ") ");
|
||||
write_type(w, info.pointer);
|
||||
n += write_string(w, "#relative(");
|
||||
n += write_type(w, info.base_integer);
|
||||
n += write_string(w, ") ");
|
||||
n += write_type(w, info.pointer);
|
||||
|
||||
case Type_Info_Relative_Slice:
|
||||
write_string(w, "#relative(");
|
||||
write_type(w, info.base_integer);
|
||||
write_string(w, ") ");
|
||||
write_type(w, info.slice);
|
||||
n += write_string(w, "#relative(");
|
||||
n += write_type(w, info.base_integer);
|
||||
n += write_string(w, ") ");
|
||||
n += write_type(w, info.slice);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user