Browse Source

Merge pull request #1914 from wjlroe/fix-json-unmarshal-without-assertions-bug

Fix bug unmarshalling JSON with assertions disabled
Jeroen van Rijn 3 years ago
parent
commit
7258588ed5
1 changed files with 2 additions and 2 deletions
  1. 2 2
      core/encoding/json/unmarshal.odin

+ 2 - 2
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}
 	UNSUPPORTED_TYPE := Unsupported_Type_Error{v.id, p.curr_token}
 	
 	
 	if end_token == .Close_Brace {
 	if end_token == .Close_Brace {
-		assert(expect_token(p, .Open_Brace) == nil)
+		unmarshal_expect_token(p, .Open_Brace)
 	}
 	}
 
 
 	v := v
 	v := v
@@ -473,7 +473,7 @@ unmarshal_object :: proc(p: ^Parser, v: any, end_token: Token_Kind) -> (err: Unm
 	}
 	}
 	
 	
 	if end_token == .Close_Brace {
 	if end_token == .Close_Brace {
-		assert(expect_token(p, .Close_Brace) == nil)
+		unmarshal_expect_token(p, .Close_Brace)
 	}
 	}
 	return
 	return
 }
 }