Sun, 29 Dec 2024 18:03:21 +0100
optimize cxJsonObjGet() part 1 - binary search
part 2 will be the index buffer to preserve the order
relates to #462
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1 | /* |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
3 | * |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
4 | * Copyright 2024 Mike Becker, Olaf Wintermann All rights reserved. |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
5 | * |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
8 | * |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
11 | * |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
15 | * |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
27 | */ |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
28 | |
1040
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents:
1037
diff
changeset
|
29 | #include "cx/json.h" |
1067
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
30 | #include "cx/compare.h" |
1040
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents:
1037
diff
changeset
|
31 | |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
32 | #include <string.h> |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
33 | #include <ctype.h> |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
34 | #include <assert.h> |
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
35 | #include <stdio.h> |
1014
56eb7da4f3e1
fix number parser not detecting integers out of range
Mike Becker <universe@uap-core.de>
parents:
1012
diff
changeset
|
36 | #include <errno.h> |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
37 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
38 | /* |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
39 | * RFC 8259 |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
40 | * https://tools.ietf.org/html/rfc8259 |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
41 | */ |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
42 | |
944
c26299cc9897
make both gcc and clang happy with how cx_json_value_nothing is initialized
Mike Becker <universe@uap-core.de>
parents:
943
diff
changeset
|
43 | static CxJsonValue cx_json_value_nothing = {.type = CX_JSON_NOTHING}; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
44 | |
1067
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
45 | static int json_cmp_objvalue(const void *l, const void *r) { |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
46 | const CxJsonObjValue *left = l; |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
47 | const CxJsonObjValue *right = r; |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
48 | return cx_strcmp(cx_strcast(left->name), cx_strcast(right->name)); |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
49 | } |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
50 | |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
51 | static CxJsonObjValue *json_find_objvalue(const CxJsonValue *obj, cxstring name) { |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
52 | assert(obj->type == CX_JSON_OBJECT); |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
53 | CxJsonObjValue kv_dummy; |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
54 | kv_dummy.name = cx_mutstrn((char*) name.ptr, name.length); |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
55 | size_t index = cx_array_binary_search( |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
56 | obj->value.object.values, |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
57 | obj->value.object.values_size, |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
58 | sizeof(CxJsonObjValue), |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
59 | &kv_dummy, |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
60 | json_cmp_objvalue |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
61 | ); |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
62 | if (index == obj->value.object.values_size) { |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
63 | return NULL; |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
64 | } else { |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
65 | return &obj->value.object.values[index]; |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
66 | } |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
67 | } |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
68 | |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
69 | static int json_add_objvalue(CxJsonValue *obj, CxJsonObjValue member) { |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
70 | assert(obj->type == CX_JSON_OBJECT); |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
71 | CxArrayReallocator value_realloc = cx_array_reallocator(obj->allocator, NULL); |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
72 | return cx_array_simple_add_sorted_a( |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
73 | &value_realloc, obj->value.object.values, |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
74 | member, json_cmp_objvalue |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
75 | ); |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
76 | } |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
77 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
78 | static void token_destroy(CxJsonToken *token) { |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
79 | if (token->allocated) { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
80 | cx_strfree(&token->content); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
81 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
82 | } |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
83 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
84 | static int num_isexp(const char *content, size_t length, size_t pos) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
85 | if (pos >= length) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
86 | return 0; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
87 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
88 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
89 | int ok = 0; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
90 | for (size_t i = pos; i < length; i++) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
91 | char c = content[i]; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
92 | if (isdigit(c)) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
93 | ok = 1; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
94 | } else if (i == pos) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
95 | if (!(c == '+' || c == '-')) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
96 | return 0; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
97 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
98 | } else { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
99 | return 0; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
100 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
101 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
102 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
103 | return ok; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
104 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
105 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
106 | static CxJsonTokenType token_numbertype(const char *content, size_t length) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
107 | if (length == 0) return CX_JSON_TOKEN_ERROR; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
108 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
109 | if (content[0] != '-' && !isdigit(content[0])) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
110 | return CX_JSON_TOKEN_ERROR; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
111 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
112 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
113 | CxJsonTokenType type = CX_JSON_TOKEN_INTEGER; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
114 | for (size_t i = 1; i < length; i++) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
115 | if (content[i] == '.') { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
116 | if (type == CX_JSON_TOKEN_NUMBER) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
117 | return CX_JSON_TOKEN_ERROR; // more than one decimal separator |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
118 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
119 | type = CX_JSON_TOKEN_NUMBER; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
120 | } else if (content[i] == 'e' || content[i] == 'E') { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
121 | return num_isexp(content, length, i + 1) ? CX_JSON_TOKEN_NUMBER : CX_JSON_TOKEN_ERROR; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
122 | } else if (!isdigit(content[i])) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
123 | return CX_JSON_TOKEN_ERROR; // char is not a digit, decimal separator or exponent sep |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
124 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
125 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
126 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
127 | return type; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
128 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
129 | |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
130 | static CxJsonToken token_create(CxJson *json, bool isstring, size_t start, size_t end) { |
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
131 | cxmutstr str = cx_mutstrn(json->buffer.space + start, end - start); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
132 | bool allocated = false; |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
133 | if (json->uncompleted.tokentype != CX_JSON_NO_TOKEN) { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
134 | allocated = true; |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
135 | str = cx_strcat_m(json->uncompleted.content, 1, str); |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
136 | if (str.ptr == NULL) { // LCOV_EXCL_START |
1020
e78e65405c56
fix wrong "variant" of zero/NULL/false
Mike Becker <universe@uap-core.de>
parents:
1014
diff
changeset
|
137 | return (CxJsonToken){CX_JSON_NO_TOKEN, false, {NULL, 0}}; |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
138 | } // LCOV_EXCL_STOP |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
139 | } |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
140 | json->uncompleted = (CxJsonToken){0}; |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
141 | CxJsonTokenType ttype; |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
142 | if (isstring) { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
143 | ttype = CX_JSON_TOKEN_STRING; |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
144 | } else { |
1009 | 145 | cxstring s = cx_strcast(str); |
146 | if (!cx_strcmp(s, CX_STR("true")) || !cx_strcmp(s, CX_STR("false")) | |
147 | || !cx_strcmp(s, CX_STR("null"))) { | |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
148 | ttype = CX_JSON_TOKEN_LITERAL; |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
149 | } else { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
150 | ttype = token_numbertype(str.ptr, str.length); |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
151 | } |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
152 | } |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
153 | if (ttype == CX_JSON_TOKEN_ERROR) { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
154 | if (allocated) { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
155 | cx_strfree(&str); |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
156 | } |
1020
e78e65405c56
fix wrong "variant" of zero/NULL/false
Mike Becker <universe@uap-core.de>
parents:
1014
diff
changeset
|
157 | return (CxJsonToken){CX_JSON_TOKEN_ERROR, false, {NULL, 0}}; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
158 | } |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
159 | return (CxJsonToken){ttype, allocated, str}; |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
160 | } |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
161 | |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
162 | static CxJsonTokenType char2ttype(char c) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
163 | switch (c) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
164 | case '[': { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
165 | return CX_JSON_TOKEN_BEGIN_ARRAY; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
166 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
167 | case '{': { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
168 | return CX_JSON_TOKEN_BEGIN_OBJECT; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
169 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
170 | case ']': { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
171 | return CX_JSON_TOKEN_END_ARRAY; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
172 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
173 | case '}': { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
174 | return CX_JSON_TOKEN_END_OBJECT; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
175 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
176 | case ':': { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
177 | return CX_JSON_TOKEN_NAME_SEPARATOR; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
178 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
179 | case ',': { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
180 | return CX_JSON_TOKEN_VALUE_SEPARATOR; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
181 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
182 | case '"': { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
183 | return CX_JSON_TOKEN_STRING; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
184 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
185 | default: { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
186 | if (isspace(c)) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
187 | return CX_JSON_TOKEN_SPACE; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
188 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
189 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
190 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
191 | return CX_JSON_NO_TOKEN; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
192 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
193 | |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
194 | static enum cx_json_status token_parse_next(CxJson *json, CxJsonToken *result) { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
195 | // check if there is data in the buffer |
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
196 | if (cxBufferEof(&json->buffer)) { |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
197 | return json->uncompleted.tokentype == CX_JSON_NO_TOKEN ? |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
198 | CX_JSON_NO_DATA : CX_JSON_INCOMPLETE_DATA; |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
199 | } |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
200 | |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
201 | // current token type and start index |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
202 | CxJsonTokenType ttype = json->uncompleted.tokentype; |
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
203 | size_t token_start = json->buffer.pos; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
204 | |
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
205 | for (size_t i = json->buffer.pos; i < json->buffer.size; i++) { |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
206 | char c = json->buffer.space[i]; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
207 | if (ttype != CX_JSON_TOKEN_STRING) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
208 | // currently non-string token |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
209 | CxJsonTokenType ctype = char2ttype(c); // start of new token? |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
210 | if (ttype == CX_JSON_NO_TOKEN) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
211 | if (ctype == CX_JSON_TOKEN_SPACE) { |
1008
3b69f025f083
json: enable multiple subsequent fills - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
212 | json->buffer.pos++; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
213 | continue; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
214 | } else if (ctype == CX_JSON_TOKEN_STRING) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
215 | // begin string |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
216 | ttype = CX_JSON_TOKEN_STRING; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
217 | token_start = i; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
218 | } else if (ctype != CX_JSON_NO_TOKEN) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
219 | // single-char token |
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
220 | json->buffer.pos = i + 1; |
1020
e78e65405c56
fix wrong "variant" of zero/NULL/false
Mike Becker <universe@uap-core.de>
parents:
1014
diff
changeset
|
221 | *result = (CxJsonToken){ctype, false, {NULL, 0}}; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
222 | return CX_JSON_NO_ERROR; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
223 | } else { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
224 | ttype = CX_JSON_TOKEN_LITERAL; // number or literal |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
225 | token_start = i; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
226 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
227 | } else { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
228 | // finish token |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
229 | if (ctype != CX_JSON_NO_TOKEN) { |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
230 | *result = token_create(json, false, token_start, i); |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
231 | if (result->tokentype == CX_JSON_NO_TOKEN) { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
232 | return CX_JSON_BUFFER_ALLOC_FAILED; // LCOV_EXCL_LINE |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
233 | } |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
234 | if (result->tokentype == CX_JSON_TOKEN_ERROR) { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
235 | return CX_JSON_FORMAT_ERROR_NUMBER; |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
236 | } |
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
237 | json->buffer.pos = i; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
238 | return CX_JSON_NO_ERROR; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
239 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
240 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
241 | } else { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
242 | // currently inside a string |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
243 | if (json->tokenizer_escape) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
244 | json->tokenizer_escape = false; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
245 | } else { |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
246 | if (c == '"') { |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
247 | *result = token_create(json, true, token_start, i + 1); |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
248 | if (result->tokentype == CX_JSON_NO_TOKEN) { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
249 | return CX_JSON_BUFFER_ALLOC_FAILED; // LCOV_EXCL_LINE |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
250 | } |
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
251 | json->buffer.pos = i + 1; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
252 | return CX_JSON_NO_ERROR; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
253 | } else if (c == '\\') { |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
254 | json->tokenizer_escape = true; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
255 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
256 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
257 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
258 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
259 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
260 | if (ttype != CX_JSON_NO_TOKEN) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
261 | // uncompleted token |
1008
3b69f025f083
json: enable multiple subsequent fills - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
262 | size_t uncompleted_len = json->buffer.size - token_start; |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
263 | if (json->uncompleted.tokentype == CX_JSON_NO_TOKEN) { |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
264 | // current token is uncompleted |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
265 | // save current token content |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
266 | CxJsonToken uncompleted = { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
267 | ttype, true, |
1008
3b69f025f083
json: enable multiple subsequent fills - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
268 | cx_strdup(cx_strn(json->buffer.space + token_start, uncompleted_len)) |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
269 | }; |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
270 | if (uncompleted.content.ptr == NULL) { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
271 | return CX_JSON_BUFFER_ALLOC_FAILED; // LCOV_EXCL_LINE |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
272 | } |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
273 | json->uncompleted = uncompleted; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
274 | } else { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
275 | // previously we also had an uncompleted token |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
276 | // combine the uncompleted token with the current token |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
277 | assert(json->uncompleted.allocated); |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
278 | cxmutstr str = cx_strcat_m(json->uncompleted.content, 1, |
1008
3b69f025f083
json: enable multiple subsequent fills - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
279 | cx_strn(json->buffer.space + token_start, uncompleted_len)); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
280 | if (str.ptr == NULL) { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
281 | return CX_JSON_BUFFER_ALLOC_FAILED; // LCOV_EXCL_LINE |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
282 | } |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
283 | json->uncompleted.content = str; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
284 | } |
1008
3b69f025f083
json: enable multiple subsequent fills - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
285 | // advance the buffer position - we saved the stuff in the uncompleted token |
3b69f025f083
json: enable multiple subsequent fills - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1007
diff
changeset
|
286 | json->buffer.pos += uncompleted_len; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
287 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
288 | |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
289 | return CX_JSON_INCOMPLETE_DATA; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
290 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
291 | |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
292 | static cxmutstr unescape_string(const CxAllocator *a, cxmutstr str) { |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
293 | // TODO: support more escape sequences |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
294 | // we know that the unescaped string will be shorter by at least 2 chars |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
295 | cxmutstr result; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
296 | result.length = 0; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
297 | result.ptr = cxMalloc(a, str.length - 1); |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
298 | if (result.ptr == NULL) return result; // LCOV_EXCL_LINE |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
299 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
300 | bool u = false; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
301 | for (size_t i = 1; i < str.length - 1; i++) { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
302 | char c = str.ptr[i]; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
303 | if (u) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
304 | u = false; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
305 | if (c == 'n') { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
306 | c = '\n'; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
307 | } else if (c == 't') { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
308 | c = '\t'; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
309 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
310 | result.ptr[result.length++] = c; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
311 | } else { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
312 | if (c == '\\') { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
313 | u = true; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
314 | } else { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
315 | result.ptr[result.length++] = c; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
316 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
317 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
318 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
319 | result.ptr[result.length] = 0; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
320 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
321 | return result; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
322 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
323 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
324 | static CxJsonValue* create_json_value(CxJson *json, CxJsonValueType type) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
325 | CxJsonValue *v = cxMalloc(json->allocator, sizeof(CxJsonValue)); |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
326 | if (v == NULL) return NULL; // LCOV_EXCL_LINE |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
327 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
328 | // initialize the value |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
329 | if (type == CX_JSON_ARRAY) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
330 | cx_array_initialize_a(json->allocator, v->value.array.array, 16); |
1067
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
331 | if (v->value.array.array == NULL) goto create_json_value_exit_error; // LCOV_EXCL_LINE |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
332 | } else if (type == CX_JSON_OBJECT) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
333 | cx_array_initialize_a(json->allocator, v->value.object.values, 16); |
1067
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
334 | if (v->value.object.values == NULL) goto create_json_value_exit_error; // LCOV_EXCL_LINE |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
335 | } else { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
336 | memset(v, 0, sizeof(CxJsonValue)); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
337 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
338 | v->type = type; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
339 | v->allocator = json->allocator; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
340 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
341 | // add the new value to a possible parent |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
342 | if (json->vbuf_size > 0) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
343 | CxJsonValue *parent = json->vbuf[json->vbuf_size - 1]; |
1067
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
344 | assert(parent != NULL); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
345 | if (parent->type == CX_JSON_ARRAY) { |
1067
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
346 | CxArrayReallocator value_realloc = cx_array_reallocator(json->allocator, NULL); |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
347 | if (cx_array_simple_add_a(&value_realloc, parent->value.array.array, v)) { |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
348 | goto create_json_value_exit_error; // LCOV_EXCL_LINE |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
349 | } |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
350 | } else if (parent->type == CX_JSON_OBJECT) { |
1067
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
351 | // the member was already created after parsing the name |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
352 | assert(json->uncompleted_member.name.ptr != NULL); |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
353 | json->uncompleted_member.value = v; |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
354 | if (json_add_objvalue(parent, json->uncompleted_member)) { |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
355 | goto create_json_value_exit_error; // LCOV_EXCL_LINE |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
356 | } |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
357 | json->uncompleted_member.name = (cxmutstr) {NULL, 0}; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
358 | } else { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
359 | assert(false); // LCOV_EXCL_LINE |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
360 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
361 | } |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
362 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
363 | // add the new value to the stack, if it is an array or object |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
364 | if (type == CX_JSON_ARRAY || type == CX_JSON_OBJECT) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
365 | CxArrayReallocator vbuf_realloc = cx_array_reallocator(NULL, json->vbuf_internal); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
366 | if (cx_array_simple_add_a(&vbuf_realloc, json->vbuf, v)) { |
1067
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
367 | goto create_json_value_exit_error; // LCOV_EXCL_LINE |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
368 | } |
940
bbf41b9c2658
fix memory leak in json reader when handling incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
938
diff
changeset
|
369 | } |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
370 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
371 | // if currently no value is parsed, this is now the value of interest |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
372 | if (json->parsed == NULL) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
373 | json->parsed = v; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
374 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
375 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
376 | return v; |
1067
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
377 | // LCOV_EXCL_START |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
378 | create_json_value_exit_error: |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
379 | cxFree(json->allocator, v); |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
380 | return NULL; |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
381 | // LCOV_EXCL_STOP |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
382 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
383 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
384 | #define JP_STATE_VALUE_BEGIN 0 |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
385 | #define JP_STATE_VALUE_END 10 |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
386 | #define JP_STATE_VALUE_BEGIN_OBJ 1 |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
387 | #define JP_STATE_OBJ_SEP_OR_CLOSE 11 |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
388 | #define JP_STATE_VALUE_BEGIN_AR 2 |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
389 | #define JP_STATE_ARRAY_SEP_OR_CLOSE 12 |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
390 | #define JP_STATE_OBJ_NAME_OR_CLOSE 5 |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
391 | #define JP_STATE_OBJ_NAME 6 |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
392 | #define JP_STATE_OBJ_COLON 7 |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
393 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
394 | void cxJsonInit(CxJson *json, const CxAllocator *allocator) { |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
976
diff
changeset
|
395 | if (allocator == NULL) { |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
976
diff
changeset
|
396 | allocator = cxDefaultAllocator; |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
976
diff
changeset
|
397 | } |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
976
diff
changeset
|
398 | |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
399 | memset(json, 0, sizeof(CxJson)); |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
976
diff
changeset
|
400 | json->allocator = allocator; |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
401 | |
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
944
diff
changeset
|
402 | json->states = json->states_internal; |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
403 | json->states_capacity = cx_nmemb(json->states_internal); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
404 | json->states[0] = JP_STATE_VALUE_BEGIN; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
405 | json->states_size = 1; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
406 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
407 | json->vbuf = json->vbuf_internal; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
408 | json->vbuf_capacity = cx_nmemb(json->vbuf_internal); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
409 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
410 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
411 | void cxJsonDestroy(CxJson *json) { |
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
412 | cxBufferDestroy(&json->buffer); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
413 | if (json->states != json->states_internal) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
414 | free(json->states); |
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
944
diff
changeset
|
415 | } |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
416 | if (json->vbuf != json->vbuf_internal) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
417 | free(json->vbuf); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
418 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
419 | cxJsonValueFree(json->parsed); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
420 | json->parsed = NULL; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
421 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
422 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
423 | int cxJsonFilln(CxJson *json, const char *buf, size_t size) { |
1060
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
424 | if (cxBufferEof(&json->buffer)) { |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
425 | // reinitialize the buffer |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
426 | cxBufferDestroy(&json->buffer); |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
427 | cxBufferInit(&json->buffer, (char*) buf, size, |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
428 | NULL, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_COPY_ON_WRITE); |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
429 | json->buffer.size = size; |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
430 | return 0; |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
431 | } else { |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
432 | return size != cxBufferAppend(buf, 1, size, &json->buffer); |
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
433 | } |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
434 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
435 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
436 | static void json_add_state(CxJson *json, int state) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
437 | // we have guaranteed the necessary space with cx_array_simple_reserve() |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
438 | // therefore, we can safely add the state in the simplest way possible |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
439 | json->states[json->states_size++] = state; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
440 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
441 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
442 | #define return_rec(code) \ |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
443 | token_destroy(&token); \ |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
444 | return code |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
445 | |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
446 | static enum cx_json_status json_parse(CxJson *json) { |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
447 | // Reserve a pointer for a possibly read value |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
448 | CxJsonValue *vbuf = NULL; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
449 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
450 | // grab the next token |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
451 | CxJsonToken token; |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
452 | { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
453 | enum cx_json_status ret = token_parse_next(json, &token); |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
454 | if (ret != CX_JSON_NO_ERROR) { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
455 | return ret; |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
456 | } |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
457 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
458 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
459 | // pop the current state |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
460 | assert(json->states_size > 0); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
461 | int state = json->states[--json->states_size]; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
462 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
463 | // guarantee that at least two more states fit on the stack |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
464 | CxArrayReallocator state_realloc = cx_array_reallocator(NULL, json->states_internal); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
465 | if (cx_array_simple_reserve_a(&state_realloc, json->states, 2)) { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
466 | return CX_JSON_BUFFER_ALLOC_FAILED; // LCOV_EXCL_LINE |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
467 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
468 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
469 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
470 | // 0 JP_STATE_VALUE_BEGIN value begin |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
471 | // 10 JP_STATE_VALUE_END expect value end |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
472 | // 1 JP_STATE_VALUE_BEGIN_OBJ value begin (inside object) |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
473 | // 11 JP_STATE_OBJ_SEP_OR_CLOSE object, expect separator, objclose |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
474 | // 2 JP_STATE_VALUE_BEGIN_AR value begin (inside array) |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
475 | // 12 JP_STATE_ARRAY_SEP_OR_CLOSE array, expect separator or arrayclose |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
476 | // 5 JP_STATE_OBJ_NAME_OR_CLOSE object, expect name or objclose |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
477 | // 6 JP_STATE_OBJ_NAME object, expect name |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
478 | // 7 JP_STATE_OBJ_COLON object, expect ':' |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
479 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
480 | if (state < 3) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
481 | // push expected end state to the stack |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
482 | json_add_state(json, 10 + state); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
483 | switch (token.tokentype) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
484 | case CX_JSON_TOKEN_BEGIN_ARRAY: { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
485 | if (create_json_value(json, CX_JSON_ARRAY) == NULL) { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
486 | return_rec(CX_JSON_VALUE_ALLOC_FAILED); // LCOV_EXCL_LINE |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
487 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
488 | json_add_state(json, JP_STATE_VALUE_BEGIN_AR); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
489 | return_rec(CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
490 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
491 | case CX_JSON_TOKEN_BEGIN_OBJECT: { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
492 | if (create_json_value(json, CX_JSON_OBJECT) == NULL) { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
493 | return_rec(CX_JSON_VALUE_ALLOC_FAILED); // LCOV_EXCL_LINE |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
494 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
495 | json_add_state(json, JP_STATE_OBJ_NAME_OR_CLOSE); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
496 | return_rec(CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
497 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
498 | case CX_JSON_TOKEN_STRING: { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
499 | if ((vbuf = create_json_value(json, CX_JSON_STRING)) == NULL) { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
500 | return_rec(CX_JSON_VALUE_ALLOC_FAILED); // LCOV_EXCL_LINE |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
501 | } |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
502 | cxmutstr str = unescape_string(json->allocator, token.content); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
503 | if (str.ptr == NULL) { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
504 | return_rec(CX_JSON_VALUE_ALLOC_FAILED); // LCOV_EXCL_LINE |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
505 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
506 | vbuf->value.string = str; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
507 | return_rec(CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
508 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
509 | case CX_JSON_TOKEN_INTEGER: |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
510 | case CX_JSON_TOKEN_NUMBER: { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
511 | int type = token.tokentype == CX_JSON_TOKEN_INTEGER ? CX_JSON_INTEGER : CX_JSON_NUMBER; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
512 | if (NULL == (vbuf = create_json_value(json, type))) { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
513 | return_rec(CX_JSON_VALUE_ALLOC_FAILED); // LCOV_EXCL_LINE |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
514 | } |
1060
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
515 | if (type == CX_JSON_INTEGER) { |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
516 | if (cx_strtoi64(token.content, &vbuf->value.integer, 10)) { |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
517 | return_rec(CX_JSON_FORMAT_ERROR_NUMBER); |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
518 | } |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
519 | } else { |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
520 | if (cx_strtod(token.content, &vbuf->value.number)) { |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
521 | return_rec(CX_JSON_FORMAT_ERROR_NUMBER); |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
522 | } |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
523 | } |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
524 | return_rec(CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
525 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
526 | case CX_JSON_TOKEN_LITERAL: { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
527 | if ((vbuf = create_json_value(json, CX_JSON_LITERAL)) == NULL) { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
528 | return_rec(CX_JSON_VALUE_ALLOC_FAILED); // LCOV_EXCL_LINE |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
529 | } |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
530 | if (0 == cx_strcmp(cx_strcast(token.content), cx_str("true"))) { |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
531 | vbuf->value.literal = CX_JSON_TRUE; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
532 | } else if (0 == cx_strcmp(cx_strcast(token.content), cx_str("false"))) { |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
533 | vbuf->value.literal = CX_JSON_FALSE; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
534 | } else { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
535 | vbuf->value.literal = CX_JSON_NULL; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
536 | } |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
537 | return_rec(CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
538 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
539 | default: { |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
540 | return_rec(CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
541 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
542 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
543 | } else if (state == JP_STATE_ARRAY_SEP_OR_CLOSE) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
544 | // expect ',' or ']' |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
545 | if (token.tokentype == CX_JSON_TOKEN_VALUE_SEPARATOR) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
546 | json_add_state(json, JP_STATE_VALUE_BEGIN_AR); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
547 | return_rec(CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
548 | } else if (token.tokentype == CX_JSON_TOKEN_END_ARRAY) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
549 | // discard the array from the value buffer |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
550 | json->vbuf_size--; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
551 | return_rec(CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
552 | } else { |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
553 | return_rec(CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
554 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
555 | } else if (state == JP_STATE_OBJ_NAME_OR_CLOSE || state == JP_STATE_OBJ_NAME) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
556 | if (state == JP_STATE_OBJ_NAME_OR_CLOSE && token.tokentype == CX_JSON_TOKEN_END_OBJECT) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
557 | // discard the obj from the value buffer |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
558 | json->vbuf_size--; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
559 | return_rec(CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
560 | } else { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
561 | // expect string |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
562 | if (token.tokentype != CX_JSON_TOKEN_STRING) { |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
563 | return_rec(CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
564 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
565 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
566 | // add new entry |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
567 | cxmutstr name = unescape_string(json->allocator, token.content); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
568 | if (name.ptr == NULL) { |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
569 | return_rec(CX_JSON_VALUE_ALLOC_FAILED); // LCOV_EXCL_LINE |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
570 | } |
1067
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
571 | assert(json->uncompleted_member.name.ptr == NULL); |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
572 | json->uncompleted_member.name = name; |
1037
83620ba72cc1
generify cxJsonObjGet() - fixes #525
Mike Becker <universe@uap-core.de>
parents:
1033
diff
changeset
|
573 | assert(json->vbuf_size > 0); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
574 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
575 | // next state |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
576 | json_add_state(json, JP_STATE_OBJ_COLON); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
577 | return_rec(CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
578 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
579 | } else if (state == JP_STATE_OBJ_COLON) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
580 | // expect ':' |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
581 | if (token.tokentype != CX_JSON_TOKEN_NAME_SEPARATOR) { |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
582 | return_rec(CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
583 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
584 | // next state |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
585 | json_add_state(json, JP_STATE_VALUE_BEGIN_OBJ); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
586 | return_rec(CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
587 | } else if (state == JP_STATE_OBJ_SEP_OR_CLOSE) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
588 | // expect ',' or '}' |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
589 | if (token.tokentype == CX_JSON_TOKEN_VALUE_SEPARATOR) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
590 | json_add_state(json, JP_STATE_OBJ_NAME); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
591 | return_rec(CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
592 | } else if (token.tokentype == CX_JSON_TOKEN_END_OBJECT) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
593 | // discard the obj from the value buffer |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
594 | json->vbuf_size--; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
595 | return_rec(CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
596 | } else { |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
597 | return_rec(CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
598 | } |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
599 | } else { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
600 | // should be unreachable |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
601 | assert(false); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
602 | return_rec(-1); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
603 | } |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
604 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
605 | |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
606 | CxJsonStatus cxJsonNext(CxJson *json, CxJsonValue **value) { |
1060
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
607 | // check if buffer has been filled |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
608 | if (json->buffer.space == NULL) { |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
609 | return CX_JSON_NULL_DATA; |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
610 | } |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
611 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
612 | // initialize output value |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
613 | *value = &cx_json_value_nothing; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
614 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
615 | // parse data |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
616 | CxJsonStatus result; |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
617 | do { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
618 | result = json_parse(json); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
619 | if (result == CX_JSON_NO_ERROR && json->states_size == 1) { |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
620 | // final state reached |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
621 | assert(json->states[0] == JP_STATE_VALUE_END); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
622 | assert(json->vbuf_size == 0); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
623 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
624 | // write output value |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
625 | *value = json->parsed; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
626 | json->parsed = NULL; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
627 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
628 | // re-initialize state machine |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
629 | json->states[0] = JP_STATE_VALUE_BEGIN; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
630 | |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
631 | return CX_JSON_NO_ERROR; |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
632 | } |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
633 | } while (result == CX_JSON_NO_ERROR); |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
634 | |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
635 | // the parser might think there is no data |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
636 | // but when we did not reach the final state, |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
637 | // we know that there must be more to come |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
638 | if (result == CX_JSON_NO_DATA && json->states_size > 1) { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
639 | return CX_JSON_INCOMPLETE_DATA; |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
640 | } |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
641 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
996
diff
changeset
|
642 | return result; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
643 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
644 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
645 | void cxJsonValueFree(CxJsonValue *value) { |
1012
21884374edbb
add documentation - resolves #431
Mike Becker <universe@uap-core.de>
parents:
1009
diff
changeset
|
646 | if (value == NULL || value->type == CX_JSON_NOTHING) return; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
647 | switch (value->type) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
648 | case CX_JSON_OBJECT: { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
649 | CxJsonObject obj = value->value.object; |
967
a58f602ed2fe
simplify parsing of array and object elements
Mike Becker <universe@uap-core.de>
parents:
965
diff
changeset
|
650 | for (size_t i = 0; i < obj.values_size; i++) { |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
651 | cxJsonValueFree(obj.values[i].value); |
1037
83620ba72cc1
generify cxJsonObjGet() - fixes #525
Mike Becker <universe@uap-core.de>
parents:
1033
diff
changeset
|
652 | cx_strfree_a(value->allocator, &obj.values[i].name); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
653 | } |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
976
diff
changeset
|
654 | cxFree(value->allocator, obj.values); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
655 | break; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
656 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
657 | case CX_JSON_ARRAY: { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
658 | CxJsonArray array = value->value.array; |
967
a58f602ed2fe
simplify parsing of array and object elements
Mike Becker <universe@uap-core.de>
parents:
965
diff
changeset
|
659 | for (size_t i = 0; i < array.array_size; i++) { |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
660 | cxJsonValueFree(array.array[i]); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
661 | } |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
976
diff
changeset
|
662 | cxFree(value->allocator, array.array); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
663 | break; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
664 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
665 | case CX_JSON_STRING: { |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
976
diff
changeset
|
666 | cxFree(value->allocator, value->value.string.ptr); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
667 | break; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
668 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
669 | default: { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
670 | break; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
671 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
672 | } |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
976
diff
changeset
|
673 | cxFree(value->allocator, value); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
674 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
675 | |
1054
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
676 | CxJsonValue* cxJsonCreateObj(const CxAllocator* allocator) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
677 | CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue)); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
678 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
679 | v->allocator = allocator; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
680 | v->type = CX_JSON_OBJECT; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
681 | cx_array_initialize_a(allocator, v->value.object.values, 16); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
682 | if (v->value.object.values == NULL) { cxFree(allocator, v); return NULL; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
683 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
684 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
685 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
686 | CxJsonValue* cxJsonCreateArr(const CxAllocator* allocator) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
687 | CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue)); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
688 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
689 | v->allocator = allocator; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
690 | v->type = CX_JSON_ARRAY; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
691 | cx_array_initialize_a(allocator, v->value.array.array, 16); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
692 | if (v->value.array.array == NULL) { cxFree(allocator, v); return NULL; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
693 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
694 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
695 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
696 | CxJsonValue* cxJsonCreateNumber(const CxAllocator* allocator, double num) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
697 | CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue)); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
698 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
699 | v->allocator = allocator; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
700 | v->type = CX_JSON_NUMBER; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
701 | v->value.number = num; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
702 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
703 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
704 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
705 | CxJsonValue* cxJsonCreateInteger(const CxAllocator* allocator, int64_t num) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
706 | CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue)); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
707 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
708 | v->allocator = allocator; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
709 | v->type = CX_JSON_INTEGER; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
710 | v->value.integer = num; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
711 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
712 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
713 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
714 | CxJsonValue* cxJsonCreateString(const CxAllocator* allocator, const char* str) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
715 | return cxJsonCreateCxString(allocator, cx_str(str)); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
716 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
717 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
718 | CxJsonValue* cxJsonCreateCxString(const CxAllocator* allocator, cxstring str) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
719 | CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue)); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
720 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
721 | v->allocator = allocator; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
722 | v->type = CX_JSON_STRING; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
723 | cxmutstr s = cx_strdup_a(allocator, str); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
724 | if (s.ptr == NULL) { cxFree(allocator, v); return NULL; } |
1057
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1055
diff
changeset
|
725 | v->value.string = s; |
1054
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
726 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
727 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
728 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
729 | CxJsonValue* cxJsonCreateLiteral(const CxAllocator* allocator, CxJsonLiteral lit) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
730 | CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue)); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
731 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
732 | v->allocator = allocator; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
733 | v->type = CX_JSON_LITERAL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
734 | v->value.literal = lit; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
735 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
736 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
737 | |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
738 | // LCOV_EXCL_START |
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
739 | // never called as long as malloc() does not return NULL |
1054
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
740 | static void cx_json_arr_free_temp(CxJsonValue** values, size_t count) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
741 | for (size_t i = 0; i < count; i++) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
742 | if (values[i] == NULL) break; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
743 | cxJsonValueFree(values[i]); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
744 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
745 | free(values); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
746 | } |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
747 | // LCOV_EXCL_STOP |
1054
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
748 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
749 | int cxJsonArrAddNumbers(CxJsonValue* arr, const double* num, size_t count) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
750 | CxJsonValue** values = calloc(count, sizeof(CxJsonValue*)); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
751 | if (values == NULL) return -1; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
752 | for (size_t i = 0; i < count; i++) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
753 | values[i] = cxJsonCreateNumber(arr->allocator, num[i]); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
754 | if (values[i] == NULL) { cx_json_arr_free_temp(values, count); return -1; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
755 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
756 | int ret = cxJsonArrAddValues(arr, values, count); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
757 | free(values); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
758 | return ret; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
759 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
760 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
761 | int cxJsonArrAddIntegers(CxJsonValue* arr, const int64_t* num, size_t count) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
762 | CxJsonValue** values = calloc(count, sizeof(CxJsonValue*)); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
763 | if (values == NULL) return -1; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
764 | for (size_t i = 0; i < count; i++) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
765 | values[i] = cxJsonCreateInteger(arr->allocator, num[i]); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
766 | if (values[i] == NULL) { cx_json_arr_free_temp(values, count); return -1; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
767 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
768 | int ret = cxJsonArrAddValues(arr, values, count); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
769 | free(values); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
770 | return ret; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
771 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
772 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
773 | int cxJsonArrAddStrings(CxJsonValue* arr, const char* const* str, size_t count) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
774 | CxJsonValue** values = calloc(count, sizeof(CxJsonValue*)); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
775 | if (values == NULL) return -1; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
776 | for (size_t i = 0; i < count; i++) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
777 | values[i] = cxJsonCreateString(arr->allocator, str[i]); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
778 | if (values[i] == NULL) { cx_json_arr_free_temp(values, count); return -1; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
779 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
780 | int ret = cxJsonArrAddValues(arr, values, count); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
781 | free(values); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
782 | return ret; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
783 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
784 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
785 | int cxJsonArrAddCxStrings(CxJsonValue* arr, const cxstring* str, size_t count) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
786 | CxJsonValue** values = calloc(count, sizeof(CxJsonValue*)); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
787 | if (values == NULL) return -1; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
788 | for (size_t i = 0; i < count; i++) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
789 | values[i] = cxJsonCreateCxString(arr->allocator, str[i]); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
790 | if (values[i] == NULL) { cx_json_arr_free_temp(values, count); return -1; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
791 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
792 | int ret = cxJsonArrAddValues(arr, values, count); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
793 | free(values); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
794 | return ret; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
795 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
796 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
797 | int cxJsonArrAddLiterals(CxJsonValue* arr, const CxJsonLiteral* lit, size_t count) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
798 | CxJsonValue** values = calloc(count, sizeof(CxJsonValue*)); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
799 | if (values == NULL) return -1; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
800 | for (size_t i = 0; i < count; i++) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
801 | values[i] = cxJsonCreateLiteral(arr->allocator, lit[i]); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
802 | if (values[i] == NULL) { cx_json_arr_free_temp(values, count); return -1; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
803 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
804 | int ret = cxJsonArrAddValues(arr, values, count); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
805 | free(values); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
806 | return ret; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
807 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
808 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
809 | int cxJsonArrAddValues(CxJsonValue* arr, CxJsonValue* const* val, size_t count) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
810 | CxArrayReallocator value_realloc = cx_array_reallocator(arr->allocator, NULL); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
811 | assert(arr->type == CX_JSON_ARRAY); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
812 | return cx_array_simple_copy_a(&value_realloc, |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
813 | arr->value.array.array, |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
814 | arr->value.array.array_size, |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
815 | val, count |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
816 | ); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
817 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
818 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
819 | int cxJsonObjPut(CxJsonValue* obj, cxstring name, CxJsonValue* child) { |
1055
221e2e2f2c06
fix cxJsonObjPut() for existing keys
Mike Becker <universe@uap-core.de>
parents:
1054
diff
changeset
|
820 | // TODO: optimize - issue #462 |
221e2e2f2c06
fix cxJsonObjPut() for existing keys
Mike Becker <universe@uap-core.de>
parents:
1054
diff
changeset
|
821 | for (size_t i = 0; i < obj->value.object.values_size; i++) { |
221e2e2f2c06
fix cxJsonObjPut() for existing keys
Mike Becker <universe@uap-core.de>
parents:
1054
diff
changeset
|
822 | if (0 == cx_strcmp(name, cx_strcast(obj->value.object.values[i].name))) { |
221e2e2f2c06
fix cxJsonObjPut() for existing keys
Mike Becker <universe@uap-core.de>
parents:
1054
diff
changeset
|
823 | // free the original value |
221e2e2f2c06
fix cxJsonObjPut() for existing keys
Mike Becker <universe@uap-core.de>
parents:
1054
diff
changeset
|
824 | cxJsonValueFree(obj->value.object.values[i].value); |
221e2e2f2c06
fix cxJsonObjPut() for existing keys
Mike Becker <universe@uap-core.de>
parents:
1054
diff
changeset
|
825 | obj->value.object.values[i].value = child; |
221e2e2f2c06
fix cxJsonObjPut() for existing keys
Mike Becker <universe@uap-core.de>
parents:
1054
diff
changeset
|
826 | return 0; |
221e2e2f2c06
fix cxJsonObjPut() for existing keys
Mike Becker <universe@uap-core.de>
parents:
1054
diff
changeset
|
827 | } |
221e2e2f2c06
fix cxJsonObjPut() for existing keys
Mike Becker <universe@uap-core.de>
parents:
1054
diff
changeset
|
828 | } |
221e2e2f2c06
fix cxJsonObjPut() for existing keys
Mike Becker <universe@uap-core.de>
parents:
1054
diff
changeset
|
829 | |
1054
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
830 | cxmutstr k = cx_strdup_a(obj->allocator, name); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
831 | if (k.ptr == NULL) return -1; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
832 | CxJsonObjValue kv = {k, child}; |
1067
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
833 | return json_add_objvalue(obj, kv); |
1054
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
834 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
835 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
836 | CxJsonValue* cxJsonObjPutObj(CxJsonValue* obj, cxstring name) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
837 | CxJsonValue* v = cxJsonCreateObj(obj->allocator); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
838 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
839 | if (cxJsonObjPut(obj, name, v)) { cxJsonValueFree(v); return NULL; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
840 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
841 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
842 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
843 | CxJsonValue* cxJsonObjPutArr(CxJsonValue* obj, cxstring name) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
844 | CxJsonValue* v = cxJsonCreateArr(obj->allocator); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
845 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
846 | if (cxJsonObjPut(obj, name, v)) { cxJsonValueFree(v); return NULL; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
847 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
848 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
849 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
850 | CxJsonValue* cxJsonObjPutNumber(CxJsonValue* obj, cxstring name, double num) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
851 | CxJsonValue* v = cxJsonCreateNumber(obj->allocator, num); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
852 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
853 | if (cxJsonObjPut(obj, name, v)) { cxJsonValueFree(v); return NULL; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
854 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
855 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
856 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
857 | CxJsonValue* cxJsonObjPutInteger(CxJsonValue* obj, cxstring name, int64_t num) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
858 | CxJsonValue* v = cxJsonCreateInteger(obj->allocator, num); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
859 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
860 | if (cxJsonObjPut(obj, name, v)) { cxJsonValueFree(v); return NULL; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
861 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
862 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
863 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
864 | CxJsonValue* cxJsonObjPutString(CxJsonValue* obj, cxstring name, const char* str) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
865 | CxJsonValue* v = cxJsonCreateString(obj->allocator, str); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
866 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
867 | if (cxJsonObjPut(obj, name, v)) { cxJsonValueFree(v); return NULL; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
868 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
869 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
870 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
871 | CxJsonValue* cxJsonObjPutCxString(CxJsonValue* obj, cxstring name, cxstring str) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
872 | CxJsonValue* v = cxJsonCreateCxString(obj->allocator, str); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
873 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
874 | if (cxJsonObjPut(obj, name, v)) { cxJsonValueFree(v); return NULL; } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
875 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
876 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
877 | |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
878 | CxJsonValue* cxJsonObjPutLiteral(CxJsonValue* obj, cxstring name, CxJsonLiteral lit) { |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
879 | CxJsonValue* v = cxJsonCreateLiteral(obj->allocator, lit); |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
880 | if (v == NULL) return NULL; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
881 | if (cxJsonObjPut(obj, name, v)) { cxJsonValueFree(v); return NULL;} |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
882 | return v; |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
883 | } |
fb1076ead56f
add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents:
1040
diff
changeset
|
884 | |
1009 | 885 | CxJsonValue *cxJsonArrGet(const CxJsonValue *value, size_t index) { |
967
a58f602ed2fe
simplify parsing of array and object elements
Mike Becker <universe@uap-core.de>
parents:
965
diff
changeset
|
886 | if (index >= value->value.array.array_size) { |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
887 | return &cx_json_value_nothing; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
888 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
889 | return value->value.array.array[index]; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
890 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
891 | |
1033
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
892 | static void *cx_json_iter_current(const void *it) { |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
893 | const CxIterator *iter = it; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
894 | return *(CxJsonValue**)iter->elem_handle; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
895 | } |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
896 | |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
897 | static bool cx_json_iter_valid(const void *it) { |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
898 | const CxIterator *iter = it; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
899 | return iter->index < iter->elem_count; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
900 | } |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
901 | |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
902 | static void cx_json_iter_next(void *it) { |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
903 | CxIterator *iter = it; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
904 | iter->index++; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
905 | iter->elem_handle = (char *) iter->elem_handle + sizeof(void *); |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
906 | } |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
907 | |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
908 | CxIterator cxJsonArrIter(const CxJsonValue *value) { |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
909 | CxIterator iter; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
910 | |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
911 | iter.index = 0; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
912 | iter.elem_count = value->value.array.array_size; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
913 | iter.src_handle.m = value->value.array.array; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
914 | iter.elem_handle = iter.src_handle.m; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
915 | iter.elem_size = sizeof(CxJsonValue*); |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
916 | iter.base.valid = cx_json_iter_valid; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
917 | iter.base.current = cx_json_iter_current; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
918 | iter.base.next = cx_json_iter_next; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
919 | iter.base.remove = false; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
920 | iter.base.mutating = false; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
921 | |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
922 | return iter; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
923 | } |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1020
diff
changeset
|
924 | |
1037
83620ba72cc1
generify cxJsonObjGet() - fixes #525
Mike Becker <universe@uap-core.de>
parents:
1033
diff
changeset
|
925 | CxJsonValue *cx_json_obj_get_cxstr(const CxJsonValue *value, cxstring name) { |
1067
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
926 | CxJsonObjValue *member = json_find_objvalue(value, name); |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
927 | if (member == NULL) { |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
928 | return &cx_json_value_nothing; |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
929 | } else { |
7799addf475f
optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
930 | return member->value; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
931 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
932 | } |