src/json.c

Sun, 28 Dec 2025 17:31:20 +0100

author
Mike Becker <universe@uap-core.de>
date
Sun, 28 Dec 2025 17:31:20 +0100
changeset 1675
36c0fb2b60b2
parent 1672
94360453bce4
permissions
-rw-r--r--

overhaul all attributes

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) {
1672
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
99 cxmutstr str = cx_mutstrn(json->buffer.space + start, end - start);
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
100 bool allocated = false;
1667
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
101 if (json->uncompleted_tokentype != CX_JSON_NO_TOKEN) {
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
102 allocated = true;
1672
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
103 str = cx_strcat(json->uncompleted_content, 1, str);
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
104 if (str.ptr == NULL) {
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
105 return (CxJsonToken){CX_JSON_NO_TOKEN, false, CX_NULLSTR}; // LCOV_EXCL_LINE
1667
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
106 }
1672
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
107 json->uncompleted_content = CX_NULLSTR;
1667
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
108 json->uncompleted_tokentype = CX_JSON_NO_TOKEN;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
109 }
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
110 CxJsonTokenType ttype;
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
111 if (isstring) {
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
112 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
113 } else {
1667
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
114 if (!cx_strcmp(str, "true") || !cx_strcmp(str, "false")
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
115 || !cx_strcmp(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 }
1672
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
125 return (CxJsonToken){CX_JSON_TOKEN_ERROR, false, CX_NULLSTR};
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)) {
1667
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
165 return json->uncompleted_tokentype == CX_JSON_NO_TOKEN ?
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
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
1667
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
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
1668
3ffdfe1776b4 add cx_strat()
Mike Becker <universe@uap-core.de>
parents: 1667
diff changeset
174 && cx_strat(json->uncompleted_content, -1) == '\\';
1139
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;
1672
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
192 *result = (CxJsonToken){ctype, false, CX_NULLSTR};
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
1567
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
231 if (ttype == CX_JSON_NO_TOKEN) {
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
232 return CX_JSON_NO_DATA;
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
233 } else {
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
234 // uncompleted token
1667
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
235 cxstring uncompleted = cx_strn(json->buffer.space + token_part_start, json->buffer.size - token_part_start);
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
236 if (json->uncompleted_tokentype == CX_JSON_NO_TOKEN) {
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
237 assert(json->uncompleted_content.ptr == NULL);
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
238 json->uncompleted_content = cx_strdup(uncompleted);
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
239 if (json->uncompleted_content.ptr == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
240 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
241 }
1667
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
242 json->uncompleted_tokentype = ttype;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
243 } else {
1672
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
244 // previously we already had an uncompleted token
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
245 // combine the uncompleted token with the current token
1672
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
246 cxmutstr s = cx_strcat(json->uncompleted_content, 1, uncompleted);
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
247 if (s.ptr == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
248 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
249 }
1672
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
250 json->uncompleted_content = s;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
251 }
1008
3b69f025f083 json: enable multiple subsequent fills - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1007
diff changeset
252 // advance the buffer position - we saved the stuff in the uncompleted token
1667
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
253 json->buffer.pos += uncompleted.length;
1567
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
254 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
255 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
256 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
257
1156
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
258 // 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
259 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
260 if (codepoint <= 0x7F) {
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
261 *output_buf = (char)codepoint;
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
262 return 1;
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
263 } else if (codepoint <= 0x7FF) {
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
264 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
265 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
266 return 2;
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
267 } else if (codepoint <= 0xFFFF) {
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
268 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
269 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
270 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
271 return 3;
1152
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
272 } else if (codepoint <= 0x10FFFF) {
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
273 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
274 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
275 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
276 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
277 return 4;
1149
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
278 }
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
279
1156
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
280 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
281 }
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
282
1152
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
283 // 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
284 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
285 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
286 }
e4af44b488bc implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1151
diff changeset
287
1158
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
288 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
289 // 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
290 // 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
291
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
292 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
293 return 0;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
294 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
295
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
296 unsigned utf8len = 0;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
297 cxstring ustr1 = { str.ptr + 2, 4};
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
298 uint16_t utf16a, utf16b;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
299 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
300 uint32_t codepoint;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
301 if (utf16a < 0xD800 || utf16a > 0xE000) {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
302 // 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
303 // 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
304 codepoint = utf16a;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
305 utf8len = codepoint_to_utf8(codepoint, utf8buf);
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
306 } else if (utf16a >= 0xD800 && utf16a <= 0xDBFF) {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
307 // 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
308 // get next 6 bytes
1159
48279dbe4811 fix wrong inequality
Mike Becker <universe@uap-core.de>
parents: 1158
diff changeset
309 if (str.length >= 12) {
1160
4f02c1101f2e simplify array access
Mike Becker <universe@uap-core.de>
parents: 1159
diff changeset
310 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
311 cxstring ustr2 = { str.ptr+8, 4 };
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
312 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
313 && utf16b >= 0xDC00 && utf16b <= 0xDFFF) {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
314 codepoint = utf16pair_to_codepoint(utf16a, utf16b);
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
315 utf8len = codepoint_to_utf8(codepoint, utf8buf);
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
316 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
317 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
318 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
319 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
320 }
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
321 return utf8len;
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
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
324 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
325 // 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
326
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
327 cxmutstr result;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
328 result.length = 0;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
329 result.ptr = cxMalloc(a, str.length - 1);
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
330 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
331
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
332 bool u = false;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
333 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
334 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
335 if (u) {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
336 u = false;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
337 if (c == 'n') {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
338 c = '\n';
1156
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
339 } else if (c == '"') {
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
340 c = '"';
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
341 } else if (c == 't') {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
342 c = '\t';
1122
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
343 } else if (c == 'r') {
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
344 c = '\r';
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
345 } else if (c == '\\') {
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
346 c = '\\';
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
347 } else if (c == '/') {
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
348 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
349 } else if (c == 'f') {
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
350 c = '\f';
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
351 } else if (c == 'b') {
49ab92de9a13 add more escape sequences to unescape function
Mike Becker <universe@uap-core.de>
parents: 1121
diff changeset
352 c = '\b';
1149
df5665de7344 implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1139
diff changeset
353 } else if (c == 'u') {
1158
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
354 char utf8buf[4];
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
355 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
356 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
357 utf8buf
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
358 );
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
359 if(utf8len > 0) {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
360 i += utf8len < 4 ? 4 : 10;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
361 // 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
362 // 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
363 utf8len--;
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
364 c = utf8buf[utf8len];
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
365 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
366 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
367 }
1158
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
368 } else {
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
369 // decoding failed, ignore the entire sequence
fa2811e9ab19 extract unescape_unicode_string() and fix rages
Mike Becker <universe@uap-core.de>
parents: 1156
diff changeset
370 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
371 }
1156
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
372 } else {
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
373 // 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
374 // 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
375 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
376 }
1156
96f16b5a0029 add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents: 1152
diff changeset
377
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
378 result.ptr[result.length++] = c;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
379 } else {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
380 if (c == '\\') {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
381 u = true;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
382 } else {
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 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
385 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
386 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
387 result.ptr[result.length] = 0;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
388
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
389 return result;
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
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
392 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
393 // 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
394 // 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
395 CxBuffer buf = {0};
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
396
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
397 bool all_printable = true;
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
398 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
399 unsigned char c = str.ptr[i];
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
400 bool escape = c < 0x20 || c == '\\' || c == '"'
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
401 || (escape_slash && c == '/');
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
402
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
403 if (all_printable && escape) {
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
404 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
405 char *space = cxMallocDefault(capa);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
406 if (space == NULL) return cx_mutstrn(NULL, 0);
1601
e47078681a6f change signature of cxBufferInit() and cxBufferCreate()
Mike Becker <universe@uap-core.de>
parents: 1600
diff changeset
407 cxBufferInit(&buf, NULL, space, capa, CX_BUFFER_AUTO_EXTEND);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
408 cxBufferWrite(str.ptr, 1, i, &buf);
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
409 all_printable = false;
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
410 }
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
411 if (escape) {
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
412 cxBufferPut(&buf, '\\');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
413 if (c == '\"') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
414 cxBufferPut(&buf, '\"');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
415 } else if (c == '\n') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
416 cxBufferPut(&buf, 'n');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
417 } else if (c == '\t') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
418 cxBufferPut(&buf, 't');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
419 } else if (c == '\r') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
420 cxBufferPut(&buf, 'r');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
421 } else if (c == '\\') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
422 cxBufferPut(&buf, '\\');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
423 } else if (c == '/') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
424 cxBufferPut(&buf, '/');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
425 } else if (c == '\f') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
426 cxBufferPut(&buf, 'f');
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
427 } else if (c == '\b') {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
428 cxBufferPut(&buf, 'b');
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
429 } else {
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
430 char code[6];
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
431 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
432 cxBufferPutString(&buf, code);
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
433 }
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
434 } else if (!all_printable) {
1130
5bcb725119b6 fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents: 1123
diff changeset
435 cxBufferPut(&buf, c);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
436 }
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
437 }
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
438 cxmutstr ret;
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
439 if (all_printable) {
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
440 // 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
441 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
442 } else {
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
443 ret = cx_mutstrn(buf.space, buf.size);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
444 }
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
445 cxBufferDestroy(&buf);
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
446 return ret;
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
447 }
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
448
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
449 static CxJsonObject json_create_object_map(const CxAllocator *allocator) {
1605
55b13f583356 refactor the list and map construction functions and remove the simple macros
Mike Becker <universe@uap-core.de>
parents: 1602
diff changeset
450 CxMap *map = cxKvListCreateAsMap(allocator, CX_STORE_POINTERS);
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
451 if (map == NULL) return NULL; // LCOV_EXCL_LINE
1605
55b13f583356 refactor the list and map construction functions and remove the simple macros
Mike Becker <universe@uap-core.de>
parents: 1602
diff changeset
452 cxSetCompareFunc(map, cxJsonCompare);
55b13f583356 refactor the list and map construction functions and remove the simple macros
Mike Becker <universe@uap-core.de>
parents: 1602
diff changeset
453 cxSetDestructor(map, cxJsonValueFree);
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
454 return map;
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
455 }
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
456
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
457 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
458 cxMapFree(obj);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
459 }
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
460
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
461 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
462 CxJsonValue *v = cxCalloc(json->allocator, 1, sizeof(CxJsonValue));
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
463 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
464
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
465 // 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
466 v->type = type;
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
467 v->allocator = json->allocator;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
468 if (type == CX_JSON_ARRAY) {
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
469 if (cx_array_init_a(json->allocator, v->array, 16)) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
470 goto create_json_value_exit_error; // LCOV_EXCL_LINE
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
471 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
472 } 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
473 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
474 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
475 }
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
476
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
477 // add the new value to a possible parent
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
478 if (json->vbuf.size > 0) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
479 CxJsonValue *parent = json->vbuf.data[json->vbuf.size - 1];
1067
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
480 assert(parent != NULL);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
481 if (parent->type == CX_JSON_ARRAY) {
1625
89a2d53308e4 changes macros for adding/inserting a single element into an array to automatically take the address - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1611
diff changeset
482 if (cx_array_add_a(json->allocator, parent->array, v)) {
1067
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
483 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
484 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
485 } 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
486 // 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
487 // 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
488 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
489 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
490 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
491 }
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
492 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
493 } else {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
494 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
495 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
496 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
497
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
498 // 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
499 if (type == CX_JSON_ARRAY || type == CX_JSON_OBJECT) {
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
500 if (json->vbuf.size >= json->vbuf.capacity) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
501 int alloc_error;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
502 if (json->vbuf.data == json->vbuf_internal) {
1611
de21dd0d1426 adds docstrings to the new array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1608
diff changeset
503 alloc_error = cx_array_copy_to_new(json->vbuf, json->vbuf.size+1);
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
504 } else {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
505 alloc_error = cx_array_reserve(json->vbuf, json->vbuf.size+1);
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
506 }
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
507 if (alloc_error) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
508 goto create_json_value_exit_error; // LCOV_EXCL_LINE
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
509 }
1067
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
510 }
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
511 json->vbuf.data[json->vbuf.size] = v;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
512 json->vbuf.size++;
940
bbf41b9c2658 fix memory leak in json reader when handling incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 938
diff changeset
513 }
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
514
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
515 // 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
516 if (json->parsed == NULL) {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
517 json->parsed = v;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
518 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
519
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
520 return v;
1067
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
521 // LCOV_EXCL_START
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
522 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
523 cxJsonValueFree(v);
1067
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
524 return NULL;
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
525 // LCOV_EXCL_STOP
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
526 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
527
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
528 #define JP_STATE_VALUE_BEGIN 0
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
529 #define JP_STATE_VALUE_END 10
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
530 #define JP_STATE_VALUE_BEGIN_OBJ 1
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
531 #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
532 #define JP_STATE_VALUE_BEGIN_AR 2
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
533 #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
534 #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
535 #define JP_STATE_OBJ_NAME 6
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
536 #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
537
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
538 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
539 if (allocator == NULL) {
333155f234c4 add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 976
diff changeset
540 allocator = cxDefaultAllocator;
333155f234c4 add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 976
diff changeset
541 }
333155f234c4 add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 976
diff changeset
542
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
543 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
544 json->allocator = allocator;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
545
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
546 cx_array_init_fixed(json->states, json->states_internal, 1);
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
547 json->states.data[0] = JP_STATE_VALUE_BEGIN;
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
548 cx_array_init_fixed(json->vbuf, json->vbuf_internal, 0);
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);
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
553 if (json->states.data != json->states_internal) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
554 cx_array_free(json->states);
946
b428424c0214 avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents: 944
diff changeset
555 }
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
556 if (json->vbuf.data != json->vbuf_internal) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
557 cx_array_free(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;
1667
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
561 json->uncompleted_tokentype = CX_JSON_NO_TOKEN;
608cc0b25352 changes cx_strcat() family of function to return an int and removes two unnecessary variants
Mike Becker <universe@uap-core.de>
parents: 1654
diff changeset
562 cx_strfree(&json->uncompleted_content);
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
563 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
564 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
565
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
566 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
567 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
568 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
569 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
570 }
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
571
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
572 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
573 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
574 // 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
575 cxBufferDestroy(&json->buffer);
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
576 if (buf == NULL) buf = ""; // buffer must not be initialized with NULL
1601
e47078681a6f change signature of cxBufferInit() and cxBufferCreate()
Mike Becker <universe@uap-core.de>
parents: 1600
diff changeset
577 cxBufferInit(&json->buffer, NULL, (char*) buf,
e47078681a6f change signature of cxBufferInit() and cxBufferCreate()
Mike Becker <universe@uap-core.de>
parents: 1600
diff changeset
578 size, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_COPY_ON_WRITE);
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
579 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
580 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
581 } 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
582 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
583 }
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
584 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
585
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
586 static void json_add_state(CxJson *json, int state) {
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
587 // we have guaranteed the necessary space
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
588 // therefore, we can safely add the state in the simplest way possible
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
589 json->states.data[json->states.size++] = state;
1000
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
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
592 #define return_rec(code) \
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
593 token_destroy(&token); \
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
594 return code
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
595
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
596 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
597 // 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
598 CxJsonValue *vbuf = NULL;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
599
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
600 // 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
601 CxJsonToken token;
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
602 {
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
603 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
604 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
605 return ret;
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
606 }
1000
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
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
609 // pop the current state
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
610 assert(json->states.size > 0);
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
611 int state = json->states.data[--json->states.size];
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
612
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
613 // guarantee that at least two more states fit into the array
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
614 const size_t required_states_depth = json->states.size + 2;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
615 if (required_states_depth >= json->states.capacity) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
616 int alloc_error;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
617 if (json->states.data == json->states_internal) {
1611
de21dd0d1426 adds docstrings to the new array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1608
diff changeset
618 alloc_error = cx_array_copy_to_new(json->states, required_states_depth);
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
619 } else {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
620 alloc_error = cx_array_reserve(json->states, required_states_depth);
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
621 }
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
622 if (alloc_error) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
623 return CX_JSON_BUFFER_ALLOC_FAILED; // LCOV_EXCL_LINE
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
624 }
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
625 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
626
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
627
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
628 // 0 JP_STATE_VALUE_BEGIN value begin
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
629 // 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
630 // 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
631 // 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
632 // 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
633 // 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
634 // 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
635 // 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
636 // 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
637
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
638 if (state < 3) {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
639 // push expected end state to the stack
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
640 json_add_state(json, 10 + state);
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
641 switch (token.tokentype) {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
642 case CX_JSON_TOKEN_BEGIN_ARRAY: {
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
643 if (json_create_value(json, CX_JSON_ARRAY) == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
644 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
645 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
646 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
647 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
648 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
649 case CX_JSON_TOKEN_BEGIN_OBJECT: {
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
650 if (json_create_value(json, CX_JSON_OBJECT) == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
651 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
652 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
653 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
654 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
655 }
1596
2d2c4ec38133 fix unexpected token error when parsing an empty json array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1595
diff changeset
656 case CX_JSON_TOKEN_END_ARRAY: {
2d2c4ec38133 fix unexpected token error when parsing an empty json array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1595
diff changeset
657 if (state == JP_STATE_VALUE_BEGIN_AR) {
2d2c4ec38133 fix unexpected token error when parsing an empty json array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1595
diff changeset
658 // discard the array from the value buffer
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
659 json->vbuf.size--;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
660 json->states.size--;
1596
2d2c4ec38133 fix unexpected token error when parsing an empty json array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1595
diff changeset
661 return_rec(CX_JSON_NO_ERROR);
2d2c4ec38133 fix unexpected token error when parsing an empty json array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1595
diff changeset
662 } else {
2d2c4ec38133 fix unexpected token error when parsing an empty json array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1595
diff changeset
663 return_rec(CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN);
2d2c4ec38133 fix unexpected token error when parsing an empty json array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1595
diff changeset
664 }
2d2c4ec38133 fix unexpected token error when parsing an empty json array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1595
diff changeset
665 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
666 case CX_JSON_TOKEN_STRING: {
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
667 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
668 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
669 }
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
670 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
671 if (str.ptr == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
672 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
673 }
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
674 vbuf->string = str;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
675 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
676 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
677 case CX_JSON_TOKEN_INTEGER:
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
678 case CX_JSON_TOKEN_NUMBER: {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
679 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
680 if (NULL == (vbuf = json_create_value(json, type))) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
681 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
682 }
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
683 if (type == CX_JSON_INTEGER) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
684 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
685 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
686 }
0a7c1bb2372d avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents: 1057
diff changeset
687 } else {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
688 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
689 // 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
690 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
691 }
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
692 }
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
693 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
694 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
695 case CX_JSON_TOKEN_LITERAL: {
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
696 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
697 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
698 }
1582
32b82c424252 removes the CX_STR() macro and instead makes the cx_str() inlinable
Mike Becker <universe@uap-core.de>
parents: 1574
diff changeset
699 if (0 == cx_strcmp(token.content, "true")) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
700 vbuf->literal = CX_JSON_TRUE;
1582
32b82c424252 removes the CX_STR() macro and instead makes the cx_str() inlinable
Mike Becker <universe@uap-core.de>
parents: 1574
diff changeset
701 } else if (0 == cx_strcmp(token.content, "false")) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
702 vbuf->literal = CX_JSON_FALSE;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
703 } else {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
704 vbuf->literal = CX_JSON_NULL;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
705 }
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
706 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
707 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
708 default: {
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_FORMAT_ERROR_UNEXPECTED_TOKEN);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
710 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
711 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
712 } 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
713 // expect ',' or ']'
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
714 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
715 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
716 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
717 } 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
718 // discard the array from the value buffer
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
719 json->vbuf.size--;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
720 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
721 } else {
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
722 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
723 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
724 } 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
725 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
726 // discard the obj from the value buffer
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
727 json->vbuf.size--;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
728 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
729 } else {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
730 // expect string
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
731 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
732 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
733 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
734
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
735 // add new entry
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
736 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
737 if (name.ptr == NULL) {
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
738 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
739 }
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
740 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
741 json->uncompleted_member_name = name;
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
742 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
743
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
744 // next state
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
745 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
746 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
747 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
748 } else if (state == JP_STATE_OBJ_COLON) {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
749 // expect ':'
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
750 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
751 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
752 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
753 // next state
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
754 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
755 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
756 } 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
757 // expect ',' or '}'
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
758 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
759 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
760 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
761 } 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
762 // discard the obj from the value buffer
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
763 json->vbuf.size--;
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
764 return_rec(CX_JSON_NO_ERROR);
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
765 } else {
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
766 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
767 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
768 } else {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
769 // should be unreachable
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
770 assert(false);
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
771 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
772 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
773 }
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
774
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
775 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
776 // initialize output value
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
777 *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
778
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
779 // 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
780 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
781 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
782 }
0a7c1bb2372d avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents: 1057
diff changeset
783
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
784 // parse data
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
785 CxJsonStatus result;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
786 do {
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
787 result = json_parse(json);
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
788 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
789 // final state reached
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
790 assert(json->states.data[0] == JP_STATE_VALUE_END);
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
791 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
792
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
793 // write output value
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
794 *value = json->parsed;
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
795 json->parsed = NULL;
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
796
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
797 // re-initialize state machine
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
798 json->states.data[0] = JP_STATE_VALUE_BEGIN;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
799
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
800 return CX_JSON_NO_ERROR;
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
801 }
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
802 } 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
803
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
804 // 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
805 // 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
806 // we know that there must be more to come
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
807 if (result == CX_JSON_NO_DATA && json->states.size > 1) {
1002
1483c47063a8 add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents: 1000
diff changeset
808 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
809 }
1000
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
810
1aecddf7e209 simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents: 996
diff changeset
811 return result;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
812 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
813
1556
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
814 CxJsonStatus cx_json_from_string(const CxAllocator *allocator,
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
815 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
816 *value = &cx_json_value_nothing;
1556
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
817 CxJson parser;
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
818 cxJsonInit(&parser, allocator);
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
819 if (cxJsonFill(&parser, str)) {
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
820 // LCOV_EXCL_START
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
821 cxJsonDestroy(&parser);
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
822 return CX_JSON_BUFFER_ALLOC_FAILED;
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
823 // LCOV_EXCL_STOP
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
824 }
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
825 CxJsonStatus status = cxJsonNext(&parser, value);
1567
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
826 // check if we consume the total string
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
827 CxJsonValue *chk_value = NULL;
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
828 CxJsonStatus chk_status = CX_JSON_NO_DATA;
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
829 if (status == CX_JSON_NO_ERROR) {
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
830 chk_status = cxJsonNext(&parser, &chk_value);
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
831 }
1556
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
832 cxJsonDestroy(&parser);
1567
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
833 if (chk_status == CX_JSON_NO_DATA) {
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
834 return status;
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
835 } else {
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
836 cxJsonValueFree(*value);
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
837 // if chk_value is nothing, the free is harmless
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
838 cxJsonValueFree(chk_value);
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
839 *value = &cx_json_value_nothing;
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
840 return CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN;
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
841 }
f60f23b362e9 fix cxJsonFromString() ignoring unexpected trailing data + fix wrong handling of trailing whitespaces in general
Mike Becker <universe@uap-core.de>
parents: 1565
diff changeset
842
1556
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
843 }
afdaa70034f8 add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents: 1551
diff changeset
844
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
845 void cxJsonValueFree(CxJsonValue *value) {
1012
21884374edbb add documentation - resolves #431
Mike Becker <universe@uap-core.de>
parents: 1009
diff changeset
846 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
847 switch (value->type) {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
848 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
849 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
850 break;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
851 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
852 case CX_JSON_ARRAY: {
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
853 for (size_t i = 0; i < value->array.size; i++) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
854 cxJsonValueFree(value->array.data[i]);
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
855 }
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
856 cx_array_free_a(value->allocator, value->array);
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
857 break;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
858 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
859 case CX_JSON_STRING: {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
860 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
861 break;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
862 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
863 default: {
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
864 break;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
865 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
866 }
996
333155f234c4 add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 976
diff changeset
867 cxFree(value->allocator, value);
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
868 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
869
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
870 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
871 if (allocator == NULL) allocator = cxDefaultAllocator;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
872 CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue));
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
873 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
874 v->allocator = allocator;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
875 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
876 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
877 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
878 cxFree(allocator, v);
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
879 return NULL;
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
880 // LCOV_EXCL_STOP
46cdc8689fc4 implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents: 1079
diff changeset
881 }
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
882 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
883 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
884
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
885 CxJsonValue* cxJsonCreateArr(const CxAllocator* allocator, size_t capacity) {
1116
b381da3a9b19 fix JSON create value functions not actually accepting NULL as allocator arg
Mike Becker <universe@uap-core.de>
parents: 1083
diff changeset
886 if (allocator == NULL) allocator = cxDefaultAllocator;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
887 CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue));
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
888 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
889 v->allocator = allocator;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
890 v->type = CX_JSON_ARRAY;
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
891 if (capacity > 0) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
892 if (cx_array_init_a(allocator, v->array, capacity)) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
893 // LCOV_EXCL_START
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
894 cxFree(allocator, v);
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
895 return NULL;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
896 // LCOV_EXCL_STOP
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
897 }
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
898 } else {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
899 v->array.data = NULL;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
900 v->array.size = v->array.capacity = 0;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
901 }
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
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
905 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
906 if (allocator == NULL) allocator = cxDefaultAllocator;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
907 CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue));
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
908 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
909 v->allocator = allocator;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
910 v->type = CX_JSON_NUMBER;
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
911 v->number = num;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
912 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
913 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
914
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
915 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
916 if (allocator == NULL) allocator = cxDefaultAllocator;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
917 CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue));
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
918 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
919 v->allocator = allocator;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
920 v->type = CX_JSON_INTEGER;
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
921 v->integer = num;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
922 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
923 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
924
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
925 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
926 if (allocator == NULL) allocator = cxDefaultAllocator;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
927 CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue));
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
928 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
929 v->allocator = allocator;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
930 v->type = CX_JSON_STRING;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
931 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
932 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
933 v->string = s;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
934 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
935 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
936
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
937 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
938 if (allocator == NULL) allocator = cxDefaultAllocator;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
939 CxJsonValue* v = cxMalloc(allocator, sizeof(CxJsonValue));
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
940 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
941 v->allocator = allocator;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
942 v->type = CX_JSON_LITERAL;
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
943 v->literal = lit;
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
944 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
945 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
946
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
947 // LCOV_EXCL_START
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
948 // 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
949 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
950 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
951 if (values[i] == NULL) break;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
952 cxJsonValueFree(values[i]);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
953 }
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
954 cxFreeDefault(values);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
955 }
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1060
diff changeset
956 // LCOV_EXCL_STOP
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
957
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
958 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
959 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
960 if (values == NULL) return -1;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
961 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
962 values[i] = cxJsonCreateNumber(arr->allocator, num[i]);
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
963 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
964 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
965 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
966 cxFreeDefault(values);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
967 return ret;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
968 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
969
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
970 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
971 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
972 if (values == NULL) return -1;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
973 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
974 values[i] = cxJsonCreateInteger(arr->allocator, num[i]);
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
975 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
976 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
977 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
978 cxFreeDefault(values);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
979 return ret;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
980 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
981
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
982 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
983 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
984 if (values == NULL) return -1;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
985 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
986 values[i] = cxJsonCreateString(arr->allocator, str[i]);
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
987 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
988 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
989 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
990 cxFreeDefault(values);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
991 return ret;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
992 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
993
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
994 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
995 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
996 if (values == NULL) return -1;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
997 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
998 values[i] = cxJsonCreateString(arr->allocator, str[i]);
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
999 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
1000 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1001 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
1002 cxFreeDefault(values);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1003 return ret;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1004 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1005
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1006 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
1007 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
1008 if (values == NULL) return -1;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1009 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
1010 values[i] = cxJsonCreateLiteral(arr->allocator, lit[i]);
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1011 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
1012 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1013 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
1014 cxFreeDefault(values);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1015 return ret;
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
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1018 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
1019 assert(arr->type == CX_JSON_ARRAY);
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
1020 return cx_array_add_array_a(arr->allocator, arr->array, val, count);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1021 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1022
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1023 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
1024 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
1025 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1026
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1027 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
1028 CxJsonValue* v = cxJsonCreateObj(obj->allocator);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1029 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1030 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
1031 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1032 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1033
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
1034 CxJsonValue* cx_json_obj_put_arr(CxJsonValue* obj, cxstring name, size_t capacity) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
1035 CxJsonValue* v = cxJsonCreateArr(obj->allocator, capacity);
1054
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1036 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1037 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
1038 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1039 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1040
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1041 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
1042 CxJsonValue* v = cxJsonCreateNumber(obj->allocator, num);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1043 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1044 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
1045 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1046 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1047
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1048 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
1049 CxJsonValue* v = cxJsonCreateInteger(obj->allocator, num);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1050 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1051 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
1052 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1053 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1054
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1055 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
1056 CxJsonValue* v = cxJsonCreateString(obj->allocator, str);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1057 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1058 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
1059 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1060 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1061
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1062 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
1063 CxJsonValue* v = cxJsonCreateLiteral(obj->allocator, lit);
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1064 if (v == NULL) return NULL;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1065 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
1066 return v;
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1067 }
fb1076ead56f add implementation for creating new json values
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
1068
1009
7650e722437e minor cleanup
Mike Becker <universe@uap-core.de>
parents: 1008
diff changeset
1069 CxJsonValue *cxJsonArrGet(const CxJsonValue *value, size_t index) {
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
1070 if (index >= value->array.size) {
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1071 return &cx_json_value_nothing;
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1072 }
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
1073 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
1074 }
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1075
1337
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1076 CxJsonValue *cxJsonArrRemove(CxJsonValue *value, size_t index) {
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
1077 if (index >= value->array.size) {
1337
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1078 return NULL;
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1079 }
1551
f3ba964dc8d5 improve member names of CxJsonArray
Mike Becker <universe@uap-core.de>
parents: 1548
diff changeset
1080 CxJsonValue *ret = value->array.data[index];
1626
a2565f9fc6de add cx_array_remove() and cx_array_remove_fast()
Mike Becker <universe@uap-core.de>
parents: 1625
diff changeset
1081 cx_array_remove(value->array, index);
1337
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1082 return ret;
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1083 }
6dfa1eb58ce3 add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
1084
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
1085 char *cxJsonAsString(const CxJsonValue *value) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1086 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
1087 }
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
1088
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
1089 cxstring cxJsonAsCxString(const CxJsonValue *value) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1090 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
1091 }
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
1092
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
1093 cxmutstr cxJsonAsCxMutStr(const CxJsonValue *value) {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1094 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
1095 }
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
1096
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
1097 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
1098 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
1099 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
1100 } else {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1101 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
1102 }
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
1103 }
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
1104
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
1105 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
1106 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
1107 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
1108 } else {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1109 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
1110 }
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
1111 }
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
1112
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1113 CxIterator cxJsonArrIter(const CxJsonValue *value) {
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
1114 return cx_array_iterator_ptr(value->array);
1033
e3009345984b add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents: 1022
diff changeset
1115 }
e3009345984b add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents: 1022
diff changeset
1116
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1117 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
1118 return cxMapIterator(value->object);
1033
e3009345984b add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents: 1022
diff changeset
1119 }
e3009345984b add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents: 1022
diff changeset
1120
1417
b97faf8b7ab7 replace all remaining generics with cx_strcast() - resolves #700
Mike Becker <universe@uap-core.de>
parents: 1415
diff changeset
1121 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
1122 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
1123 if (v == NULL) {
1067
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
1124 return &cx_json_value_nothing;
7799addf475f optimize cxJsonObjGet() part 1 - binary search
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
1125 } else {
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1126 return v;
1338
cc153bffea28 add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents: 1337
diff changeset
1127 }
cc153bffea28 add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents: 1337
diff changeset
1128 }
cc153bffea28 add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents: 1337
diff changeset
1129
1417
b97faf8b7ab7 replace all remaining generics with cx_strcast() - resolves #700
Mike Becker <universe@uap-core.de>
parents: 1415
diff changeset
1130 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
1131 CxJsonValue *v = NULL;
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1132 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
1133 return v;
937
10123f4d5618 add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1134 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1135
1077
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1136 CxJsonWriter cxJsonWriterCompact(void) {
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1137 return (CxJsonWriter) {
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1138 false,
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1139 6,
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1140 false,
1123
2b83302d595a make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents: 1122
diff changeset
1141 4,
2b83302d595a make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents: 1122
diff changeset
1142 false
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1143 };
1077
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1144 }
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1145
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1146 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
1147 return (CxJsonWriter) {
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1148 true,
1117
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1149 6,
1077
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1150 use_spaces,
1123
2b83302d595a make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents: 1122
diff changeset
1151 4,
2b83302d595a make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents: 1122
diff changeset
1152 false
1077
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1153 };
911a154dd469 add functions to create default JSON writers - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1075
diff changeset
1154 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1155
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1156 static int cx_json_writer_indent(
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1157 void *target,
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1158 cx_write_func wfunc,
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1159 const CxJsonWriter *settings,
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1160 unsigned int depth
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1161 ) {
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1162 if (depth == 0) return 0;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1163
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1164 // 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
1165 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
1166 size_t width = depth;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1167 if (settings->indent_space) {
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1168 if (settings->indent == 0) return 0;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1169 width *= settings->indent;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1170 indent = " ";
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1171 } else {
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1172 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
1173 }
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1174
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1175 // 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
1176 size_t full = width / 32;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1177 size_t remaining = width % 32;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1178 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
1179 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
1180 }
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1181 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
1182
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1183 return 0;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1184 }
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1185
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1186
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1187 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
1188 void *target,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1189 const CxJsonValue *value,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1190 cx_write_func wfunc,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1191 const CxJsonWriter *settings,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1192 unsigned int depth
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1193 ) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1194 // keep track of written items
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1195 // 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
1196 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
1197
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1198 // 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
1199 char numbuf[40];
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1200
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1201 // recursively write the values
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1202 switch (value->type) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1203 case CX_JSON_OBJECT: {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1204 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
1205 if (settings->pretty) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1206 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
1207 expected += 2;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1208 } else {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1209 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
1210 expected++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1211 }
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1212 depth++;
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1213 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
1214 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
1215 // possible indentation
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1216 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
1217 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
1218 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
1219 }
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1220 }
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1221
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1222 // the name
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1223 actual += wfunc("\"", 1, 1, target);
1653
6a842bd49fea adds cx_hash_key_as_string()
Mike Becker <universe@uap-core.de>
parents: 1626
diff changeset
1224 cxstring key = cx_hash_key_as_string(member->key);
1547
12da0654e4a9 replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents: 1543
diff changeset
1225 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
1226 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
1227 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
1228 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
1229 if (settings->pretty) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1230 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
1231 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
1232 } else {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1233 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
1234 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
1235 }
12315ee158ad fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents: 1547
diff changeset
1236 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
1237 cx_strfree(&name);
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1238 }
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 // the value
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1241 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
1242
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1243 // 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
1244 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
1245 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
1246 if (settings->pretty) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1247 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
1248 expected += 2;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1249 } else {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1250 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
1251 expected++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1252 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1253 } else {
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("\n", 1, 1, target);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1256 expected ++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1257 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1258 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1259 }
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1260 depth--;
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1261 if (settings->pretty) {
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1262 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
1263 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1264 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
1265 expected++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1266 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1267 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1268 case CX_JSON_ARRAY: {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1269 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
1270 expected++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1271 CxIterator iter = cxJsonArrIter(value);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1272 cx_foreach(CxJsonValue*, element, iter) {
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1273 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
1274 target, element,
1078
ffa8bb4e9288 implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1077
diff changeset
1275 wfunc, settings, depth)
1513
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1276 ) {
4d641c6a2f82 implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
1277 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
1278 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1279
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1280 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
1281 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
1282 if (settings->pretty) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1283 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
1284 expected += 2;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1285 } else {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1286 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
1287 expected++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1288 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1289 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1290 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1291 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
1292 expected++;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1293 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1294 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1295 case CX_JSON_STRING: {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1296 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
1297 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
1298 settings->escape_slash);
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
1299 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
1300 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
1301 expected += 2 + str.length;
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1302 if (str.ptr != value->string.ptr) {
1119
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
1303 cx_strfree(&str);
ff4d7e76f85a implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents: 1117
diff changeset
1304 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1305 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1306 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1307 case CX_JSON_NUMBER: {
1117
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1308 int precision = settings->frac_max_digits;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1309 // 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
1310 // double the precision and truncate ourselves
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1311 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
1312 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
1313 char *dot, *exp;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1314 unsigned char max_digits;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1315 // 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
1316 dot = strchr(numbuf, '.');
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1317 if (dot == NULL) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1318 dot = strchr(numbuf, ',');
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1319 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1320 if (dot == NULL) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1321 // no decimal separator found
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1322 // output everything until a possible exponent
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1323 max_digits = 30;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1324 dot = numbuf;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1325 } else {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1326 // found a decimal separator
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1327 // output everything until the separator
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1328 // 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
1329 size_t len = dot - numbuf;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1330 actual += wfunc(numbuf, 1, len, target);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1331 expected += len;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1332 max_digits = settings->frac_max_digits;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1333 if (max_digits > 15) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1334 max_digits = 15;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1335 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1336 // locale independent separator
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1337 if (max_digits > 0) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1338 actual += wfunc(".", 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 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1341 dot++;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1342 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1343 // find the exponent
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1344 exp = strchr(dot, 'e');
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1345 if (exp == NULL) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1346 // no exponent - output the rest
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1347 if (max_digits > 0) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1348 size_t len = strlen(dot);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1349 if (len > max_digits) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1350 len = max_digits;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1351 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1352 actual += wfunc(dot, 1, len, target);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1353 expected += len;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1354 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1355 } else {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1356 // exponent found - truncate the frac digits
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1357 // and then output the rest
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1358 if (max_digits > 0) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1359 size_t len = exp - dot - 1;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1360 if (len > max_digits) {
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1361 len = max_digits;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1362 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1363 actual += wfunc(dot, 1, len, target);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1364 expected += len;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1365 }
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1366 actual += wfunc("e", 1, 1, target);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1367 expected++;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1368 exp++;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1369 size_t len = strlen(exp);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1370 actual += wfunc(exp, 1, len, target);
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1371 expected += len;
54df904472b0 add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1116
diff changeset
1372 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1373 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1374 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1375 case CX_JSON_INTEGER: {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1376 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
1377 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
1378 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
1379 expected += len;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1380 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1381 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1382 case CX_JSON_LITERAL: {
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1383 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
1384 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
1385 expected += 4;
1543
7b66371d6da3 use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents: 1513
diff changeset
1386 } 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
1387 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
1388 expected += 5;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1389 } else {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1390 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
1391 expected += 4;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1392 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1393 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1394 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1395 case CX_JSON_NOTHING: {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1396 // 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
1397 // 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
1398 // 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
1399 // 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
1400 break;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1401 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1402 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
1403 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1404
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1405 return expected != actual;
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1406 }
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1407
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1408 int cxJsonWrite(
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1409 void *target,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1410 const CxJsonValue *value,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1411 cx_write_func wfunc,
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1412 const CxJsonWriter *settings
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1413 ) {
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1414 assert(target != NULL);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1415 assert(value != NULL);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1416 assert(wfunc != NULL);
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1417
1121
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1418 CxJsonWriter writer_default = cxJsonWriterCompact();
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1419 if (settings == NULL) {
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1420 settings = &writer_default;
7fd2672199d7 minor cleanup of json.c
Mike Becker <universe@uap-core.de>
parents: 1119
diff changeset
1421 }
1072
c89283cd559b first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents: 1067
diff changeset
1422 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
1423 }
1573
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1424
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1425 static cxmutstr cx_json_to_string(CxJsonValue *value, const CxAllocator *allocator, CxJsonWriter *writer) {
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1426 if (allocator == NULL) allocator = cxDefaultAllocator;
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1427 CxBuffer buffer;
1601
e47078681a6f change signature of cxBufferInit() and cxBufferCreate()
Mike Becker <universe@uap-core.de>
parents: 1600
diff changeset
1428 if (cxBufferInit(&buffer, allocator, NULL, 128,
e47078681a6f change signature of cxBufferInit() and cxBufferCreate()
Mike Becker <universe@uap-core.de>
parents: 1600
diff changeset
1429 CX_BUFFER_AUTO_EXTEND | CX_BUFFER_DO_NOT_FREE)) {
1672
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
1430 return CX_NULLSTR;
1573
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1431 }
1574
cfbf4a3a9c11 fix missing error handling when terminating the string
Mike Becker <universe@uap-core.de>
parents: 1573
diff changeset
1432 if (cx_json_write_rec(&buffer, value, cxBufferWriteFunc, writer, 0)
cfbf4a3a9c11 fix missing error handling when terminating the string
Mike Becker <universe@uap-core.de>
parents: 1573
diff changeset
1433 || cxBufferTerminate(&buffer)) {
1573
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1434 // LCOV_EXCL_START
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1435 buffer.flags &= ~CX_BUFFER_DO_NOT_FREE;
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1436 cxBufferDestroy(&buffer);
1672
94360453bce4 partially revert the changes to cx_strcat() and add CX_NULLSTR macro
Mike Becker <universe@uap-core.de>
parents: 1668
diff changeset
1437 return CX_NULLSTR;
1573
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1438 // LCOV_EXCL_STOP
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1439 } else {
1654
5ab3fe0b7859 adds cx_bstr() and cx_bstr_m()
Mike Becker <universe@uap-core.de>
parents: 1653
diff changeset
1440 cxmutstr str = cx_bstr_m(&buffer);
1573
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1441 cxBufferDestroy(&buffer);
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1442 return str;
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1443 }
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1444
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1445 }
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1446
1602
7329821fd768 change signatures of cxJsonToString() and cxJsonToPrettyString()
Mike Becker <universe@uap-core.de>
parents: 1601
diff changeset
1447 cxmutstr cxJsonToString(const CxAllocator *allocator, CxJsonValue *value) {
1573
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1448 CxJsonWriter writer = cxJsonWriterCompact();
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1449 return cx_json_to_string(value, allocator, &writer);
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1450 }
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1451
1602
7329821fd768 change signatures of cxJsonToString() and cxJsonToPrettyString()
Mike Becker <universe@uap-core.de>
parents: 1601
diff changeset
1452 cxmutstr cxJsonToPrettyString(const CxAllocator *allocator, CxJsonValue *value) {
1573
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1453 CxJsonWriter writer = cxJsonWriterPretty(true);
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1454 return cx_json_to_string(value, allocator, &writer);
cd2e974410ad add cxJsonToString() and cxJsonToPrettyString() - resolves #778
Mike Becker <universe@uap-core.de>
parents: 1567
diff changeset
1455 }
1583
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1456
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1457 int cxJsonCompare(const CxJsonValue *json, const CxJsonValue *other) {
1592
c1e17411004f optimize cxJsonCompare in case both value pointers are identical
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1591
diff changeset
1458 if (json == other) return 0;
1583
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1459 if (json == NULL || other == NULL) return -1;
1584
7a14af59d356 fix that cxJsonCompare() could not compare integers with numbers
Mike Becker <universe@uap-core.de>
parents: 1583
diff changeset
1460 if (json->type != other->type) {
7a14af59d356 fix that cxJsonCompare() could not compare integers with numbers
Mike Becker <universe@uap-core.de>
parents: 1583
diff changeset
1461 if (!cxJsonIsNumber(json)) return -1;
7a14af59d356 fix that cxJsonCompare() could not compare integers with numbers
Mike Becker <universe@uap-core.de>
parents: 1583
diff changeset
1462 if (!cxJsonIsNumber(other)) return -1;
7a14af59d356 fix that cxJsonCompare() could not compare integers with numbers
Mike Becker <universe@uap-core.de>
parents: 1583
diff changeset
1463 }
1583
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1464 switch (json->type) {
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1465 case CX_JSON_NOTHING:
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1466 return 0;
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1467 case CX_JSON_OBJECT:
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1468 return cxMapCompare(json->object, other->object);
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1469 case CX_JSON_ARRAY:
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
1470 if (json->array.size != other->array.size) return -1;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
1471 for (size_t i = 0; i < json->array.size; i++) {
1583
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1472 const int d = cxJsonCompare(json->array.data[i], other->array.data[i]);
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1473 if (d != 0) return d;
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1474 }
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1475 return 0;
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1476 case CX_JSON_STRING:
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1477 return cx_strcmp(json->string, other->string);
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1478 case CX_JSON_INTEGER:
1585
8ccfbc00f690 fix that cxJsonCompare() is not symmetric when comparing integer with double
Mike Becker <universe@uap-core.de>
parents: 1584
diff changeset
1479 if (other->type == CX_JSON_INTEGER) {
8ccfbc00f690 fix that cxJsonCompare() is not symmetric when comparing integer with double
Mike Becker <universe@uap-core.de>
parents: 1584
diff changeset
1480 return cx_vcmp_int64(json->integer, other->integer);
8ccfbc00f690 fix that cxJsonCompare() is not symmetric when comparing integer with double
Mike Becker <universe@uap-core.de>
parents: 1584
diff changeset
1481 } else {
8ccfbc00f690 fix that cxJsonCompare() is not symmetric when comparing integer with double
Mike Becker <universe@uap-core.de>
parents: 1584
diff changeset
1482 return cx_vcmp_double(cxJsonAsDouble(json), other->number);
8ccfbc00f690 fix that cxJsonCompare() is not symmetric when comparing integer with double
Mike Becker <universe@uap-core.de>
parents: 1584
diff changeset
1483 }
1583
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1484 case CX_JSON_NUMBER:
1584
7a14af59d356 fix that cxJsonCompare() could not compare integers with numbers
Mike Becker <universe@uap-core.de>
parents: 1583
diff changeset
1485 return cx_vcmp_double(json->number, cxJsonAsDouble(other));
1583
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1486 case CX_JSON_LITERAL:
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1487 return json->literal == other->literal ? 0 : -1;
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1488 default:
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1489 // LCOV_EXCL_START
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1490 // unreachable
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1491 assert(false);
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1492 return -1;
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1493 // LCOV_EXCL_STOP
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1494 }
97fc8c55aeea add cxJsonCompare()
Mike Becker <universe@uap-core.de>
parents: 1582
diff changeset
1495 }
1594
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1496
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1497 CxJsonValue* cxJsonClone(const CxJsonValue* value, const CxAllocator* allocator) {
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1498 return cx_json_clone_func(NULL, value, allocator, NULL);
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1499 }
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1500
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1501 CxJsonValue* cx_json_clone_func(CxJsonValue* target, const CxJsonValue* source,
1675
36c0fb2b60b2 overhaul all attributes
Mike Becker <universe@uap-core.de>
parents: 1672
diff changeset
1502 const CxAllocator* allocator, CX_UNUSED void *data) {
1594
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1503 if (source == NULL || source->type == CX_JSON_NOTHING) {
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1504 return &cx_json_value_nothing;
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1505 }
1600
a1a728d7ebfd fix regression in cx_kvl_map_put() - after recent refactoring it returned the wrong value
Mike Becker <universe@uap-core.de>
parents: 1596
diff changeset
1506 if (allocator == NULL) allocator = cxDefaultAllocator;
1594
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1507
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1508 #define return_value(v) { \
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1509 CxJsonValue *ret = v; \
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1510 if (target == NULL) { \
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1511 return ret; \
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1512 } else { \
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1513 *target = *ret; \
1675
36c0fb2b60b2 overhaul all attributes
Mike Becker <universe@uap-core.de>
parents: 1672
diff changeset
1514 ret->type = CX_JSON_UNINITIALIZED; \
36c0fb2b60b2 overhaul all attributes
Mike Becker <universe@uap-core.de>
parents: 1672
diff changeset
1515 cxJsonValueFree(ret); \
1594
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1516 return target; \
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1517 } \
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1518 }
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1519
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1520 switch (source->type) {
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1521 case CX_JSON_OBJECT: {
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1522 CxJsonValue *obj = cxJsonCreateObj(allocator);
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1523 if (obj == NULL) return NULL; // LCOV_EXCL_LINE
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1524 if (cxMapClone(obj->object, source->object, cxJsonCloneFunc, allocator, NULL)) {
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1525 // LCOV_EXCL_START
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1526 cxJsonValueFree(obj);
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1527 return NULL;
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1528 // LCOV_EXCL_STOP
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1529 }
1600
a1a728d7ebfd fix regression in cx_kvl_map_put() - after recent refactoring it returned the wrong value
Mike Becker <universe@uap-core.de>
parents: 1596
diff changeset
1530 return_value(obj);
1594
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1531 }
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1532 case CX_JSON_ARRAY: {
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
1533 const size_t elem_count = source->array.size;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
1534 CxJsonValue *arr = cxJsonCreateArr(allocator, elem_count);
1594
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1535 if (arr == NULL) return NULL; // LCOV_EXCL_LINE
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
1536 arr->array.size = elem_count;
1594
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1537 for (size_t i = 0 ; i < elem_count ; i++) {
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1538 CxJsonValue *e = cx_json_clone_func(NULL, source->array.data[i], allocator, NULL);
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1539 if (e == NULL) {
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1540 // LCOV_EXCL_START
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1541 cxJsonValueFree(arr);
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1542 return NULL;
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1543 // LCOV_EXCL_STOP
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1544 }
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1545 arr->array.data[i] = e;
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1546 }
1600
a1a728d7ebfd fix regression in cx_kvl_map_put() - after recent refactoring it returned the wrong value
Mike Becker <universe@uap-core.de>
parents: 1596
diff changeset
1547 return_value(arr);
1594
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1548 }
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1549 case CX_JSON_STRING:
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1550 return_value(cxJsonCreateString(allocator, source->string));
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1551 case CX_JSON_INTEGER:
1595
2e0353a9bc30 add json clone tests, obj tests still dysfunctional - relates to #785
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1594
diff changeset
1552 return_value(cxJsonCreateInteger(allocator, source->integer));
1594
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1553 case CX_JSON_NUMBER:
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1554 return_value(cxJsonCreateNumber(allocator, source->number));
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1555 case CX_JSON_LITERAL:
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1556 return_value(cxJsonCreateLiteral(allocator, source->literal));
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1557 default:
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1558 // LCOV_EXCL_START
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1559 // unreachable
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1560 assert(false);
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1561 return NULL;
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1562 // LCOV_EXCL_STOP
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1563 }
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1564 #undef return_value
4b9537f93239 add cxJsonClone - resolves #785 except for the tests
Mike Becker <universe@uap-core.de>
parents: 1592
diff changeset
1565 }

mercurial