Repository navigation
Commit 7441d8d
Allow a custom "__type" name in the JsonExporter lambda converters (#1255)
The addConverter() overloads that take a user lambda always wrote and
registered BT::demangle(typeid(T)) as the JSON "__type", e.g.
"geometry_msgs::msg::Pose_<std::allocator<void> >". addConverter<T>() and
BT_JSON_CONVERTER already let the user choose the name, but the lambda
overloads did not, so such JSON was verbose, compiler-specific, and could
not use language-neutral type names.
Add an optional trailing type_name parameter (empty keeps the demangled
name). The to_json overload writes it in "__type", the from_json overload
registers it in the type-name lookup used by fromJson(), in addition to
the demangled name, so existing JSON keeps working.
A to_json overload taking only (lambda, const char*) forwards with
add_type = true; without it, addConverter<T>(f, "Name") would silently
convert the string literal to bool add_type.
Fixes #877
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>1 parent a72d63a commit 7441d8d
2 files changed
Lines changed: 83 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
| 115 | + | |
| 116 | + | |
115 | 117 | | |
116 | 118 | | |
117 | 119 | | |
118 | | - | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
119 | 130 | | |
120 | 131 | | |
121 | 132 | | |
122 | 133 | | |
123 | 134 | | |
124 | 135 | | |
| 136 | + | |
| 137 | + | |
125 | 138 | | |
126 | 139 | | |
127 | | - | |
| 140 | + | |
| 141 | + | |
128 | 142 | | |
129 | 143 | | |
130 | 144 | | |
| |||
196 | 210 | | |
197 | 211 | | |
198 | 212 | | |
199 | | - | |
200 | | - | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
201 | 216 | | |
202 | | - | |
| 217 | + | |
| 218 | + | |
203 | 219 | | |
204 | 220 | | |
205 | 221 | | |
206 | | - | |
| 222 | + | |
207 | 223 | | |
208 | 224 | | |
209 | 225 | | |
| |||
222 | 238 | | |
223 | 239 | | |
224 | 240 | | |
225 | | - | |
226 | | - | |
| 241 | + | |
| 242 | + | |
227 | 243 | | |
228 | 244 | | |
229 | 245 | | |
230 | 246 | | |
231 | 247 | | |
232 | 248 | | |
233 | 249 | | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
234 | 254 | | |
235 | 255 | | |
236 | 256 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
51 | 56 | | |
52 | 57 | | |
53 | 58 | | |
| |||
82 | 87 | | |
83 | 88 | | |
84 | 89 | | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
85 | 100 | | |
86 | 101 | | |
87 | 102 | | |
| |||
177 | 192 | | |
178 | 193 | | |
179 | 194 | | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
180 | 235 | | |
181 | 236 | | |
182 | 237 | | |
| |||
0 commit comments