From f2ecda8fece3b7f184207cfcecf246ded7b27f72 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 16 Jun 2022 15:49:08 +0100 Subject: [PATCH] Rename to SJSON for the Simplified JSON notation variant --- core/encoding/json/parser.odin | 2 +- core/encoding/json/types.odin | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/encoding/json/parser.odin b/core/encoding/json/parser.odin index 7bf88c565..ed36ae33b 100644 --- a/core/encoding/json/parser.odin +++ b/core/encoding/json/parser.odin @@ -40,7 +40,7 @@ parse_string :: proc(data: string, spec := DEFAULT_SPECIFICATION, parse_integers return parse_object(&p) case .JSON5: return parse_value(&p) - case .MJSON: + case .SJSON: #partial switch p.curr_token.kind { case .Ident, .String: return parse_object_body(&p, .EOF) diff --git a/core/encoding/json/types.odin b/core/encoding/json/types.odin index 534d20311..468774aa9 100644 --- a/core/encoding/json/types.odin +++ b/core/encoding/json/types.odin @@ -33,8 +33,9 @@ package json Specification :: enum { JSON, JSON5, // https://json5.org/ - MJSON, // https://bitsquid.blogspot.com/2009/10/simplified-json-notation.html - Bitsquid = MJSON, + SJSON, // https://bitsquid.blogspot.com/2009/10/simplified-json-notation.html + Bitsquid = SJSON, + MJSON = SJSON, }