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

Diff Legend

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