ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/JSON-XS/XS.xs
(Generate patch)

Comparing JSON-XS/XS.xs (file contents):
Revision 1.2 by root, Thu Mar 22 17:28:50 2007 UTC vs.
Revision 1.23 by root, Tue Apr 3 23:34:17 2007 UTC

… …
4 4
5#include "assert.h" 5#include "assert.h"
6#include "string.h" 6#include "string.h"
7#include "stdlib.h" 7#include "stdlib.h"
8 8
9#define F_ASCII 0x00000001 9#define F_ASCII 0x00000001UL
10#define F_UTF8 0x00000002 10#define F_UTF8 0x00000002UL
11#define F_INDENT 0x00000004 11#define F_INDENT 0x00000004UL
12#define F_CANONICAL 0x00000008 12#define F_CANONICAL 0x00000008UL
13#define F_SPACE_BEFORE 0x00000010 13#define F_SPACE_BEFORE 0x00000010UL
14#define F_SPACE_AFTER 0x00000020 14#define F_SPACE_AFTER 0x00000020UL
15#define F_ALLOW_NONREF 0x00000080UL
15#define F_JSON_RPC 0x00000040 16#define F_SHRINK 0x00000100UL
17#define F_MAXDEPTH 0xf8000000UL
18#define S_MAXDEPTH 27
19
20#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
21
22// F_SELFCONVERT? <=> to_json/toJson
23// F_BLESSED? <=> { $__class__$ => }
16 24
17#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 25#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
18#define F_DEFAULT 0 26#define F_DEFAULT (12UL << S_MAXDEPTH)
19 27
20#define INIT_SIZE 32 // initial scalar size to be allocated 28#define INIT_SIZE 32 // initial scalar size to be allocated
29#define INDENT_STEP 3 // spaces per indentation level
30
31#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character
32#define SHORT_STRING_LEN 512 // special-case strings of up to this size
21 33
22#define SB do { 34#define SB do {
23#define SE } while (0) 35#define SE } while (0)
24 36
25static HV *json_stash; 37static HV *json_stash; // JSON::XS::
38
39/////////////////////////////////////////////////////////////////////////////
40// utility functions
41
42static UV *
43SvJSON (SV *sv)
44{
45 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
46 croak ("object is not of type JSON::XS");
47
48 return &SvUVX (SvRV (sv));
49}
50
51static void
52shrink (SV *sv)
53{
54 sv_utf8_downgrade (sv, 1);
55 if (SvLEN (sv) > SvCUR (sv) + 1)
56 {
57#ifdef SvPV_shrink_to_cur
58 SvPV_shrink_to_cur (sv);
59#elif defined (SvPV_renew)
60 SvPV_renew (sv, SvCUR (sv) + 1);
61#endif
62 }
63}
64
65// decode an utf-8 character and return it, or (UV)-1 in
66// case of an error.
67// we special-case "safe" characters from U+80 .. U+7FF,
68// but use the very good perl function to parse anything else.
69// note that we never call this function for a ascii codepoints
70static UV
71decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
72{
73 if (s[0] > 0xdf || s[0] < 0xc2)
74 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
75 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
76 {
77 *clen = 2;
78 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
79 }
80 else
81 {
82 *clen = (STRLEN)-1;
83 return (UV)-1;
84 }
85}
86
87/////////////////////////////////////////////////////////////////////////////
88// encoder
26 89
27// structure used for encoding JSON 90// structure used for encoding JSON
28typedef struct 91typedef struct
29{ 92{
30 char *cur; 93 char *cur; // SvPVX (sv) + current output position
31 STRLEN len; // SvLEN (sv)
32 char *end; // SvEND (sv) 94 char *end; // SvEND (sv)
33 SV *sv; 95 SV *sv; // result scalar
34 UV flags; 96 U32 flags; // F_*
35 int max_recurse; 97 U32 indent; // indentation level
36 int indent; 98 U32 maxdepth; // max. indentation/recursion level
37} enc_t; 99} enc_t;
38
39// structure used for decoding JSON
40typedef struct
41{
42 char *cur;
43 char *end;
44 char *err;
45 UV flags;
46} dec_t;
47
48static UV *
49SvJSON (SV *sv)
50{
51 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
52 croak ("object is not of type JSON::XS");
53
54 return &SvUVX (SvRV (sv));
55}
56
57/////////////////////////////////////////////////////////////////////////////
58 100
59static void 101static void
60need (enc_t *enc, STRLEN len) 102need (enc_t *enc, STRLEN len)
61{ 103{
62 if (enc->cur + len >= enc->end) 104 if (enc->cur + len >= enc->end)
63 { 105 {
64 STRLEN cur = enc->cur - SvPVX (enc->sv); 106 STRLEN cur = enc->cur - SvPVX (enc->sv);
65 SvGROW (enc->sv, cur + len + 1); 107 SvGROW (enc->sv, cur + len + 1);
66 enc->cur = SvPVX (enc->sv) + cur; 108 enc->cur = SvPVX (enc->sv) + cur;
67 enc->end = SvEND (enc->sv); 109 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv);
68 } 110 }
69} 111}
70 112
71static void 113static void
72encode_ch (enc_t *enc, char ch) 114encode_ch (enc_t *enc, char ch)
… …
78static void 120static void
79encode_str (enc_t *enc, char *str, STRLEN len, int is_utf8) 121encode_str (enc_t *enc, char *str, STRLEN len, int is_utf8)
80{ 122{
81 char *end = str + len; 123 char *end = str + len;
82 124
125 need (enc, len);
126
83 while (str < end) 127 while (str < end)
84 { 128 {
85 unsigned char ch = *(unsigned char *)str; 129 unsigned char ch = *(unsigned char *)str;
130
86 if (ch >= 0x20 && ch < 0x80) // most common case 131 if (ch >= 0x20 && ch < 0x80) // most common case
87 { 132 {
133 if (ch == '"') // but with slow exceptions
134 {
135 need (enc, len += 1);
136 *enc->cur++ = '\\';
137 *enc->cur++ = '"';
138 }
139 else if (ch == '\\')
140 {
141 need (enc, len += 1);
142 *enc->cur++ = '\\';
143 *enc->cur++ = '\\';
144 }
145 else
88 *enc->cur++ = ch; 146 *enc->cur++ = ch;
147
89 str++; 148 ++str;
90 } 149 }
91 else 150 else
92 { 151 {
93 STRLEN clen; 152 switch (ch)
94 UV uch;
95
96 if (is_utf8)
97 { 153 {
98 uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY); 154 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
99 if (clen < 0) 155 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
100 croak ("malformed UTF-8 character in string, cannot convert to JSON"); 156 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
101 } 157 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
102 else 158 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
103 {
104 uch = ch;
105 clen = 1;
106 }
107 159
108 need (enc, len += 6); 160 default:
109
110 if (uch < 0xa0 || enc->flags & F_ASCII)
111 {
112 if (uch > 0xFFFFUL)
113 { 161 {
162 STRLEN clen;
163 UV uch;
164
165 if (is_utf8)
166 {
167 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
168 uch = decode_utf8 (str, end - str, &clen);
169 if (clen == (STRLEN)-1)
170 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
171 }
172 else
173 {
174 uch = ch;
114 len += 6; 175 clen = 1;
176 }
177
178 if (uch > 0x10FFFFUL)
179 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
180
181 if (uch < 0x80 || enc->flags & F_ASCII)
182 {
183 if (uch > 0xFFFFUL)
184 {
115 need (enc, len += 6); 185 need (enc, len += 11);
116 sprintf (enc->cur, "\\u%04x\\u%04x", 186 sprintf (enc->cur, "\\u%04x\\u%04x",
117 (uch - 0x10000) / 0x400 + 0xD800, 187 (int)((uch - 0x10000) / 0x400 + 0xD800),
118 (uch - 0x10000) % 0x400 + 0xDC00); 188 (int)((uch - 0x10000) % 0x400 + 0xDC00));
119 enc->cur += 12; 189 enc->cur += 12;
190 }
191 else
192 {
193 static char hexdigit [16] = "0123456789abcdef";
194 need (enc, len += 5);
195 *enc->cur++ = '\\';
196 *enc->cur++ = 'u';
197 *enc->cur++ = hexdigit [ uch >> 12 ];
198 *enc->cur++ = hexdigit [(uch >> 8) & 15];
199 *enc->cur++ = hexdigit [(uch >> 4) & 15];
200 *enc->cur++ = hexdigit [(uch >> 0) & 15];
201 }
202
203 str += clen;
120 } 204 }
205 else if (is_utf8)
206 {
207 need (enc, len += clen);
208 do
209 {
210 *enc->cur++ = *str++;
211 }
212 while (--clen);
213 }
121 else 214 else
122 { 215 {
123 sprintf (enc->cur, "\\u%04x", uch); 216 need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed
124 enc->cur += 6; 217 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
218 ++str;
219 }
125 } 220 }
126 } 221 }
127 else if (is_utf8)
128 {
129 memcpy (enc->cur, str, clen);
130 enc->cur += clen;
131 }
132 else
133 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
134
135 str += clen;
136 } 222 }
137 223
138 --len; 224 --len;
139 } 225 }
140} 226}
141 227
142#define INDENT SB \ 228static void
229encode_indent (enc_t *enc)
230{
143 if (enc->flags & F_INDENT) \ 231 if (enc->flags & F_INDENT)
144 { \ 232 {
145 int i_; \ 233 int spaces = enc->indent * INDENT_STEP;
146 need (enc, enc->indent); \
147 for (i_ = enc->indent * 3; i_--; )\
148 encode_ch (enc, ' '); \
149 } \
150 SE
151 234
152#define SPACE SB need (enc, 1); encode_ch (enc, ' '); SE 235 need (enc, spaces);
153#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE 236 memset (enc->cur, ' ', spaces);
154#define COMMA SB \ 237 enc->cur += spaces;
238 }
239}
240
241static void
242encode_space (enc_t *enc)
243{
244 need (enc, 1);
155 encode_ch (enc, ','); \ 245 encode_ch (enc, ' ');
246}
247
248static void
249encode_nl (enc_t *enc)
250{
156 if (enc->flags & F_INDENT) \ 251 if (enc->flags & F_INDENT)
157 NL; \ 252 {
253 need (enc, 1);
254 encode_ch (enc, '\n');
255 }
256}
257
258static void
259encode_comma (enc_t *enc)
260{
261 encode_ch (enc, ',');
262
263 if (enc->flags & F_INDENT)
264 encode_nl (enc);
158 else if (enc->flags & F_SPACE_AFTER) \ 265 else if (enc->flags & F_SPACE_AFTER)
159 SPACE; \ 266 encode_space (enc);
160 SE 267}
161 268
162static void encode_sv (enc_t *enc, SV *sv); 269static void encode_sv (enc_t *enc, SV *sv);
163 270
164static void 271static void
165encode_av (enc_t *enc, AV *av) 272encode_av (enc_t *enc, AV *av)
166{ 273{
167 int i, len = av_len (av); 274 int i, len = av_len (av);
168 275
169 encode_ch (enc, '['); NL; 276 if (enc->indent >= enc->maxdepth)
277 croak ("data structure too deep (hit recursion limit)");
278
279 encode_ch (enc, '['); encode_nl (enc);
170 ++enc->indent; 280 ++enc->indent;
171 281
172 for (i = 0; i <= len; ++i) 282 for (i = 0; i <= len; ++i)
173 { 283 {
174 INDENT; 284 encode_indent (enc);
175 encode_sv (enc, *av_fetch (av, i, 0)); 285 encode_sv (enc, *av_fetch (av, i, 0));
176 286
177 if (i < len) 287 if (i < len)
178 COMMA; 288 encode_comma (enc);
179 } 289 }
180 290
181 NL; 291 encode_nl (enc);
182 292
183 --enc->indent; 293 --enc->indent;
184 INDENT; encode_ch (enc, ']'); 294 encode_indent (enc); encode_ch (enc, ']');
185} 295}
186 296
187static void 297static void
188encode_he (enc_t *enc, HE *he) 298encode_he (enc_t *enc, HE *he)
189{ 299{
… …
191 301
192 if (HeKLEN (he) == HEf_SVKEY) 302 if (HeKLEN (he) == HEf_SVKEY)
193 { 303 {
194 SV *sv = HeSVKEY (he); 304 SV *sv = HeSVKEY (he);
195 STRLEN len; 305 STRLEN len;
306 char *str;
307
308 SvGETMAGIC (sv);
196 char *str = SvPV (sv, len); 309 str = SvPV (sv, len);
197 310
198 encode_str (enc, str, len, SvUTF8 (sv)); 311 encode_str (enc, str, len, SvUTF8 (sv));
199 } 312 }
200 else 313 else
201 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 314 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
202 315
203 encode_ch (enc, '"'); 316 encode_ch (enc, '"');
204 317
205 if (enc->flags & F_SPACE_BEFORE) SPACE; 318 if (enc->flags & F_SPACE_BEFORE) encode_space (enc);
206 encode_ch (enc, ':'); 319 encode_ch (enc, ':');
207 if (enc->flags & F_SPACE_AFTER ) SPACE; 320 if (enc->flags & F_SPACE_AFTER ) encode_space (enc);
208 encode_sv (enc, HeVAL (he)); 321 encode_sv (enc, HeVAL (he));
209} 322}
210 323
211// compare hash entries, used when all keys are bytestrings 324// compare hash entries, used when all keys are bytestrings
212static int 325static int
… …
218 HE *b = *(HE **)b_; 331 HE *b = *(HE **)b_;
219 332
220 STRLEN la = HeKLEN (a); 333 STRLEN la = HeKLEN (a);
221 STRLEN lb = HeKLEN (b); 334 STRLEN lb = HeKLEN (b);
222 335
223 if (!(cmp == memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 336 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))
224 cmp = la < lb ? -1 : la == lb ? 0 : 1; 337 cmp = la - lb;
225 338
226 return cmp; 339 return cmp;
227} 340}
228 341
229// compare hash entries, used when some keys are sv's or utf-x 342// compare hash entries, used when some keys are sv's or utf-x
… …
236static void 349static void
237encode_hv (enc_t *enc, HV *hv) 350encode_hv (enc_t *enc, HV *hv)
238{ 351{
239 int count, i; 352 int count, i;
240 353
354 if (enc->indent >= enc->maxdepth)
355 croak ("data structure too deep (hit recursion limit)");
356
241 encode_ch (enc, '{'); NL; ++enc->indent; 357 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
242 358
243 if ((count = hv_iterinit (hv))) 359 if ((count = hv_iterinit (hv)))
244 { 360 {
245 // for canonical output we have to sort by keys first 361 // for canonical output we have to sort by keys first
246 // actually, this is mostly due to the stupid so-called 362 // actually, this is mostly due to the stupid so-called
247 // security workaround added somewhere in 5.8.x. 363 // security workaround added somewhere in 5.8.x.
248 // that randomises hash orderings 364 // that randomises hash orderings
249 if (enc->flags & F_CANONICAL) 365 if (enc->flags & F_CANONICAL)
250 { 366 {
251 HE *he, *hes [count]; 367 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
252 int fast = 1; 368 int fast = 1;
253 369
254 i = 0; 370 i = 0;
255 while ((he = hv_iternext (hv))) 371 while ((he = hv_iternext (hv)))
256 { 372 {
… …
263 379
264 if (fast) 380 if (fast)
265 qsort (hes, count, sizeof (HE *), he_cmp_fast); 381 qsort (hes, count, sizeof (HE *), he_cmp_fast);
266 else 382 else
267 { 383 {
268 // hack to disable "use bytes" 384 // hack to forcefully disable "use bytes"
269 COP *oldcop = PL_curcop, cop; 385 COP cop = *PL_curcop;
270 cop.op_private = 0; 386 cop.op_private = 0;
387
388 ENTER;
389 SAVETMPS;
390
391 SAVEVPTR (PL_curcop);
271 PL_curcop = &cop; 392 PL_curcop = &cop;
272 393
273 SAVETMPS;
274 qsort (hes, count, sizeof (HE *), he_cmp_slow); 394 qsort (hes, count, sizeof (HE *), he_cmp_slow);
395
275 FREETMPS; 396 FREETMPS;
276 397 LEAVE;
277 PL_curcop = oldcop;
278 } 398 }
279 399
280 for (i = 0; i < count; ++i) 400 for (i = 0; i < count; ++i)
281 { 401 {
282 INDENT; 402 encode_indent (enc);
283 encode_he (enc, hes [i]); 403 encode_he (enc, hes [i]);
284 404
285 if (i < count - 1) 405 if (i < count - 1)
286 COMMA; 406 encode_comma (enc);
287 } 407 }
288 408
289 NL; 409 encode_nl (enc);
290 } 410 }
291 else 411 else
292 { 412 {
293 SV *sv; 413 SV *sv;
294 HE *he = hv_iternext (hv); 414 HE *he = hv_iternext (hv);
295 415
296 for (;;) 416 for (;;)
297 { 417 {
298 INDENT; 418 encode_indent (enc);
299 encode_he (enc, he); 419 encode_he (enc, he);
300 420
301 if (!(he = hv_iternext (hv))) 421 if (!(he = hv_iternext (hv)))
302 break; 422 break;
303 423
304 COMMA; 424 encode_comma (enc);
305 } 425 }
306 426
307 NL; 427 encode_nl (enc);
308 } 428 }
309 } 429 }
310 430
311 --enc->indent; INDENT; encode_ch (enc, '}'); 431 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
432}
433
434// encode objects, arrays and special \0=false and \1=true values.
435static void
436encode_rv (enc_t *enc, SV *sv)
437{
438 SvGETMAGIC (sv);
439
440 svtype svt = SvTYPE (sv);
441
442 if (svt == SVt_PVHV)
443 encode_hv (enc, (HV *)sv);
444 else if (svt == SVt_PVAV)
445 encode_av (enc, (AV *)sv);
446 else if (svt < SVt_PVAV)
447 {
448 if (SvNIOK (sv) && SvIV (sv) == 0)
449 encode_str (enc, "false", 5, 0);
450 else if (SvNIOK (sv) && SvIV (sv) == 1)
451 encode_str (enc, "true", 4, 0);
452 else
453 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
454 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
455 }
456 else
457 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
458 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
312} 459}
313 460
314static void 461static void
315encode_sv (enc_t *enc, SV *sv) 462encode_sv (enc_t *enc, SV *sv)
316{ 463{
464 SvGETMAGIC (sv);
465
317 if (SvPOKp (sv)) 466 if (SvPOKp (sv))
318 { 467 {
319 STRLEN len; 468 STRLEN len;
320 char *str = SvPV (sv, len); 469 char *str = SvPV (sv, len);
321 encode_ch (enc, '"'); 470 encode_ch (enc, '"');
… …
335 SvIsUV(sv) 484 SvIsUV(sv)
336 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 485 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))
337 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 486 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));
338 } 487 }
339 else if (SvROK (sv)) 488 else if (SvROK (sv))
340 { 489 encode_rv (enc, SvRV (sv));
341 if (!--enc->max_recurse)
342 croak ("data structure too deep (hit recursion limit)");
343
344 sv = SvRV (sv);
345
346 switch (SvTYPE (sv))
347 {
348 case SVt_PVAV: encode_av (enc, (AV *)sv); break;
349 case SVt_PVHV: encode_hv (enc, (HV *)sv); break;
350
351 default:
352 croak ("JSON can only represent references to arrays or hashes");
353 }
354 }
355 else if (!SvOK (sv)) 490 else if (!SvOK (sv))
356 encode_str (enc, "null", 4, 0); 491 encode_str (enc, "null", 4, 0);
357 else 492 else
358 croak ("encountered perl type that JSON cannot handle"); 493 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
494 SvPV_nolen (sv), SvFLAGS (sv));
359} 495}
360 496
361static SV * 497static SV *
362encode_json (SV *scalar, UV flags) 498encode_json (SV *scalar, U32 flags)
363{ 499{
500 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
501 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
502
364 enc_t enc; 503 enc_t enc;
365 enc.flags = flags; 504 enc.flags = flags;
366 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 505 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
367 enc.cur = SvPVX (enc.sv); 506 enc.cur = SvPVX (enc.sv);
368 enc.end = SvEND (enc.sv); 507 enc.end = SvEND (enc.sv);
369 enc.max_recurse = 0;
370 enc.indent = 0; 508 enc.indent = 0;
509 enc.maxdepth = DEC_DEPTH (flags);
371 510
372 SvPOK_only (enc.sv); 511 SvPOK_only (enc.sv);
373 encode_sv (&enc, scalar); 512 encode_sv (&enc, scalar);
374 513
375 if (!(flags & (F_ASCII | F_UTF8))) 514 if (!(flags & (F_ASCII | F_UTF8)))
376 SvUTF8_on (enc.sv); 515 SvUTF8_on (enc.sv);
377 516
378 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 517 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
518
519 if (enc.flags & F_SHRINK)
520 shrink (enc.sv);
521
379 return enc.sv; 522 return enc.sv;
380} 523}
381 524
382///////////////////////////////////////////////////////////////////////////// 525/////////////////////////////////////////////////////////////////////////////
526// decoder
383 527
384#define WS \ 528// structure used for decoding JSON
529typedef struct
530{
531 char *cur; // current parser pointer
532 char *end; // end of input string
533 const char *err; // parse error, if != 0
534 U32 flags; // F_*
535 U32 depth; // recursion depth
536 U32 maxdepth; // recursion depth limit
537} dec_t;
538
539static void
540decode_ws (dec_t *dec)
541{
385 for (;;) \ 542 for (;;)
386 { \ 543 {
387 char ch = *dec->cur; \ 544 char ch = *dec->cur;
545
388 if (ch > 0x20 \ 546 if (ch > 0x20
389 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) \ 547 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))
390 break; \ 548 break;
549
391 ++dec->cur; \ 550 ++dec->cur;
392 } 551 }
552}
393 553
394#define ERR(reason) SB dec->err = reason; goto fail; SE 554#define ERR(reason) SB dec->err = reason; goto fail; SE
555
395#define EXPECT_CH(ch) SB \ 556#define EXPECT_CH(ch) SB \
396 if (*dec->cur != ch) \ 557 if (*dec->cur != ch) \
397 ERR (# ch " expected"); \ 558 ERR (# ch " expected"); \
398 ++dec->cur; \ 559 ++dec->cur; \
399 SE 560 SE
400 561
562#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")
563#define DEC_DEC_DEPTH --dec->depth
564
401static SV *decode_sv (dec_t *dec); 565static SV *decode_sv (dec_t *dec);
402
403#define APPEND_CH(ch) SB \
404 SvGROW (sv, cur + 1 + 1); \
405 SvPVX (sv)[cur++] = (ch); \
406 SE
407 566
408static signed char decode_hexdigit[256]; 567static signed char decode_hexdigit[256];
409 568
410static UV 569static UV
411decode_4hex (dec_t *dec) 570decode_4hex (dec_t *dec)
412{ 571{
413 signed char d1, d2, d3, d4; 572 signed char d1, d2, d3, d4;
573 unsigned char *cur = (unsigned char *)dec->cur;
414 574
415 d1 = decode_hexdigit [((unsigned char *)dec->cur) [0]];
416 if (d1 < 0) ERR ("four hexadecimal digits expected"); 575 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected");
417 d2 = decode_hexdigit [((unsigned char *)dec->cur) [1]];
418 if (d2 < 0) ERR ("four hexadecimal digits expected"); 576 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected");
419 d3 = decode_hexdigit [((unsigned char *)dec->cur) [2]];
420 if (d3 < 0) ERR ("four hexadecimal digits expected"); 577 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected");
421 d4 = decode_hexdigit [((unsigned char *)dec->cur) [3]];
422 if (d4 < 0) ERR ("four hexadecimal digits expected"); 578 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected");
423 579
424 dec->cur += 4; 580 dec->cur += 4;
425 581
426 return ((UV)d1) << 12 582 return ((UV)d1) << 12
427 | ((UV)d2) << 8 583 | ((UV)d2) << 8
… …
433} 589}
434 590
435static SV * 591static SV *
436decode_str (dec_t *dec) 592decode_str (dec_t *dec)
437{ 593{
438 SV *sv = NEWSV (0,2); 594 SV *sv = 0;
439 STRLEN cur = 0;
440 int utf8 = 0; 595 int utf8 = 0;
441 596
442 for (;;) 597 do
443 { 598 {
444 unsigned char ch = *(unsigned char *)dec->cur; 599 char buf [SHORT_STRING_LEN + UTF8_MAX_LEN];
600 char *cur = buf;
445 601
446 if (ch == '"') 602 do
447 break;
448 else if (ch == '\\')
449 { 603 {
450 switch (*++dec->cur) 604 unsigned char ch = *(unsigned char *)dec->cur++;
605
606 if (ch == '"')
451 { 607 {
452 case '\\': 608 --dec->cur;
453 case '/': 609 break;
454 case '"': APPEND_CH (*dec->cur++); break; 610 }
455 611 else if (ch == '\\')
456 case 'b': APPEND_CH ('\010'); ++dec->cur; break; 612 {
457 case 't': APPEND_CH ('\011'); ++dec->cur; break; 613 switch (*dec->cur)
458 case 'n': APPEND_CH ('\012'); ++dec->cur; break;
459 case 'f': APPEND_CH ('\014'); ++dec->cur; break;
460 case 'r': APPEND_CH ('\015'); ++dec->cur; break;
461
462 case 'u':
463 { 614 {
464 UV lo, hi; 615 case '\\':
465 ++dec->cur; 616 case '/':
617 case '"': *cur++ = *dec->cur++; break;
466 618
467 hi = decode_4hex (dec); 619 case 'b': ++dec->cur; *cur++ = '\010'; break;
468 if (hi == (UV)-1) 620 case 't': ++dec->cur; *cur++ = '\011'; break;
469 goto fail; 621 case 'n': ++dec->cur; *cur++ = '\012'; break;
622 case 'f': ++dec->cur; *cur++ = '\014'; break;
623 case 'r': ++dec->cur; *cur++ = '\015'; break;
470 624
471 // possibly a surrogate pair 625 case 'u':
472 if (hi >= 0xd800 && hi < 0xdc00)
473 { 626 {
474 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 627 UV lo, hi;
475 ERR ("illegal surrogate character");
476
477 dec->cur += 2; 628 ++dec->cur;
478 629
479 lo = decode_4hex (dec); 630 hi = decode_4hex (dec);
480 if (lo == (UV)-1) 631 if (hi == (UV)-1)
481 goto fail; 632 goto fail;
482 633
634 // possibly a surrogate pair
635 if (hi >= 0xd800)
636 if (hi < 0xdc00)
637 {
638 if (dec->cur [0] != '\\' || dec->cur [1] != 'u')
639 ERR ("missing low surrogate character in surrogate pair");
640
641 dec->cur += 2;
642
643 lo = decode_4hex (dec);
644 if (lo == (UV)-1)
645 goto fail;
646
483 if (lo < 0xdc00 || lo >= 0xe000) 647 if (lo < 0xdc00 || lo >= 0xe000)
484 ERR ("surrogate pair expected"); 648 ERR ("surrogate pair expected");
485 649
486 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000; 650 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000;
651 }
652 else if (hi < 0xe000)
653 ERR ("missing high surrogate character in surrogate pair");
654
655 if (hi >= 0x80)
656 {
657 utf8 = 1;
658
659 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
660 }
661 else
662 *cur++ = hi;
487 } 663 }
488 else if (lo >= 0xdc00 && lo < 0xe000)
489 ERR ("illegal surrogate character");
490
491 if (hi >= 0x80)
492 { 664 break;
493 utf8 = 1;
494 665
495 SvGROW (sv, cur + 4 + 1); // at most 4 bytes for 21 bits
496 cur = (char *)uvuni_to_utf8_flags (SvPVX (sv) + cur, hi, 0) - SvPVX (sv);
497 }
498 else 666 default:
499 APPEND_CH (hi); 667 --dec->cur;
668 ERR ("illegal backslash escape sequence in string");
500 } 669 }
670 }
671 else if (ch >= 0x20 && ch <= 0x7f)
672 *cur++ = ch;
673 else if (ch >= 0x80)
674 {
675 --dec->cur;
676
677 STRLEN clen;
678 UV uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);
679 if (clen == (STRLEN)-1)
680 ERR ("malformed UTF-8 character in JSON string");
681
682 do
683 *cur++ = *dec->cur++;
684 while (--clen);
685
686 utf8 = 1;
687 }
688 else
689 {
690 --dec->cur;
691
692 if (!ch)
693 ERR ("unexpected end of string while parsing json string");
501 break; 694 else
695 ERR ("invalid character encountered while parsing json string");
502 } 696 }
503 } 697 }
504 else if (ch >= 0x20 && ch <= 0x7f) 698 while (cur < buf + SHORT_STRING_LEN);
505 APPEND_CH (*dec->cur++); 699
506 else if (ch >= 0x80) 700 STRLEN len = cur - buf;
701
702 if (sv)
507 { 703 {
508 STRLEN clen; 704 SvGROW (sv, SvCUR (sv) + len + 1);
509 UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY); 705 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
510 if (clen < 0) 706 SvCUR_set (sv, SvCUR (sv) + len);
511 ERR ("malformed UTF-8 character in string, cannot convert to JSON");
512
513 SvGROW (sv, cur + clen + 1); // at most 4 bytes for 21 bits
514 memcpy (SvPVX (sv) + cur, dec->cur, clen);
515 dec->cur += clen;
516 } 707 }
517 else 708 else
518 ERR ("invalid character encountered"); 709 sv = newSVpvn (buf, len);
519 } 710 }
711 while (*dec->cur != '"');
520 712
521 ++dec->cur; 713 ++dec->cur;
522 714
715 if (sv)
716 {
523 SvPOK_only (sv); 717 SvPOK_only (sv);
524
525 SvCUR_set (sv, cur);
526 *SvEND (sv) = 0; 718 *SvEND (sv) = 0;
527 719
528 if (utf8) 720 if (utf8)
529 SvUTF8_on (sv); 721 SvUTF8_on (sv);
722 }
723 else
724 sv = newSVpvn ("", 0);
530 725
531 return sv; 726 return sv;
532 727
533fail: 728fail:
534 SvREFCNT_dec (sv);
535 return 0; 729 return 0;
536} 730}
537 731
538static SV * 732static SV *
539decode_num (dec_t *dec) 733decode_num (dec_t *dec)
… …
549 { 743 {
550 ++dec->cur; 744 ++dec->cur;
551 if (*dec->cur >= '0' && *dec->cur <= '9') 745 if (*dec->cur >= '0' && *dec->cur <= '9')
552 ERR ("malformed number (leading zero must not be followed by another digit)"); 746 ERR ("malformed number (leading zero must not be followed by another digit)");
553 } 747 }
554 748 else if (*dec->cur < '0' || *dec->cur > '9')
555 // int 749 ERR ("malformed number (no digits after initial minus)");
750 else
751 do
752 {
753 ++dec->cur;
754 }
556 while (*dec->cur >= '0' && *dec->cur <= '9') 755 while (*dec->cur >= '0' && *dec->cur <= '9');
557 ++dec->cur;
558 756
559 // [frac] 757 // [frac]
560 if (*dec->cur == '.') 758 if (*dec->cur == '.')
561 { 759 {
562 is_nv = 1; 760 ++dec->cur;
761
762 if (*dec->cur < '0' || *dec->cur > '9')
763 ERR ("malformed number (no digits after decimal point)");
563 764
564 do 765 do
565 { 766 {
566 ++dec->cur; 767 ++dec->cur;
567 } 768 }
568 while (*dec->cur >= '0' && *dec->cur <= '9'); 769 while (*dec->cur >= '0' && *dec->cur <= '9');
770
771 is_nv = 1;
569 } 772 }
570 773
571 // [exp] 774 // [exp]
572 if (*dec->cur == 'e' || *dec->cur == 'E') 775 if (*dec->cur == 'e' || *dec->cur == 'E')
573 { 776 {
574 is_nv = 1;
575
576 ++dec->cur; 777 ++dec->cur;
778
577 if (*dec->cur == '-' || *dec->cur == '+') 779 if (*dec->cur == '-' || *dec->cur == '+')
578 ++dec->cur; 780 ++dec->cur;
579 781
782 if (*dec->cur < '0' || *dec->cur > '9')
783 ERR ("malformed number (no digits after exp sign)");
784
785 do
786 {
787 ++dec->cur;
788 }
580 while (*dec->cur >= '0' && *dec->cur <= '9') 789 while (*dec->cur >= '0' && *dec->cur <= '9');
581 ++dec->cur; 790
791 is_nv = 1;
582 } 792 }
583 793
584 if (!is_nv) 794 if (!is_nv)
585 { 795 {
586 UV uv; 796 UV uv;
… …
604static SV * 814static SV *
605decode_av (dec_t *dec) 815decode_av (dec_t *dec)
606{ 816{
607 AV *av = newAV (); 817 AV *av = newAV ();
608 818
819 DEC_INC_DEPTH;
820 decode_ws (dec);
821
822 if (*dec->cur == ']')
823 ++dec->cur;
824 else
609 for (;;) 825 for (;;)
610 { 826 {
611 SV *value; 827 SV *value;
612 828
613 value = decode_sv (dec); 829 value = decode_sv (dec);
614 if (!value) 830 if (!value)
615 goto fail; 831 goto fail;
616 832
617 av_push (av, value); 833 av_push (av, value);
618 834
619 WS; 835 decode_ws (dec);
620 836
621 if (*dec->cur == ']') 837 if (*dec->cur == ']')
622 { 838 {
623 ++dec->cur; 839 ++dec->cur;
624 break; 840 break;
841 }
625 } 842
626
627 if (*dec->cur != ',') 843 if (*dec->cur != ',')
628 ERR (", or ] expected while parsing array"); 844 ERR (", or ] expected while parsing array");
629 845
630 ++dec->cur; 846 ++dec->cur;
631 } 847 }
632 848
849 DEC_DEC_DEPTH;
633 return newRV_noinc ((SV *)av); 850 return newRV_noinc ((SV *)av);
634 851
635fail: 852fail:
636 SvREFCNT_dec (av); 853 SvREFCNT_dec (av);
854 DEC_DEC_DEPTH;
637 return 0; 855 return 0;
638} 856}
639 857
640static SV * 858static SV *
641decode_hv (dec_t *dec) 859decode_hv (dec_t *dec)
642{ 860{
643 HV *hv = newHV (); 861 HV *hv = newHV ();
644 862
863 DEC_INC_DEPTH;
864 decode_ws (dec);
865
866 if (*dec->cur == '}')
867 ++dec->cur;
868 else
645 for (;;) 869 for (;;)
646 { 870 {
647 SV *key, *value; 871 SV *key, *value;
648 872
649 WS; EXPECT_CH ('"'); 873 decode_ws (dec); EXPECT_CH ('"');
650 874
651 key = decode_str (dec); 875 key = decode_str (dec);
652 if (!key) 876 if (!key)
653 goto fail;
654
655 WS; EXPECT_CH (':');
656
657 value = decode_sv (dec);
658 if (!value)
659 {
660 SvREFCNT_dec (key);
661 goto fail; 877 goto fail;
878
879 decode_ws (dec); EXPECT_CH (':');
880
881 value = decode_sv (dec);
882 if (!value)
883 {
884 SvREFCNT_dec (key);
885 goto fail;
662 } 886 }
663 887
664 //TODO: optimise
665 hv_store_ent (hv, key, value, 0); 888 hv_store_ent (hv, key, value, 0);
889 SvREFCNT_dec (key);
666 890
667 WS; 891 decode_ws (dec);
668 892
669 if (*dec->cur == '}') 893 if (*dec->cur == '}')
670 { 894 {
671 ++dec->cur; 895 ++dec->cur;
672 break; 896 break;
673 } 897 }
674 898
675 if (*dec->cur != ',') 899 if (*dec->cur != ',')
676 ERR (", or } expected while parsing object/hash"); 900 ERR (", or } expected while parsing object/hash");
677 901
678 ++dec->cur; 902 ++dec->cur;
679 } 903 }
680 904
905 DEC_DEC_DEPTH;
681 return newRV_noinc ((SV *)hv); 906 return newRV_noinc ((SV *)hv);
682 907
683fail: 908fail:
684 SvREFCNT_dec (hv); 909 SvREFCNT_dec (hv);
910 DEC_DEC_DEPTH;
685 return 0; 911 return 0;
686} 912}
687 913
688static SV * 914static SV *
689decode_sv (dec_t *dec) 915decode_sv (dec_t *dec)
690{ 916{
691 WS; 917 decode_ws (dec);
692 switch (*dec->cur) 918 switch (*dec->cur)
693 { 919 {
694 case '"': ++dec->cur; return decode_str (dec); 920 case '"': ++dec->cur; return decode_str (dec);
695 case '[': ++dec->cur; return decode_av (dec); 921 case '[': ++dec->cur; return decode_av (dec);
696 case '{': ++dec->cur; return decode_hv (dec); 922 case '{': ++dec->cur; return decode_hv (dec);
… …
724 950
725 case 'n': 951 case 'n':
726 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 952 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
727 { 953 {
728 dec->cur += 4; 954 dec->cur += 4;
729 return newSViv (1); 955 return newSVsv (&PL_sv_undef);
730 } 956 }
731 else 957 else
732 ERR ("'null' expected"); 958 ERR ("'null' expected");
733 959
734 break; 960 break;
735 961
736 default: 962 default:
737 ERR ("malformed json string"); 963 ERR ("malformed json string, neither array, object, number, string or atom");
738 break; 964 break;
739 } 965 }
740 966
741fail: 967fail:
742 return 0; 968 return 0;
743} 969}
744 970
745static SV * 971static SV *
746decode_json (SV *string, UV flags) 972decode_json (SV *string, U32 flags)
747{ 973{
748 SV *sv; 974 SV *sv;
749 975
976 SvUPGRADE (string, SVt_PV);
977
750 if (!(flags & F_UTF8)) 978 if (flags & F_UTF8)
979 sv_utf8_downgrade (string, 0);
980 else
751 sv_utf8_upgrade (string); 981 sv_utf8_upgrade (string);
752 982
753 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 983 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
754 984
755 dec_t dec; 985 dec_t dec;
756 dec.flags = flags; 986 dec.flags = flags;
757 dec.cur = SvPVX (string); 987 dec.cur = SvPVX (string);
758 dec.end = SvEND (string); 988 dec.end = SvEND (string);
759 dec.err = 0; 989 dec.err = 0;
990 dec.depth = 0;
991 dec.maxdepth = DEC_DEPTH (dec.flags);
760 992
761 *dec.end = 1; // invalid anywhere 993 *dec.end = 0; // this should basically be a nop, too, but make sure its there
762 sv = decode_sv (&dec); 994 sv = decode_sv (&dec);
763 *dec.end = 0;
764 995
765 if (!sv) 996 if (!sv)
766 { 997 {
998 IV offset = dec.flags & F_UTF8
999 ? dec.cur - SvPVX (string)
767 IV offset = utf8_distance (dec.cur, SvPVX (string)); 1000 : utf8_distance (dec.cur, SvPVX (string));
768 SV *uni = sv_newmortal (); 1001 SV *uni = sv_newmortal ();
769 1002
1003 // horrible hack to silence warning inside pv_uni_display
1004 COP cop = *PL_curcop;
1005 cop.cop_warnings = pWARN_NONE;
1006 ENTER;
1007 SAVEVPTR (PL_curcop);
1008 PL_curcop = &cop;
770 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1009 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1010 LEAVE;
1011
771 croak ("%s, at character %d (%s)", 1012 croak ("%s, at character offset %d [\"%s\"]",
772 dec.err, 1013 dec.err,
773 (int)offset, 1014 (int)offset,
774 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1015 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
775 } 1016 }
776 1017
777 sv_dump (sv);//D
778 return sv_2mortal (sv); 1018 sv = sv_2mortal (sv);
1019
1020 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))
1021 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1022
1023 return sv;
779} 1024}
1025
1026/////////////////////////////////////////////////////////////////////////////
1027// XS interface functions
780 1028
781MODULE = JSON::XS PACKAGE = JSON::XS 1029MODULE = JSON::XS PACKAGE = JSON::XS
782 1030
783BOOT: 1031BOOT:
784{ 1032{
785 int i; 1033 int i;
786 1034
787 memset (decode_hexdigit, 0xff, 256); 1035 memset (decode_hexdigit, 0xff, 256);
1036
788 for (i = 10; i--; ) 1037 for (i = 0; i < 256; ++i)
789 decode_hexdigit ['0' + i] = i; 1038 decode_hexdigit [i] =
790 1039 i >= '0' && i <= '9' ? i - '0'
791 for (i = 6; --i; ) 1040 : i >= 'a' && i <= 'f' ? i - 'a' + 10
792 { 1041 : i >= 'A' && i <= 'F' ? i - 'A' + 10
793 decode_hexdigit ['a' + i] = 10 + i; 1042 : -1;
794 decode_hexdigit ['A' + i] = 10 + i;
795 }
796 1043
797 json_stash = gv_stashpv ("JSON::XS", 1); 1044 json_stash = gv_stashpv ("JSON::XS", 1);
798} 1045}
1046
1047PROTOTYPES: DISABLE
799 1048
800SV *new (char *dummy) 1049SV *new (char *dummy)
801 CODE: 1050 CODE:
802 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1051 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);
803 OUTPUT: 1052 OUTPUT:
804 RETVAL 1053 RETVAL
805 1054
806SV *ascii (SV *self, int enable) 1055SV *ascii (SV *self, int enable = 1)
807 ALIAS: 1056 ALIAS:
808 ascii = F_ASCII 1057 ascii = F_ASCII
809 utf8 = F_UTF8 1058 utf8 = F_UTF8
810 indent = F_INDENT 1059 indent = F_INDENT
811 canonical = F_CANONICAL 1060 canonical = F_CANONICAL
812 space_before = F_SPACE_BEFORE 1061 space_before = F_SPACE_BEFORE
813 space_after = F_SPACE_AFTER 1062 space_after = F_SPACE_AFTER
814 json_rpc = F_JSON_RPC
815 pretty = F_PRETTY 1063 pretty = F_PRETTY
1064 allow_nonref = F_ALLOW_NONREF
1065 shrink = F_SHRINK
816 CODE: 1066 CODE:
817{ 1067{
818 UV *uv = SvJSON (self); 1068 UV *uv = SvJSON (self);
819 if (enable) 1069 if (enable)
820 *uv |= ix; 1070 *uv |= ix;
… …
824 RETVAL = newSVsv (self); 1074 RETVAL = newSVsv (self);
825} 1075}
826 OUTPUT: 1076 OUTPUT:
827 RETVAL 1077 RETVAL
828 1078
1079SV *max_depth (SV *self, int max_depth = 0x80000000UL)
1080 CODE:
1081{
1082 UV *uv = SvJSON (self);
1083 UV log2 = 0;
1084
1085 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1086
1087 while ((1UL << log2) < max_depth)
1088 ++log2;
1089
1090 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1091
1092 RETVAL = newSVsv (self);
1093}
1094 OUTPUT:
1095 RETVAL
1096
829void encode (SV *self, SV *scalar) 1097void encode (SV *self, SV *scalar)
830 PPCODE: 1098 PPCODE:
831 XPUSHs (encode_json (scalar, *SvJSON (self))); 1099 XPUSHs (encode_json (scalar, *SvJSON (self)));
832 1100
833void decode (SV *self, SV *jsonstr) 1101void decode (SV *self, SV *jsonstr)
834 PPCODE: 1102 PPCODE:
835 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1103 XPUSHs (decode_json (jsonstr, *SvJSON (self)));
836 1104
1105PROTOTYPES: ENABLE
1106
837void to_json (SV *scalar) 1107void to_json (SV *scalar)
1108 ALIAS:
1109 objToJson = 0
838 PPCODE: 1110 PPCODE:
839 XPUSHs (encode_json (scalar, F_UTF8)); 1111 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8));
840 1112
841void from_json (SV *jsonstr) 1113void from_json (SV *jsonstr)
1114 ALIAS:
1115 jsonToObj = 0
842 PPCODE: 1116 PPCODE:
843 XPUSHs (decode_json (jsonstr, F_UTF8)); 1117 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8));
844 1118

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines