diff options
| author | Jeroen van Rijn <Kelimion@users.noreply.github.com> | 2022-07-28 15:03:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-28 15:03:47 +0200 |
| commit | 7258588ed587ba6be2343dd10a364bb42d72591f (patch) | |
| tree | 7723a22907a88a844be36750a9eaf36ff992b164 | |
| parent | 4af8a6458047787dd4b743198f20dd262f3e0592 (diff) | |
| parent | d913155972cb4ca4b080e176cd2e51614caca9c7 (diff) | |
Merge pull request #1914 from wjlroe/fix-json-unmarshal-without-assertions-bug
Fix bug unmarshalling JSON with assertions disabled
| -rw-r--r-- | core/encoding/json/unmarshal.odin | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/encoding/json/unmarshal.odin b/core/encoding/json/unmarshal.odin index 2ff268a21..97d2421d4 100644 --- a/core/encoding/json/unmarshal.odin +++ b/core/encoding/json/unmarshal.odin @@ -325,7 +325,7 @@ unmarshal_object :: proc(p: ^Parser, v: any, end_token: Token_Kind) -> (err: Unm UNSUPPORTED_TYPE := Unsupported_Type_Error{v.id, p.curr_token} if end_token == .Close_Brace { - assert(expect_token(p, .Open_Brace) == nil) + unmarshal_expect_token(p, .Open_Brace) } v := v @@ -473,7 +473,7 @@ unmarshal_object :: proc(p: ^Parser, v: any, end_token: Token_Kind) -> (err: Unm } if end_token == .Close_Brace { - assert(expect_token(p, .Close_Brace) == nil) + unmarshal_expect_token(p, .Close_Brace) } return } |