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.114 by root, Wed Aug 1 19:04:41 2012 UTC vs.
Revision 1.128 by root, Fri Oct 7 05:18:48 2016 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
… …
67#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)" 79#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
68 80
69#ifdef USE_ITHREADS 81#ifdef USE_ITHREADS
70# define JSON_SLOW 1 82# define JSON_SLOW 1
71# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 83# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
84# define BOOL_STASH (bool_stash ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
72#else 85#else
73# define JSON_SLOW 0 86# define JSON_SLOW 0
74# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash
75#endif 89#endif
76 90
77static HV *json_stash, *json_boolean_stash; // JSON::XS:: 91// the amount of HEs to allocate on the stack, when sorting keys
78static SV *json_true, *json_false; 92#define STACK_HES 64
93
94static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
95static SV *bool_true, *bool_false, *sv_json;
79 96
80enum { 97enum {
81 INCR_M_WS = 0, // initial whitespace skipping, must be 0 98 INCR_M_WS = 0, // initial whitespace skipping, must be 0
82 INCR_M_STR, // inside string 99 INCR_M_STR, // inside string
83 INCR_M_BS, // inside backslash 100 INCR_M_BS, // inside backslash
… …
284 // a recursion depth of ten gives us >>500 bits 301 // a recursion depth of ten gives us >>500 bits
285 json_atof_scan1 (s, &accum, &expo, 0, 10); 302 json_atof_scan1 (s, &accum, &expo, 0, 10);
286 303
287 return neg ? -accum : accum; 304 return neg ? -accum : accum;
288} 305}
306
307// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
308static int
309ref_bool_type (SV *sv)
310{
311 svtype svt = SvTYPE (sv);
312
313 if (svt < SVt_PVAV)
314 {
315 STRLEN len = 0;
316 char *pv = svt ? SvPV (sv, len) : 0;
317
318 if (len == 1)
319 if (*pv == '1')
320 return 1;
321 else if (*pv == '0')
322 return 0;
323 }
324
325 return -1;
326}
327
328// returns whether scalar is not a reference in the sense of allow_nonref
329static int
330json_nonref (SV *scalar)
331{
332 if (!SvROK (scalar))
333 return 1;
334
335 scalar = SvRV (scalar);
336
337 if (SvTYPE (scalar) >= SVt_PVMG)
338 {
339 if (SvSTASH (scalar) == bool_stash)
340 return 1;
341
342 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
343 return 1;
344 }
345
346 return 0;
347}
348
289///////////////////////////////////////////////////////////////////////////// 349/////////////////////////////////////////////////////////////////////////////
290// encoder 350// encoder
291 351
292// structure used for encoding JSON 352// structure used for encoding JSON
293typedef struct 353typedef struct
… …
480 540
481 if (enc->indent >= enc->json.max_depth) 541 if (enc->indent >= enc->json.max_depth)
482 croak (ERR_NESTING_EXCEEDED); 542 croak (ERR_NESTING_EXCEEDED);
483 543
484 encode_ch (enc, '['); 544 encode_ch (enc, '[');
485 545
486 if (len >= 0) 546 if (len >= 0)
487 { 547 {
488 encode_nl (enc); ++enc->indent; 548 encode_nl (enc); ++enc->indent;
489 549
490 for (i = 0; i <= len; ++i) 550 for (i = 0; i <= len; ++i)
… …
502 encode_comma (enc); 562 encode_comma (enc);
503 } 563 }
504 564
505 encode_nl (enc); --enc->indent; encode_indent (enc); 565 encode_nl (enc); --enc->indent; encode_indent (enc);
506 } 566 }
507 567
508 encode_ch (enc, ']'); 568 encode_ch (enc, ']');
509} 569}
510 570
511static void 571static void
512encode_hk (enc_t *enc, HE *he) 572encode_hk (enc_t *enc, HE *he)
… …
516 if (HeKLEN (he) == HEf_SVKEY) 576 if (HeKLEN (he) == HEf_SVKEY)
517 { 577 {
518 SV *sv = HeSVKEY (he); 578 SV *sv = HeSVKEY (he);
519 STRLEN len; 579 STRLEN len;
520 char *str; 580 char *str;
521 581
522 SvGETMAGIC (sv); 582 SvGETMAGIC (sv);
523 str = SvPV (sv, len); 583 str = SvPV (sv, len);
524 584
525 encode_str (enc, str, len, SvUTF8 (sv)); 585 encode_str (enc, str, len, SvUTF8 (sv));
526 } 586 }
… …
592 } 652 }
593 653
594 if (count) 654 if (count)
595 { 655 {
596 int i, fast = 1; 656 int i, fast = 1;
597#if defined(__BORLANDC__) || defined(_MSC_VER) 657 HE *hes_stack [STACK_HES];
598 HE **hes = _alloca (count * sizeof (HE)); 658 HE **hes = hes_stack;
599#else 659
600 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 660 // allocate larger arrays on the heap
601#endif 661 if (count > STACK_HES)
662 {
663 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
664 hes = (HE **)SvPVX (sv);
665 }
602 666
603 i = 0; 667 i = 0;
604 while ((he = hv_iternext (hv))) 668 while ((he = hv_iternext (hv)))
605 { 669 {
606 hes [i++] = he; 670 hes [i++] = he;
… …
675// encode objects, arrays and special \0=false and \1=true values. 739// encode objects, arrays and special \0=false and \1=true values.
676static void 740static void
677encode_rv (enc_t *enc, SV *sv) 741encode_rv (enc_t *enc, SV *sv)
678{ 742{
679 svtype svt; 743 svtype svt;
744 GV *method;
680 745
681 SvGETMAGIC (sv); 746 SvGETMAGIC (sv);
682 svt = SvTYPE (sv); 747 svt = SvTYPE (sv);
683 748
684 if (expect_false (SvOBJECT (sv))) 749 if (expect_false (SvOBJECT (sv)))
685 { 750 {
686 HV *stash = !JSON_SLOW || json_boolean_stash 751 HV *stash = SvSTASH (sv);
687 ? json_boolean_stash
688 : gv_stashpv ("JSON::XS::Boolean", 1);
689 752
690 if (SvSTASH (sv) == stash) 753 if (stash == bool_stash)
691 { 754 {
692 if (SvIV (sv)) 755 if (SvIV (sv))
693 encode_str (enc, "true", 4, 0); 756 encode_str (enc, "true", 4, 0);
694 else 757 else
695 encode_str (enc, "false", 5, 0); 758 encode_str (enc, "false", 5, 0);
696 } 759 }
760 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
761 {
762 int count;
763 dSP;
764
765 ENTER; SAVETMPS;
766 SAVESTACK_POS ();
767 PUSHMARK (SP);
768 EXTEND (SP, 2);
769 // we re-bless the reference to get overload and other niceties right
770 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
771 PUSHs (sv_json);
772
773 PUTBACK;
774 count = call_sv ((SV *)GvCV (method), G_ARRAY);
775 SPAGAIN;
776
777 // catch this surprisingly common error
778 if (SvROK (TOPs) && SvRV (TOPs) == sv)
779 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
780
781 encode_ch (enc, '(');
782 encode_ch (enc, '"');
783 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
784 encode_ch (enc, '"');
785 encode_ch (enc, ')');
786 encode_ch (enc, '[');
787
788 while (count)
789 {
790 encode_sv (enc, SP[1 - count--]);
791
792 if (count)
793 encode_ch (enc, ',');
794 }
795
796 encode_ch (enc, ']');
797
798 FREETMPS; LEAVE;
799 }
800 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
801 {
802 dSP;
803
804 ENTER; SAVETMPS;
805 PUSHMARK (SP);
806 // we re-bless the reference to get overload and other niceties right
807 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
808
809 // calling with G_SCALAR ensures that we always get a 1 return value
810 PUTBACK;
811 call_sv ((SV *)GvCV (method), G_SCALAR);
812 SPAGAIN;
813
814 // catch this surprisingly common error
815 if (SvROK (TOPs) && SvRV (TOPs) == sv)
816 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
817
818 sv = POPs;
819 PUTBACK;
820
821 encode_sv (enc, sv);
822
823 FREETMPS; LEAVE;
824 }
825 else if (enc->json.flags & F_ALLOW_BLESSED)
826 encode_str (enc, "null", 4, 0);
697 else 827 else
698 {
699#if 0
700 if (0 && sv_derived_from (rv, "JSON::Literal"))
701 {
702 // not yet
703 }
704#endif
705 if (enc->json.flags & F_CONV_BLESSED)
706 {
707 // we re-bless the reference to get overload and other niceties right
708 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
709
710 if (to_json)
711 {
712 dSP;
713
714 ENTER; SAVETMPS; PUSHMARK (SP);
715 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
716
717 // calling with G_SCALAR ensures that we always get a 1 return value
718 PUTBACK;
719 call_sv ((SV *)GvCV (to_json), G_SCALAR);
720 SPAGAIN;
721
722 // catch this surprisingly common error
723 if (SvROK (TOPs) && SvRV (TOPs) == sv)
724 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
725
726 sv = POPs;
727 PUTBACK;
728
729 encode_sv (enc, sv);
730
731 FREETMPS; LEAVE;
732 }
733 else if (enc->json.flags & F_ALLOW_BLESSED)
734 encode_str (enc, "null", 4, 0);
735 else
736 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
737 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
738 }
739 else if (enc->json.flags & F_ALLOW_BLESSED)
740 encode_str (enc, "null", 4, 0);
741 else
742 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 828 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
743 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 829 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
744 }
745 } 830 }
746 else if (svt == SVt_PVHV) 831 else if (svt == SVt_PVHV)
747 encode_hv (enc, (HV *)sv); 832 encode_hv (enc, (HV *)sv);
748 else if (svt == SVt_PVAV) 833 else if (svt == SVt_PVAV)
749 encode_av (enc, (AV *)sv); 834 encode_av (enc, (AV *)sv);
750 else if (svt < SVt_PVAV) 835 else if (svt < SVt_PVAV)
751 { 836 {
752 STRLEN len = 0; 837 int bool_type = ref_bool_type (sv);
753 char *pv = svt ? SvPV (sv, len) : 0;
754 838
755 if (len == 1 && *pv == '1') 839 if (bool_type == 1)
756 encode_str (enc, "true", 4, 0); 840 encode_str (enc, "true", 4, 0);
757 else if (len == 1 && *pv == '0') 841 else if (bool_type == 0)
758 encode_str (enc, "false", 5, 0); 842 encode_str (enc, "false", 5, 0);
759 else if (enc->json.flags & F_ALLOW_UNKNOWN) 843 else if (enc->json.flags & F_ALLOW_UNKNOWN)
760 encode_str (enc, "null", 4, 0); 844 encode_str (enc, "null", 4, 0);
761 else 845 else
762 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 846 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
… …
836 else if (SvROK (sv)) 920 else if (SvROK (sv))
837 encode_rv (enc, SvRV (sv)); 921 encode_rv (enc, SvRV (sv));
838 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 922 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
839 encode_str (enc, "null", 4, 0); 923 encode_str (enc, "null", 4, 0);
840 else 924 else
841 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 925 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
842 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 926 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
843} 927}
844 928
845static SV * 929static SV *
846encode_json (SV *scalar, JSON *json) 930encode_json (SV *scalar, JSON *json)
847{ 931{
848 enc_t enc; 932 enc_t enc;
849 933
850 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 934 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
851 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 935 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
852 936
853 enc.json = *json; 937 enc.json = *json;
854 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 938 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
855 enc.cur = SvPVX (enc.sv); 939 enc.cur = SvPVX (enc.sv);
… …
1062 *cur++ = *dec_cur++; 1146 *cur++ = *dec_cur++;
1063 while (--clen); 1147 while (--clen);
1064 1148
1065 utf8 = 1; 1149 utf8 = 1;
1066 } 1150 }
1151 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1152 *cur++ = ch;
1067 else 1153 else
1068 { 1154 {
1069 --dec_cur; 1155 --dec_cur;
1070 1156
1071 if (!ch) 1157 if (!ch)
… …
1259 if (*dec->cur == ']') 1345 if (*dec->cur == ']')
1260 { 1346 {
1261 ++dec->cur; 1347 ++dec->cur;
1262 break; 1348 break;
1263 } 1349 }
1264 1350
1265 if (*dec->cur != ',') 1351 if (*dec->cur != ',')
1266 ERR (", or ] expected while parsing array"); 1352 ERR (", or ] expected while parsing array");
1267 1353
1268 ++dec->cur; 1354 ++dec->cur;
1269 1355
… …
1393 1479
1394 hv_iterinit (hv); 1480 hv_iterinit (hv);
1395 he = hv_iternext (hv); 1481 he = hv_iternext (hv);
1396 hv_iterinit (hv); 1482 hv_iterinit (hv);
1397 1483
1398 // the next line creates a mortal sv each time its called. 1484 // the next line creates a mortal sv each time it's called.
1399 // might want to optimise this for common cases. 1485 // might want to optimise this for common cases.
1400 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1486 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1401 1487
1402 if (cb) 1488 if (cb)
1403 { 1489 {
1404 dSP; 1490 dSP;
1405 int count; 1491 int count;
1406 1492
1407 ENTER; SAVETMPS; PUSHMARK (SP); 1493 ENTER; SAVETMPS;
1494 SAVESTACK_POS ();
1495 PUSHMARK (SP);
1408 XPUSHs (HeVAL (he)); 1496 XPUSHs (HeVAL (he));
1409 sv_2mortal (sv); 1497 sv_2mortal (sv);
1410 1498
1411 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1499 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1412 1500
… …
1425 if (dec->json.cb_object) 1513 if (dec->json.cb_object)
1426 { 1514 {
1427 dSP; 1515 dSP;
1428 int count; 1516 int count;
1429 1517
1430 ENTER; SAVETMPS; PUSHMARK (SP); 1518 ENTER; SAVETMPS;
1519 SAVESTACK_POS ();
1520 PUSHMARK (SP);
1431 XPUSHs (sv_2mortal (sv)); 1521 XPUSHs (sv_2mortal (sv));
1432 1522
1433 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1523 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1434 1524
1435 if (count == 1) 1525 if (count == 1)
… …
1451 DEC_DEC_DEPTH; 1541 DEC_DEC_DEPTH;
1452 return 0; 1542 return 0;
1453} 1543}
1454 1544
1455static SV * 1545static SV *
1546decode_tag (dec_t *dec)
1547{
1548 SV *tag = 0;
1549 SV *val = 0;
1550
1551 if (!(dec->json.flags & F_ALLOW_TAGS))
1552 ERR ("malformed JSON string, neither array, object, number, string or atom");
1553
1554 ++dec->cur;
1555
1556 decode_ws (dec);
1557
1558 tag = decode_sv (dec);
1559 if (!tag)
1560 goto fail;
1561
1562 if (!SvPOK (tag))
1563 ERR ("malformed JSON string, (tag) must be a string");
1564
1565 decode_ws (dec);
1566
1567 if (*dec->cur != ')')
1568 ERR (") expected after tag");
1569
1570 ++dec->cur;
1571
1572 decode_ws (dec);
1573
1574 val = decode_sv (dec);
1575 if (!val)
1576 goto fail;
1577
1578 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1579 ERR ("malformed JSON string, tag value must be an array");
1580
1581 {
1582 AV *av = (AV *)SvRV (val);
1583 int i, len = av_len (av) + 1;
1584 HV *stash = gv_stashsv (tag, 0);
1585 SV *sv;
1586
1587 if (!stash)
1588 ERR ("cannot decode perl-object (package does not exist)");
1589
1590 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1591
1592 if (!method)
1593 ERR ("cannot decode perl-object (package does not have a THAW method)");
1594
1595 dSP;
1596
1597 ENTER; SAVETMPS;
1598 PUSHMARK (SP);
1599 EXTEND (SP, len + 2);
1600 // we re-bless the reference to get overload and other niceties right
1601 PUSHs (tag);
1602 PUSHs (sv_json);
1603
1604 for (i = 0; i < len; ++i)
1605 PUSHs (*av_fetch (av, i, 1));
1606
1607 PUTBACK;
1608 call_sv ((SV *)GvCV (method), G_SCALAR);
1609 SPAGAIN;
1610
1611 SvREFCNT_dec (tag);
1612 SvREFCNT_dec (val);
1613 sv = SvREFCNT_inc (POPs);
1614
1615 PUTBACK;
1616
1617 FREETMPS; LEAVE;
1618
1619 return sv;
1620 }
1621
1622fail:
1623 SvREFCNT_dec (tag);
1624 SvREFCNT_dec (val);
1625 return 0;
1626}
1627
1628static SV *
1456decode_sv (dec_t *dec) 1629decode_sv (dec_t *dec)
1457{ 1630{
1458 // the beauty of JSON: you need exactly one character lookahead 1631 // the beauty of JSON: you need exactly one character lookahead
1459 // to parse everything. 1632 // to parse everything.
1460 switch (*dec->cur) 1633 switch (*dec->cur)
1461 { 1634 {
1462 case '"': ++dec->cur; return decode_str (dec); 1635 case '"': ++dec->cur; return decode_str (dec);
1463 case '[': ++dec->cur; return decode_av (dec); 1636 case '[': ++dec->cur; return decode_av (dec);
1464 case '{': ++dec->cur; return decode_hv (dec); 1637 case '{': ++dec->cur; return decode_hv (dec);
1638 case '(': return decode_tag (dec);
1465 1639
1466 case '-': 1640 case '-':
1467 case '0': case '1': case '2': case '3': case '4': 1641 case '0': case '1': case '2': case '3': case '4':
1468 case '5': case '6': case '7': case '8': case '9': 1642 case '5': case '6': case '7': case '8': case '9':
1469 return decode_num (dec); 1643 return decode_num (dec);
… …
1471 case 't': 1645 case 't':
1472 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1646 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1473 { 1647 {
1474 dec->cur += 4; 1648 dec->cur += 4;
1475#if JSON_SLOW 1649#if JSON_SLOW
1476 json_true = get_bool ("JSON::XS::true"); 1650 bool_true = get_bool ("Types::Serialiser::true");
1477#endif 1651#endif
1478 return newSVsv (json_true); 1652 return newSVsv (bool_true);
1479 } 1653 }
1480 else 1654 else
1481 ERR ("'true' expected"); 1655 ERR ("'true' expected");
1482 1656
1483 break; 1657 break;
… …
1485 case 'f': 1659 case 'f':
1486 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1660 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1487 { 1661 {
1488 dec->cur += 5; 1662 dec->cur += 5;
1489#if JSON_SLOW 1663#if JSON_SLOW
1490 json_false = get_bool ("JSON::XS::false"); 1664 bool_false = get_bool ("Types::Serialiser::false");
1491#endif 1665#endif
1492 return newSVsv (json_false); 1666 return newSVsv (bool_false);
1493 } 1667 }
1494 else 1668 else
1495 ERR ("'false' expected"); 1669 ERR ("'false' expected");
1496 1670
1497 break; 1671 break;
… …
1506 ERR ("'null' expected"); 1680 ERR ("'null' expected");
1507 1681
1508 break; 1682 break;
1509 1683
1510 default: 1684 default:
1511 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1685 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1512 break; 1686 break;
1513 } 1687 }
1514 1688
1515fail: 1689fail:
1516 return 0; 1690 return 0;
… …
1521{ 1695{
1522 dec_t dec; 1696 dec_t dec;
1523 SV *sv; 1697 SV *sv;
1524 1698
1525 /* work around bugs in 5.10 where manipulating magic values 1699 /* work around bugs in 5.10 where manipulating magic values
1526 * will perl ignore the magic in subsequent accesses. 1700 * makes perl ignore the magic in subsequent accesses.
1527 * also make a copy of non-PV values, to get them into a clean 1701 * also make a copy of non-PV values, to get them into a clean
1528 * state (SvPV should do that, but it's buggy, see below). 1702 * state (SvPV should do that, but it's buggy, see below).
1703 *
1704 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1705 * as reported by Reini Urban.
1529 */ 1706 */
1530 /*SvGETMAGIC (string);*/ 1707 /*SvGETMAGIC (string);*/
1531 if (SvMAGICAL (string) || !SvPOK (string)) 1708 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1532 string = sv_2mortal (newSVsv (string)); 1709 string = sv_2mortal (newSVsv (string));
1533 1710
1534 SvUPGRADE (string, SVt_PV); 1711 SvUPGRADE (string, SVt_PV);
1535 1712
1536 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1713 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1611 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1788 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1612 } 1789 }
1613 1790
1614 sv = sv_2mortal (sv); 1791 sv = sv_2mortal (sv);
1615 1792
1616 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1793 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1617 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1794 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1618 1795
1619 return sv; 1796 return sv;
1620} 1797}
1621 1798
… …
1743 self->incr_mode = INCR_M_STR; 1920 self->incr_mode = INCR_M_STR;
1744 goto incr_m_str; 1921 goto incr_m_str;
1745 1922
1746 case '[': 1923 case '[':
1747 case '{': 1924 case '{':
1925 case '(':
1748 if (++self->incr_nest > self->max_depth) 1926 if (++self->incr_nest > self->max_depth)
1749 croak (ERR_NESTING_EXCEEDED); 1927 croak (ERR_NESTING_EXCEEDED);
1750 break; 1928 break;
1751 1929
1752 case ']': 1930 case ']':
1753 case '}': 1931 case '}':
1754 if (--self->incr_nest <= 0) 1932 if (--self->incr_nest <= 0)
1755 goto interrupt; 1933 goto interrupt;
1934 break;
1935
1936 case ')':
1937 --self->incr_nest;
1756 break; 1938 break;
1757 1939
1758 case '#': 1940 case '#':
1759 self->incr_mode = INCR_M_C1; 1941 self->incr_mode = INCR_M_C1;
1760 goto incr_m_c; 1942 goto incr_m_c;
… …
1786 i >= '0' && i <= '9' ? i - '0' 1968 i >= '0' && i <= '9' ? i - '0'
1787 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1969 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1788 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1970 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1789 : -1; 1971 : -1;
1790 1972
1791 json_stash = gv_stashpv ("JSON::XS" , 1); 1973 json_stash = gv_stashpv ("JSON::XS" , 1);
1792 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1974 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1793
1794 json_true = get_bool ("JSON::XS::true"); 1975 bool_true = get_bool ("Types::Serialiser::true");
1795 json_false = get_bool ("JSON::XS::false"); 1976 bool_false = get_bool ("Types::Serialiser::false");
1977
1978 sv_json = newSVpv ("JSON", 0);
1979 SvREADONLY_on (sv_json);
1796 1980
1797 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1981 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1798} 1982}
1799 1983
1800PROTOTYPES: DISABLE 1984PROTOTYPES: DISABLE
1801 1985
1802void CLONE (...) 1986void CLONE (...)
1803 CODE: 1987 CODE:
1804 json_stash = 0; 1988 json_stash = 0;
1805 json_boolean_stash = 0; 1989 bool_stash = 0;
1806 1990
1807void new (char *klass) 1991void new (char *klass)
1808 PPCODE: 1992 PPCODE:
1809{ 1993{
1810 SV *pv = NEWSV (0, sizeof (JSON)); 1994 SV *pv = NEWSV (0, sizeof (JSON));
1811 SvPOK_only (pv); 1995 SvPOK_only (pv);
1812 json_init ((JSON *)SvPVX (pv)); 1996 json_init ((JSON *)SvPVX (pv));
1813 XPUSHs (sv_2mortal (sv_bless ( 1997 XPUSHs (sv_2mortal (sv_bless (
1814 newRV_noinc (pv), 1998 newRV_noinc (pv),
1815 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1999 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1830 shrink = F_SHRINK 2014 shrink = F_SHRINK
1831 allow_blessed = F_ALLOW_BLESSED 2015 allow_blessed = F_ALLOW_BLESSED
1832 convert_blessed = F_CONV_BLESSED 2016 convert_blessed = F_CONV_BLESSED
1833 relaxed = F_RELAXED 2017 relaxed = F_RELAXED
1834 allow_unknown = F_ALLOW_UNKNOWN 2018 allow_unknown = F_ALLOW_UNKNOWN
2019 allow_tags = F_ALLOW_TAGS
1835 PPCODE: 2020 PPCODE:
1836{ 2021{
1837 if (enable) 2022 if (enable)
1838 self->flags |= ix; 2023 self->flags |= ix;
1839 else 2024 else
… …
1855 get_shrink = F_SHRINK 2040 get_shrink = F_SHRINK
1856 get_allow_blessed = F_ALLOW_BLESSED 2041 get_allow_blessed = F_ALLOW_BLESSED
1857 get_convert_blessed = F_CONV_BLESSED 2042 get_convert_blessed = F_CONV_BLESSED
1858 get_relaxed = F_RELAXED 2043 get_relaxed = F_RELAXED
1859 get_allow_unknown = F_ALLOW_UNKNOWN 2044 get_allow_unknown = F_ALLOW_UNKNOWN
2045 get_allow_tags = F_ALLOW_TAGS
1860 PPCODE: 2046 PPCODE:
1861 XPUSHs (boolSV (self->flags & ix)); 2047 XPUSHs (boolSV (self->flags & ix));
1862 2048
1863void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2049void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1864 PPCODE: 2050 PPCODE:
… …
2064 SvREFCNT_dec (self->incr_text); 2250 SvREFCNT_dec (self->incr_text);
2065 2251
2066PROTOTYPES: ENABLE 2252PROTOTYPES: ENABLE
2067 2253
2068void encode_json (SV *scalar) 2254void encode_json (SV *scalar)
2069 ALIAS:
2070 to_json_ = 0
2071 encode_json = F_UTF8
2072 PPCODE: 2255 PPCODE:
2073{ 2256{
2074 JSON json; 2257 JSON json;
2075 json_init (&json); 2258 json_init (&json);
2076 json.flags |= ix; 2259 json.flags |= F_UTF8;
2077 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN; 2260 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2078 XPUSHs (scalar); 2261 XPUSHs (scalar);
2079} 2262}
2080 2263
2081void decode_json (SV *jsonstr) 2264void decode_json (SV *jsonstr)
2082 ALIAS:
2083 from_json_ = 0
2084 decode_json = F_UTF8
2085 PPCODE: 2265 PPCODE:
2086{ 2266{
2087 JSON json; 2267 JSON json;
2088 json_init (&json); 2268 json_init (&json);
2089 json.flags |= ix; 2269 json.flags |= F_UTF8;
2090 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN; 2270 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2091 XPUSHs (jsonstr); 2271 XPUSHs (jsonstr);
2092} 2272}
2093 2273

Diff Legend

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