diff options
| author | gingerBill <bill@gingerbill.org> | 2023-09-19 15:13:05 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2023-09-19 15:13:05 +0100 |
| commit | 6257d0e1a9d9107043e13af410228a298d14abcb (patch) | |
| tree | 35677554f24da2d66c8fb0c96893a2fc04189b00 /core/encoding/json/marshal.odin | |
| parent | b2f1c58321a21c3376e6ba329bdf928da5fabc94 (diff) | |
| parent | ecde06e3a31179bd8f86383fd65cfbce31ab6d9a (diff) | |
Merge branch 'master' into windows-llvm-11.1.0windows-llvm-11.1.0
Diffstat (limited to 'core/encoding/json/marshal.odin')
| -rw-r--r-- | core/encoding/json/marshal.odin | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/encoding/json/marshal.odin b/core/encoding/json/marshal.odin index 77a5bf8df..43f464bdb 100644 --- a/core/encoding/json/marshal.odin +++ b/core/encoding/json/marshal.odin @@ -404,7 +404,7 @@ opt_write_key :: proc(w: io.Writer, opt: ^Marshal_Options, name: string) -> (err switch opt.spec { case .JSON, .JSON5: io.write_quoted_string(w, name) or_return - io.write_string(w, ": ") or_return + io.write_string(w, ": " if opt.pretty else ":") or_return case .MJSON: if opt.mjson_keys_use_quotes { @@ -412,11 +412,11 @@ opt_write_key :: proc(w: io.Writer, opt: ^Marshal_Options, name: string) -> (err } else { io.write_string(w, name) or_return } - + if opt.mjson_keys_use_equal_sign { - io.write_string(w, " = ") or_return + io.write_string(w, " = " if opt.pretty else "=") or_return } else { - io.write_string(w, ": ") or_return + io.write_string(w, ": " if opt.pretty else ":") or_return } } @@ -446,7 +446,7 @@ opt_write_iteration :: proc(w: io.Writer, opt: ^Marshal_Options, iteration: int) switch opt.spec { case .JSON, .JSON5: if iteration > 0 { - io.write_string(w, ", ") or_return + io.write_byte(w, ',') or_return if opt.pretty { io.write_byte(w, '\n') or_return @@ -462,7 +462,7 @@ opt_write_iteration :: proc(w: io.Writer, opt: ^Marshal_Options, iteration: int) io.write_byte(w, '\n') or_return } else { // comma separation necessary for non pretty output! - io.write_string(w, ", ") or_return + io.write_byte(w, ',') or_return } } |