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.116 by root, Thu May 23 09:31:32 2013 UTC vs.
Revision 1.129 by root, Wed Nov 16 18:06:34 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
77// the amount of HEs to allocate on the stack, when sorting keys 91// the amount of HEs to allocate on the stack, when sorting keys
78#define STACK_HES 64 92#define STACK_HES 64
79 93
80static HV *json_stash, *json_boolean_stash; // JSON::XS:: 94static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
81static SV *json_true, *json_false; 95static SV *bool_true, *bool_false, *sv_json;
82 96
83enum { 97enum {
84 INCR_M_WS = 0, // initial whitespace skipping, must be 0 98 INCR_M_WS = 0, // initial whitespace skipping, must be 0
85 INCR_M_STR, // inside string 99 INCR_M_STR, // inside string
86 INCR_M_BS, // inside backslash 100 INCR_M_BS, // inside backslash
… …
287 // a recursion depth of ten gives us >>500 bits 301 // a recursion depth of ten gives us >>500 bits
288 json_atof_scan1 (s, &accum, &expo, 0, 10); 302 json_atof_scan1 (s, &accum, &expo, 0, 10);
289 303
290 return neg ? -accum : accum; 304 return neg ? -accum : accum;
291} 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
292///////////////////////////////////////////////////////////////////////////// 349/////////////////////////////////////////////////////////////////////////////
293// encoder 350// encoder
294 351
295// structure used for encoding JSON 352// structure used for encoding JSON
296typedef struct 353typedef struct
… …
483 540
484 if (enc->indent >= enc->json.max_depth) 541 if (enc->indent >= enc->json.max_depth)
485 croak (ERR_NESTING_EXCEEDED); 542 croak (ERR_NESTING_EXCEEDED);
486 543
487 encode_ch (enc, '['); 544 encode_ch (enc, '[');
488 545
489 if (len >= 0) 546 if (len >= 0)
490 { 547 {
491 encode_nl (enc); ++enc->indent; 548 encode_nl (enc); ++enc->indent;
492 549
493 for (i = 0; i <= len; ++i) 550 for (i = 0; i <= len; ++i)
… …
505 encode_comma (enc); 562 encode_comma (enc);
506 } 563 }
507 564
508 encode_nl (enc); --enc->indent; encode_indent (enc); 565 encode_nl (enc); --enc->indent; encode_indent (enc);
509 } 566 }
510 567
511 encode_ch (enc, ']'); 568 encode_ch (enc, ']');
512} 569}
513 570
514static void 571static void
515encode_hk (enc_t *enc, HE *he) 572encode_hk (enc_t *enc, HE *he)
… …
519 if (HeKLEN (he) == HEf_SVKEY) 576 if (HeKLEN (he) == HEf_SVKEY)
520 { 577 {
521 SV *sv = HeSVKEY (he); 578 SV *sv = HeSVKEY (he);
522 STRLEN len; 579 STRLEN len;
523 char *str; 580 char *str;
524 581
525 SvGETMAGIC (sv); 582 SvGETMAGIC (sv);
526 str = SvPV (sv, len); 583 str = SvPV (sv, len);
527 584
528 encode_str (enc, str, len, SvUTF8 (sv)); 585 encode_str (enc, str, len, SvUTF8 (sv));
529 } 586 }
… …
597 if (count) 654 if (count)
598 { 655 {
599 int i, fast = 1; 656 int i, fast = 1;
600 HE *hes_stack [STACK_HES]; 657 HE *hes_stack [STACK_HES];
601 HE **hes = hes_stack; 658 HE **hes = hes_stack;
602 659
603 // allocate larger arrays on the heap 660 // allocate larger arrays on the heap
604 if (count > STACK_HES) 661 if (count > STACK_HES)
605 { 662 {
606 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes))); 663 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
607 hes = (HE **)SvPVX (sv); 664 hes = (HE **)SvPVX (sv);
… …
682// encode objects, arrays and special \0=false and \1=true values. 739// encode objects, arrays and special \0=false and \1=true values.
683static void 740static void
684encode_rv (enc_t *enc, SV *sv) 741encode_rv (enc_t *enc, SV *sv)
685{ 742{
686 svtype svt; 743 svtype svt;
744 GV *method;
687 745
688 SvGETMAGIC (sv); 746 SvGETMAGIC (sv);
689 svt = SvTYPE (sv); 747 svt = SvTYPE (sv);
690 748
691 if (expect_false (SvOBJECT (sv))) 749 if (expect_false (SvOBJECT (sv)))
692 { 750 {
693 HV *stash = !JSON_SLOW || json_boolean_stash 751 HV *stash = SvSTASH (sv);
694 ? json_boolean_stash
695 : gv_stashpv ("JSON::XS::Boolean", 1);
696 752
697 if (SvSTASH (sv) == stash) 753 if (stash == bool_stash)
698 { 754 {
699 if (SvIV (sv)) 755 if (SvIV (sv))
700 encode_str (enc, "true", 4, 0); 756 encode_str (enc, "true", 4, 0);
701 else 757 else
702 encode_str (enc, "false", 5, 0); 758 encode_str (enc, "false", 5, 0);
703 } 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);
704 else 827 else
705 {
706#if 0
707 if (0 && sv_derived_from (rv, "JSON::Literal"))
708 {
709 // not yet
710 }
711#endif
712 if (enc->json.flags & F_CONV_BLESSED)
713 {
714 // we re-bless the reference to get overload and other niceties right
715 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
716
717 if (to_json)
718 {
719 dSP;
720
721 ENTER; SAVETMPS; PUSHMARK (SP);
722 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
723
724 // calling with G_SCALAR ensures that we always get a 1 return value
725 PUTBACK;
726 call_sv ((SV *)GvCV (to_json), G_SCALAR);
727 SPAGAIN;
728
729 // catch this surprisingly common error
730 if (SvROK (TOPs) && SvRV (TOPs) == sv)
731 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
732
733 sv = POPs;
734 PUTBACK;
735
736 encode_sv (enc, sv);
737
738 FREETMPS; LEAVE;
739 }
740 else if (enc->json.flags & F_ALLOW_BLESSED)
741 encode_str (enc, "null", 4, 0);
742 else
743 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
744 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
745 }
746 else if (enc->json.flags & F_ALLOW_BLESSED)
747 encode_str (enc, "null", 4, 0);
748 else
749 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)",
750 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 829 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
751 }
752 } 830 }
753 else if (svt == SVt_PVHV) 831 else if (svt == SVt_PVHV)
754 encode_hv (enc, (HV *)sv); 832 encode_hv (enc, (HV *)sv);
755 else if (svt == SVt_PVAV) 833 else if (svt == SVt_PVAV)
756 encode_av (enc, (AV *)sv); 834 encode_av (enc, (AV *)sv);
757 else if (svt < SVt_PVAV) 835 else if (svt < SVt_PVAV)
758 { 836 {
759 STRLEN len = 0; 837 int bool_type = ref_bool_type (sv);
760 char *pv = svt ? SvPV (sv, len) : 0;
761 838
762 if (len == 1 && *pv == '1') 839 if (bool_type == 1)
763 encode_str (enc, "true", 4, 0); 840 encode_str (enc, "true", 4, 0);
764 else if (len == 1 && *pv == '0') 841 else if (bool_type == 0)
765 encode_str (enc, "false", 5, 0); 842 encode_str (enc, "false", 5, 0);
766 else if (enc->json.flags & F_ALLOW_UNKNOWN) 843 else if (enc->json.flags & F_ALLOW_UNKNOWN)
767 encode_str (enc, "null", 4, 0); 844 encode_str (enc, "null", 4, 0);
768 else 845 else
769 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",
… …
843 else if (SvROK (sv)) 920 else if (SvROK (sv))
844 encode_rv (enc, SvRV (sv)); 921 encode_rv (enc, SvRV (sv));
845 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 922 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
846 encode_str (enc, "null", 4, 0); 923 encode_str (enc, "null", 4, 0);
847 else 924 else
848 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",
849 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 926 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
850} 927}
851 928
852static SV * 929static SV *
853encode_json (SV *scalar, JSON *json) 930encode_json (SV *scalar, JSON *json)
854{ 931{
855 enc_t enc; 932 enc_t enc;
856 933
857 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 934 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
858 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)");
859 936
860 enc.json = *json; 937 enc.json = *json;
861 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 938 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
862 enc.cur = SvPVX (enc.sv); 939 enc.cur = SvPVX (enc.sv);
… …
1069 *cur++ = *dec_cur++; 1146 *cur++ = *dec_cur++;
1070 while (--clen); 1147 while (--clen);
1071 1148
1072 utf8 = 1; 1149 utf8 = 1;
1073 } 1150 }
1151 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1152 *cur++ = ch;
1074 else 1153 else
1075 { 1154 {
1076 --dec_cur; 1155 --dec_cur;
1077 1156
1078 if (!ch) 1157 if (!ch)
… …
1266 if (*dec->cur == ']') 1345 if (*dec->cur == ']')
1267 { 1346 {
1268 ++dec->cur; 1347 ++dec->cur;
1269 break; 1348 break;
1270 } 1349 }
1271 1350
1272 if (*dec->cur != ',') 1351 if (*dec->cur != ',')
1273 ERR (", or ] expected while parsing array"); 1352 ERR (", or ] expected while parsing array");
1274 1353
1275 ++dec->cur; 1354 ++dec->cur;
1276 1355
… …
1400 1479
1401 hv_iterinit (hv); 1480 hv_iterinit (hv);
1402 he = hv_iternext (hv); 1481 he = hv_iternext (hv);
1403 hv_iterinit (hv); 1482 hv_iterinit (hv);
1404 1483
1405 // the next line creates a mortal sv each time its called. 1484 // the next line creates a mortal sv each time it's called.
1406 // might want to optimise this for common cases. 1485 // might want to optimise this for common cases.
1407 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);
1408 1487
1409 if (cb) 1488 if (cb)
1410 { 1489 {
1411 dSP; 1490 dSP;
1412 int count; 1491 int count;
1413 1492
1414 ENTER; SAVETMPS; PUSHMARK (SP); 1493 ENTER; SAVETMPS;
1494 SAVESTACK_POS ();
1495 PUSHMARK (SP);
1415 XPUSHs (HeVAL (he)); 1496 XPUSHs (HeVAL (he));
1416 sv_2mortal (sv); 1497 sv_2mortal (sv);
1417 1498
1418 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1499 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1419 1500
… …
1432 if (dec->json.cb_object) 1513 if (dec->json.cb_object)
1433 { 1514 {
1434 dSP; 1515 dSP;
1435 int count; 1516 int count;
1436 1517
1437 ENTER; SAVETMPS; PUSHMARK (SP); 1518 ENTER; SAVETMPS;
1519 SAVESTACK_POS ();
1520 PUSHMARK (SP);
1438 XPUSHs (sv_2mortal (sv)); 1521 XPUSHs (sv_2mortal (sv));
1439 1522
1440 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1523 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1441 1524
1442 if (count == 1) 1525 if (count == 1)
… …
1458 DEC_DEC_DEPTH; 1541 DEC_DEC_DEPTH;
1459 return 0; 1542 return 0;
1460} 1543}
1461 1544
1462static 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 *
1463decode_sv (dec_t *dec) 1629decode_sv (dec_t *dec)
1464{ 1630{
1465 // the beauty of JSON: you need exactly one character lookahead 1631 // the beauty of JSON: you need exactly one character lookahead
1466 // to parse everything. 1632 // to parse everything.
1467 switch (*dec->cur) 1633 switch (*dec->cur)
1468 { 1634 {
1469 case '"': ++dec->cur; return decode_str (dec); 1635 case '"': ++dec->cur; return decode_str (dec);
1470 case '[': ++dec->cur; return decode_av (dec); 1636 case '[': ++dec->cur; return decode_av (dec);
1471 case '{': ++dec->cur; return decode_hv (dec); 1637 case '{': ++dec->cur; return decode_hv (dec);
1638 case '(': return decode_tag (dec);
1472 1639
1473 case '-': 1640 case '-':
1474 case '0': case '1': case '2': case '3': case '4': 1641 case '0': case '1': case '2': case '3': case '4':
1475 case '5': case '6': case '7': case '8': case '9': 1642 case '5': case '6': case '7': case '8': case '9':
1476 return decode_num (dec); 1643 return decode_num (dec);
… …
1478 case 't': 1645 case 't':
1479 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1646 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1480 { 1647 {
1481 dec->cur += 4; 1648 dec->cur += 4;
1482#if JSON_SLOW 1649#if JSON_SLOW
1483 json_true = get_bool ("JSON::XS::true"); 1650 bool_true = get_bool ("Types::Serialiser::true");
1484#endif 1651#endif
1485 return newSVsv (json_true); 1652 return newSVsv (bool_true);
1486 } 1653 }
1487 else 1654 else
1488 ERR ("'true' expected"); 1655 ERR ("'true' expected");
1489 1656
1490 break; 1657 break;
… …
1492 case 'f': 1659 case 'f':
1493 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1660 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1494 { 1661 {
1495 dec->cur += 5; 1662 dec->cur += 5;
1496#if JSON_SLOW 1663#if JSON_SLOW
1497 json_false = get_bool ("JSON::XS::false"); 1664 bool_false = get_bool ("Types::Serialiser::false");
1498#endif 1665#endif
1499 return newSVsv (json_false); 1666 return newSVsv (bool_false);
1500 } 1667 }
1501 else 1668 else
1502 ERR ("'false' expected"); 1669 ERR ("'false' expected");
1503 1670
1504 break; 1671 break;
… …
1513 ERR ("'null' expected"); 1680 ERR ("'null' expected");
1514 1681
1515 break; 1682 break;
1516 1683
1517 default: 1684 default:
1518 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1685 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1519 break; 1686 break;
1520 } 1687 }
1521 1688
1522fail: 1689fail:
1523 return 0; 1690 return 0;
1524} 1691}
1525 1692
1526static SV * 1693static SV *
1527decode_json (SV *string, JSON *json, char **offset_return) 1694decode_json (SV *string, JSON *json, STRLEN *offset_return)
1528{ 1695{
1529 dec_t dec; 1696 dec_t dec;
1530 SV *sv; 1697 SV *sv;
1531 1698
1532 /* work around bugs in 5.10 where manipulating magic values 1699 /* work around bugs in 5.10 where manipulating magic values
1533 * makes perl ignore the magic in subsequent accesses. 1700 * makes perl ignore the magic in subsequent accesses.
1534 * 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
1535 * 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.
1536 */ 1706 */
1537 /*SvGETMAGIC (string);*/ 1707 /*SvGETMAGIC (string);*/
1538 if (SvMAGICAL (string) || !SvPOK (string)) 1708 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1539 string = sv_2mortal (newSVsv (string)); 1709 string = sv_2mortal (newSVsv (string));
1540 1710
1541 SvUPGRADE (string, SVt_PV); 1711 SvUPGRADE (string, SVt_PV);
1542 1712
1543 /* 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
… …
1582 1752
1583 decode_ws (&dec); 1753 decode_ws (&dec);
1584 sv = decode_sv (&dec); 1754 sv = decode_sv (&dec);
1585 1755
1586 if (offset_return) 1756 if (offset_return)
1587 *offset_return = dec.cur; 1757 *offset_return = dec.cur - SvPVX (string);
1588 1758 else if (sv)
1589 if (!(offset_return || !sv))
1590 { 1759 {
1591 // check for trailing garbage 1760 // check for trailing garbage
1592 decode_ws (&dec); 1761 decode_ws (&dec);
1593 1762
1594 if (*dec.cur) 1763 if (*dec.cur)
… …
1618 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1787 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1619 } 1788 }
1620 1789
1621 sv = sv_2mortal (sv); 1790 sv = sv_2mortal (sv);
1622 1791
1623 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1792 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1624 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1793 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1625 1794
1626 return sv; 1795 return sv;
1627} 1796}
1628 1797
… …
1750 self->incr_mode = INCR_M_STR; 1919 self->incr_mode = INCR_M_STR;
1751 goto incr_m_str; 1920 goto incr_m_str;
1752 1921
1753 case '[': 1922 case '[':
1754 case '{': 1923 case '{':
1924 case '(':
1755 if (++self->incr_nest > self->max_depth) 1925 if (++self->incr_nest > self->max_depth)
1756 croak (ERR_NESTING_EXCEEDED); 1926 croak (ERR_NESTING_EXCEEDED);
1757 break; 1927 break;
1758 1928
1759 case ']': 1929 case ']':
1760 case '}': 1930 case '}':
1761 if (--self->incr_nest <= 0) 1931 if (--self->incr_nest <= 0)
1762 goto interrupt; 1932 goto interrupt;
1933 break;
1934
1935 case ')':
1936 --self->incr_nest;
1763 break; 1937 break;
1764 1938
1765 case '#': 1939 case '#':
1766 self->incr_mode = INCR_M_C1; 1940 self->incr_mode = INCR_M_C1;
1767 goto incr_m_c; 1941 goto incr_m_c;
… …
1793 i >= '0' && i <= '9' ? i - '0' 1967 i >= '0' && i <= '9' ? i - '0'
1794 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1968 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1795 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1969 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1796 : -1; 1970 : -1;
1797 1971
1798 json_stash = gv_stashpv ("JSON::XS" , 1); 1972 json_stash = gv_stashpv ("JSON::XS" , 1);
1799 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1973 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1800
1801 json_true = get_bool ("JSON::XS::true"); 1974 bool_true = get_bool ("Types::Serialiser::true");
1802 json_false = get_bool ("JSON::XS::false"); 1975 bool_false = get_bool ("Types::Serialiser::false");
1976
1977 sv_json = newSVpv ("JSON", 0);
1978 SvREADONLY_on (sv_json);
1803 1979
1804 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1980 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1805} 1981}
1806 1982
1807PROTOTYPES: DISABLE 1983PROTOTYPES: DISABLE
1808 1984
1809void CLONE (...) 1985void CLONE (...)
1810 CODE: 1986 CODE:
1811 json_stash = 0; 1987 json_stash = 0;
1812 json_boolean_stash = 0; 1988 bool_stash = 0;
1813 1989
1814void new (char *klass) 1990void new (char *klass)
1815 PPCODE: 1991 PPCODE:
1816{ 1992{
1817 SV *pv = NEWSV (0, sizeof (JSON)); 1993 SV *pv = NEWSV (0, sizeof (JSON));
… …
1837 shrink = F_SHRINK 2013 shrink = F_SHRINK
1838 allow_blessed = F_ALLOW_BLESSED 2014 allow_blessed = F_ALLOW_BLESSED
1839 convert_blessed = F_CONV_BLESSED 2015 convert_blessed = F_CONV_BLESSED
1840 relaxed = F_RELAXED 2016 relaxed = F_RELAXED
1841 allow_unknown = F_ALLOW_UNKNOWN 2017 allow_unknown = F_ALLOW_UNKNOWN
2018 allow_tags = F_ALLOW_TAGS
1842 PPCODE: 2019 PPCODE:
1843{ 2020{
1844 if (enable) 2021 if (enable)
1845 self->flags |= ix; 2022 self->flags |= ix;
1846 else 2023 else
… …
1862 get_shrink = F_SHRINK 2039 get_shrink = F_SHRINK
1863 get_allow_blessed = F_ALLOW_BLESSED 2040 get_allow_blessed = F_ALLOW_BLESSED
1864 get_convert_blessed = F_CONV_BLESSED 2041 get_convert_blessed = F_CONV_BLESSED
1865 get_relaxed = F_RELAXED 2042 get_relaxed = F_RELAXED
1866 get_allow_unknown = F_ALLOW_UNKNOWN 2043 get_allow_unknown = F_ALLOW_UNKNOWN
2044 get_allow_tags = F_ALLOW_TAGS
1867 PPCODE: 2045 PPCODE:
1868 XPUSHs (boolSV (self->flags & ix)); 2046 XPUSHs (boolSV (self->flags & ix));
1869 2047
1870void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2048void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1871 PPCODE: 2049 PPCODE:
… …
1932 2110
1933void decode_prefix (JSON *self, SV *jsonstr) 2111void decode_prefix (JSON *self, SV *jsonstr)
1934 PPCODE: 2112 PPCODE:
1935{ 2113{
1936 SV *sv; 2114 SV *sv;
1937 char *offset; 2115 STRLEN offset;
1938 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN; 2116 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1939 EXTEND (SP, 2); 2117 EXTEND (SP, 2);
1940 PUSHs (sv); 2118 PUSHs (sv);
1941 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2119 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1942} 2120}
1943 2121
1944void incr_parse (JSON *self, SV *jsonstr = 0) 2122void incr_parse (JSON *self, SV *jsonstr = 0)
1945 PPCODE: 2123 PPCODE:
1946{ 2124{
… …
1993 2171
1994 if (GIMME_V != G_VOID) 2172 if (GIMME_V != G_VOID)
1995 do 2173 do
1996 { 2174 {
1997 SV *sv; 2175 SV *sv;
1998 char *offset; 2176 STRLEN offset;
1999 2177
2000 if (!INCR_DONE (self)) 2178 if (!INCR_DONE (self))
2001 { 2179 {
2002 incr_parse (self); 2180 incr_parse (self);
2003 2181
… …
2019 } 2197 }
2020 2198
2021 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN; 2199 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2022 XPUSHs (sv); 2200 XPUSHs (sv);
2023 2201
2024 self->incr_pos -= offset - SvPVX (self->incr_text); 2202 self->incr_pos -= offset;
2025 self->incr_nest = 0; 2203 self->incr_nest = 0;
2026 self->incr_mode = 0; 2204 self->incr_mode = 0;
2027 2205
2028 sv_chop (self->incr_text, offset); 2206 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2029 } 2207 }
2030 while (GIMME_V == G_ARRAY); 2208 while (GIMME_V == G_ARRAY);
2031} 2209}
2032 2210
2033SV *incr_text (JSON *self) 2211SV *incr_text (JSON *self)
… …
2071 SvREFCNT_dec (self->incr_text); 2249 SvREFCNT_dec (self->incr_text);
2072 2250
2073PROTOTYPES: ENABLE 2251PROTOTYPES: ENABLE
2074 2252
2075void encode_json (SV *scalar) 2253void encode_json (SV *scalar)
2076 ALIAS:
2077 to_json_ = 0
2078 encode_json = F_UTF8
2079 PPCODE: 2254 PPCODE:
2080{ 2255{
2081 JSON json; 2256 JSON json;
2082 json_init (&json); 2257 json_init (&json);
2083 json.flags |= ix; 2258 json.flags |= F_UTF8;
2084 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN; 2259 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2085 XPUSHs (scalar); 2260 XPUSHs (scalar);
2086} 2261}
2087 2262
2088void decode_json (SV *jsonstr) 2263void decode_json (SV *jsonstr)
2089 ALIAS:
2090 from_json_ = 0
2091 decode_json = F_UTF8
2092 PPCODE: 2264 PPCODE:
2093{ 2265{
2094 JSON json; 2266 JSON json;
2095 json_init (&json); 2267 json_init (&json);
2096 json.flags |= ix; 2268 json.flags |= F_UTF8;
2097 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN; 2269 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2098 XPUSHs (jsonstr); 2270 XPUSHs (jsonstr);
2099} 2271}
2100 2272

Diff Legend

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