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.104 by root, Tue Jan 19 00:31:13 2010 UTC vs.
Revision 1.123 by root, Sun Dec 8 20:44:23 2013 UTC

… …
15 15
16// some old perls do not have this, try to make it work, no 16// some old perls do not have this, try to make it work, no
17// guarantees, though. if it breaks, you get to keep the pieces. 17// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
20#endif
21
22// compatibility with perl <5.18
23#ifndef HvNAMELEN_get
24# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
25#endif
26#ifndef HvNAMELEN
27# define HvNAMELEN(hv) HvNAMELEN_get (hv)
28#endif
29#ifndef HvNAMEUTF8
30# define HvNAMEUTF8(hv) 0
20#endif 31#endif
21 32
22// three extra for rounding, sign, and end of string 33// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3) 34#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
24 35
… …
33#define F_SHRINK 0x00000200UL 44#define F_SHRINK 0x00000200UL
34#define F_ALLOW_BLESSED 0x00000400UL 45#define F_ALLOW_BLESSED 0x00000400UL
35#define F_CONV_BLESSED 0x00000800UL 46#define F_CONV_BLESSED 0x00000800UL
36#define F_RELAXED 0x00001000UL 47#define F_RELAXED 0x00001000UL
37#define F_ALLOW_UNKNOWN 0x00002000UL 48#define F_ALLOW_UNKNOWN 0x00002000UL
49#define F_ALLOW_TAGS 0x00004000UL
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 50#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 51
40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 52#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
41 53
42#define INIT_SIZE 32 // initial scalar size to be allocated 54#define INIT_SIZE 32 // initial scalar size to be allocated
43#define INDENT_STEP 3 // spaces per indentation level 55#define INDENT_STEP 3 // spaces per indentation level
44 56
45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 57#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
58
59#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
46 60
47#define SB do { 61#define SB do {
48#define SE } while (0) 62#define SE } while (0)
49 63
50#if __GNUC__ >= 3 64#if __GNUC__ >= 3
… …
70#else 84#else
71# define JSON_SLOW 0 85# define JSON_SLOW 0
72# define JSON_STASH json_stash 86# define JSON_STASH json_stash
73#endif 87#endif
74 88
89// the amount of HEs to allocate on the stack, when sorting keys
90#define STACK_HES 64
91
75static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
76static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
77 94
78enum { 95enum {
79 INCR_M_WS = 0, // initial whitespace skipping, must be 0 96 INCR_M_WS = 0, // initial whitespace skipping, must be 0
80 INCR_M_STR, // inside string 97 INCR_M_STR, // inside string
81 INCR_M_BS, // inside backslash 98 INCR_M_BS, // inside backslash
… …
192///////////////////////////////////////////////////////////////////////////// 209/////////////////////////////////////////////////////////////////////////////
193// fp hell 210// fp hell
194 211
195// scan a group of digits, and a trailing exponent 212// scan a group of digits, and a trailing exponent
196static void 213static void
197json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp) 214json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
198{ 215{
199 UV uaccum = 0; 216 UV uaccum = 0;
200 int eaccum = 0; 217 int eaccum = 0;
218
219 // if we recurse too deep, skip all remaining digits
220 // to avoid a stack overflow attack
221 if (expect_false (--maxdepth <= 0))
222 while (((U8)*s - '0') < 10)
223 ++s;
201 224
202 for (;;) 225 for (;;)
203 { 226 {
204 U8 dig = (U8)*s - '0'; 227 U8 dig = (U8)*s - '0';
205 228
206 if (expect_false (dig >= 10)) 229 if (expect_false (dig >= 10))
207 { 230 {
208 if (dig == (U8)((U8)'.' - (U8)'0')) 231 if (dig == (U8)((U8)'.' - (U8)'0'))
209 { 232 {
210 ++s; 233 ++s;
211 json_atof_scan1 (s, accum, expo, 1); 234 json_atof_scan1 (s, accum, expo, 1, maxdepth);
212 } 235 }
213 else if ((dig | ' ') == 'e' - '0') 236 else if ((dig | ' ') == 'e' - '0')
214 { 237 {
215 int exp2 = 0; 238 int exp2 = 0;
216 int neg = 0; 239 int neg = 0;
… …
242 // if we have too many digits, then recurse for more 265 // if we have too many digits, then recurse for more
243 // we actually do this for rather few digits 266 // we actually do this for rather few digits
244 if (uaccum >= (UV_MAX - 9) / 10) 267 if (uaccum >= (UV_MAX - 9) / 10)
245 { 268 {
246 if (postdp) *expo -= eaccum; 269 if (postdp) *expo -= eaccum;
247 json_atof_scan1 (s, accum, expo, postdp); 270 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
248 if (postdp) *expo += eaccum; 271 if (postdp) *expo += eaccum;
249 272
250 break; 273 break;
251 } 274 }
252 } 275 }
253 276
277 // this relies greatly on the quality of the pow ()
278 // implementation of the platform, but a good
279 // implementation is hard to beat.
280 // (IEEE 754 conformant ones are required to be exact)
254 if (postdp) *expo -= eaccum; 281 if (postdp) *expo -= eaccum;
255 *accum += uaccum * pow (10., *expo); 282 *accum += uaccum * Perl_pow (10., *expo);
256 *expo += eaccum; 283 *expo += eaccum;
257} 284}
258 285
259static NV 286static NV
260json_atof (const char *s) 287json_atof (const char *s)
… …
267 { 294 {
268 ++s; 295 ++s;
269 neg = 1; 296 neg = 1;
270 } 297 }
271 298
299 // a recursion depth of ten gives us >>500 bits
272 json_atof_scan1 (s, &accum, &expo, 0); 300 json_atof_scan1 (s, &accum, &expo, 0, 10);
273 301
274 return neg ? -accum : accum; 302 return neg ? -accum : accum;
275} 303}
276///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
277// encoder 305// encoder
… …
467 495
468 if (enc->indent >= enc->json.max_depth) 496 if (enc->indent >= enc->json.max_depth)
469 croak (ERR_NESTING_EXCEEDED); 497 croak (ERR_NESTING_EXCEEDED);
470 498
471 encode_ch (enc, '['); 499 encode_ch (enc, '[');
472 500
473 if (len >= 0) 501 if (len >= 0)
474 { 502 {
475 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
476 504
477 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
… …
489 encode_comma (enc); 517 encode_comma (enc);
490 } 518 }
491 519
492 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
493 } 521 }
494 522
495 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
496} 524}
497 525
498static void 526static void
499encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
… …
503 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
504 { 532 {
505 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
506 STRLEN len; 534 STRLEN len;
507 char *str; 535 char *str;
508 536
509 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
510 str = SvPV (sv, len); 538 str = SvPV (sv, len);
511 539
512 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
513 } 541 }
… …
579 } 607 }
580 608
581 if (count) 609 if (count)
582 { 610 {
583 int i, fast = 1; 611 int i, fast = 1;
584#if defined(__BORLANDC__) || defined(_MSC_VER) 612 HE *hes_stack [STACK_HES];
585 HE **hes = _alloca (count * sizeof (HE)); 613 HE **hes = hes_stack;
586#else 614
587 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 615 // allocate larger arrays on the heap
588#endif 616 if (count > STACK_HES)
617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
589 621
590 i = 0; 622 i = 0;
591 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
592 { 624 {
593 hes [i++] = he; 625 hes [i++] = he;
… …
662// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
663static void 695static void
664encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
665{ 697{
666 svtype svt; 698 svtype svt;
699 GV *method;
667 700
668 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
669 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
670 703
671 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
672 { 705 {
673 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
674 ? json_boolean_stash 707 ? types_boolean_stash
675 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
676 710
677 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
678 { 712 {
679 if (SvIV (sv)) 713 if (SvIV (sv))
680 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
681 else 715 else
682 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
683 } 717 }
718 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
719 {
720 int count;
721 dSP;
722
723 ENTER; SAVETMPS; PUSHMARK (SP);
724 EXTEND (SP, 2);
725 // we re-bless the reference to get overload and other niceties right
726 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
727 PUSHs (sv_json);
728
729 PUTBACK;
730 count = call_sv ((SV *)GvCV (method), G_ARRAY);
731 SPAGAIN;
732
733 // catch this surprisingly common error
734 if (SvROK (TOPs) && SvRV (TOPs) == sv)
735 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
736
737 encode_ch (enc, '(');
738 encode_ch (enc, '"');
739 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
740 encode_ch (enc, '"');
741 encode_ch (enc, ')');
742 encode_ch (enc, '[');
743
744 while (count)
745 {
746 encode_sv (enc, SP[1 - count--]);
747
748 if (count)
749 encode_ch (enc, ',');
750 }
751
752 encode_ch (enc, ']');
753
754 PUTBACK;
755
756 FREETMPS; LEAVE;
757 }
758 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
759 {
760 dSP;
761
762 ENTER; SAVETMPS; PUSHMARK (SP);
763 // we re-bless the reference to get overload and other niceties right
764 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
765
766 // calling with G_SCALAR ensures that we always get a 1 return value
767 PUTBACK;
768 call_sv ((SV *)GvCV (method), G_SCALAR);
769 SPAGAIN;
770
771 // catch this surprisingly common error
772 if (SvROK (TOPs) && SvRV (TOPs) == sv)
773 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
774
775 sv = POPs;
776 PUTBACK;
777
778 encode_sv (enc, sv);
779
780 FREETMPS; LEAVE;
781 }
782 else if (enc->json.flags & F_ALLOW_BLESSED)
783 encode_str (enc, "null", 4, 0);
684 else 784 else
685 {
686#if 0
687 if (0 && sv_derived_from (rv, "JSON::Literal"))
688 {
689 // not yet
690 }
691#endif
692 if (enc->json.flags & F_CONV_BLESSED)
693 {
694 // we re-bless the reference to get overload and other niceties right
695 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
696
697 if (to_json)
698 {
699 dSP;
700
701 ENTER; SAVETMPS; PUSHMARK (SP);
702 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
703
704 // calling with G_SCALAR ensures that we always get a 1 return value
705 PUTBACK;
706 call_sv ((SV *)GvCV (to_json), G_SCALAR);
707 SPAGAIN;
708
709 // catch this surprisingly common error
710 if (SvROK (TOPs) && SvRV (TOPs) == sv)
711 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
712
713 sv = POPs;
714 PUTBACK;
715
716 encode_sv (enc, sv);
717
718 FREETMPS; LEAVE;
719 }
720 else if (enc->json.flags & F_ALLOW_BLESSED)
721 encode_str (enc, "null", 4, 0);
722 else
723 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
724 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
725 }
726 else if (enc->json.flags & F_ALLOW_BLESSED)
727 encode_str (enc, "null", 4, 0);
728 else
729 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 785 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
730 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 786 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
731 }
732 } 787 }
733 else if (svt == SVt_PVHV) 788 else if (svt == SVt_PVHV)
734 encode_hv (enc, (HV *)sv); 789 encode_hv (enc, (HV *)sv);
735 else if (svt == SVt_PVAV) 790 else if (svt == SVt_PVAV)
736 encode_av (enc, (AV *)sv); 791 encode_av (enc, (AV *)sv);
… …
812 } 867 }
813 else 868 else
814 { 869 {
815 // large integer, use the (rather slow) snprintf way. 870 // large integer, use the (rather slow) snprintf way.
816 need (enc, IVUV_MAXCHARS); 871 need (enc, IVUV_MAXCHARS);
817 enc->cur += 872 enc->cur +=
818 SvIsUV(sv) 873 SvIsUV(sv)
819 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 874 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
820 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 875 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
821 } 876 }
822 } 877 }
823 else if (SvROK (sv)) 878 else if (SvROK (sv))
824 encode_rv (enc, SvRV (sv)); 879 encode_rv (enc, SvRV (sv));
825 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 880 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
826 encode_str (enc, "null", 4, 0); 881 encode_str (enc, "null", 4, 0);
827 else 882 else
828 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 883 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
829 SvPV_nolen (sv), SvFLAGS (sv)); 884 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
830} 885}
831 886
832static SV * 887static SV *
833encode_json (SV *scalar, JSON *json) 888encode_json (SV *scalar, JSON *json)
834{ 889{
… …
1246 if (*dec->cur == ']') 1301 if (*dec->cur == ']')
1247 { 1302 {
1248 ++dec->cur; 1303 ++dec->cur;
1249 break; 1304 break;
1250 } 1305 }
1251 1306
1252 if (*dec->cur != ',') 1307 if (*dec->cur != ',')
1253 ERR (", or ] expected while parsing array"); 1308 ERR (", or ] expected while parsing array");
1254 1309
1255 ++dec->cur; 1310 ++dec->cur;
1256 1311
… …
1391 dSP; 1446 dSP;
1392 int count; 1447 int count;
1393 1448
1394 ENTER; SAVETMPS; PUSHMARK (SP); 1449 ENTER; SAVETMPS; PUSHMARK (SP);
1395 XPUSHs (HeVAL (he)); 1450 XPUSHs (HeVAL (he));
1451 sv_2mortal (sv);
1396 1452
1397 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1453 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1398 1454
1399 if (count == 1) 1455 if (count == 1)
1400 { 1456 {
1401 sv = newSVsv (POPs); 1457 sv = newSVsv (POPs);
1402 FREETMPS; LEAVE; 1458 FREETMPS; LEAVE;
1403 return sv; 1459 return sv;
1404 } 1460 }
1405 1461
1462 SvREFCNT_inc (sv);
1406 FREETMPS; LEAVE; 1463 FREETMPS; LEAVE;
1407 } 1464 }
1408 } 1465 }
1409 1466
1410 if (dec->json.cb_object) 1467 if (dec->json.cb_object)
… …
1436 DEC_DEC_DEPTH; 1493 DEC_DEC_DEPTH;
1437 return 0; 1494 return 0;
1438} 1495}
1439 1496
1440static SV * 1497static SV *
1498decode_tag (dec_t *dec)
1499{
1500 SV *tag = 0;
1501 SV *val = 0;
1502
1503 if (!(dec->json.flags & F_ALLOW_TAGS))
1504 ERR ("malformed JSON string, neither array, object, number, string or atom");
1505
1506 ++dec->cur;
1507
1508 decode_ws (dec);
1509
1510 tag = decode_sv (dec);
1511 if (!tag)
1512 goto fail;
1513
1514 if (!SvPOK (tag))
1515 ERR ("malformed JSON string, (tag) must be a string");
1516
1517 decode_ws (dec);
1518
1519 if (*dec->cur != ')')
1520 ERR (") expected after tag");
1521
1522 ++dec->cur;
1523
1524 decode_ws (dec);
1525
1526 val = decode_sv (dec);
1527 if (!val)
1528 goto fail;
1529
1530 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1531 ERR ("malformed JSON string, tag value must be an array");
1532
1533 {
1534 AV *av = (AV *)SvRV (val);
1535 int i, len = av_len (av) + 1;
1536 HV *stash = gv_stashsv (tag, 0);
1537 SV *sv;
1538
1539 if (!stash)
1540 ERR ("cannot decode perl-object (package does not exist)");
1541
1542 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1543
1544 if (!method)
1545 ERR ("cannot decode perl-object (package does not have a THAW method)");
1546
1547 dSP;
1548
1549 ENTER; SAVETMPS; PUSHMARK (SP);
1550 EXTEND (SP, len + 2);
1551 // we re-bless the reference to get overload and other niceties right
1552 PUSHs (tag);
1553 PUSHs (sv_json);
1554
1555 for (i = 0; i < len; ++i)
1556 PUSHs (*av_fetch (av, i, 1));
1557
1558 PUTBACK;
1559 call_sv ((SV *)GvCV (method), G_SCALAR);
1560 SPAGAIN;
1561
1562 SvREFCNT_dec (tag);
1563 SvREFCNT_dec (val);
1564 sv = SvREFCNT_inc (POPs);
1565
1566 PUTBACK;
1567
1568 FREETMPS; LEAVE;
1569
1570 return sv;
1571 }
1572
1573fail:
1574 SvREFCNT_dec (tag);
1575 SvREFCNT_dec (val);
1576 return 0;
1577}
1578
1579static SV *
1441decode_sv (dec_t *dec) 1580decode_sv (dec_t *dec)
1442{ 1581{
1443 // the beauty of JSON: you need exactly one character lookahead 1582 // the beauty of JSON: you need exactly one character lookahead
1444 // to parse everything. 1583 // to parse everything.
1445 switch (*dec->cur) 1584 switch (*dec->cur)
1446 { 1585 {
1447 case '"': ++dec->cur; return decode_str (dec); 1586 case '"': ++dec->cur; return decode_str (dec);
1448 case '[': ++dec->cur; return decode_av (dec); 1587 case '[': ++dec->cur; return decode_av (dec);
1449 case '{': ++dec->cur; return decode_hv (dec); 1588 case '{': ++dec->cur; return decode_hv (dec);
1589 case '(': return decode_tag (dec);
1450 1590
1451 case '-': 1591 case '-':
1452 case '0': case '1': case '2': case '3': case '4': 1592 case '0': case '1': case '2': case '3': case '4':
1453 case '5': case '6': case '7': case '8': case '9': 1593 case '5': case '6': case '7': case '8': case '9':
1454 return decode_num (dec); 1594 return decode_num (dec);
… …
1456 case 't': 1596 case 't':
1457 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1597 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1458 { 1598 {
1459 dec->cur += 4; 1599 dec->cur += 4;
1460#if JSON_SLOW 1600#if JSON_SLOW
1461 json_true = get_bool ("JSON::XS::true"); 1601 types_true = get_bool ("Types::Serialiser::true");
1462#endif 1602#endif
1463 return newSVsv (json_true); 1603 return newSVsv (types_true);
1464 } 1604 }
1465 else 1605 else
1466 ERR ("'true' expected"); 1606 ERR ("'true' expected");
1467 1607
1468 break; 1608 break;
… …
1470 case 'f': 1610 case 'f':
1471 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1611 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1472 { 1612 {
1473 dec->cur += 5; 1613 dec->cur += 5;
1474#if JSON_SLOW 1614#if JSON_SLOW
1475 json_false = get_bool ("JSON::XS::false"); 1615 types_false = get_bool ("Types::Serialiser::false");
1476#endif 1616#endif
1477 return newSVsv (json_false); 1617 return newSVsv (types_false);
1478 } 1618 }
1479 else 1619 else
1480 ERR ("'false' expected"); 1620 ERR ("'false' expected");
1481 1621
1482 break; 1622 break;
… …
1491 ERR ("'null' expected"); 1631 ERR ("'null' expected");
1492 1632
1493 break; 1633 break;
1494 1634
1495 default: 1635 default:
1496 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1636 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1497 break; 1637 break;
1498 } 1638 }
1499 1639
1500fail: 1640fail:
1501 return 0; 1641 return 0;
… …
1506{ 1646{
1507 dec_t dec; 1647 dec_t dec;
1508 SV *sv; 1648 SV *sv;
1509 1649
1510 /* work around bugs in 5.10 where manipulating magic values 1650 /* work around bugs in 5.10 where manipulating magic values
1511 * will perl ignore the magic in subsequent accesses 1651 * makes perl ignore the magic in subsequent accesses.
1652 * also make a copy of non-PV values, to get them into a clean
1653 * state (SvPV should do that, but it's buggy, see below).
1512 */ 1654 */
1513 /*SvGETMAGIC (string);*/ 1655 /*SvGETMAGIC (string);*/
1514 if (SvMAGICAL (string)) 1656 if (SvMAGICAL (string) || !SvPOK (string))
1515 string = sv_2mortal (newSVsv (string)); 1657 string = sv_2mortal (newSVsv (string));
1516 1658
1517 SvUPGRADE (string, SVt_PV); 1659 SvUPGRADE (string, SVt_PV);
1518 1660
1519 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1661 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1536 if (offset > json->max_size && json->max_size) 1678 if (offset > json->max_size && json->max_size)
1537 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1679 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1538 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1680 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1539 } 1681 }
1540 1682
1541 if (json->flags & F_UTF8) 1683 if (DECODE_WANTS_OCTETS (json))
1542 sv_utf8_downgrade (string, 0); 1684 sv_utf8_downgrade (string, 0);
1543 else 1685 else
1544 sv_utf8_upgrade (string); 1686 sv_utf8_upgrade (string);
1545 1687
1546 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1688 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1588 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1730 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1589 LEAVE; 1731 LEAVE;
1590 1732
1591 croak ("%s, at character offset %d (before \"%s\")", 1733 croak ("%s, at character offset %d (before \"%s\")",
1592 dec.err, 1734 dec.err,
1593 ptr_to_index (string, dec.cur), 1735 (int)ptr_to_index (string, dec.cur),
1594 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1736 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1595 } 1737 }
1596 1738
1597 sv = sv_2mortal (sv); 1739 sv = sv_2mortal (sv);
1598 1740
… …
1726 self->incr_mode = INCR_M_STR; 1868 self->incr_mode = INCR_M_STR;
1727 goto incr_m_str; 1869 goto incr_m_str;
1728 1870
1729 case '[': 1871 case '[':
1730 case '{': 1872 case '{':
1873 case '(':
1731 if (++self->incr_nest > self->max_depth) 1874 if (++self->incr_nest > self->max_depth)
1732 croak (ERR_NESTING_EXCEEDED); 1875 croak (ERR_NESTING_EXCEEDED);
1733 break; 1876 break;
1734 1877
1735 case ']': 1878 case ']':
1736 case '}': 1879 case '}':
1737 if (--self->incr_nest <= 0) 1880 if (--self->incr_nest <= 0)
1738 goto interrupt; 1881 goto interrupt;
1882 break;
1883
1884 case ')':
1885 --self->incr_nest;
1739 break; 1886 break;
1740 1887
1741 case '#': 1888 case '#':
1742 self->incr_mode = INCR_M_C1; 1889 self->incr_mode = INCR_M_C1;
1743 goto incr_m_c; 1890 goto incr_m_c;
… …
1769 i >= '0' && i <= '9' ? i - '0' 1916 i >= '0' && i <= '9' ? i - '0'
1770 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1917 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1771 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1918 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1772 : -1; 1919 : -1;
1773 1920
1774 json_stash = gv_stashpv ("JSON::XS" , 1); 1921 json_stash = gv_stashpv ("JSON::XS" , 1);
1775 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1922 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1776 1923
1777 json_true = get_bool ("JSON::XS::true"); 1924 types_true = get_bool ("Types::Serialiser::true");
1778 json_false = get_bool ("JSON::XS::false"); 1925 types_false = get_bool ("Types::Serialiser::false");
1926
1927 sv_json = newSVpv ("JSON", 0);
1928 SvREADONLY_on (sv_json);
1779 1929
1780 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1930 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1781} 1931}
1782 1932
1783PROTOTYPES: DISABLE 1933PROTOTYPES: DISABLE
1784 1934
1785void CLONE (...) 1935void CLONE (...)
1786 CODE: 1936 CODE:
1787 json_stash = 0; 1937 json_stash = 0;
1788 json_boolean_stash = 0; 1938 types_boolean_stash = 0;
1789 1939
1790void new (char *klass) 1940void new (char *klass)
1791 PPCODE: 1941 PPCODE:
1792{ 1942{
1793 SV *pv = NEWSV (0, sizeof (JSON)); 1943 SV *pv = NEWSV (0, sizeof (JSON));
1794 SvPOK_only (pv); 1944 SvPOK_only (pv);
1795 json_init ((JSON *)SvPVX (pv)); 1945 json_init ((JSON *)SvPVX (pv));
1796 XPUSHs (sv_2mortal (sv_bless ( 1946 XPUSHs (sv_2mortal (sv_bless (
1797 newRV_noinc (pv), 1947 newRV_noinc (pv),
1798 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1948 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1813 shrink = F_SHRINK 1963 shrink = F_SHRINK
1814 allow_blessed = F_ALLOW_BLESSED 1964 allow_blessed = F_ALLOW_BLESSED
1815 convert_blessed = F_CONV_BLESSED 1965 convert_blessed = F_CONV_BLESSED
1816 relaxed = F_RELAXED 1966 relaxed = F_RELAXED
1817 allow_unknown = F_ALLOW_UNKNOWN 1967 allow_unknown = F_ALLOW_UNKNOWN
1968 allow_tags = F_ALLOW_TAGS
1818 PPCODE: 1969 PPCODE:
1819{ 1970{
1820 if (enable) 1971 if (enable)
1821 self->flags |= ix; 1972 self->flags |= ix;
1822 else 1973 else
… …
1838 get_shrink = F_SHRINK 1989 get_shrink = F_SHRINK
1839 get_allow_blessed = F_ALLOW_BLESSED 1990 get_allow_blessed = F_ALLOW_BLESSED
1840 get_convert_blessed = F_CONV_BLESSED 1991 get_convert_blessed = F_CONV_BLESSED
1841 get_relaxed = F_RELAXED 1992 get_relaxed = F_RELAXED
1842 get_allow_unknown = F_ALLOW_UNKNOWN 1993 get_allow_unknown = F_ALLOW_UNKNOWN
1994 get_allow_tags = F_ALLOW_TAGS
1843 PPCODE: 1995 PPCODE:
1844 XPUSHs (boolSV (self->flags & ix)); 1996 XPUSHs (boolSV (self->flags & ix));
1845 1997
1846void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 1998void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1847 PPCODE: 1999 PPCODE:
… …
1875} 2027}
1876 2028
1877void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2029void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1878 PPCODE: 2030 PPCODE:
1879{ 2031{
1880 if (!self->cb_sk_object) 2032 if (!self->cb_sk_object)
1881 self->cb_sk_object = newHV (); 2033 self->cb_sk_object = newHV ();
1882 2034
1883 if (SvOK (cb)) 2035 if (SvOK (cb))
1884 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2036 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1885 else 2037 else
… …
1896 XPUSHs (ST (0)); 2048 XPUSHs (ST (0));
1897} 2049}
1898 2050
1899void encode (JSON *self, SV *scalar) 2051void encode (JSON *self, SV *scalar)
1900 PPCODE: 2052 PPCODE:
1901 XPUSHs (encode_json (scalar, self)); 2053 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2054 XPUSHs (scalar);
1902 2055
1903void decode (JSON *self, SV *jsonstr) 2056void decode (JSON *self, SV *jsonstr)
1904 PPCODE: 2057 PPCODE:
1905 XPUSHs (decode_json (jsonstr, self, 0)); 2058 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2059 XPUSHs (jsonstr);
1906 2060
1907void decode_prefix (JSON *self, SV *jsonstr) 2061void decode_prefix (JSON *self, SV *jsonstr)
1908 PPCODE: 2062 PPCODE:
1909{ 2063{
2064 SV *sv;
1910 char *offset; 2065 char *offset;
2066 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1911 EXTEND (SP, 2); 2067 EXTEND (SP, 2);
1912 PUSHs (decode_json (jsonstr, self, &offset)); 2068 PUSHs (sv);
1913 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2069 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1914} 2070}
1915 2071
1916void incr_parse (JSON *self, SV *jsonstr = 0) 2072void incr_parse (JSON *self, SV *jsonstr = 0)
1917 PPCODE: 2073 PPCODE:
1918{ 2074{
1919 if (!self->incr_text) 2075 if (!self->incr_text)
1920 self->incr_text = newSVpvn ("", 0); 2076 self->incr_text = newSVpvn ("", 0);
2077
2078 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2079 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2080 if (DECODE_WANTS_OCTETS (self))
2081 {
2082 if (self->incr_pos)
2083 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2084 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2085
2086 sv_utf8_downgrade (self->incr_text, 0);
2087 }
2088 else
2089 {
2090 sv_utf8_upgrade (self->incr_text);
2091
2092 if (self->incr_pos)
2093 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2094 - (U8 *)SvPVX (self->incr_text);
2095 }
1921 2096
1922 // append data, if any 2097 // append data, if any
1923 if (jsonstr) 2098 if (jsonstr)
1924 { 2099 {
2100 /* make sure both strings have same encoding */
2101 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1925 if (SvUTF8 (jsonstr)) 2102 if (SvUTF8 (jsonstr))
2103 sv_utf8_downgrade (jsonstr, 0);
1926 { 2104 else
1927 if (!SvUTF8 (self->incr_text))
1928 {
1929 /* utf-8-ness differs, need to upgrade */
1930 sv_utf8_upgrade (self->incr_text);
1931
1932 if (self->incr_pos)
1933 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1934 - (U8 *)SvPVX (self->incr_text);
1935 }
1936 }
1937 else if (SvUTF8 (self->incr_text))
1938 sv_utf8_upgrade (jsonstr); 2105 sv_utf8_upgrade (jsonstr);
1939 2106
2107 /* and then just blindly append */
1940 { 2108 {
1941 STRLEN len; 2109 STRLEN len;
1942 const char *str = SvPV (jsonstr, len); 2110 const char *str = SvPV (jsonstr, len);
1943 STRLEN cur = SvCUR (self->incr_text); 2111 STRLEN cur = SvCUR (self->incr_text);
1944 2112
… …
1952 } 2120 }
1953 2121
1954 if (GIMME_V != G_VOID) 2122 if (GIMME_V != G_VOID)
1955 do 2123 do
1956 { 2124 {
2125 SV *sv;
1957 char *offset; 2126 char *offset;
1958 2127
1959 if (!INCR_DONE (self)) 2128 if (!INCR_DONE (self))
1960 { 2129 {
1961 incr_parse (self); 2130 incr_parse (self);
… …
1963 if (self->incr_pos > self->max_size && self->max_size) 2132 if (self->incr_pos > self->max_size && self->max_size)
1964 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2133 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1965 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2134 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1966 2135
1967 if (!INCR_DONE (self)) 2136 if (!INCR_DONE (self))
2137 {
2138 // as an optimisation, do not accumulate white space in the incr buffer
2139 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2140 {
2141 self->incr_pos = 0;
2142 SvCUR_set (self->incr_text, 0);
2143 }
2144
1968 break; 2145 break;
2146 }
1969 } 2147 }
1970 2148
1971 XPUSHs (decode_json (self->incr_text, self, &offset)); 2149 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2150 XPUSHs (sv);
1972 2151
1973 self->incr_pos -= offset - SvPVX (self->incr_text); 2152 self->incr_pos -= offset - SvPVX (self->incr_text);
1974 self->incr_nest = 0; 2153 self->incr_nest = 0;
1975 self->incr_mode = 0; 2154 self->incr_mode = 0;
1976 2155
… …
2020 SvREFCNT_dec (self->incr_text); 2199 SvREFCNT_dec (self->incr_text);
2021 2200
2022PROTOTYPES: ENABLE 2201PROTOTYPES: ENABLE
2023 2202
2024void encode_json (SV *scalar) 2203void encode_json (SV *scalar)
2025 ALIAS:
2026 to_json_ = 0
2027 encode_json = F_UTF8
2028 PPCODE: 2204 PPCODE:
2029{ 2205{
2030 JSON json; 2206 JSON json;
2031 json_init (&json); 2207 json_init (&json);
2032 json.flags |= ix; 2208 json.flags |= F_UTF8;
2033 XPUSHs (encode_json (scalar, &json)); 2209 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2210 XPUSHs (scalar);
2034} 2211}
2035 2212
2036void decode_json (SV *jsonstr) 2213void decode_json (SV *jsonstr)
2037 ALIAS:
2038 from_json_ = 0
2039 decode_json = F_UTF8
2040 PPCODE: 2214 PPCODE:
2041{ 2215{
2042 JSON json; 2216 JSON json;
2043 json_init (&json); 2217 json_init (&json);
2044 json.flags |= ix; 2218 json.flags |= F_UTF8;
2045 XPUSHs (decode_json (jsonstr, &json, 0)); 2219 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2220 XPUSHs (jsonstr);
2046} 2221}
2047 2222

Diff Legend

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