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.38 by root, Mon Jun 11 03:18:07 2007 UTC vs.
Revision 1.61 by root, Sun Aug 26 21:56:47 2007 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
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#include "stdio.h" 8#include <stdio.h>
9#include <float.h>
9 10
10#if defined(__BORLANDC__) || defined(_MSC_VER) 11#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h 12# define snprintf _snprintf // C compilers have this in stdio.h
12#endif 13#endif
13 14
15// some old perls do not have this, try to make it work, no
16// guarentees, though. if it breaks, you get to keep the pieces.
17#ifndef UTF8_MAXBYTES
18# define UTF8_MAXBYTES 13
19#endif
20
14#define F_ASCII 0x00000001UL 21#define F_ASCII 0x00000001UL
15#define F_LATIN1 0x00000002UL 22#define F_LATIN1 0x00000002UL
16#define F_UTF8 0x00000004UL 23#define F_UTF8 0x00000004UL
17#define F_INDENT 0x00000008UL 24#define F_INDENT 0x00000008UL
18#define F_CANONICAL 0x00000010UL 25#define F_CANONICAL 0x00000010UL
19#define F_SPACE_BEFORE 0x00000020UL 26#define F_SPACE_BEFORE 0x00000020UL
20#define F_SPACE_AFTER 0x00000040UL 27#define F_SPACE_AFTER 0x00000040UL
21#define F_ALLOW_NONREF 0x00000100UL 28#define F_ALLOW_NONREF 0x00000100UL
22#define F_SHRINK 0x00000200UL 29#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL
23#define F_MAXDEPTH 0xf8000000UL 32#define F_MAXDEPTH 0xf8000000UL
24#define S_MAXDEPTH 27 33#define S_MAXDEPTH 27
34#define F_MAXSIZE 0x01f00000UL
35#define S_MAXSIZE 20
36#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
25 37
26#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 38#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
27 39#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
28// F_SELFCONVERT? <=> to_json/toJson
29// F_BLESSED? <=> { $__class__$ => }
30 40
31#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
32#define F_DEFAULT (9UL << S_MAXDEPTH) 42#define F_DEFAULT (9UL << S_MAXDEPTH)
33 43
34#define INIT_SIZE 32 // initial scalar size to be allocated 44#define INIT_SIZE 32 // initial scalar size to be allocated
48#endif 58#endif
49 59
50#define expect_false(expr) expect ((expr) != 0, 0) 60#define expect_false(expr) expect ((expr) != 0, 0)
51#define expect_true(expr) expect ((expr) != 0, 1) 61#define expect_true(expr) expect ((expr) != 0, 1)
52 62
63#ifdef USE_ITHREADS
64# define JSON_SLOW 1
65# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
66#else
67# define JSON_SLOW 0
68# define JSON_STASH json_stash
69#endif
70
53static HV *json_stash; // JSON::XS:: 71static HV *json_stash, *json_boolean_stash; // JSON::XS::
72static SV *json_true, *json_false;
73
74typedef struct {
75 U32 flags;
76 SV *cb_object;
77 HV *cb_sk_object;
78} JSON;
54 79
55///////////////////////////////////////////////////////////////////////////// 80/////////////////////////////////////////////////////////////////////////////
56// utility functions 81// utility functions
57 82
58static UV * 83inline void
59SvJSON (SV *sv)
60{
61 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
62 croak ("object is not of type JSON::XS");
63
64 return &SvUVX (SvRV (sv));
65}
66
67static void
68shrink (SV *sv) 84shrink (SV *sv)
69{ 85{
70 sv_utf8_downgrade (sv, 1); 86 sv_utf8_downgrade (sv, 1);
71 if (SvLEN (sv) > SvCUR (sv) + 1) 87 if (SvLEN (sv) > SvCUR (sv) + 1)
72 { 88 {
107typedef struct 123typedef struct
108{ 124{
109 char *cur; // SvPVX (sv) + current output position 125 char *cur; // SvPVX (sv) + current output position
110 char *end; // SvEND (sv) 126 char *end; // SvEND (sv)
111 SV *sv; // result scalar 127 SV *sv; // result scalar
112 U32 flags; // F_* 128 JSON json;
113 U32 indent; // indentation level 129 U32 indent; // indentation level
114 U32 maxdepth; // max. indentation/recursion level 130 U32 maxdepth; // max. indentation/recursion level
115} enc_t; 131} enc_t;
116 132
117inline void 133inline void
178 STRLEN clen; 194 STRLEN clen;
179 UV uch; 195 UV uch;
180 196
181 if (is_utf8) 197 if (is_utf8)
182 { 198 {
183 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
184 uch = decode_utf8 (str, end - str, &clen); 199 uch = decode_utf8 (str, end - str, &clen);
185 if (clen == (STRLEN)-1) 200 if (clen == (STRLEN)-1)
186 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str); 201 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
187 } 202 }
188 else 203 else
192 } 207 }
193 208
194 if (uch > 0x10FFFFUL) 209 if (uch > 0x10FFFFUL)
195 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 210 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
196 211
197 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF)) 212 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
198 { 213 {
199 if (uch > 0xFFFFUL) 214 if (uch > 0xFFFFUL)
200 { 215 {
201 need (enc, len += 11); 216 need (enc, len += 11);
202 sprintf (enc->cur, "\\u%04x\\u%04x", 217 sprintf (enc->cur, "\\u%04x\\u%04x",
216 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 231 *enc->cur++ = hexdigit [(uch >> 0) & 15];
217 } 232 }
218 233
219 str += clen; 234 str += clen;
220 } 235 }
221 else if (enc->flags & F_LATIN1) 236 else if (enc->json.flags & F_LATIN1)
222 { 237 {
223 *enc->cur++ = uch; 238 *enc->cur++ = uch;
224 str += clen; 239 str += clen;
225 } 240 }
226 else if (is_utf8) 241 else if (is_utf8)
247} 262}
248 263
249inline void 264inline void
250encode_indent (enc_t *enc) 265encode_indent (enc_t *enc)
251{ 266{
252 if (enc->flags & F_INDENT) 267 if (enc->json.flags & F_INDENT)
253 { 268 {
254 int spaces = enc->indent * INDENT_STEP; 269 int spaces = enc->indent * INDENT_STEP;
255 270
256 need (enc, spaces); 271 need (enc, spaces);
257 memset (enc->cur, ' ', spaces); 272 memset (enc->cur, ' ', spaces);
267} 282}
268 283
269inline void 284inline void
270encode_nl (enc_t *enc) 285encode_nl (enc_t *enc)
271{ 286{
272 if (enc->flags & F_INDENT) 287 if (enc->json.flags & F_INDENT)
273 { 288 {
274 need (enc, 1); 289 need (enc, 1);
275 encode_ch (enc, '\n'); 290 encode_ch (enc, '\n');
276 } 291 }
277} 292}
279inline void 294inline void
280encode_comma (enc_t *enc) 295encode_comma (enc_t *enc)
281{ 296{
282 encode_ch (enc, ','); 297 encode_ch (enc, ',');
283 298
284 if (enc->flags & F_INDENT) 299 if (enc->json.flags & F_INDENT)
285 encode_nl (enc); 300 encode_nl (enc);
286 else if (enc->flags & F_SPACE_AFTER) 301 else if (enc->json.flags & F_SPACE_AFTER)
287 encode_space (enc); 302 encode_space (enc);
288} 303}
289 304
290static void encode_sv (enc_t *enc, SV *sv); 305static void encode_sv (enc_t *enc, SV *sv);
291 306
300 encode_ch (enc, '['); encode_nl (enc); 315 encode_ch (enc, '['); encode_nl (enc);
301 ++enc->indent; 316 ++enc->indent;
302 317
303 for (i = 0; i <= len; ++i) 318 for (i = 0; i <= len; ++i)
304 { 319 {
320 SV **svp = av_fetch (av, i, 0);
321
305 encode_indent (enc); 322 encode_indent (enc);
306 encode_sv (enc, *av_fetch (av, i, 0)); 323
324 if (svp)
325 encode_sv (enc, *svp);
326 else
327 encode_str (enc, "null", 4, 0);
307 328
308 if (i < len) 329 if (i < len)
309 encode_comma (enc); 330 encode_comma (enc);
310 } 331 }
311 332
314 --enc->indent; 335 --enc->indent;
315 encode_indent (enc); encode_ch (enc, ']'); 336 encode_indent (enc); encode_ch (enc, ']');
316} 337}
317 338
318static void 339static void
319encode_he (enc_t *enc, HE *he) 340encode_hk (enc_t *enc, HE *he)
320{ 341{
321 encode_ch (enc, '"'); 342 encode_ch (enc, '"');
322 343
323 if (HeKLEN (he) == HEf_SVKEY) 344 if (HeKLEN (he) == HEf_SVKEY)
324 { 345 {
334 else 355 else
335 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 356 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
336 357
337 encode_ch (enc, '"'); 358 encode_ch (enc, '"');
338 359
339 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 360 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
340 encode_ch (enc, ':'); 361 encode_ch (enc, ':');
341 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 362 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
342 encode_sv (enc, HeVAL (he));
343} 363}
344 364
345// compare hash entries, used when all keys are bytestrings 365// compare hash entries, used when all keys are bytestrings
346static int 366static int
347he_cmp_fast (const void *a_, const void *b_) 367he_cmp_fast (const void *a_, const void *b_)
352 HE *b = *(HE **)b_; 372 HE *b = *(HE **)b_;
353 373
354 STRLEN la = HeKLEN (a); 374 STRLEN la = HeKLEN (a);
355 STRLEN lb = HeKLEN (b); 375 STRLEN lb = HeKLEN (b);
356 376
357 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 377 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
358 cmp = la - lb; 378 cmp = lb - la;
359 379
360 return cmp; 380 return cmp;
361} 381}
362 382
363// compare hash entries, used when some keys are sv's or utf-x 383// compare hash entries, used when some keys are sv's or utf-x
364static int 384static int
365he_cmp_slow (const void *a, const void *b) 385he_cmp_slow (const void *a, const void *b)
366{ 386{
367 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 387 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
368} 388}
369 389
370static void 390static void
371encode_hv (enc_t *enc, HV *hv) 391encode_hv (enc_t *enc, HV *hv)
372{ 392{
393 HE *he;
373 int count, i; 394 int count;
374 395
375 if (enc->indent >= enc->maxdepth) 396 if (enc->indent >= enc->maxdepth)
376 croak ("data structure too deep (hit recursion limit)"); 397 croak ("data structure too deep (hit recursion limit)");
377 398
378 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 399 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
379 400
380 if ((count = hv_iterinit (hv)))
381 {
382 // for canonical output we have to sort by keys first 401 // for canonical output we have to sort by keys first
383 // actually, this is mostly due to the stupid so-called 402 // actually, this is mostly due to the stupid so-called
384 // security workaround added somewhere in 5.8.x. 403 // security workaround added somewhere in 5.8.x.
385 // that randomises hash orderings 404 // that randomises hash orderings
386 if (enc->flags & F_CANONICAL) 405 if (enc->json.flags & F_CANONICAL)
406 {
407 int count = hv_iterinit (hv);
408
409 if (SvMAGICAL (hv))
387 { 410 {
411 // need to count by iterating. could improve by dynamically building the vector below
412 // but I don't care for the speed of this special case.
413 // note also that we will run into undefined behaviour when the two iterations
414 // do not result in the same count, something I might care for in some later release.
415
416 count = 0;
417 while (hv_iternext (hv))
418 ++count;
419
420 hv_iterinit (hv);
421 }
422
423 if (count)
424 {
388 int fast = 1; 425 int i, fast = 1;
389 HE *he;
390#if defined(__BORLANDC__) || defined(_MSC_VER) 426#if defined(__BORLANDC__) || defined(_MSC_VER)
391 HE **hes = _alloca (count * sizeof (HE)); 427 HE **hes = _alloca (count * sizeof (HE));
392#else 428#else
393 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 429 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
394#endif 430#endif
421 457
422 FREETMPS; 458 FREETMPS;
423 LEAVE; 459 LEAVE;
424 } 460 }
425 461
426 for (i = 0; i < count; ++i) 462 while (count--)
427 { 463 {
428 encode_indent (enc); 464 encode_indent (enc);
465 he = hes [count];
429 encode_he (enc, hes [i]); 466 encode_hk (enc, he);
467 encode_sv (enc, SvMAGICAL (hv) ? hv_iterval (hv, he) : HeVAL (he));
430 468
431 if (i < count - 1) 469 if (count)
432 encode_comma (enc); 470 encode_comma (enc);
433 } 471 }
434 472 }
473 }
474 else
475 {
476 if (hv_iterinit (hv) || SvMAGICAL (hv))
477 if ((he = hv_iternext (hv)))
478 for (;;)
479 {
435 encode_nl (enc); 480 encode_indent (enc);
481 encode_hk (enc, he);
482 encode_sv (enc, SvMAGICAL (hv) ? hv_iterval (hv, he) : HeVAL (he));
483
484 if (!(he = hv_iternext (hv)))
485 break;
486
487 encode_comma (enc);
488 }
489 }
490
491 encode_nl (enc);
492
493 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
494}
495
496// encode objects, arrays and special \0=false and \1=true values.
497static void
498encode_rv (enc_t *enc, SV *sv)
499{
500 svtype svt;
501
502 SvGETMAGIC (sv);
503 svt = SvTYPE (sv);
504
505 if (expect_false (SvOBJECT (sv)))
506 {
507 HV *stash = !JSON_SLOW || json_boolean_stash
508 ? json_boolean_stash
509 : gv_stashpv ("JSON::XS::Boolean", 1);
510
511 if (SvSTASH (sv) == stash)
512 {
513 if (SvIV (sv))
514 encode_str (enc, "true", 4, 0);
515 else
516 encode_str (enc, "false", 5, 0);
436 } 517 }
437 else 518 else
438 { 519 {
439 HE *he = hv_iternext (hv); 520#if 0
440 521 if (0 && sv_derived_from (rv, "JSON::Literal"))
441 for (;;)
442 {
443 encode_indent (enc);
444 encode_he (enc, he);
445
446 if (!(he = hv_iternext (hv)))
447 break;
448
449 encode_comma (enc);
450 } 522 {
523 // not yet
524 }
525#endif
526 if (enc->json.flags & F_CONV_BLESSED)
527 {
528 // we re-bless the reference to get overload and other niceties right
529 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
451 530
531 if (to_json)
532 {
533 dSP;
534
535 ENTER; SAVETMPS; PUSHMARK (SP);
536 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
537
538 // calling with G_SCALAR ensures that we always get a 1 return value
539 PUTBACK;
540 call_sv ((SV *)GvCV (to_json), G_SCALAR);
541 SPAGAIN;
542
543 // catch this surprisingly common error
544 if (SvROK (TOPs) && SvRV (TOPs) == sv)
545 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
546
547 sv = POPs;
548 PUTBACK;
549
452 encode_nl (enc); 550 encode_sv (enc, sv);
551
552 FREETMPS; LEAVE;
553 }
554 else if (enc->json.flags & F_ALLOW_BLESSED)
555 encode_str (enc, "null", 4, 0);
556 else
557 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
558 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
559 }
560 else if (enc->json.flags & F_ALLOW_BLESSED)
561 encode_str (enc, "null", 4, 0);
562 else
563 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
564 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
453 } 565 }
454 } 566 }
455
456 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
457}
458
459// encode objects, arrays and special \0=false and \1=true values.
460static void
461encode_rv (enc_t *enc, SV *sv)
462{
463 svtype svt;
464
465 SvGETMAGIC (sv);
466 svt = SvTYPE (sv);
467
468 if (svt == SVt_PVHV) 567 else if (svt == SVt_PVHV)
469 encode_hv (enc, (HV *)sv); 568 encode_hv (enc, (HV *)sv);
470 else if (svt == SVt_PVAV) 569 else if (svt == SVt_PVAV)
471 encode_av (enc, (AV *)sv); 570 encode_av (enc, (AV *)sv);
472 else if (svt < SVt_PVAV) 571 else if (svt < SVt_PVAV)
473 { 572 {
474 if (SvNIOK (sv) && SvIV (sv) == 0) 573 STRLEN len = 0;
574 char *pv = svt ? SvPV (sv, len) : 0;
575
576 if (len == 1 && *pv == '1')
577 encode_str (enc, "true", 4, 0);
578 else if (len == 1 && *pv == '0')
475 encode_str (enc, "false", 5, 0); 579 encode_str (enc, "false", 5, 0);
476 else if (SvNIOK (sv) && SvIV (sv) == 1)
477 encode_str (enc, "true", 4, 0);
478 else 580 else
479 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 581 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
480 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 582 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
481 } 583 }
482 else 584 else
497 encode_str (enc, str, len, SvUTF8 (sv)); 599 encode_str (enc, str, len, SvUTF8 (sv));
498 encode_ch (enc, '"'); 600 encode_ch (enc, '"');
499 } 601 }
500 else if (SvNOKp (sv)) 602 else if (SvNOKp (sv))
501 { 603 {
604 // trust that perl will do the right thing w.r.t. JSON syntax.
502 need (enc, NV_DIG + 32); 605 need (enc, NV_DIG + 32);
503 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 606 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
504 enc->cur += strlen (enc->cur); 607 enc->cur += strlen (enc->cur);
505 } 608 }
506 else if (SvIOKp (sv)) 609 else if (SvIOKp (sv))
507 { 610 {
508 // we assume we can always read an IV as a UV 611 // we assume we can always read an IV as a UV
509 if (SvUV (sv) & ~(UV)0x7fff) 612 if (SvUV (sv) & ~(UV)0x7fff)
510 { 613 {
614 // large integer, use the (rather slow) snprintf way.
511 need (enc, sizeof (UV) * 3); 615 need (enc, sizeof (UV) * 3);
512 enc->cur += 616 enc->cur +=
513 SvIsUV(sv) 617 SvIsUV(sv)
514 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv)) 618 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
515 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv)); 619 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
518 { 622 {
519 // optimise the "small number case" 623 // optimise the "small number case"
520 // code will likely be branchless and use only a single multiplication 624 // code will likely be branchless and use only a single multiplication
521 I32 i = SvIV (sv); 625 I32 i = SvIV (sv);
522 U32 u; 626 U32 u;
627 char digit, nz = 0;
523 628
524 need (enc, 6); 629 need (enc, 6);
525 630
526 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0; 631 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
527 u = i < 0 ? -i : i; 632 u = i < 0 ? -i : i;
528 633
529 // convert to 4.28 fixed-point representation 634 // convert to 4.28 fixed-point representation
530 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits 635 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
531 636
532 char digit, nz = 0; 637 // now output digit by digit, each time masking out the integer part
533 638 // and multiplying by 5 while moving the decimal point one to the right,
639 // resulting in a net multiplication by 10.
640 // we always write the digit to memory but conditionally increment
641 // the pointer, to ease the usage of conditional move instructions.
534 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 642 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
535 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 643 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
536 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 644 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
537 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 645 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
538 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; 646 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
539 } 647 }
540 } 648 }
541 else if (SvROK (sv)) 649 else if (SvROK (sv))
542 encode_rv (enc, SvRV (sv)); 650 encode_rv (enc, SvRV (sv));
543 else if (!SvOK (sv)) 651 else if (!SvOK (sv))
546 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 654 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
547 SvPV_nolen (sv), SvFLAGS (sv)); 655 SvPV_nolen (sv), SvFLAGS (sv));
548} 656}
549 657
550static SV * 658static SV *
551encode_json (SV *scalar, U32 flags) 659encode_json (SV *scalar, JSON *json)
552{ 660{
553 enc_t enc; 661 enc_t enc;
554 662
555 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 663 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
556 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 664 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
557 665
558 enc.flags = flags; 666 enc.json = *json;
559 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 667 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
560 enc.cur = SvPVX (enc.sv); 668 enc.cur = SvPVX (enc.sv);
561 enc.end = SvEND (enc.sv); 669 enc.end = SvEND (enc.sv);
562 enc.indent = 0; 670 enc.indent = 0;
563 enc.maxdepth = DEC_DEPTH (flags); 671 enc.maxdepth = DEC_DEPTH (enc.json.flags);
564 672
565 SvPOK_only (enc.sv); 673 SvPOK_only (enc.sv);
566 encode_sv (&enc, scalar); 674 encode_sv (&enc, scalar);
567 675
568 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 676 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
569 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 677 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
570 678
571 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 679 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
572 SvUTF8_on (enc.sv); 680 SvUTF8_on (enc.sv);
573 681
574 if (enc.flags & F_SHRINK) 682 if (enc.json.flags & F_SHRINK)
575 shrink (enc.sv); 683 shrink (enc.sv);
576 684
577 return enc.sv; 685 return enc.sv;
578} 686}
579 687
584typedef struct 692typedef struct
585{ 693{
586 char *cur; // current parser pointer 694 char *cur; // current parser pointer
587 char *end; // end of input string 695 char *end; // end of input string
588 const char *err; // parse error, if != 0 696 const char *err; // parse error, if != 0
589 U32 flags; // F_* 697 JSON json;
590 U32 depth; // recursion depth 698 U32 depth; // recursion depth
591 U32 maxdepth; // recursion depth limit 699 U32 maxdepth; // recursion depth limit
592} dec_t; 700} dec_t;
593 701
594inline void 702inline void
625decode_4hex (dec_t *dec) 733decode_4hex (dec_t *dec)
626{ 734{
627 signed char d1, d2, d3, d4; 735 signed char d1, d2, d3, d4;
628 unsigned char *cur = (unsigned char *)dec->cur; 736 unsigned char *cur = (unsigned char *)dec->cur;
629 737
630 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("four hexadecimal digits expected"); 738 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
631 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("four hexadecimal digits expected"); 739 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
632 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("four hexadecimal digits expected"); 740 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
633 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("four hexadecimal digits expected"); 741 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
634 742
635 dec->cur += 4; 743 dec->cur += 4;
636 744
637 return ((UV)d1) << 12 745 return ((UV)d1) << 12
638 | ((UV)d2) << 8 746 | ((UV)d2) << 8
857 is_nv = 1; 965 is_nv = 1;
858 } 966 }
859 967
860 if (!is_nv) 968 if (!is_nv)
861 { 969 {
970 int len = dec->cur - start;
971
862 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 972 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
863 if (*start == '-') 973 if (*start == '-')
864 switch (dec->cur - start) 974 switch (len)
865 { 975 {
866 case 2: return newSViv (-( start [1] - '0' )); 976 case 2: return newSViv (-( start [1] - '0' * 1));
867 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 977 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
868 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 978 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
869 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 979 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
870 } 980 }
871 else 981 else
872 switch (dec->cur - start) 982 switch (len)
873 { 983 {
874 case 1: return newSViv ( start [0] - '0' ); 984 case 1: return newSViv ( start [0] - '0' * 1);
875 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 985 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
876 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 986 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
877 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 987 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
878 } 988 }
879 989
880 { 990 {
881 UV uv; 991 UV uv;
882 int numtype = grok_number (start, dec->cur - start, &uv); 992 int numtype = grok_number (start, len, &uv);
883 if (numtype & IS_NUMBER_IN_UV) 993 if (numtype & IS_NUMBER_IN_UV)
884 if (numtype & IS_NUMBER_NEG) 994 if (numtype & IS_NUMBER_NEG)
885 { 995 {
886 if (uv < (UV)IV_MIN) 996 if (uv < (UV)IV_MIN)
887 return newSViv (-(IV)uv); 997 return newSViv (-(IV)uv);
888 } 998 }
889 else 999 else
890 return newSVuv (uv); 1000 return newSVuv (uv);
891 } 1001 }
892 }
893 1002
1003 len -= *start == '-' ? 1 : 0;
1004
1005 // does not fit into IV or UV, try NV
1006 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
1007 #if defined (LDBL_DIG)
1008 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1009 #endif
1010 )
1011 // fits into NV without loss of precision
1012 return newSVnv (Atof (start));
1013
1014 // everything else fails, convert it to a string
1015 return newSVpvn (start, dec->cur - start);
1016 }
1017
1018 // loss of precision here
894 return newSVnv (Atof (start)); 1019 return newSVnv (Atof (start));
895 1020
896fail: 1021fail:
897 return 0; 1022 return 0;
898} 1023}
942} 1067}
943 1068
944static SV * 1069static SV *
945decode_hv (dec_t *dec) 1070decode_hv (dec_t *dec)
946{ 1071{
1072 SV *sv;
947 HV *hv = newHV (); 1073 HV *hv = newHV ();
948 1074
949 DEC_INC_DEPTH; 1075 DEC_INC_DEPTH;
950 decode_ws (dec); 1076 decode_ws (dec);
951 1077
952 if (*dec->cur == '}') 1078 if (*dec->cur == '}')
953 ++dec->cur; 1079 ++dec->cur;
954 else 1080 else
955 for (;;) 1081 for (;;)
956 { 1082 {
957 SV *key, *value;
958
959 decode_ws (dec); EXPECT_CH ('"'); 1083 decode_ws (dec); EXPECT_CH ('"');
960 1084
961 key = decode_str (dec); 1085 // heuristic: assume that
962 if (!key) 1086 // a) decode_str + hv_store_ent are abysmally slow.
963 goto fail; 1087 // b) most hash keys are short, simple ascii text.
1088 // => try to "fast-match" such strings to avoid
1089 // the overhead of decode_str + hv_store_ent.
1090 {
1091 SV *value;
1092 char *p = dec->cur;
1093 char *e = p + 24; // only try up to 24 bytes
964 1094
965 decode_ws (dec); EXPECT_CH (':'); 1095 for (;;)
966
967 value = decode_sv (dec);
968 if (!value)
969 { 1096 {
1097 // the >= 0x80 is true on most architectures
1098 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1099 {
1100 // slow path, back up and use decode_str
1101 SV *key = decode_str (dec);
1102 if (!key)
1103 goto fail;
1104
1105 decode_ws (dec); EXPECT_CH (':');
1106
1107 value = decode_sv (dec);
1108 if (!value)
1109 {
1110 SvREFCNT_dec (key);
1111 goto fail;
1112 }
1113
1114 hv_store_ent (hv, key, value, 0);
970 SvREFCNT_dec (key); 1115 SvREFCNT_dec (key);
1116
1117 break;
1118 }
1119 else if (*p == '"')
1120 {
1121 // fast path, got a simple key
1122 char *key = dec->cur;
1123 int len = p - key;
1124 dec->cur = p + 1;
1125
1126 decode_ws (dec); EXPECT_CH (':');
1127
1128 value = decode_sv (dec);
1129 if (!value)
971 goto fail; 1130 goto fail;
1131
1132 hv_store (hv, key, len, value, 0);
1133
1134 break;
1135 }
1136
1137 ++p;
972 } 1138 }
973 1139 }
974 hv_store_ent (hv, key, value, 0);
975 SvREFCNT_dec (key);
976 1140
977 decode_ws (dec); 1141 decode_ws (dec);
978 1142
979 if (*dec->cur == '}') 1143 if (*dec->cur == '}')
980 { 1144 {
987 1151
988 ++dec->cur; 1152 ++dec->cur;
989 } 1153 }
990 1154
991 DEC_DEC_DEPTH; 1155 DEC_DEC_DEPTH;
992 return newRV_noinc ((SV *)hv); 1156 sv = newRV_noinc ((SV *)hv);
1157
1158 // check filter callbacks
1159 if (dec->json.flags & F_HOOK)
1160 {
1161 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1162 {
1163 HE *cb, *he;
1164
1165 hv_iterinit (hv);
1166 he = hv_iternext (hv);
1167 hv_iterinit (hv);
1168
1169 // the next line creates a mortal sv each time its called.
1170 // might want to optimise this for common cases.
1171 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1172
1173 if (cb)
1174 {
1175 dSP;
1176 int count;
1177
1178 ENTER; SAVETMPS; PUSHMARK (SP);
1179 XPUSHs (HeVAL (he));
1180
1181 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1182
1183 if (count == 1)
1184 {
1185 sv = newSVsv (POPs);
1186 FREETMPS; LEAVE;
1187 return sv;
1188 }
1189
1190 FREETMPS; LEAVE;
1191 }
1192 }
1193
1194 if (dec->json.cb_object)
1195 {
1196 dSP;
1197 int count;
1198
1199 ENTER; SAVETMPS; PUSHMARK (SP);
1200 XPUSHs (sv_2mortal (sv));
1201
1202 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1203
1204 if (count == 1)
1205 {
1206 sv = newSVsv (POPs);
1207 FREETMPS; LEAVE;
1208 return sv;
1209 }
1210
1211 SvREFCNT_inc (sv);
1212 FREETMPS; LEAVE;
1213 }
1214 }
1215
1216 return sv;
993 1217
994fail: 1218fail:
995 SvREFCNT_dec (hv); 1219 SvREFCNT_dec (hv);
996 DEC_DEC_DEPTH; 1220 DEC_DEC_DEPTH;
997 return 0; 1221 return 0;
999 1223
1000static SV * 1224static SV *
1001decode_sv (dec_t *dec) 1225decode_sv (dec_t *dec)
1002{ 1226{
1003 decode_ws (dec); 1227 decode_ws (dec);
1228
1229 // the beauty of JSON: you need exactly one character lookahead
1230 // to parse anything.
1004 switch (*dec->cur) 1231 switch (*dec->cur)
1005 { 1232 {
1006 case '"': ++dec->cur; return decode_str (dec); 1233 case '"': ++dec->cur; return decode_str (dec);
1007 case '[': ++dec->cur; return decode_av (dec); 1234 case '[': ++dec->cur; return decode_av (dec);
1008 case '{': ++dec->cur; return decode_hv (dec); 1235 case '{': ++dec->cur; return decode_hv (dec);
1014 1241
1015 case 't': 1242 case 't':
1016 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1243 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1017 { 1244 {
1018 dec->cur += 4; 1245 dec->cur += 4;
1019 return newSViv (1); 1246#if JSON_SLOW
1247 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
1248#endif
1249 return SvREFCNT_inc (json_true);
1020 } 1250 }
1021 else 1251 else
1022 ERR ("'true' expected"); 1252 ERR ("'true' expected");
1023 1253
1024 break; 1254 break;
1025 1255
1026 case 'f': 1256 case 'f':
1027 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1257 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1028 { 1258 {
1029 dec->cur += 5; 1259 dec->cur += 5;
1030 return newSViv (0); 1260#if JSON_SLOW
1261 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1262#endif
1263 return SvREFCNT_inc (json_false);
1031 } 1264 }
1032 else 1265 else
1033 ERR ("'false' expected"); 1266 ERR ("'false' expected");
1034 1267
1035 break; 1268 break;
1053fail: 1286fail:
1054 return 0; 1287 return 0;
1055} 1288}
1056 1289
1057static SV * 1290static SV *
1058decode_json (SV *string, U32 flags, UV *offset_return) 1291decode_json (SV *string, JSON *json, UV *offset_return)
1059{ 1292{
1060 dec_t dec; 1293 dec_t dec;
1061 UV offset; 1294 UV offset;
1062 SV *sv; 1295 SV *sv;
1063 1296
1064 SvGETMAGIC (string); 1297 SvGETMAGIC (string);
1065 SvUPGRADE (string, SVt_PV); 1298 SvUPGRADE (string, SVt_PV);
1066 1299
1300 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1301 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1302 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1303
1067 if (flags & F_UTF8) 1304 if (json->flags & F_UTF8)
1068 sv_utf8_downgrade (string, 0); 1305 sv_utf8_downgrade (string, 0);
1069 else 1306 else
1070 sv_utf8_upgrade (string); 1307 sv_utf8_upgrade (string);
1071 1308
1072 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1309 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1073 1310
1074 dec.flags = flags; 1311 dec.json = *json;
1075 dec.cur = SvPVX (string); 1312 dec.cur = SvPVX (string);
1076 dec.end = SvEND (string); 1313 dec.end = SvEND (string);
1077 dec.err = 0; 1314 dec.err = 0;
1078 dec.depth = 0; 1315 dec.depth = 0;
1079 dec.maxdepth = DEC_DEPTH (dec.flags); 1316 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1317
1318 if (dec.json.cb_object || dec.json.cb_sk_object)
1319 dec.json.flags |= F_HOOK;
1080 1320
1081 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1321 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1082 sv = decode_sv (&dec); 1322 sv = decode_sv (&dec);
1083 1323
1084 if (!(offset_return || !sv)) 1324 if (!(offset_return || !sv))
1094 } 1334 }
1095 } 1335 }
1096 1336
1097 if (offset_return || !sv) 1337 if (offset_return || !sv)
1098 { 1338 {
1099 offset = dec.flags & F_UTF8 1339 offset = dec.json.flags & F_UTF8
1100 ? dec.cur - SvPVX (string) 1340 ? dec.cur - SvPVX (string)
1101 : utf8_distance (dec.cur, SvPVX (string)); 1341 : utf8_distance (dec.cur, SvPVX (string));
1102 1342
1103 if (offset_return) 1343 if (offset_return)
1104 *offset_return = offset; 1344 *offset_return = offset;
1123 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1363 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1124 } 1364 }
1125 1365
1126 sv = sv_2mortal (sv); 1366 sv = sv_2mortal (sv);
1127 1367
1128 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1368 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1129 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1369 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1130 1370
1131 return sv; 1371 return sv;
1132} 1372}
1133 1373
1137MODULE = JSON::XS PACKAGE = JSON::XS 1377MODULE = JSON::XS PACKAGE = JSON::XS
1138 1378
1139BOOT: 1379BOOT:
1140{ 1380{
1141 int i; 1381 int i;
1142
1143 memset (decode_hexdigit, 0xff, 256);
1144 1382
1145 for (i = 0; i < 256; ++i) 1383 for (i = 0; i < 256; ++i)
1146 decode_hexdigit [i] = 1384 decode_hexdigit [i] =
1147 i >= '0' && i <= '9' ? i - '0' 1385 i >= '0' && i <= '9' ? i - '0'
1148 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1386 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1149 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1387 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1150 : -1; 1388 : -1;
1151 1389
1152 json_stash = gv_stashpv ("JSON::XS", 1); 1390 json_stash = gv_stashpv ("JSON::XS" , 1);
1391 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1392
1393 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1394 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1153} 1395}
1154 1396
1155PROTOTYPES: DISABLE 1397PROTOTYPES: DISABLE
1156 1398
1157SV *new (char *dummy) 1399void CLONE (...)
1158 CODE: 1400 CODE:
1159 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1401 json_stash = 0;
1160 OUTPUT: 1402 json_boolean_stash = 0;
1161 RETVAL
1162 1403
1404void new (char *klass)
1405 PPCODE:
1406{
1407 SV *pv = NEWSV (0, sizeof (JSON));
1408 SvPOK_only (pv);
1409 Zero (SvPVX (pv), 1, JSON);
1410 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1411 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1412}
1413
1163SV *ascii (SV *self, int enable = 1) 1414void ascii (JSON *self, int enable = 1)
1164 ALIAS: 1415 ALIAS:
1165 ascii = F_ASCII 1416 ascii = F_ASCII
1166 latin1 = F_LATIN1 1417 latin1 = F_LATIN1
1167 utf8 = F_UTF8 1418 utf8 = F_UTF8
1168 indent = F_INDENT 1419 indent = F_INDENT
1169 canonical = F_CANONICAL 1420 canonical = F_CANONICAL
1170 space_before = F_SPACE_BEFORE 1421 space_before = F_SPACE_BEFORE
1171 space_after = F_SPACE_AFTER 1422 space_after = F_SPACE_AFTER
1172 pretty = F_PRETTY 1423 pretty = F_PRETTY
1173 allow_nonref = F_ALLOW_NONREF 1424 allow_nonref = F_ALLOW_NONREF
1174 shrink = F_SHRINK 1425 shrink = F_SHRINK
1426 allow_blessed = F_ALLOW_BLESSED
1427 convert_blessed = F_CONV_BLESSED
1175 CODE: 1428 PPCODE:
1176{ 1429{
1177 UV *uv = SvJSON (self);
1178 if (enable) 1430 if (enable)
1179 *uv |= ix; 1431 self->flags |= ix;
1180 else 1432 else
1181 *uv &= ~ix; 1433 self->flags &= ~ix;
1182 1434
1183 RETVAL = newSVsv (self); 1435 XPUSHs (ST (0));
1184} 1436}
1185 OUTPUT:
1186 RETVAL
1187 1437
1188SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1438void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1189 CODE: 1439 PPCODE:
1190{ 1440{
1191 UV *uv = SvJSON (self);
1192 UV log2 = 0; 1441 UV log2 = 0;
1193 1442
1194 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1443 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1195 1444
1196 while ((1UL << log2) < max_depth) 1445 while ((1UL << log2) < max_depth)
1197 ++log2; 1446 ++log2;
1198 1447
1199 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1448 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1200 1449
1201 RETVAL = newSVsv (self); 1450 XPUSHs (ST (0));
1202} 1451}
1203 OUTPUT:
1204 RETVAL
1205 1452
1206void encode (SV *self, SV *scalar) 1453void max_size (JSON *self, UV max_size = 0)
1207 PPCODE: 1454 PPCODE:
1208 XPUSHs (encode_json (scalar, *SvJSON (self))); 1455{
1456 UV log2 = 0;
1209 1457
1210void decode (SV *self, SV *jsonstr) 1458 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1459 if (max_size == 1) max_size = 2;
1460
1461 while ((1UL << log2) < max_size)
1462 ++log2;
1463
1464 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1465
1466 XPUSHs (ST (0));
1467}
1468
1469void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1211 PPCODE: 1470 PPCODE:
1471{
1472 SvREFCNT_dec (self->cb_object);
1473 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1474
1475 XPUSHs (ST (0));
1476}
1477
1478void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1479 PPCODE:
1480{
1481 if (!self->cb_sk_object)
1482 self->cb_sk_object = newHV ();
1483
1484 if (SvOK (cb))
1485 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1486 else
1487 {
1488 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1489
1490 if (!HvKEYS (self->cb_sk_object))
1491 {
1492 SvREFCNT_dec (self->cb_sk_object);
1493 self->cb_sk_object = 0;
1494 }
1495 }
1496
1497 XPUSHs (ST (0));
1498}
1499
1500void encode (JSON *self, SV *scalar)
1501 PPCODE:
1502 XPUSHs (encode_json (scalar, self));
1503
1504void decode (JSON *self, SV *jsonstr)
1505 PPCODE:
1212 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0)); 1506 XPUSHs (decode_json (jsonstr, self, 0));
1213 1507
1214void decode_prefix (SV *self, SV *jsonstr) 1508void decode_prefix (JSON *self, SV *jsonstr)
1215 PPCODE: 1509 PPCODE:
1216{ 1510{
1217 UV offset; 1511 UV offset;
1218 EXTEND (SP, 2); 1512 EXTEND (SP, 2);
1219 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset)); 1513 PUSHs (decode_json (jsonstr, self, &offset));
1220 PUSHs (sv_2mortal (newSVuv (offset))); 1514 PUSHs (sv_2mortal (newSVuv (offset)));
1221} 1515}
1222 1516
1517void DESTROY (JSON *self)
1518 CODE:
1519 SvREFCNT_dec (self->cb_sk_object);
1520 SvREFCNT_dec (self->cb_object);
1521
1223PROTOTYPES: ENABLE 1522PROTOTYPES: ENABLE
1224 1523
1225void to_json (SV *scalar) 1524void to_json (SV *scalar)
1226 ALIAS:
1227 objToJson = 0
1228 PPCODE: 1525 PPCODE:
1526{
1527 JSON json = { F_DEFAULT | F_UTF8 };
1229 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1528 XPUSHs (encode_json (scalar, &json));
1529}
1230 1530
1231void from_json (SV *jsonstr) 1531void from_json (SV *jsonstr)
1232 ALIAS:
1233 jsonToObj = 0
1234 PPCODE: 1532 PPCODE:
1533{
1534 JSON json = { F_DEFAULT | F_UTF8 };
1235 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0)); 1535 XPUSHs (decode_json (jsonstr, &json, 0));
1536}
1236 1537

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines