src/json.c

Wed, 10 Dec 2025 22:16:19 +0100

author
Mike Becker <universe@uap-core.de>
date
Wed, 10 Dec 2025 22:16:19 +0100
changeset 1565
fb314eeca7a4
parent 1564
500e3c744d87
child 1567
f60f23b362e9
permissions
-rw-r--r--

fix that cxJsonFromString() stores NULL instead of a "nothing" value in case of a fill error

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"
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
30 #include "cx/kv_list.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>
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
33 #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
34 #include <stdio.h>
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
35 #include <inttypes.h>
1415
40074e643663 go back to ctype.h, but this time try to avoid crashes in Microsoft's implementation
Mike Becker <universe@uap-core.de>
parents: 1340
diff changeset
36 #include <ctype.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
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
45 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
46 if (token->allocated) {
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
47 cx_strfree(&token->content);
1564
500e3c744d87 fix that token_destroy() did not set token->allocated to false
Mike Becker <universe@uap-core.de>
parents: 1563
diff changeset
48 token->allocated = false;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
49 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
50 }
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
51
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
52 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
53 if (pos >= length) {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
54 return 0;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
55 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
56
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
57 int ok = 0;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
58 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
59 char c = content[i];
1415
40074e643663 go back to ctype.h, but this time try to avoid crashes in Microsoft's implementation
Mike Becker <universe@uap-core.de>
parents: 1340
diff changeset
60 if (isdigit((unsigned char)c)) {
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
61 ok = 1;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
62 } else if (i == pos) {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
63 if (!(c == '+' || c == '-')) {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
64 return 0;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
65 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
66 } else {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
67 return 0;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
68 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
69 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
70
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
71 return ok;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
72 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
73
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
74 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
75 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
76
1415
40074e643663 go back to ctype.h, but this time try to avoid crashes in Microsoft's implementation
Mike Becker <universe@uap-core.de>
parents: 1340
diff changeset
77 if (content[0] != '-' && !isdigit((unsigned char)content[0])) {
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
78 return CX_JSON_TOKEN_ERROR;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
79 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
80
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
81 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
82 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
83 if (content[i] == '.') {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
84 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
85 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
86 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
87 type = CX_JSON_TOKEN_NUMBER;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
88 } 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
89 return num_isexp(content, length, i + 1) ? CX_JSON_TOKEN_NUMBER : CX_JSON_TOKEN_ERROR;
1415
40074e643663 go back to ctype.h, but this time try to avoid crashes in Microsoft's implementation
Mike Becker <universe@uap-core.de>
parents: 1340
diff changeset
90 } else if (!isdigit((unsigned char)content[i])) {
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
91 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
92 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
93 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
94
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
95 return type;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
96 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
97
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
98 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
99 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
100 bool allocated = false;
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
101 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
102 allocated = true;
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
103 str = cx_strcat_m(json->uncompleted.content, 1, str);
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
104 if (str.ptr == NULL) { // LCOV_EXCL_START
1022
e78e65405c56 fix wrong "variant" of zero/NULL/false
Mike Becker <universe@uap-core.de>
parents: 1014
diff changeset
105 return (CxJsonToken){CX_JSON_NO_TOKEN, false, {NULL, 0}};
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
106 } // LCOV_EXCL_STOP
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
107 }
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
108 json->uncompleted = (CxJsonToken){0};
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
109 CxJsonTokenType ttype;
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
110 if (isstring) {
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
111 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
112 } else {
1009
7650e722437e minor cleanup
Mike Becker <universe@uap-core.de>
parents: 1008
diff changeset
113 cxstring s = cx_strcast(str);
7650e722437e minor cleanup
Mike Becker <universe@uap-core.de>
parents: 1008
diff changeset
114 if (!cx_strcmp(s, CX_STR("true")) || !cx_strcmp(s, CX_STR("false"))
7650e722437e minor cleanup
Mike Becker <universe@uap-core.de>
parents: 1008
diff changeset
115 || !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
116 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
117 } else {
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
118 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
119 }
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
120 }
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
121 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
122 if (allocated) {
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
123 cx_strfree(&str);
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
124 }
1022
e78e65405c56 fix wrong "variant" of zero/NULL/false
Mike Becker <universe@uap-core.de>
parents: 1014
diff changeset
125 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
126 }
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
127 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
128 }
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
129
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
130 static CxJsonTokenType char2ttype(char c) {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
131 switch (c) {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
132 case '[': {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
133 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
134 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
135 case '{': {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
136 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
137 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
138 case ']': {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
139 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
140 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
141 case '}': {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
142 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
143 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
144 case ':': {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
145 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
146 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
147 case ',': {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
148 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
149 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
150 case '"': {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
151 return CX_JSON_TOKEN_STRING;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
152 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
153 default: {
1415
40074e643663 go back to ctype.h, but this time try to avoid crashes in Microsoft's implementation
Mike Becker <universe@uap-core.de>
parents: 1340
diff changeset
154 if (isspace((unsigned char)c)) {
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
155 return CX_JSON_TOKEN_SPACE;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
156 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
157 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
158 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
159 return CX_JSON_NO_TOKEN;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
160 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
161
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
162 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
163 // 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
164 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
165 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
166 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
167 }
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
168
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
169 // current token type and start index
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
170 CxJsonTokenType ttype = json->uncompleted.tokentype;
1122
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
171 size_t token_part_start = json->buffer.pos;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
172
1139
7dfa5bcf39ee remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents: 1132
diff changeset
173 bool escape_end_of_string = ttype == CX_JSON_TOKEN_STRING
7dfa5bcf39ee remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents: 1132
diff changeset
174 && json->uncompleted.content.ptr[json->uncompleted.content.length-1] == '\\';
7dfa5bcf39ee remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents: 1132
diff changeset
175
1007
81b2986d2b04 fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents: 1002
diff changeset
176 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
177 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
178 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
179 // currently non-string token
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
180 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
181 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
182 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
183 json->buffer.pos++;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
184 continue;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
185 } 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
186 // begin string
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
187 ttype = CX_JSON_TOKEN_STRING;
1122
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
188 token_part_start = i;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
189 } 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
190 // 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
191 json->buffer.pos = i + 1;
1022
e78e65405c56 fix wrong "variant" of zero/NULL/false
Mike Becker <universe@uap-core.de>
parents: 1014
diff changeset
192 *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
193 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
194 } else {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
195 ttype = CX_JSON_TOKEN_LITERAL; // number or literal
1122
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
196 token_part_start = i;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
197 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
198 } else {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
199 // finish token
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
200 if (ctype != CX_JSON_NO_TOKEN) {
1122
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
201 *result = token_create(json, false, token_part_start, i);
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
202 if (result->tokentype == CX_JSON_NO_TOKEN) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
203 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
204 }
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
205 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
206 return CX_JSON_FORMAT_ERROR_NUMBER;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
207 }
1007
81b2986d2b04 fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents: 1002
diff changeset
208 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
209 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
210 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
211 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
212 } else {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
213 // currently inside a string
1139
7dfa5bcf39ee remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents: 1132
diff changeset
214 if (escape_end_of_string) {
7dfa5bcf39ee remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents: 1132
diff changeset
215 escape_end_of_string = false;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
216 } else {
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
217 if (c == '"') {
1122
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
218 *result = token_create(json, true, token_part_start, i + 1);
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
219 if (result->tokentype == CX_JSON_NO_TOKEN) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
220 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
221 }
1007
81b2986d2b04 fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents: 1002
diff changeset
222 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
223 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
224 } else if (c == '\\') {
1139
7dfa5bcf39ee remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents: 1132
diff changeset
225 escape_end_of_string = true;
937
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 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
228 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
229 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
230
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
231 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
232 // uncompleted token
1122
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
233 size_t uncompleted_len = json->buffer.size - token_part_start;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
234 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
235 // 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
236 // save current token content
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
237 CxJsonToken uncompleted = {
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
238 ttype, true,
1122
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
239 cx_strdup(cx_strn(json->buffer.space + token_part_start, uncompleted_len))
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
240 };
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
241 if (uncompleted.content.ptr == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
242 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
243 }
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
244 json->uncompleted = uncompleted;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
245 } else {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
246 // 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
247 // 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
248 assert(json->uncompleted.allocated);
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
249 cxmutstr str = cx_strcat_m(json->uncompleted.content, 1,
1122
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
250 cx_strn(json->buffer.space + token_part_start, uncompleted_len));
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
251 if (str.ptr == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
252 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
253 }
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
254 json->uncompleted.content = str;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
255 }
1008
3b69f025f083 json: enable multiple subsequent fills - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
256 // 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
257 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
258 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
259
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
260 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
261 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
262
1156
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
263 // converts a Unicode codepoint to utf8
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
264 static unsigned codepoint_to_utf8(uint32_t codepoint, char *output_buf) {
1149
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
265 if (codepoint <= 0x7F) {
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
266 *output_buf = (char)codepoint;
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
267 return 1;
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
268 } else if (codepoint <= 0x7FF) {
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
269 output_buf[0] = (char)(0xC0 | ((codepoint >> 6) & 0x1F));
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
270 output_buf[1] = (char)(0x80 | (codepoint & 0x3F));
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
271 return 2;
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
272 } else if (codepoint <= 0xFFFF) {
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
273 output_buf[0] = (char)(0xE0 | ((codepoint >> 12) & 0x0F));
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
274 output_buf[1] = (char)(0x80 | ((codepoint >> 6) & 0x3F));
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
275 output_buf[2] = (char)(0x80 | (codepoint & 0x3F));
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
276 return 3;
1152
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
277 } else if (codepoint <= 0x10FFFF) {
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
278 output_buf[0] = (char)(0xF0 | ((codepoint >> 18) & 0x07));
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
279 output_buf[1] = (char)(0x80 | ((codepoint >> 12) & 0x3F));
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
280 output_buf[2] = (char)(0x80 | ((codepoint >> 6) & 0x3F));
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
281 output_buf[3] = (char)(0x80 | (codepoint & 0x3F));
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
282 return 4;
1149
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
283 }
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
284
1156
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
285 return 0; // LCOV_EXCL_LINE
1149
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
286 }
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
287
1152
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
288 // converts a utf16 surrogate pair to utf8
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
289 static inline uint32_t utf16pair_to_codepoint(uint16_t c0, uint16_t c1) {
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
290 return ((c0 - 0xD800) << 10) + (c1 - 0xDC00) + 0x10000;
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
291 }
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
292
1158
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
293 static unsigned unescape_unicode_string(cxstring str, char *utf8buf) {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
294 // str is supposed to start with "\uXXXX" or "\uXXXX\uXXXX"
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
295 // remaining bytes in the string are ignored (str may be larger!)
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
296
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
297 if (str.length < 6 || str.ptr[0] != '\\' || str.ptr[1] != 'u') {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
298 return 0;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
299 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
300
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
301 unsigned utf8len = 0;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
302 cxstring ustr1 = { str.ptr + 2, 4};
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
303 uint16_t utf16a, utf16b;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
304 if (!cx_strtou16_lc(ustr1, &utf16a, 16, "")) {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
305 uint32_t codepoint;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
306 if (utf16a < 0xD800 || utf16a > 0xE000) {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
307 // character is in the Basic Multilingual Plane
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
308 // and encoded as a single utf16 char
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
309 codepoint = utf16a;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
310 utf8len = codepoint_to_utf8(codepoint, utf8buf);
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
311 } else if (utf16a >= 0xD800 && utf16a <= 0xDBFF) {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
312 // character is encoded as a surrogate pair
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
313 // get next 6 bytes
1159
48279dbe4811 fix wrong inequality
Mike Becker <universe@uap-core.de>
parents: 1158
diff changeset
314 if (str.length >= 12) {
1160
4f02c1101f2e simplify array access
Mike Becker <universe@uap-core.de>
parents: 1159
diff changeset
315 if (str.ptr[6] == '\\' && str.ptr[7] == 'u') {
1158
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
316 cxstring ustr2 = { str.ptr+8, 4 };
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
317 if (!cx_strtou16_lc(ustr2, &utf16b, 16, "")
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
318 && utf16b >= 0xDC00 && utf16b <= 0xDFFF) {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
319 codepoint = utf16pair_to_codepoint(utf16a, utf16b);
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
320 utf8len = codepoint_to_utf8(codepoint, utf8buf);
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
321 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
322 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
323 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
324 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
325 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
326 return utf8len;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
327 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
328
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
329 static cxmutstr unescape_string(const CxAllocator *a, cxmutstr str) {
1122
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
330 // note: this function expects that str contains the enclosing quotes!
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
331
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
332 cxmutstr result;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
333 result.length = 0;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
334 result.ptr = cxMalloc(a, str.length - 1);
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
335 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
336
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
337 bool u = false;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
338 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
339 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
340 if (u) {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
341 u = false;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
342 if (c == 'n') {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
343 c = '\n';
1156
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
344 } else if (c == '"') {
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
345 c = '"';
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
346 } else if (c == 't') {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
347 c = '\t';
1122
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
348 } else if (c == 'r') {
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
349 c = '\r';
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
350 } else if (c == '\\') {
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
351 c = '\\';
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
352 } else if (c == '/') {
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
353 c = '/'; // always unescape, we don't need settings here
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
354 } else if (c == 'f') {
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
355 c = '\f';
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
356 } else if (c == 'b') {
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
357 c = '\b';
1149
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
358 } else if (c == 'u') {
1158
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
359 char utf8buf[4];
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
360 unsigned utf8len = unescape_unicode_string(
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
361 cx_strn(str.ptr + i - 1, str.length - i),
1158
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
362 utf8buf
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
363 );
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
364 if(utf8len > 0) {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
365 i += utf8len < 4 ? 4 : 10;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
366 // add all bytes from utf8buf except the last char
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
367 // to the result (last char will be added below)
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
368 utf8len--;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
369 c = utf8buf[utf8len];
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
370 for (unsigned x = 0; x < utf8len; x++) {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
371 result.ptr[result.length++] = utf8buf[x];
1156
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
372 }
1158
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
373 } else {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
374 // decoding failed, ignore the entire sequence
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
375 result.ptr[result.length++] = '\\';
1149
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
376 }
1156
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
377 } else {
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
378 // TODO: discuss the behavior for unrecognized escape sequences
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
379 // most parsers throw an error here - we just ignore it
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
380 result.ptr[result.length++] = '\\'; // LCOV_EXCL_LINE
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
381 }
1156
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
382
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
383 result.ptr[result.length++] = c;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
384 } else {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
385 if (c == '\\') {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
386 u = true;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
387 } else {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
388 result.ptr[result.length++] = c;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
389 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
390 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
391 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
392 result.ptr[result.length] = 0;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
393
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
394 return result;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
395 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
396
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
397 static cxmutstr escape_string(cxstring str, bool escape_slash) {
1122
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
398 // note: this function produces the string without enclosing quotes
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
399 // the reason is that we don't want to allocate memory just for that
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
400 CxBuffer buf = {0};
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
401
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
402 bool all_printable = true;
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
403 for (size_t i = 0; i < str.length; i++) {
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
404 unsigned char c = str.ptr[i];
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
405 bool escape = c < 0x20 || c == '\\' || c == '"'
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
406 || (escape_slash && c == '/');
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
407
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
408 if (all_printable && escape) {
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
409 size_t capa = str.length + 32;
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
410 char *space = cxMallocDefault(capa);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
411 if (space == NULL) return cx_mutstrn(NULL, 0);
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
412 cxBufferInit(&buf, space, capa, NULL, CX_BUFFER_AUTO_EXTEND);
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
413 cxBufferWrite(str.ptr, 1, i, &buf);
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
414 all_printable = false;
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
415 }
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
416 if (escape) {
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
417 cxBufferPut(&buf, '\\');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
418 if (c == '\"') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
419 cxBufferPut(&buf, '\"');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
420 } else if (c == '\n') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
421 cxBufferPut(&buf, 'n');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
422 } else if (c == '\t') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
423 cxBufferPut(&buf, 't');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
424 } else if (c == '\r') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
425 cxBufferPut(&buf, 'r');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
426 } else if (c == '\\') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
427 cxBufferPut(&buf, '\\');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
428 } else if (c == '/') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
429 cxBufferPut(&buf, '/');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
430 } else if (c == '\f') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
431 cxBufferPut(&buf, 'f');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
432 } else if (c == '\b') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
433 cxBufferPut(&buf, 'b');
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
434 } else {
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
435 char code[6];
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
436 snprintf(code, sizeof(code), "u%04x", (unsigned int) c);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
437 cxBufferPutString(&buf, code);
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
438 }
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
439 } else if (!all_printable) {
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
440 cxBufferPut(&buf, c);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
441 }
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
442 }
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
443 cxmutstr ret;
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
444 if (all_printable) {
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
445 // don't copy the string when we don't need to escape anything
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
446 ret = cx_mutstrn((char*)str.ptr, str.length);
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
447 } else {
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
448 ret = cx_mutstrn(buf.space, buf.size);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
449 }
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
450 cxBufferDestroy(&buf);
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
451 return ret;
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
452 }
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
453
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
454 static CxJsonObject json_create_object_map(const CxAllocator *allocator) {
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
455 // TODO: we might want to add a comparator that is sorting the elements by their key
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
456 CxMap *map = cxKvListCreateAsMap(allocator, NULL, CX_STORE_POINTERS);
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
457 if (map == NULL) return NULL; // LCOV_EXCL_LINE
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
458 cxDefineDestructor(map, cxJsonValueFree);
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
459 return map;
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
460 }
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
461
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
462 static void json_free_object_map(CxJsonObject obj) {
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
463 cxMapFree(obj);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
464 }
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
465
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
466 static CxJsonValue* json_create_value(CxJson *json, CxJsonValueType type) {
1082
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
467 CxJsonValue *v = cxCalloc(json->allocator, 1, sizeof(CxJsonValue));
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
468 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
469
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
470 // initialize the value
1082
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
471 v->type = type;
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
472 v->allocator = json->allocator;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
473 if (type == CX_JSON_ARRAY) {
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
474 cx_array_initialize_a(json->allocator, v->array.data, 16);
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
475 if (v->array.data == 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
476 } else if (type == CX_JSON_OBJECT) {
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
477 v->object = json_create_object_map(json->allocator);
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
478 if (v->object == 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
479 }
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
480
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
481 // 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
482 if (json->vbuf_size > 0) {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
483 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
484 assert(parent != NULL);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
485 if (parent->type == CX_JSON_ARRAY) {
1067
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
486 CxArrayReallocator value_realloc = cx_array_reallocator(json->allocator, NULL);
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
487 if (cx_array_simple_add_a(&value_realloc, parent->array.data, v)) {
1067
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
488 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
489 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
490 } 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
491 // the member was already created after parsing the name
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
492 // store the pointer of the uncompleted value in the map
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
493 assert(json->uncompleted_member_name.ptr != NULL);
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
494 if (cxMapPut(parent->object, json->uncompleted_member_name, v)) {
1067
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
495 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
496 }
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
497 cx_strfree_a(json->allocator, &json->uncompleted_member_name);
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
498 } else {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
499 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
500 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
501 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
502
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
503 // 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
504 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
505 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
506 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
507 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
508 }
940
bbf41b9c2658 fix memory leak in json reader when handling incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 938
diff changeset
509 }
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
510
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
511 // 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
512 if (json->parsed == NULL) {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
513 json->parsed = v;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
514 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
515
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
516 return v;
1067
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
517 // LCOV_EXCL_START
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
518 create_json_value_exit_error:
1082
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
519 cxJsonValueFree(v);
1067
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
520 return NULL;
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
521 // LCOV_EXCL_STOP
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
522 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
523
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
524 #define JP_STATE_VALUE_BEGIN 0
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
525 #define JP_STATE_VALUE_END 10
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
526 #define JP_STATE_VALUE_BEGIN_OBJ 1
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
527 #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
528 #define JP_STATE_VALUE_BEGIN_AR 2
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
529 #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
530 #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
531 #define JP_STATE_OBJ_NAME 6
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
532 #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
533
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
534 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
535 if (allocator == NULL) {
333155f234c4 add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 976
diff changeset
536 allocator = cxDefaultAllocator;
333155f234c4 add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 976
diff changeset
537 }
333155f234c4 add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 976
diff changeset
538
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
539 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
540 json->allocator = allocator;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
541
946
b428424c0214 avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents: 944
diff changeset
542 json->states = json->states_internal;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
543 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
544 json->states[0] = JP_STATE_VALUE_BEGIN;
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
545 json->states_size = 1;
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
546
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
547 json->vbuf = json->vbuf_internal;
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
548 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
549 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
550
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
551 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
552 cxBufferDestroy(&json->buffer);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
553 if (json->states != json->states_internal) {
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
554 cxFreeDefault(json->states);
946
b428424c0214 avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents: 944
diff changeset
555 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
556 if (json->vbuf != json->vbuf_internal) {
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
557 cxFreeDefault(json->vbuf);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
558 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
559 cxJsonValueFree(json->parsed);
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
560 json->parsed = NULL;
1563
6e2f83ef6f5a fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1556
diff changeset
561 token_destroy(&json->uncompleted);
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
562 cx_strfree_a(json->allocator, &json->uncompleted_member_name);
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
563 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
564
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
565 void cxJsonReset(CxJson *json) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
566 const CxAllocator *allocator = json->allocator;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
567 cxJsonDestroy(json);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
568 cxJsonInit(json, allocator);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
569 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
570
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
571 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
572 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
573 // 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
574 cxBufferDestroy(&json->buffer);
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
575 if (buf == NULL) buf = ""; // buffer must not be initialized with NULL
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
576 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
577 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
578 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
579 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
580 } 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
581 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
582 }
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
583 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
584
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
585 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
586 // 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
587 // 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
588 json->states[json->states_size++] = state;
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
589 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
590
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
591 #define return_rec(code) \
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
592 token_destroy(&token); \
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
593 return code
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
594
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
595 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
596 // 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
597 CxJsonValue *vbuf = NULL;
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 // 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
600 CxJsonToken token;
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
601 {
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
602 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
603 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
604 return ret;
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
605 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
606 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
607
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
608 // pop the current state
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
609 assert(json->states_size > 0);
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
610 int state = json->states[--json->states_size];
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
611
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
612 // 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
613 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
614 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
615 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
616 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
617
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
618
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
619 // 0 JP_STATE_VALUE_BEGIN value begin
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
620 // 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
621 // 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
622 // 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
623 // 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
624 // 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
625 // 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
626 // 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
627 // 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
628
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
629 if (state < 3) {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
630 // push expected end state to the stack
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
631 json_add_state(json, 10 + state);
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
632 switch (token.tokentype) {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
633 case CX_JSON_TOKEN_BEGIN_ARRAY: {
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
634 if (json_create_value(json, CX_JSON_ARRAY) == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
635 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
636 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
637 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
638 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
639 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
640 case CX_JSON_TOKEN_BEGIN_OBJECT: {
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
641 if (json_create_value(json, CX_JSON_OBJECT) == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
642 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
643 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
644 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
645 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
646 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
647 case CX_JSON_TOKEN_STRING: {
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
648 if ((vbuf = json_create_value(json, CX_JSON_STRING)) == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
649 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
650 }
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
651 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
652 if (str.ptr == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
653 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
654 }
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
655 vbuf->string = str;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
656 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
657 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
658 case CX_JSON_TOKEN_INTEGER:
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
659 case CX_JSON_TOKEN_NUMBER: {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
660 int type = token.tokentype == CX_JSON_TOKEN_INTEGER ? CX_JSON_INTEGER : CX_JSON_NUMBER;
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
661 if (NULL == (vbuf = json_create_value(json, type))) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
662 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
663 }
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
664 if (type == CX_JSON_INTEGER) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
665 if (cx_strtoi64(token.content, &vbuf->integer, 10)) {
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
666 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
667 }
0a7c1bb2372d avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents: 1057
diff changeset
668 } else {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
669 if (cx_strtod(token.content, &vbuf->number)) {
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
670 // TODO: at the moment this is unreachable, because the tokenizer is already stricter than cx_strtod()
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
671 return_rec(CX_JSON_FORMAT_ERROR_NUMBER); // LCOV_EXCL_LINE
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
672 }
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
673 }
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
674 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
675 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
676 case CX_JSON_TOKEN_LITERAL: {
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
677 if ((vbuf = json_create_value(json, CX_JSON_LITERAL)) == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
678 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
679 }
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
680 if (0 == cx_strcmp(cx_strcast(token.content), cx_str("true"))) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
681 vbuf->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
682 } else if (0 == cx_strcmp(cx_strcast(token.content), cx_str("false"))) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
683 vbuf->literal = CX_JSON_FALSE;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
684 } else {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
685 vbuf->literal = CX_JSON_NULL;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
686 }
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
687 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
688 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
689 default: {
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
690 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
691 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
692 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
693 } 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
694 // expect ',' or ']'
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
695 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
696 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
697 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
698 } 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
699 // discard the array from the value buffer
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
700 json->vbuf_size--;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
701 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
702 } else {
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
703 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
704 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
705 } 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
706 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
707 // discard the obj from the value buffer
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
708 json->vbuf_size--;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
709 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
710 } else {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
711 // expect string
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
712 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
713 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
714 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
715
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
716 // add new entry
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
717 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
718 if (name.ptr == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
719 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
720 }
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
721 assert(json->uncompleted_member_name.ptr == NULL);
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
722 json->uncompleted_member_name = name;
1037
83620ba72cc1 generify cxJsonObjGet() - fixes #525
Mike Becker <universe@uap-core.de>
parents: 1033
diff changeset
723 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
724
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
725 // next state
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
726 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
727 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
728 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
729 } else if (state == JP_STATE_OBJ_COLON) {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
730 // expect ':'
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
731 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
732 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
733 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
734 // next state
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
735 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
736 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
737 } 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
738 // expect ',' or '}'
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
739 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
740 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
741 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
742 } 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
743 // discard the obj from the value buffer
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
744 json->vbuf_size--;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
745 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
746 } else {
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
747 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
748 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
749 } else {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
750 // should be unreachable
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
751 assert(false);
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
752 return_rec(-1); // LCOV_EXCL_LINE
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
753 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
754 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
755
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
756 CxJsonStatus cxJsonNext(CxJson *json, CxJsonValue **value) {
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
757 // initialize output value
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
758 *value = &cx_json_value_nothing;
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
759
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
760 // check if the buffer has been filled
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
761 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
762 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
763 }
0a7c1bb2372d avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents: 1057
diff changeset
764
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
765 // parse data
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
766 CxJsonStatus result;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
767 do {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
768 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
769 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
770 // final state reached
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
771 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
772 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
773
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
774 // write output value
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
775 *value = json->parsed;
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
776 json->parsed = NULL;
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
777
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
778 // re-initialize state machine
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
779 json->states[0] = JP_STATE_VALUE_BEGIN;
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
780
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
781 return CX_JSON_NO_ERROR;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
782 }
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
783 } 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
784
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
785 // 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
786 // 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
787 // 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
788 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
789 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
790 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
791
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
792 return result;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
793 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
794
1556
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
795 CxJsonStatus cx_json_from_string(const CxAllocator *allocator,
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
796 cxstring str, CxJsonValue **value) {
1565
fb314eeca7a4 fix that cxJsonFromString() stores NULL instead of a "nothing" value in case of a fill error
Mike Becker <universe@uap-core.de>
parents: 1564
diff changeset
797 *value = &cx_json_value_nothing;
1556
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
798 CxJson parser;
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
799 cxJsonInit(&parser, allocator);
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
800 if (cxJsonFill(&parser, str)) {
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
801 // LCOV_EXCL_START
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
802 cxJsonDestroy(&parser);
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
803 return CX_JSON_BUFFER_ALLOC_FAILED;
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
804 // LCOV_EXCL_STOP
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
805 }
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
806 CxJsonStatus status = cxJsonNext(&parser, value);
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
807 cxJsonDestroy(&parser);
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
808 return status;
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
809 }
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
810
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
811 void cxJsonValueFree(CxJsonValue *value) {
1012
21884374edbb add documentation - resolves #431
Mike Becker <universe@uap-core.de>
parents: 1009
diff changeset
812 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
813 switch (value->type) {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
814 case CX_JSON_OBJECT: {
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
815 json_free_object_map(value->object);
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
816 break;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
817 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
818 case CX_JSON_ARRAY: {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
819 CxJsonArray array = value->array;
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
820 for (size_t i = 0; i < array.data_size; i++) {
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
821 cxJsonValueFree(array.data[i]);
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
822 }
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
823 cxFree(value->allocator, array.data);
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
824 break;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
825 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
826 case CX_JSON_STRING: {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
827 cxFree(value->allocator, value->string.ptr);
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
828 break;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
829 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
830 default: {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
831 break;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
832 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
833 }
996
333155f234c4 add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 976
diff changeset
834 cxFree(value->allocator, value);
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
835 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
836
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
837 CxJsonValue* cxJsonCreateObj(const CxAllocator* allocator) {
1116
b381da3a9b19 fix JSON create value functions not actually accepting NULL as allocator arg
Mike Becker <universe@uap-core.de>
parents: 1083
diff changeset
838 if (allocator == NULL) allocator = cxDefaultAllocator;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
839 CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue));
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
840 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
841 v->allocator = allocator;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
842 v->type = CX_JSON_OBJECT;
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
843 v->object = json_create_object_map(allocator);
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
844 if (v->object == NULL) { // LCOV_EXCL_START
1082
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
845 cxFree(allocator, v);
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
846 return NULL;
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
847 // LCOV_EXCL_STOP
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
848 }
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
849 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
850 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
851
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
852 CxJsonValue* cxJsonCreateArr(const CxAllocator* allocator) {
1116
b381da3a9b19 fix JSON create value functions not actually accepting NULL as allocator arg
Mike Becker <universe@uap-core.de>
parents: 1083
diff changeset
853 if (allocator == NULL) allocator = cxDefaultAllocator;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
854 CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue));
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
855 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
856 v->allocator = allocator;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
857 v->type = CX_JSON_ARRAY;
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
858 cx_array_initialize_a(allocator, v->array.data, 16);
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
859 if (v->array.data == NULL) { cxFree(allocator, v); return NULL; }
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
860 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
861 }
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 CxJsonValue* cxJsonCreateNumber(const CxAllocator* allocator, double num) {
1116
b381da3a9b19 fix JSON create value functions not actually accepting NULL as allocator arg
Mike Becker <universe@uap-core.de>
parents: 1083
diff changeset
864 if (allocator == NULL) allocator = cxDefaultAllocator;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
865 CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue));
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 v->allocator = allocator;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
868 v->type = CX_JSON_NUMBER;
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
869 v->number = num;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
870 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
871 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
872
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
873 CxJsonValue* cxJsonCreateInteger(const CxAllocator* allocator, int64_t num) {
1116
b381da3a9b19 fix JSON create value functions not actually accepting NULL as allocator arg
Mike Becker <universe@uap-core.de>
parents: 1083
diff changeset
874 if (allocator == NULL) allocator = cxDefaultAllocator;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
875 CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue));
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
876 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
877 v->allocator = allocator;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
878 v->type = CX_JSON_INTEGER;
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
879 v->integer = num;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
880 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
881 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
882
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
883 CxJsonValue* cx_json_create_string(const CxAllocator* allocator, cxstring str) {
1116
b381da3a9b19 fix JSON create value functions not actually accepting NULL as allocator arg
Mike Becker <universe@uap-core.de>
parents: 1083
diff changeset
884 if (allocator == NULL) allocator = cxDefaultAllocator;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
885 CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue));
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
886 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
887 v->allocator = allocator;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
888 v->type = CX_JSON_STRING;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
889 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
890 if (s.ptr == NULL) { cxFree(allocator, v); return NULL; }
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
891 v->string = s;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
892 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
893 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
894
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
895 CxJsonValue* cxJsonCreateLiteral(const CxAllocator* allocator, CxJsonLiteral lit) {
1116
b381da3a9b19 fix JSON create value functions not actually accepting NULL as allocator arg
Mike Becker <universe@uap-core.de>
parents: 1083
diff changeset
896 if (allocator == NULL) allocator = cxDefaultAllocator;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
897 CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue));
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
898 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
899 v->allocator = allocator;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
900 v->type = CX_JSON_LITERAL;
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
901 v->literal = lit;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
902 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
903 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
904
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
905 // LCOV_EXCL_START
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
906 // never called as long as malloc() does not return NULL
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
907 static void json_arr_free_temp(CxJsonValue** values, size_t count) {
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
908 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
909 if (values[i] == NULL) break;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
910 cxJsonValueFree(values[i]);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
911 }
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
912 cxFreeDefault(values);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
913 }
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
914 // LCOV_EXCL_STOP
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
915
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
916 int cxJsonArrAddNumbers(CxJsonValue* arr, const double* num, size_t count) {
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
917 CxJsonValue** values = cxCallocDefault(count, sizeof(CxJsonValue*));
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
918 if (values == NULL) return -1;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
919 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
920 values[i] = cxJsonCreateNumber(arr->allocator, num[i]);
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
921 if (values[i] == NULL) { json_arr_free_temp(values, count); return -1; }
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
922 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
923 int ret = cxJsonArrAddValues(arr, values, count);
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
924 cxFreeDefault(values);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
925 return ret;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
926 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
927
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
928 int cxJsonArrAddIntegers(CxJsonValue* arr, const int64_t* num, size_t count) {
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
929 CxJsonValue** values = cxCallocDefault(count, sizeof(CxJsonValue*));
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
930 if (values == NULL) return -1;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
931 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
932 values[i] = cxJsonCreateInteger(arr->allocator, num[i]);
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
933 if (values[i] == NULL) { json_arr_free_temp(values, count); return -1; }
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
934 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
935 int ret = cxJsonArrAddValues(arr, values, count);
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
936 cxFreeDefault(values);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
937 return ret;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
938 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
939
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
940 int cxJsonArrAddStrings(CxJsonValue* arr, const char* const* str, size_t count) {
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
941 CxJsonValue** values = cxCallocDefault(count, sizeof(CxJsonValue*));
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
942 if (values == NULL) return -1;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
943 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
944 values[i] = cxJsonCreateString(arr->allocator, str[i]);
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
945 if (values[i] == NULL) { json_arr_free_temp(values, count); return -1; }
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
946 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
947 int ret = cxJsonArrAddValues(arr, values, count);
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
948 cxFreeDefault(values);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
949 return ret;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
950 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
951
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
952 int cxJsonArrAddCxStrings(CxJsonValue* arr, const cxstring* str, size_t count) {
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
953 CxJsonValue** values = cxCallocDefault(count, sizeof(CxJsonValue*));
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
954 if (values == NULL) return -1;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
955 for (size_t i = 0; i < count; i++) {
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
956 values[i] = cxJsonCreateString(arr->allocator, str[i]);
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
957 if (values[i] == NULL) { json_arr_free_temp(values, count); return -1; }
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
958 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
959 int ret = cxJsonArrAddValues(arr, values, count);
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
960 cxFreeDefault(values);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
961 return ret;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
962 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
963
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
964 int cxJsonArrAddLiterals(CxJsonValue* arr, const CxJsonLiteral* lit, size_t count) {
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
965 CxJsonValue** values = cxCallocDefault(count, sizeof(CxJsonValue*));
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
966 if (values == NULL) return -1;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
967 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
968 values[i] = cxJsonCreateLiteral(arr->allocator, lit[i]);
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
969 if (values[i] == NULL) { json_arr_free_temp(values, count); return -1; }
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
970 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
971 int ret = cxJsonArrAddValues(arr, values, count);
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
972 cxFreeDefault(values);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
973 return ret;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
974 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
975
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
976 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
977 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
978 assert(arr->type == CX_JSON_ARRAY);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
979 return cx_array_simple_copy_a(&value_realloc,
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
980 arr->array.data,
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
981 arr->array.data_size,
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
982 val, count
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
983 );
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
984 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
985
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
986 int cx_json_obj_put(CxJsonValue* obj, cxstring name, CxJsonValue* child) {
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
987 return cxMapPut(obj->object, name, child);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
988 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
989
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
990 CxJsonValue* cx_json_obj_put_obj(CxJsonValue* obj, cxstring name) {
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
991 CxJsonValue* v = cxJsonCreateObj(obj->allocator);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
992 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
993 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
994 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
995 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
996
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
997 CxJsonValue* cx_json_obj_put_arr(CxJsonValue* obj, cxstring name) {
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
998 CxJsonValue* v = cxJsonCreateArr(obj->allocator);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
999 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1000 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
1001 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1002 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1003
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1004 CxJsonValue* cx_json_obj_put_number(CxJsonValue* obj, cxstring name, double num) {
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1005 CxJsonValue* v = cxJsonCreateNumber(obj->allocator, num);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1006 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1007 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
1008 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1009 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1010
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1011 CxJsonValue* cx_json_obj_put_integer(CxJsonValue* obj, cxstring name, int64_t num) {
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1012 CxJsonValue* v = cxJsonCreateInteger(obj->allocator, num);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1013 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1014 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
1015 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1016 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1017
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1018 CxJsonValue* cx_json_obj_put_string(CxJsonValue* obj, cxstring name, cxstring str) {
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1019 CxJsonValue* v = cxJsonCreateString(obj->allocator, str);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1020 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1021 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
1022 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1023 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1024
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1025 CxJsonValue* cx_json_obj_put_literal(CxJsonValue* obj, cxstring name, CxJsonLiteral lit) {
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1026 CxJsonValue* v = cxJsonCreateLiteral(obj->allocator, lit);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1027 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1028 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
1029 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1030 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1031
1009
7650e722437e minor cleanup
Mike Becker <universe@uap-core.de>
parents: 1008
diff changeset
1032 CxJsonValue *cxJsonArrGet(const CxJsonValue *value, size_t index) {
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
1033 if (index >= value->array.data_size) {
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1034 return &cx_json_value_nothing;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1035 }
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
1036 return value->array.data[index];
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1037 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1038
1337
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1039 CxJsonValue *cxJsonArrRemove(CxJsonValue *value, size_t index) {
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
1040 if (index >= value->array.data_size) {
1337
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1041 return NULL;
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1042 }
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
1043 CxJsonValue *ret = value->array.data[index];
1337
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1044 // TODO: replace with a low level cx_array_remove()
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
1045 size_t count = value->array.data_size - index - 1;
1337
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1046 if (count > 0) {
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
1047 memmove(value->array.data + index, value->array.data + index + 1, count * sizeof(CxJsonValue*));
1337
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1048 }
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
1049 value->array.data_size--;
1337
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1050 return ret;
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1051 }
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1052
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1053 char *cxJsonAsString(const CxJsonValue *value) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1054 return value->string.ptr;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1055 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1056
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1057 cxstring cxJsonAsCxString(const CxJsonValue *value) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1058 return cx_strcast(value->string);
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1059 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1060
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1061 cxmutstr cxJsonAsCxMutStr(const CxJsonValue *value) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1062 return value->string;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1063 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1064
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1065 double cxJsonAsDouble(const CxJsonValue *value) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1066 if (value->type == CX_JSON_INTEGER) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1067 return (double) value->integer;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1068 } else {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1069 return value->number;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1070 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1071 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1072
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1073 int64_t cxJsonAsInteger(const CxJsonValue *value) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1074 if (value->type == CX_JSON_INTEGER) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1075 return value->integer;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1076 } else {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1077 return (int64_t) value->number;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1078 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1079 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1417
diff changeset
1080
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1081 CxIterator cxJsonArrIter(const CxJsonValue *value) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1082 return cxIteratorPtr(
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
1083 value->array.data,
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
1084 value->array.data_size,
1429
6e0c3a8a914a remove the concept of "mutating iterators" - resolves #579
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
1085 true // arrays need to keep order
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1086 );
1033
e3009345984b add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents: 1022
diff changeset
1087 }
e3009345984b add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents: 1022
diff changeset
1088
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1089 CxMapIterator cxJsonObjIter(const CxJsonValue *value) {
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1090 return cxMapIterator(value->object);
1033
e3009345984b add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents: 1022
diff changeset
1091 }
e3009345984b add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents: 1022
diff changeset
1092
1417
b97faf8b7ab7 replace all remaining generics with cx_strcast() - resolves #700
Mike Becker <universe@uap-core.de>
parents: 1415
diff changeset
1093 CxJsonValue *cx_json_obj_get(const CxJsonValue *value, cxstring name) {
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1094 CxJsonValue *v = cxMapGet(value->object, name);
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1095 if (v == NULL) {
1067
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
1096 return &cx_json_value_nothing;
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
1097 } else {
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1098 return v;
1338
cc153bffea28 add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents: 1337
diff changeset
1099 }
cc153bffea28 add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents: 1337
diff changeset
1100 }
cc153bffea28 add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents: 1337
diff changeset
1101
1417
b97faf8b7ab7 replace all remaining generics with cx_strcast() - resolves #700
Mike Becker <universe@uap-core.de>
parents: 1415
diff changeset
1102 CxJsonValue *cx_json_obj_remove(CxJsonValue *value, cxstring name) {
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1103 CxJsonValue *v = NULL;
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1104 cxMapRemoveAndGet(value->object, name, &v);
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1105 return v;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1106 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1107
1077
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1108 CxJsonWriter cxJsonWriterCompact(void) {
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1109 return (CxJsonWriter) {
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1110 false,
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1111 6,
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1112 false,
1123
2b83302d595a make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents: 1122
diff changeset
1113 4,
2b83302d595a make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents: 1122
diff changeset
1114 false
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1115 };
1077
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1116 }
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1117
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1118 CxJsonWriter cxJsonWriterPretty(bool use_spaces) {
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1119 return (CxJsonWriter) {
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1120 true,
1117
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1121 6,
1077
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1122 use_spaces,
1123
2b83302d595a make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents: 1122
diff changeset
1123 4,
2b83302d595a make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents: 1122
diff changeset
1124 false
1077
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1125 };
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1126 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1127
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1128 static int cx_json_writer_indent(
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1129 void *target,
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1130 cx_write_func wfunc,
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1131 const CxJsonWriter *settings,
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1132 unsigned int depth
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1133 ) {
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1134 if (depth == 0) return 0;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1135
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1136 // determine the width and characters to use
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1137 const char* indent; // for 32 prepared chars
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1138 size_t width = depth;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1139 if (settings->indent_space) {
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1140 if (settings->indent == 0) return 0;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1141 width *= settings->indent;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1142 indent = " ";
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1143 } else {
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1144 indent = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1145 }
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1146
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1147 // calculate the number of write calls and write
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1148 size_t full = width / 32;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1149 size_t remaining = width % 32;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1150 for (size_t i = 0; i < full; i++) {
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1151 if (32 != wfunc(indent, 1, 32, target)) return 1;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1152 }
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1153 if (remaining != wfunc(indent, 1, remaining, target)) return 1;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1154
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1155 return 0;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1156 }
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1157
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1158
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1159 int cx_json_write_rec(
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1160 void *target,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1161 const CxJsonValue *value,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1162 cx_write_func wfunc,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1163 const CxJsonWriter *settings,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1164 unsigned int depth
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1165 ) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1166 // keep track of written items
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1167 // the idea is to reduce the number of jumps for error checking
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1168 size_t actual = 0, expected = 0;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1169
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1170 // small buffer for number to string conversions
1117
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1171 char numbuf[40];
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1172
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1173 // recursively write the values
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1174 switch (value->type) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1175 case CX_JSON_OBJECT: {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1176 const char *begin_obj = "{\n";
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1177 if (settings->pretty) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1178 actual += wfunc(begin_obj, 1, 2, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1179 expected += 2;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1180 } else {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1181 actual += wfunc(begin_obj, 1, 1, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1182 expected++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1183 }
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1184 depth++;
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1185 CxMapIterator member_iter = cxJsonObjIter(value);
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1186 cx_foreach(const CxMapEntry *, member, member_iter) {
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1187 // possible indentation
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1188 if (settings->pretty) {
1082
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
1189 if (cx_json_writer_indent(target, wfunc, settings, depth)) {
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
1190 return 1; // LCOV_EXCL_LINE
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
1191 }
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1192 }
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1193
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1194 // the name
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1195 actual += wfunc("\"", 1, 1, target);
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1196 cxstring key = cx_strn(member->key->data, member->key->len);
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1197 cxmutstr name = escape_string(key, settings->escape_slash);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
1198 actual += wfunc(name.ptr, 1, name.length, target);
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1199 actual += wfunc("\"", 1, 1, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1200 const char *obj_name_sep = ": ";
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1201 if (settings->pretty) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1202 actual += wfunc(obj_name_sep, 1, 2, target);
1548
12315ee158ad fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents: 1547
diff changeset
1203 expected += 4 + name.length;
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1204 } else {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1205 actual += wfunc(obj_name_sep, 1, 1, target);
1548
12315ee158ad fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents: 1547
diff changeset
1206 expected += 3 + name.length;
12315ee158ad fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents: 1547
diff changeset
1207 }
12315ee158ad fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents: 1547
diff changeset
1208 if (name.ptr != key.ptr) {
12315ee158ad fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents: 1547
diff changeset
1209 cx_strfree(&name);
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1210 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1211
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1212 // the value
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1213 if (cx_json_write_rec(target, member->value, wfunc, settings, depth)) return 1;
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1214
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1215 // end of object-value
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1216 if (member_iter.index < member_iter.elem_count - 1) {
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1217 const char *obj_value_sep = ",\n";
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1218 if (settings->pretty) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1219 actual += wfunc(obj_value_sep, 1, 2, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1220 expected += 2;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1221 } else {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1222 actual += wfunc(obj_value_sep, 1, 1, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1223 expected++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1224 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1225 } else {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1226 if (settings->pretty) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1227 actual += wfunc("\n", 1, 1, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1228 expected ++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1229 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1230 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1231 }
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1232 depth--;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1233 if (settings->pretty) {
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1234 if (cx_json_writer_indent(target, wfunc, settings, depth)) return 1;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1235 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1236 actual += wfunc("}", 1, 1, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1237 expected++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1238 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1239 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1240 case CX_JSON_ARRAY: {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1241 actual += wfunc("[", 1, 1, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1242 expected++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1243 CxIterator iter = cxJsonArrIter(value);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1244 cx_foreach(CxJsonValue*, element, iter) {
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1245 if (cx_json_write_rec(
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1246 target, element,
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1247 wfunc, settings, depth)
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1248 ) {
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1249 return 1; // LCOV_EXCL_LINE
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1250 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1251
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1252 if (iter.index < iter.elem_count - 1) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1253 const char *arr_value_sep = ", ";
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1254 if (settings->pretty) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1255 actual += wfunc(arr_value_sep, 1, 2, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1256 expected += 2;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1257 } else {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1258 actual += wfunc(arr_value_sep, 1, 1, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1259 expected++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1260 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1261 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1262 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1263 actual += wfunc("]", 1, 1, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1264 expected++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1265 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1266 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1267 case CX_JSON_STRING: {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1268 actual += wfunc("\"", 1, 1, target);
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1269 cxmutstr str = escape_string(cx_strcast(value->string),
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1270 settings->escape_slash);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
1271 actual += wfunc(str.ptr, 1, str.length, target);
1548
12315ee158ad fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents: 1547
diff changeset
1272 actual += wfunc("\"", 1, 1, target);
12315ee158ad fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents: 1547
diff changeset
1273 expected += 2 + str.length;
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1274 if (str.ptr != value->string.ptr) {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
1275 cx_strfree(&str);
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
1276 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1277 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1278 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1279 case CX_JSON_NUMBER: {
1117
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1280 int precision = settings->frac_max_digits;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1281 // because of the way how %g is defined, we need to
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1282 // double the precision and truncate ourselves
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1283 precision = 1 + (precision > 15 ? 30 : 2 * precision);
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1284 snprintf(numbuf, 40, "%.*g", precision, value->number);
1117
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1285 char *dot, *exp;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1286 unsigned char max_digits;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1287 // find the decimal separator and hope that it's one of . or ,
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1288 dot = strchr(numbuf, '.');
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1289 if (dot == NULL) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1290 dot = strchr(numbuf, ',');
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1291 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1292 if (dot == NULL) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1293 // no decimal separator found
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1294 // output everything until a possible exponent
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1295 max_digits = 30;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1296 dot = numbuf;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1297 } else {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1298 // found a decimal separator
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1299 // output everything until the separator
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1300 // and set max digits to what the settings say
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1301 size_t len = dot - numbuf;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1302 actual += wfunc(numbuf, 1, len, target);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1303 expected += len;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1304 max_digits = settings->frac_max_digits;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1305 if (max_digits > 15) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1306 max_digits = 15;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1307 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1308 // locale independent separator
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1309 if (max_digits > 0) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1310 actual += wfunc(".", 1, 1, target);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1311 expected++;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1312 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1313 dot++;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1314 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1315 // find the exponent
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1316 exp = strchr(dot, 'e');
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1317 if (exp == NULL) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1318 // no exponent - output the rest
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1319 if (max_digits > 0) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1320 size_t len = strlen(dot);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1321 if (len > max_digits) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1322 len = max_digits;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1323 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1324 actual += wfunc(dot, 1, len, target);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1325 expected += len;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1326 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1327 } else {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1328 // exponent found - truncate the frac digits
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1329 // and then output the rest
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1330 if (max_digits > 0) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1331 size_t len = exp - dot - 1;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1332 if (len > max_digits) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1333 len = max_digits;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1334 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1335 actual += wfunc(dot, 1, len, target);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1336 expected += len;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1337 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1338 actual += wfunc("e", 1, 1, target);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1339 expected++;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1340 exp++;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1341 size_t len = strlen(exp);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1342 actual += wfunc(exp, 1, len, target);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1343 expected += len;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1344 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1345 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1346 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1347 case CX_JSON_INTEGER: {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1348 snprintf(numbuf, 32, "%" PRIi64, value->integer);
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1349 size_t len = strlen(numbuf);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1350 actual += wfunc(numbuf, 1, len, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1351 expected += len;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1352 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1353 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1354 case CX_JSON_LITERAL: {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1355 if (value->literal == CX_JSON_TRUE) {
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1356 actual += wfunc("true", 1, 4, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1357 expected += 4;
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1358 } else if (value->literal == CX_JSON_FALSE) {
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1359 actual += wfunc("false", 1, 5, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1360 expected += 5;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1361 } else {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1362 actual += wfunc("null", 1, 4, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1363 expected += 4;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1364 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1365 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1366 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1367 case CX_JSON_NOTHING: {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1368 // deliberately supported as an empty string!
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1369 // users might want to just write the result
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1370 // of a get operation without testing the value
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1371 // and therefore this should not blow up
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1372 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1373 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1374 default: assert(false); // LCOV_EXCL_LINE
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1375 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1376
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1377 return expected != actual;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1378 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1379
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1380 int cxJsonWrite(
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1381 void *target,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1382 const CxJsonValue *value,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1383 cx_write_func wfunc,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1384 const CxJsonWriter *settings
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1385 ) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1386 assert(target != NULL);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1387 assert(value != NULL);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1388 assert(wfunc != NULL);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1389
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1390 CxJsonWriter writer_default = cxJsonWriterCompact();
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1391 if (settings == NULL) {
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1392 settings = &writer_default;
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1393 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1394 return cx_json_write_rec(target, value, wfunc, settings, 0);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1395 }

mercurial