Add json encoding test + fix enum not being set on success.

This commit is contained in:
Daniel Gavin
2021-11-07 14:35:52 +01:00
parent 40eed29527
commit 5b074ceee5
4 changed files with 102 additions and 6 deletions

View File

@@ -18,7 +18,7 @@ Marshal_Error :: union {
marshal :: proc(v: any, allocator := context.allocator) -> (data: []byte, err: Marshal_Error) {
b := strings.make_builder(allocator)
defer if err != nil || data == nil {
defer if err != .None {
strings.destroy_builder(&b)
}
@@ -27,7 +27,7 @@ marshal :: proc(v: any, allocator := context.allocator) -> (data: []byte, err: M
if len(b.buf) != 0 {
data = b.buf[:]
}
return
return data, .None
}
marshal_to_builder :: proc(b: ^strings.Builder, v: any) -> Marshal_Error {

View File

@@ -106,6 +106,7 @@ parse_comma :: proc(p: ^Parser) -> (do_break: bool) {
}
parse_value :: proc(p: ^Parser) -> (value: Value, err: Error) {
err = .None
token := p.curr_token
#partial switch token.kind {
case .Null:
@@ -175,6 +176,7 @@ parse_value :: proc(p: ^Parser) -> (value: Value, err: Error) {
}
parse_array :: proc(p: ^Parser) -> (value: Value, err: Error) {
err = .None
expect_token(p, .Open_Bracket) or_return
array: Array
@@ -266,15 +268,14 @@ parse_object_body :: proc(p: ^Parser, end_token: Token_Kind) -> (obj: Object, er
break
}
}
return
return obj, .None
}
parse_object :: proc(p: ^Parser) -> (value: Value, err: Error) {
expect_token(p, .Open_Brace) or_return
obj := parse_object_body(p, .Close_Brace) or_return
expect_token(p, .Close_Brace) or_return
value = obj
return
return obj, .None
}