ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-03 14:18:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move flush to within the sbprint* procedures

Browse Source
This commit is contained in:
gingerBill
2020-10-01 12:09:38 +01:00
parent 66c648e5e0
commit c604e359c7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt/fmt.odin
+3 -3
View File
@@ -86,7 +86,6 @@ fprint :: proc(fd: os.Handle, args: ..any, sep := " ") -> int {
flush_data := Flush_Data{handle=fd}; flush_data := Flush_Data{handle=fd};
buf := fmt_file_builder(data[:], &flush_data); buf := fmt_file_builder(data[:], &flush_data);
_ = sbprint(buf=&buf, args=args, sep=sep); _ = sbprint(buf=&buf, args=args, sep=sep);
strings.flush_builder(&buf);
return flush_data.bytes_written; return flush_data.bytes_written;
} }
@@ -95,7 +94,6 @@ fprintln :: proc(fd: os.Handle, args: ..any, sep := " ") -> int {
flush_data := Flush_Data{handle=fd}; flush_data := Flush_Data{handle=fd};
buf := fmt_file_builder(data[:], &flush_data); buf := fmt_file_builder(data[:], &flush_data);
_ = sbprintln(buf=&buf, args=args, sep=sep); _ = sbprintln(buf=&buf, args=args, sep=sep);
strings.flush_builder(&buf);
return flush_data.bytes_written; return flush_data.bytes_written;
} }
fprintf :: proc(fd: os.Handle, fmt: string, args: ..any) -> int { fprintf :: proc(fd: os.Handle, fmt: string, args: ..any) -> int {
@@ -103,7 +101,6 @@ fprintf :: proc(fd: os.Handle, fmt: string, args: ..any) -> int {
flush_data := Flush_Data{handle=fd}; flush_data := Flush_Data{handle=fd};
buf := fmt_file_builder(data[:], &flush_data); buf := fmt_file_builder(data[:], &flush_data);
_ = sbprintf(&buf, fmt, ..args); _ = sbprintf(&buf, fmt, ..args);
strings.flush_builder(&buf);
return flush_data.bytes_written; return flush_data.bytes_written;
} }
fprint_type :: proc(fd: os.Handle, info: ^runtime.Type_Info) -> int { fprint_type :: proc(fd: os.Handle, info: ^runtime.Type_Info) -> int {
@@ -231,6 +228,7 @@ sbprint :: proc(buf: ^strings.Builder, args: ..any, sep := " ") -> string {
fmt_value(&fi, args[i], 'v'); fmt_value(&fi, args[i], 'v');
} }
strings.flush_builder(buf);
return strings.to_string(buf^); return strings.to_string(buf^);
} }
@@ -246,6 +244,7 @@ sbprintln :: proc(buf: ^strings.Builder, args: ..any, sep := " ") -> string {
fmt_value(&fi, args[i], 'v'); fmt_value(&fi, args[i], 'v');
} }
strings.write_byte(buf, '\n'); strings.write_byte(buf, '\n');
strings.flush_builder(buf);
return strings.to_string(buf^); return strings.to_string(buf^);
} }
@@ -521,6 +520,7 @@ sbprintf :: proc(b: ^strings.Builder, fmt: string, args: ..any) -> string {
strings.write_string(b, ")"); strings.write_string(b, ")");
} }
strings.flush_builder(b);
return strings.to_string(b^); return strings.to_string(b^);
} }