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.112 by root, Thu Aug 11 17:06:53 2011 UTC vs.
Revision 1.125 by root, Sun Feb 21 15:37:53 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
… …
72#else 84#else
73# define JSON_SLOW 0 85# define JSON_SLOW 0
74# define JSON_STASH json_stash 86# define JSON_STASH json_stash
75#endif 87#endif
76 88
89// the amount of HEs to allocate on the stack, when sorting keys
90#define STACK_HES 64
91
77static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
78static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
79 94
80enum { 95enum {
81 INCR_M_WS = 0, // initial whitespace skipping, must be 0 96 INCR_M_WS = 0, // initial whitespace skipping, must be 0
82 INCR_M_STR, // inside string 97 INCR_M_STR, // inside string
83 INCR_M_BS, // inside backslash 98 INCR_M_BS, // inside backslash
… …
480 495
481 if (enc->indent >= enc->json.max_depth) 496 if (enc->indent >= enc->json.max_depth)
482 croak (ERR_NESTING_EXCEEDED); 497 croak (ERR_NESTING_EXCEEDED);
483 498
484 encode_ch (enc, '['); 499 encode_ch (enc, '[');
485 500
486 if (len >= 0) 501 if (len >= 0)
487 { 502 {
488 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
489 504
490 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
… …
502 encode_comma (enc); 517 encode_comma (enc);
503 } 518 }
504 519
505 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
506 } 521 }
507 522
508 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
509} 524}
510 525
511static void 526static void
512encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
… …
516 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
517 { 532 {
518 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
519 STRLEN len; 534 STRLEN len;
520 char *str; 535 char *str;
521 536
522 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
523 str = SvPV (sv, len); 538 str = SvPV (sv, len);
524 539
525 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
526 } 541 }
… …
592 } 607 }
593 608
594 if (count) 609 if (count)
595 { 610 {
596 int i, fast = 1; 611 int i, fast = 1;
597#if defined(__BORLANDC__) || defined(_MSC_VER) 612 HE *hes_stack [STACK_HES];
598 HE **hes = _alloca (count * sizeof (HE)); 613 HE **hes = hes_stack;
599#else 614
600 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 615 // allocate larger arrays on the heap
601#endif 616 if (count > STACK_HES)
617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
602 621
603 i = 0; 622 i = 0;
604 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
605 { 624 {
606 hes [i++] = he; 625 hes [i++] = he;
… …
675// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
676static void 695static void
677encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
678{ 697{
679 svtype svt; 698 svtype svt;
699 GV *method;
680 700
681 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
682 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
683 703
684 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
685 { 705 {
686 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
687 ? json_boolean_stash 707 ? types_boolean_stash
688 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
689 710
690 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
691 { 712 {
692 if (SvIV (sv)) 713 if (SvIV (sv))
693 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
694 else 715 else
695 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
696 } 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;
724 SAVESTACK_POS ();
725 PUSHMARK (SP);
726 EXTEND (SP, 2);
727 // we re-bless the reference to get overload and other niceties right
728 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
729 PUSHs (sv_json);
730
731 PUTBACK;
732 count = call_sv ((SV *)GvCV (method), G_ARRAY);
733 SPAGAIN;
734
735 // catch this surprisingly common error
736 if (SvROK (TOPs) && SvRV (TOPs) == sv)
737 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
738
739 encode_ch (enc, '(');
740 encode_ch (enc, '"');
741 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
742 encode_ch (enc, '"');
743 encode_ch (enc, ')');
744 encode_ch (enc, '[');
745
746 while (count)
747 {
748 encode_sv (enc, SP[1 - count--]);
749
750 if (count)
751 encode_ch (enc, ',');
752 }
753
754 encode_ch (enc, ']');
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;
763 PUSHMARK (SP);
764 // we re-bless the reference to get overload and other niceties right
765 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
766
767 // calling with G_SCALAR ensures that we always get a 1 return value
768 PUTBACK;
769 call_sv ((SV *)GvCV (method), G_SCALAR);
770 SPAGAIN;
771
772 // catch this surprisingly common error
773 if (SvROK (TOPs) && SvRV (TOPs) == sv)
774 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
775
776 sv = POPs;
777 PUTBACK;
778
779 encode_sv (enc, sv);
780
781 FREETMPS; LEAVE;
782 }
783 else if (enc->json.flags & F_ALLOW_BLESSED)
784 encode_str (enc, "null", 4, 0);
697 else 785 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", 786 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)))); 787 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
744 }
745 } 788 }
746 else if (svt == SVt_PVHV) 789 else if (svt == SVt_PVHV)
747 encode_hv (enc, (HV *)sv); 790 encode_hv (enc, (HV *)sv);
748 else if (svt == SVt_PVAV) 791 else if (svt == SVt_PVAV)
749 encode_av (enc, (AV *)sv); 792 encode_av (enc, (AV *)sv);
… …
825 } 868 }
826 else 869 else
827 { 870 {
828 // large integer, use the (rather slow) snprintf way. 871 // large integer, use the (rather slow) snprintf way.
829 need (enc, IVUV_MAXCHARS); 872 need (enc, IVUV_MAXCHARS);
830 enc->cur += 873 enc->cur +=
831 SvIsUV(sv) 874 SvIsUV(sv)
832 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 875 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
833 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 876 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
834 } 877 }
835 } 878 }
836 else if (SvROK (sv)) 879 else if (SvROK (sv))
837 encode_rv (enc, SvRV (sv)); 880 encode_rv (enc, SvRV (sv));
838 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 881 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
839 encode_str (enc, "null", 4, 0); 882 encode_str (enc, "null", 4, 0);
840 else 883 else
841 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 884 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
842 SvPV_nolen (sv), SvFLAGS (sv)); 885 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
886}
887
888static int
889json_scalar (SV *scalar)
890{
891 return 0;//D
892 if (!SvROK (scalar))
893 return 1;
843} 894}
844 895
845static SV * 896static SV *
846encode_json (SV *scalar, JSON *json) 897encode_json (SV *scalar, JSON *json)
847{ 898{
848 enc_t enc; 899 enc_t enc;
849 900
850 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 901 if (!(json->flags & F_ALLOW_NONREF) && json_scalar (scalar))
851 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 902 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
852 903
853 enc.json = *json; 904 enc.json = *json;
854 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 905 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
855 enc.cur = SvPVX (enc.sv); 906 enc.cur = SvPVX (enc.sv);
… …
1062 *cur++ = *dec_cur++; 1113 *cur++ = *dec_cur++;
1063 while (--clen); 1114 while (--clen);
1064 1115
1065 utf8 = 1; 1116 utf8 = 1;
1066 } 1117 }
1118 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1119 *cur++ = ch;
1067 else 1120 else
1068 { 1121 {
1069 --dec_cur; 1122 --dec_cur;
1070 1123
1071 if (!ch) 1124 if (!ch)
… …
1259 if (*dec->cur == ']') 1312 if (*dec->cur == ']')
1260 { 1313 {
1261 ++dec->cur; 1314 ++dec->cur;
1262 break; 1315 break;
1263 } 1316 }
1264 1317
1265 if (*dec->cur != ',') 1318 if (*dec->cur != ',')
1266 ERR (", or ] expected while parsing array"); 1319 ERR (", or ] expected while parsing array");
1267 1320
1268 ++dec->cur; 1321 ++dec->cur;
1269 1322
… …
1393 1446
1394 hv_iterinit (hv); 1447 hv_iterinit (hv);
1395 he = hv_iternext (hv); 1448 he = hv_iternext (hv);
1396 hv_iterinit (hv); 1449 hv_iterinit (hv);
1397 1450
1398 // the next line creates a mortal sv each time its called. 1451 // the next line creates a mortal sv each time it's called.
1399 // might want to optimise this for common cases. 1452 // might want to optimise this for common cases.
1400 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1453 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1401 1454
1402 if (cb) 1455 if (cb)
1403 { 1456 {
1404 dSP; 1457 dSP;
1405 int count; 1458 int count;
1406 1459
1407 ENTER; SAVETMPS; PUSHMARK (SP); 1460 ENTER; SAVETMPS;
1461 SAVESTACK_POS ();
1462 PUSHMARK (SP);
1408 XPUSHs (HeVAL (he)); 1463 XPUSHs (HeVAL (he));
1409 sv_2mortal (sv); 1464 sv_2mortal (sv);
1410 1465
1411 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1466 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1412 1467
… …
1425 if (dec->json.cb_object) 1480 if (dec->json.cb_object)
1426 { 1481 {
1427 dSP; 1482 dSP;
1428 int count; 1483 int count;
1429 1484
1430 ENTER; SAVETMPS; PUSHMARK (SP); 1485 ENTER; SAVETMPS;
1486 SAVESTACK_POS ();
1487 PUSHMARK (SP);
1431 XPUSHs (sv_2mortal (sv)); 1488 XPUSHs (sv_2mortal (sv));
1432 1489
1433 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1490 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1434 1491
1435 if (count == 1) 1492 if (count == 1)
… …
1451 DEC_DEC_DEPTH; 1508 DEC_DEC_DEPTH;
1452 return 0; 1509 return 0;
1453} 1510}
1454 1511
1455static SV * 1512static SV *
1513decode_tag (dec_t *dec)
1514{
1515 SV *tag = 0;
1516 SV *val = 0;
1517
1518 if (!(dec->json.flags & F_ALLOW_TAGS))
1519 ERR ("malformed JSON string, neither array, object, number, string or atom");
1520
1521 ++dec->cur;
1522
1523 decode_ws (dec);
1524
1525 tag = decode_sv (dec);
1526 if (!tag)
1527 goto fail;
1528
1529 if (!SvPOK (tag))
1530 ERR ("malformed JSON string, (tag) must be a string");
1531
1532 decode_ws (dec);
1533
1534 if (*dec->cur != ')')
1535 ERR (") expected after tag");
1536
1537 ++dec->cur;
1538
1539 decode_ws (dec);
1540
1541 val = decode_sv (dec);
1542 if (!val)
1543 goto fail;
1544
1545 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1546 ERR ("malformed JSON string, tag value must be an array");
1547
1548 {
1549 AV *av = (AV *)SvRV (val);
1550 int i, len = av_len (av) + 1;
1551 HV *stash = gv_stashsv (tag, 0);
1552 SV *sv;
1553
1554 if (!stash)
1555 ERR ("cannot decode perl-object (package does not exist)");
1556
1557 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1558
1559 if (!method)
1560 ERR ("cannot decode perl-object (package does not have a THAW method)");
1561
1562 dSP;
1563
1564 ENTER; SAVETMPS;
1565 PUSHMARK (SP);
1566 EXTEND (SP, len + 2);
1567 // we re-bless the reference to get overload and other niceties right
1568 PUSHs (tag);
1569 PUSHs (sv_json);
1570
1571 for (i = 0; i < len; ++i)
1572 PUSHs (*av_fetch (av, i, 1));
1573
1574 PUTBACK;
1575 call_sv ((SV *)GvCV (method), G_SCALAR);
1576 SPAGAIN;
1577
1578 SvREFCNT_dec (tag);
1579 SvREFCNT_dec (val);
1580 sv = SvREFCNT_inc (POPs);
1581
1582 PUTBACK;
1583
1584 FREETMPS; LEAVE;
1585
1586 return sv;
1587 }
1588
1589fail:
1590 SvREFCNT_dec (tag);
1591 SvREFCNT_dec (val);
1592 return 0;
1593}
1594
1595static SV *
1456decode_sv (dec_t *dec) 1596decode_sv (dec_t *dec)
1457{ 1597{
1458 // the beauty of JSON: you need exactly one character lookahead 1598 // the beauty of JSON: you need exactly one character lookahead
1459 // to parse everything. 1599 // to parse everything.
1460 switch (*dec->cur) 1600 switch (*dec->cur)
1461 { 1601 {
1462 case '"': ++dec->cur; return decode_str (dec); 1602 case '"': ++dec->cur; return decode_str (dec);
1463 case '[': ++dec->cur; return decode_av (dec); 1603 case '[': ++dec->cur; return decode_av (dec);
1464 case '{': ++dec->cur; return decode_hv (dec); 1604 case '{': ++dec->cur; return decode_hv (dec);
1605 case '(': return decode_tag (dec);
1465 1606
1466 case '-': 1607 case '-':
1467 case '0': case '1': case '2': case '3': case '4': 1608 case '0': case '1': case '2': case '3': case '4':
1468 case '5': case '6': case '7': case '8': case '9': 1609 case '5': case '6': case '7': case '8': case '9':
1469 return decode_num (dec); 1610 return decode_num (dec);
… …
1471 case 't': 1612 case 't':
1472 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1613 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1473 { 1614 {
1474 dec->cur += 4; 1615 dec->cur += 4;
1475#if JSON_SLOW 1616#if JSON_SLOW
1476 json_true = get_bool ("JSON::XS::true"); 1617 types_true = get_bool ("Types::Serialiser::true");
1477#endif 1618#endif
1478 return newSVsv (json_true); 1619 return newSVsv (types_true);
1479 } 1620 }
1480 else 1621 else
1481 ERR ("'true' expected"); 1622 ERR ("'true' expected");
1482 1623
1483 break; 1624 break;
… …
1485 case 'f': 1626 case 'f':
1486 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1627 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1487 { 1628 {
1488 dec->cur += 5; 1629 dec->cur += 5;
1489#if JSON_SLOW 1630#if JSON_SLOW
1490 json_false = get_bool ("JSON::XS::false"); 1631 types_false = get_bool ("Types::Serialiser::false");
1491#endif 1632#endif
1492 return newSVsv (json_false); 1633 return newSVsv (types_false);
1493 } 1634 }
1494 else 1635 else
1495 ERR ("'false' expected"); 1636 ERR ("'false' expected");
1496 1637
1497 break; 1638 break;
… …
1506 ERR ("'null' expected"); 1647 ERR ("'null' expected");
1507 1648
1508 break; 1649 break;
1509 1650
1510 default: 1651 default:
1511 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1652 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1512 break; 1653 break;
1513 } 1654 }
1514 1655
1515fail: 1656fail:
1516 return 0; 1657 return 0;
… …
1521{ 1662{
1522 dec_t dec; 1663 dec_t dec;
1523 SV *sv; 1664 SV *sv;
1524 1665
1525 /* work around bugs in 5.10 where manipulating magic values 1666 /* work around bugs in 5.10 where manipulating magic values
1526 * will perl ignore the magic in subsequent accesses. 1667 * makes perl ignore the magic in subsequent accesses.
1527 * also make a copy of non-PV values, to get them into a clean 1668 * 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). 1669 * state (SvPV should do that, but it's buggy, see below).
1529 */ 1670 */
1530 /*SvGETMAGIC (string);*/ 1671 /*SvGETMAGIC (string);*/
1531 if (SvMAGICAL (string) || !SvPOK (string)) 1672 if (SvMAGICAL (string) || !SvPOK (string))
… …
1605 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1746 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1606 LEAVE; 1747 LEAVE;
1607 1748
1608 croak ("%s, at character offset %d (before \"%s\")", 1749 croak ("%s, at character offset %d (before \"%s\")",
1609 dec.err, 1750 dec.err,
1610 ptr_to_index (string, dec.cur), 1751 (int)ptr_to_index (string, dec.cur),
1611 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1752 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1612 } 1753 }
1613 1754
1614 sv = sv_2mortal (sv); 1755 sv = sv_2mortal (sv);
1615 1756
… …
1743 self->incr_mode = INCR_M_STR; 1884 self->incr_mode = INCR_M_STR;
1744 goto incr_m_str; 1885 goto incr_m_str;
1745 1886
1746 case '[': 1887 case '[':
1747 case '{': 1888 case '{':
1889 case '(':
1748 if (++self->incr_nest > self->max_depth) 1890 if (++self->incr_nest > self->max_depth)
1749 croak (ERR_NESTING_EXCEEDED); 1891 croak (ERR_NESTING_EXCEEDED);
1750 break; 1892 break;
1751 1893
1752 case ']': 1894 case ']':
1753 case '}': 1895 case '}':
1754 if (--self->incr_nest <= 0) 1896 if (--self->incr_nest <= 0)
1755 goto interrupt; 1897 goto interrupt;
1898 break;
1899
1900 case ')':
1901 --self->incr_nest;
1756 break; 1902 break;
1757 1903
1758 case '#': 1904 case '#':
1759 self->incr_mode = INCR_M_C1; 1905 self->incr_mode = INCR_M_C1;
1760 goto incr_m_c; 1906 goto incr_m_c;
… …
1786 i >= '0' && i <= '9' ? i - '0' 1932 i >= '0' && i <= '9' ? i - '0'
1787 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1933 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1788 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1934 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1789 : -1; 1935 : -1;
1790 1936
1791 json_stash = gv_stashpv ("JSON::XS" , 1); 1937 json_stash = gv_stashpv ("JSON::XS" , 1);
1792 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1938 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1793 1939
1794 json_true = get_bool ("JSON::XS::true"); 1940 types_true = get_bool ("Types::Serialiser::true");
1795 json_false = get_bool ("JSON::XS::false"); 1941 types_false = get_bool ("Types::Serialiser::false");
1942
1943 sv_json = newSVpv ("JSON", 0);
1944 SvREADONLY_on (sv_json);
1796 1945
1797 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1946 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1798} 1947}
1799 1948
1800PROTOTYPES: DISABLE 1949PROTOTYPES: DISABLE
1801 1950
1802void CLONE (...) 1951void CLONE (...)
1803 CODE: 1952 CODE:
1804 json_stash = 0; 1953 json_stash = 0;
1805 json_boolean_stash = 0; 1954 types_boolean_stash = 0;
1806 1955
1807void new (char *klass) 1956void new (char *klass)
1808 PPCODE: 1957 PPCODE:
1809{ 1958{
1810 SV *pv = NEWSV (0, sizeof (JSON)); 1959 SV *pv = NEWSV (0, sizeof (JSON));
1811 SvPOK_only (pv); 1960 SvPOK_only (pv);
1812 json_init ((JSON *)SvPVX (pv)); 1961 json_init ((JSON *)SvPVX (pv));
1813 XPUSHs (sv_2mortal (sv_bless ( 1962 XPUSHs (sv_2mortal (sv_bless (
1814 newRV_noinc (pv), 1963 newRV_noinc (pv),
1815 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1964 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1830 shrink = F_SHRINK 1979 shrink = F_SHRINK
1831 allow_blessed = F_ALLOW_BLESSED 1980 allow_blessed = F_ALLOW_BLESSED
1832 convert_blessed = F_CONV_BLESSED 1981 convert_blessed = F_CONV_BLESSED
1833 relaxed = F_RELAXED 1982 relaxed = F_RELAXED
1834 allow_unknown = F_ALLOW_UNKNOWN 1983 allow_unknown = F_ALLOW_UNKNOWN
1984 allow_tags = F_ALLOW_TAGS
1835 PPCODE: 1985 PPCODE:
1836{ 1986{
1837 if (enable) 1987 if (enable)
1838 self->flags |= ix; 1988 self->flags |= ix;
1839 else 1989 else
… …
1855 get_shrink = F_SHRINK 2005 get_shrink = F_SHRINK
1856 get_allow_blessed = F_ALLOW_BLESSED 2006 get_allow_blessed = F_ALLOW_BLESSED
1857 get_convert_blessed = F_CONV_BLESSED 2007 get_convert_blessed = F_CONV_BLESSED
1858 get_relaxed = F_RELAXED 2008 get_relaxed = F_RELAXED
1859 get_allow_unknown = F_ALLOW_UNKNOWN 2009 get_allow_unknown = F_ALLOW_UNKNOWN
2010 get_allow_tags = F_ALLOW_TAGS
1860 PPCODE: 2011 PPCODE:
1861 XPUSHs (boolSV (self->flags & ix)); 2012 XPUSHs (boolSV (self->flags & ix));
1862 2013
1863void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2014void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1864 PPCODE: 2015 PPCODE:
… …
1892} 2043}
1893 2044
1894void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2045void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1895 PPCODE: 2046 PPCODE:
1896{ 2047{
1897 if (!self->cb_sk_object) 2048 if (!self->cb_sk_object)
1898 self->cb_sk_object = newHV (); 2049 self->cb_sk_object = newHV ();
1899 2050
1900 if (SvOK (cb)) 2051 if (SvOK (cb))
1901 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2052 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1902 else 2053 else
… …
1913 XPUSHs (ST (0)); 2064 XPUSHs (ST (0));
1914} 2065}
1915 2066
1916void encode (JSON *self, SV *scalar) 2067void encode (JSON *self, SV *scalar)
1917 PPCODE: 2068 PPCODE:
1918 XPUSHs (encode_json (scalar, self)); 2069 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2070 XPUSHs (scalar);
1919 2071
1920void decode (JSON *self, SV *jsonstr) 2072void decode (JSON *self, SV *jsonstr)
1921 PPCODE: 2073 PPCODE:
1922 XPUSHs (decode_json (jsonstr, self, 0)); 2074 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2075 XPUSHs (jsonstr);
1923 2076
1924void decode_prefix (JSON *self, SV *jsonstr) 2077void decode_prefix (JSON *self, SV *jsonstr)
1925 PPCODE: 2078 PPCODE:
1926{ 2079{
2080 SV *sv;
1927 char *offset; 2081 char *offset;
2082 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1928 EXTEND (SP, 2); 2083 EXTEND (SP, 2);
1929 PUSHs (decode_json (jsonstr, self, &offset)); 2084 PUSHs (sv);
1930 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2085 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1931} 2086}
1932 2087
1933void incr_parse (JSON *self, SV *jsonstr = 0) 2088void incr_parse (JSON *self, SV *jsonstr = 0)
1934 PPCODE: 2089 PPCODE:
… …
1981 } 2136 }
1982 2137
1983 if (GIMME_V != G_VOID) 2138 if (GIMME_V != G_VOID)
1984 do 2139 do
1985 { 2140 {
2141 SV *sv;
1986 char *offset; 2142 char *offset;
1987 2143
1988 if (!INCR_DONE (self)) 2144 if (!INCR_DONE (self))
1989 { 2145 {
1990 incr_parse (self); 2146 incr_parse (self);
… …
2004 2160
2005 break; 2161 break;
2006 } 2162 }
2007 } 2163 }
2008 2164
2009 XPUSHs (decode_json (self->incr_text, self, &offset)); 2165 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2166 XPUSHs (sv);
2010 2167
2011 self->incr_pos -= offset - SvPVX (self->incr_text); 2168 self->incr_pos -= offset - SvPVX (self->incr_text);
2012 self->incr_nest = 0; 2169 self->incr_nest = 0;
2013 self->incr_mode = 0; 2170 self->incr_mode = 0;
2014 2171
… …
2058 SvREFCNT_dec (self->incr_text); 2215 SvREFCNT_dec (self->incr_text);
2059 2216
2060PROTOTYPES: ENABLE 2217PROTOTYPES: ENABLE
2061 2218
2062void encode_json (SV *scalar) 2219void encode_json (SV *scalar)
2063 ALIAS:
2064 to_json_ = 0
2065 encode_json = F_UTF8
2066 PPCODE: 2220 PPCODE:
2067{ 2221{
2068 JSON json; 2222 JSON json;
2069 json_init (&json); 2223 json_init (&json);
2070 json.flags |= ix; 2224 json.flags |= F_UTF8;
2071 XPUSHs (encode_json (scalar, &json)); 2225 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2226 XPUSHs (scalar);
2072} 2227}
2073 2228
2074void decode_json (SV *jsonstr) 2229void decode_json (SV *jsonstr)
2075 ALIAS:
2076 from_json_ = 0
2077 decode_json = F_UTF8
2078 PPCODE: 2230 PPCODE:
2079{ 2231{
2080 JSON json; 2232 JSON json;
2081 json_init (&json); 2233 json_init (&json);
2082 json.flags |= ix; 2234 json.flags |= F_UTF8;
2083 XPUSHs (decode_json (jsonstr, &json, 0)); 2235 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2236 XPUSHs (jsonstr);
2084} 2237}
2085 2238

Diff Legend

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