From c604e359c7d905e2d7f14b658dc6ac6e1ada2dbb Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 1 Oct 2020 12:09:38 +0100 Subject: [PATCH] Move flush to within the sbprint* procedures --- core/fmt/fmt.odin | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/fmt/fmt.odin b/core/fmt/fmt.odin index 5177468a0..8a0d475d8 100644 --- a/core/fmt/fmt.odin +++ b/core/fmt/fmt.odin @@ -86,7 +86,6 @@ fprint :: proc(fd: os.Handle, args: ..any, sep := " ") -> int { flush_data := Flush_Data{handle=fd}; buf := fmt_file_builder(data[:], &flush_data); _ = sbprint(buf=&buf, args=args, sep=sep); - strings.flush_builder(&buf); return flush_data.bytes_written; } @@ -95,7 +94,6 @@ fprintln :: proc(fd: os.Handle, args: ..any, sep := " ") -> int { flush_data := Flush_Data{handle=fd}; buf := fmt_file_builder(data[:], &flush_data); _ = sbprintln(buf=&buf, args=args, sep=sep); - strings.flush_builder(&buf); return flush_data.bytes_written; } 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}; buf := fmt_file_builder(data[:], &flush_data); _ = sbprintf(&buf, fmt, ..args); - strings.flush_builder(&buf); return flush_data.bytes_written; } 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'); } + strings.flush_builder(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'); } strings.write_byte(buf, '\n'); + strings.flush_builder(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.flush_builder(b); return strings.to_string(b^); }