mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2025-12-31 02:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1737 from Kelimion/fix_json_unmarshal

Browse Source 
[json/unmarshal] Fix quoted strings.
This commit is contained in:
Jeroen van Rijn
2022-04-19 20:40:40 +02:00
committed by GitHub
parent 29b2c04766 a30b9b17b3
commit e8c0be23f2
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/encoding/json/parser.odin
View File

@@ -354,6 +354,12 @@ unquote_string :: proc(token: Token, spec: Specification, allocator := context.a
b := bytes_make(len(s) + 2*utf8.UTF_MAX, 1, allocator) or_return
w := copy(b, s[0:i])
if len(b) == 0 && allocator.data == nil {
// `unmarshal_count_array` calls us with a nil allocator
return string(b[:w]), nil
}
loop: for i < len(s) {
c := s[i]
switch {

20
tests/core/encoding/json/test_core_json.odin
View File

@@ -71,7 +71,8 @@ parse_json :: proc(t: ^testing.T) {
_, err := json.parse(transmute([]u8)json_data)
expect(t, err == .None, "expected json error to be none")
msg := fmt.tprintf("Expected `json.parse` to return nil, got %v", err)
expect(t, err == nil, msg)
}
@test
@@ -88,8 +89,8 @@ marshal_json :: proc(t: ^testing.T) {
}
_, err := json.marshal(my_struct)
expect(t, err == nil, "expected json error to be none")
msg := fmt.tprintf("Expected `json.marshal` to return nil, got %v", err)
expect(t, err == nil, msg)
}
PRODUCTS := `
@@ -97,7 +98,7 @@ PRODUCTS := `
"cash": "0",
"products": [
{
"name": "Cog Cola",
"name": "Cog\nCola",
"cost": "3",
"owned": "1",
@@ -204,7 +205,7 @@ original_data := Game_Marshal{
cash = "0",
products = {
{
name = "Cog Cola",
name = "Cog\nCola",
cost = "3",
owned = "1",
profit = "4",
@@ -331,13 +332,14 @@ unmarshal_json :: proc(t: ^testing.T) {
err := json.unmarshal(transmute([]u8)PRODUCTS, &g, json.DEFAULT_SPECIFICATION)
defer cleanup(g)
expect(t, err == nil, "Expected json error to be nil")
msg := fmt.tprintf("Expected `json.unmarshal` to return nil, got %v", err)
expect(t, err == nil, msg)
msg := fmt.tprintf("Expected %v products to have been unmarshaled, got %v", len(original_data.products), len(g.products))
msg = fmt.tprintf("Expected %v products to have been unmarshaled, got %v", len(original_data.products), len(g.products))
expect(t, len(g.products) == len(original_data.products), msg)
msg = fmt.tprintf("Expected cash to have been unmarshaled as %v, got %v", original_data.cash, g.cash)
expect(t, original_data.cash == g.cash, "Cash unmarshaled improperly")
msg = fmt.tprintf("Expected cash to have been unmarshaled as %v, got %v", original_data.cash, g.cash)
expect(t, original_data.cash == g.cash, msg)
for p, i in g.products {
expect(t, p == original_data.products[i], "Producted unmarshaled improperly")