diff options
| author | gingerBill <bill@gingerbill.org> | 2023-02-10 16:23:33 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2023-02-10 16:23:33 +0000 |
| commit | 986cba584e0c95102a91d81fc085f1251e48474e (patch) | |
| tree | bfe715182b8edb5f41486f4ede212bf9e3876b8c /core/encoding | |
| parent | b427a4c8c908ecff3dcf1fb14d90ddfe7f3c0bf5 (diff) | |
Add `runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD` where appropriate
Diffstat (limited to 'core/encoding')
| -rw-r--r-- | core/encoding/json/unmarshal.odin | 2 | ||||
| -rw-r--r-- | core/encoding/xml/xml_reader.odin | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/encoding/json/unmarshal.odin b/core/encoding/json/unmarshal.odin index 11cae6160..1e8ec0e0d 100644 --- a/core/encoding/json/unmarshal.odin +++ b/core/encoding/json/unmarshal.odin @@ -346,6 +346,8 @@ unmarshal_object :: proc(p: ^Parser, v: any, end_token: Token_Kind) -> (err: Unm fields := reflect.struct_fields_zipped(ti.id) + runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD(ignore = context.temp_allocator == context.allocator) + field_used := make([]bool, len(fields), context.temp_allocator) use_field_idx := -1 diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin index b77ae97b3..f5523c299 100644 --- a/core/encoding/xml/xml_reader.odin +++ b/core/encoding/xml/xml_reader.odin @@ -33,6 +33,7 @@ import "core:intrinsics" import "core:mem" import "core:os" import "core:strings" +import "core:runtime" likely :: intrinsics.expect @@ -408,7 +409,7 @@ parse_bytes :: proc(data: []u8, options := DEFAULT_OPTIONS, path := "", error_ha next := scan(t) #partial switch next.kind { case .Ident: - if len(next.text) == 3 && strings.to_lower(next.text, context.temp_allocator) == "xml" { + if len(next.text) == 3 && strings.equal_fold(next.text, "xml") { parse_prologue(doc) or_return } else if len(doc.prologue) > 0 { /* @@ -614,6 +615,7 @@ parse_prologue :: proc(doc: ^Document) -> (err: Error) { } case "encoding": + runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD() switch strings.to_lower(attr.val, context.temp_allocator) { case "utf-8", "utf8": doc.encoding = .UTF_8 |