Mercurial > code

annotate C++/modules/Json/Json.cpp @ 478:c7825b8c6145

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Json: - Finalize iterators, - Add more tests, - Add more asserts.
author David Demelier <markand@malikania.fr>
date Tue, 10 Nov 2015 14:11:14 +0100
parents b681299e6987
children 3ee3f3e53ee3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
244
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 /*
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
2 * Json.cpp -- C++14 JSON manipulation using jansson parser
244
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 *
403
d5ec1174b707 Massive cleanup
David Demelier <markand@malikania.fr>
parents: 334
diff changeset
4 * Copyright (c) 2013-2015 David Demelier <markand@malikania.fr>
244
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 *
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 * Permission to use, copy, modify, and/or distribute this software for any
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 * purpose with or without fee is hereby granted, provided that the above
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 * copyright notice and this permission notice appear in all copies.
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 *
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 */
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
18
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
19 #include "Json.h"
314
4c3019385769 Json: add iterators
David Demelier <markand@malikania.fr>
parents: 312
diff changeset
20
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
21 #include <jansson.h>
244
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
22
404
9ab878fb9fa2 Json: bring classes into json namespace
David Demelier <markand@malikania.fr>
parents: 403
diff changeset
23 namespace json {
9ab878fb9fa2 Json: bring classes into json namespace
David Demelier <markand@malikania.fr>
parents: 403
diff changeset
24
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
25 namespace {
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
26
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
27 void readObject(Value &parent, json_t *object);
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
28 void readArray(Value &parent, json_t *array);
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
29
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
30 Value readValue(json_t *v)
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
31 {
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
32 if (json_is_null(v)) {
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
33 return Value{nullptr};
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
34 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
35 if (json_is_string(v)) {
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
36 return Value{json_string_value(v)};
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
37 }
406
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
38 if (json_is_real(v)) {
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
39 return Value{json_number_value(v)};
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
40 }
406
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
41 if (json_is_integer(v)) {
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
42 return Value{static_cast<int>(json_integer_value(v))};
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
43 }
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
44 if (json_is_boolean(v)) {
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
45 return Value{json_boolean_value(v)};
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
46 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
47 if (json_is_object(v)) {
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
48 Value object{Type::Object};
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
49
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
50 readObject(object, v);
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
51
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
52 return object;
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
53 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
54 if (json_is_array(v)) {
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
55 Value array{Type::Array};
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
56
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
57 readArray(array, v);
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
58
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
59 return array;
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
60 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
61
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
62 return Value{};
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
63 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
64
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
65 void readObject(Value &parent, json_t *object)
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
66 {
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
67 const char *key;
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
68 json_t *value;
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
69
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
70 json_object_foreach(object, key, value) {
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
71 parent.insert(key, readValue(value));
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
72 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
73 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
74
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
75 void readArray(Value &parent, json_t *array)
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
76 {
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
77 size_t index;
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
78 json_t *value;
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
79
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
80 json_array_foreach(array, index, value) {
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
81 parent.append(readValue(value));
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
82 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
83 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
84
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
85 template <typename Func, typename... Args>
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
86 Value convert(Func fn, Args&&... args)
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
87 {
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
88 json_error_t error;
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
89 json_t *json = fn(std::forward<Args>(args)..., &error);
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
90
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
91 if (json == nullptr) {
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
92 throw Error{error.text, error.source, error.line, error.column, error.position};
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
93 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
94
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
95 Value value;
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
96
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
97 if (json_is_object(json)) {
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
98 value = Value{Type::Object};
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
99 readObject(value, json);
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
100 } else {
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
101 value = Value{Type::Array};
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
102 readArray(value, json);
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
103 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
104
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
105 json_decref(json);
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
106
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
107 return value;
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
108 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
109
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
110 } // !namespace
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
111
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
112 void Value::copy(const Value &other)
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
113 {
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
114 switch (other.m_type) {
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
115 case Type::Array:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
116 new (&m_array) std::deque<Value>(other.m_array);
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
117 break;
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
118 case Type::Boolean:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
119 m_boolean = other.m_boolean;
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
120 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
121 case Type::Int:
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
122 m_integer = other.m_integer;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
123 break;
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
124 case Type::Object:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
125 new (&m_object) std::map<std::string, Value>(other.m_object);
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
126 break;
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
127 case Type::Real:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
128 m_number = other.m_number;
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
129 break;
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
130 case Type::String:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
131 new (&m_string) std::string(other.m_string);
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
132 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
133 default:
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
134 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
135 }
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
136
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
137 m_type = other.m_type;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
138 }
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
139
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
140 void Value::move(Value &&other)
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
141 {
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
142 switch (other.m_type) {
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
143 case Type::Array:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
144 new (&m_array) std::deque<Value>(std::move(other.m_array));
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
145 break;
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
146 case Type::Boolean:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
147 m_boolean = other.m_boolean;
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
148 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
149 case Type::Int:
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
150 m_integer = other.m_integer;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
151 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
152 case Type::Object:
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
153 new (&m_object) std::map<std::string, Value>(std::move(other.m_object));
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
154 break;
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
155 case Type::Real:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
156 m_number = other.m_number;
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
157 break;
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
158 case Type::String:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
159 new (&m_string) std::string(std::move(other.m_string));
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
160 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
161 default:
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
162 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
163 }
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
164
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
165 m_type = other.m_type;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
166 }
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
167
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
168 Value::Value(Type type)
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
169 : m_type{type}
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
170 {
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
171 switch (m_type) {
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
172 case Type::Array:
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
173 new (&m_array) std::deque<Value>();
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
174 break;
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
175 case Type::Boolean:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
176 m_boolean = false;
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
177 break;
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
178 case Type::Int:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
179 m_integer = 0;
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
180 break;
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
181 case Type::Object:
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
182 new (&m_object) std::map<std::string, Value>();
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
183 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
184 case Type::Real:
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
185 m_number = 0;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
186 break;
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
187 case Type::String:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
188 new (&m_string) std::string();
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
189 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
190 default:
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
191 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
192 }
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
193 }
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
194
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
195 Value::~Value()
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
196 {
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
197 switch (m_type) {
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
198 case Type::Array:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
199 m_array.~deque<Value>();
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
200 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
201 case Type::Object:
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
202 m_object.~map<std::string, Value>();
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
203 break;
478
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
204 case Type::String:
David Demelier <markand@malikania.fr>
parents: 475
diff changeset
205 m_string.~basic_string();
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
206 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
207 default:
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
208 break;
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
209 }
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
210 }
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
211
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
212 bool Value::toBool() const noexcept
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
213 {
406
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
214 if (m_type != Type::Boolean) {
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
215 return false;
406
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
216 }
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
217
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
218 return m_boolean;
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
219 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
220
406
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
221 double Value::toReal() const noexcept
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
222 {
406
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
223 if (m_type != Type::Real) {
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
224 return 0;
406
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
225 }
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
226
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
227 return m_number;
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
228 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
229
406
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
230 int Value::toInt() const noexcept
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
231 {
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
232 if (m_type != Type::Int) {
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
233 return 0;
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
234 }
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
235
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
236 return m_integer;
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
237 }
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
238
405
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
239 std::string Value::toString() const noexcept
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
240 {
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
241 if (m_type != Type::String) {
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
242 return "";
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
243 }
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
244
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
245 return m_string;
David Demelier <markand@malikania.fr>
parents: 404
diff changeset
246 }
244
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
247
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
248 Value::Value(const Buffer &buffer)
244
777bc3cb665a Add Json, a jansson wrapper
David Demelier <markand@malikania.fr>
parents:
diff changeset
249 {
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
250 *this = convert(json_loads, buffer.text.c_str(), 0);
311
David Demelier <markand@malikania.fr>
parents: 244
diff changeset
251 }
David Demelier <markand@malikania.fr>
parents: 244
diff changeset
252
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
253 Value::Value(const File &file)
311
David Demelier <markand@malikania.fr>
parents: 244
diff changeset
254 {
475
b681299e6987 Json: removal of json::Object, json::Array, json::Document
David Demelier <markand@malikania.fr>
parents: 451
diff changeset
255 *this = convert(json_load_file, file.path.c_str(), 0);
404
9ab878fb9fa2 Json: bring classes into json namespace
David Demelier <markand@malikania.fr>
parents: 403
diff changeset
256 }
9ab878fb9fa2 Json: bring classes into json namespace
David Demelier <markand@malikania.fr>
parents: 403
diff changeset
257
451
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
258 std::string escape(const std::string &value)
445
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
259 {
451
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
260 std::string result;
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
261
445
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
262 for (auto it = value.begin(); it != value.end(); ++it) {
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
263 switch (*it) {
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
264 case '\\':
451
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
265 result += "\\\\";
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
266 break;
445
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
267 case '/':
451
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
268 result += "\\/";
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
269 break;
445
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
270 case '"':
451
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
271 result += "\\\"";
445
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
272 break;
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
273 case '\b':
451
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
274 result += "\\b";
445
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
275 break;
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
276 case '\f':
451
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
277 result += "\\f";
445
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
278 break;
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
279 case '\n':
451
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
280 result += "\\n";
445
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
281 break;
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
282 case '\r':
451
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
283 result += "\\r";
445
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
284 break;
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
285 case '\t':
451
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
286 result += "\\t";
445
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
287 break;
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
288 default:
451
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
289 result += *it;
445
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
290 break;
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
291 }
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
292 }
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
293
451
902b034df6e3 Json: escape string construct a new string
David Demelier <markand@malikania.fr>
parents: 445
diff changeset
294 return result;
445
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
295 }
f5e62f6c1475 Json: add escape free function
David Demelier <markand@malikania.fr>
parents: 406
diff changeset
296
406
David Demelier <markand@malikania.fr>
parents: 405
diff changeset
297 } // !json