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.115 by root, Fri Dec 21 05:16:19 2012 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
… …
75#endif 87#endif
76 88
77// the amount of HEs to allocate on the stack, when sorting keys 89// the amount of HEs to allocate on the stack, when sorting keys
78#define STACK_HES 64 90#define STACK_HES 64
79 91
80static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
81static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
82 94
83enum { 95enum {
84 INCR_M_WS = 0, // initial whitespace skipping, must be 0 96 INCR_M_WS = 0, // initial whitespace skipping, must be 0
85 INCR_M_STR, // inside string 97 INCR_M_STR, // inside string
86 INCR_M_BS, // inside backslash 98 INCR_M_BS, // inside backslash
… …
483 495
484 if (enc->indent >= enc->json.max_depth) 496 if (enc->indent >= enc->json.max_depth)
485 croak (ERR_NESTING_EXCEEDED); 497 croak (ERR_NESTING_EXCEEDED);
486 498
487 encode_ch (enc, '['); 499 encode_ch (enc, '[');
488 500
489 if (len >= 0) 501 if (len >= 0)
490 { 502 {
491 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
492 504
493 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
… …
505 encode_comma (enc); 517 encode_comma (enc);
506 } 518 }
507 519
508 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
509 } 521 }
510 522
511 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
512} 524}
513 525
514static void 526static void
515encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
… …
519 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
520 { 532 {
521 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
522 STRLEN len; 534 STRLEN len;
523 char *str; 535 char *str;
524 536
525 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
526 str = SvPV (sv, len); 538 str = SvPV (sv, len);
527 539
528 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
529 } 541 }
… …
597 if (count) 609 if (count)
598 { 610 {
599 int i, fast = 1; 611 int i, fast = 1;
600 HE *hes_stack [STACK_HES]; 612 HE *hes_stack [STACK_HES];
601 HE **hes = hes_stack; 613 HE **hes = hes_stack;
602 614
603 // allocate larger arrays on the heap 615 // allocate larger arrays on the heap
604 if (count > STACK_HES) 616 if (count > STACK_HES)
605 { 617 {
606 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes))); 618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
607 hes = (HE **)SvPVX (sv); 619 hes = (HE **)SvPVX (sv);
… …
682// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
683static void 695static void
684encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
685{ 697{
686 svtype svt; 698 svtype svt;
699 GV *method;
687 700
688 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
689 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
690 703
691 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
692 { 705 {
693 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
694 ? json_boolean_stash 707 ? types_boolean_stash
695 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
696 710
697 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
698 { 712 {
699 if (SvIV (sv)) 713 if (SvIV (sv))
700 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
701 else 715 else
702 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
703 } 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);
704 else 785 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", 786 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)))); 787 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
751 }
752 } 788 }
753 else if (svt == SVt_PVHV) 789 else if (svt == SVt_PVHV)
754 encode_hv (enc, (HV *)sv); 790 encode_hv (enc, (HV *)sv);
755 else if (svt == SVt_PVAV) 791 else if (svt == SVt_PVAV)
756 encode_av (enc, (AV *)sv); 792 encode_av (enc, (AV *)sv);
… …
843 else if (SvROK (sv)) 879 else if (SvROK (sv))
844 encode_rv (enc, SvRV (sv)); 880 encode_rv (enc, SvRV (sv));
845 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 881 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
846 encode_str (enc, "null", 4, 0); 882 encode_str (enc, "null", 4, 0);
847 else 883 else
848 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",
849 SvPV_nolen (sv), (unsigned int)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;
850} 894}
851 895
852static SV * 896static SV *
853encode_json (SV *scalar, JSON *json) 897encode_json (SV *scalar, JSON *json)
854{ 898{
855 enc_t enc; 899 enc_t enc;
856 900
857 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 901 if (!(json->flags & F_ALLOW_NONREF) && json_scalar (scalar))
858 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)");
859 903
860 enc.json = *json; 904 enc.json = *json;
861 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 905 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
862 enc.cur = SvPVX (enc.sv); 906 enc.cur = SvPVX (enc.sv);
… …
1069 *cur++ = *dec_cur++; 1113 *cur++ = *dec_cur++;
1070 while (--clen); 1114 while (--clen);
1071 1115
1072 utf8 = 1; 1116 utf8 = 1;
1073 } 1117 }
1118 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1119 *cur++ = ch;
1074 else 1120 else
1075 { 1121 {
1076 --dec_cur; 1122 --dec_cur;
1077 1123
1078 if (!ch) 1124 if (!ch)
… …
1266 if (*dec->cur == ']') 1312 if (*dec->cur == ']')
1267 { 1313 {
1268 ++dec->cur; 1314 ++dec->cur;
1269 break; 1315 break;
1270 } 1316 }
1271 1317
1272 if (*dec->cur != ',') 1318 if (*dec->cur != ',')
1273 ERR (", or ] expected while parsing array"); 1319 ERR (", or ] expected while parsing array");
1274 1320
1275 ++dec->cur; 1321 ++dec->cur;
1276 1322
… …
1400 1446
1401 hv_iterinit (hv); 1447 hv_iterinit (hv);
1402 he = hv_iternext (hv); 1448 he = hv_iternext (hv);
1403 hv_iterinit (hv); 1449 hv_iterinit (hv);
1404 1450
1405 // the next line creates a mortal sv each time its called. 1451 // the next line creates a mortal sv each time it's called.
1406 // might want to optimise this for common cases. 1452 // might want to optimise this for common cases.
1407 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);
1408 1454
1409 if (cb) 1455 if (cb)
1410 { 1456 {
1411 dSP; 1457 dSP;
1412 int count; 1458 int count;
1413 1459
1414 ENTER; SAVETMPS; PUSHMARK (SP); 1460 ENTER; SAVETMPS;
1461 SAVESTACK_POS ();
1462 PUSHMARK (SP);
1415 XPUSHs (HeVAL (he)); 1463 XPUSHs (HeVAL (he));
1416 sv_2mortal (sv); 1464 sv_2mortal (sv);
1417 1465
1418 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1466 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1419 1467
… …
1432 if (dec->json.cb_object) 1480 if (dec->json.cb_object)
1433 { 1481 {
1434 dSP; 1482 dSP;
1435 int count; 1483 int count;
1436 1484
1437 ENTER; SAVETMPS; PUSHMARK (SP); 1485 ENTER; SAVETMPS;
1486 SAVESTACK_POS ();
1487 PUSHMARK (SP);
1438 XPUSHs (sv_2mortal (sv)); 1488 XPUSHs (sv_2mortal (sv));
1439 1489
1440 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1490 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1441 1491
1442 if (count == 1) 1492 if (count == 1)
… …
1458 DEC_DEC_DEPTH; 1508 DEC_DEC_DEPTH;
1459 return 0; 1509 return 0;
1460} 1510}
1461 1511
1462static 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 *
1463decode_sv (dec_t *dec) 1596decode_sv (dec_t *dec)
1464{ 1597{
1465 // the beauty of JSON: you need exactly one character lookahead 1598 // the beauty of JSON: you need exactly one character lookahead
1466 // to parse everything. 1599 // to parse everything.
1467 switch (*dec->cur) 1600 switch (*dec->cur)
1468 { 1601 {
1469 case '"': ++dec->cur; return decode_str (dec); 1602 case '"': ++dec->cur; return decode_str (dec);
1470 case '[': ++dec->cur; return decode_av (dec); 1603 case '[': ++dec->cur; return decode_av (dec);
1471 case '{': ++dec->cur; return decode_hv (dec); 1604 case '{': ++dec->cur; return decode_hv (dec);
1605 case '(': return decode_tag (dec);
1472 1606
1473 case '-': 1607 case '-':
1474 case '0': case '1': case '2': case '3': case '4': 1608 case '0': case '1': case '2': case '3': case '4':
1475 case '5': case '6': case '7': case '8': case '9': 1609 case '5': case '6': case '7': case '8': case '9':
1476 return decode_num (dec); 1610 return decode_num (dec);
… …
1478 case 't': 1612 case 't':
1479 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1613 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1480 { 1614 {
1481 dec->cur += 4; 1615 dec->cur += 4;
1482#if JSON_SLOW 1616#if JSON_SLOW
1483 json_true = get_bool ("JSON::XS::true"); 1617 types_true = get_bool ("Types::Serialiser::true");
1484#endif 1618#endif
1485 return newSVsv (json_true); 1619 return newSVsv (types_true);
1486 } 1620 }
1487 else 1621 else
1488 ERR ("'true' expected"); 1622 ERR ("'true' expected");
1489 1623
1490 break; 1624 break;
… …
1492 case 'f': 1626 case 'f':
1493 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1627 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1494 { 1628 {
1495 dec->cur += 5; 1629 dec->cur += 5;
1496#if JSON_SLOW 1630#if JSON_SLOW
1497 json_false = get_bool ("JSON::XS::false"); 1631 types_false = get_bool ("Types::Serialiser::false");
1498#endif 1632#endif
1499 return newSVsv (json_false); 1633 return newSVsv (types_false);
1500 } 1634 }
1501 else 1635 else
1502 ERR ("'false' expected"); 1636 ERR ("'false' expected");
1503 1637
1504 break; 1638 break;
… …
1513 ERR ("'null' expected"); 1647 ERR ("'null' expected");
1514 1648
1515 break; 1649 break;
1516 1650
1517 default: 1651 default:
1518 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1652 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1519 break; 1653 break;
1520 } 1654 }
1521 1655
1522fail: 1656fail:
1523 return 0; 1657 return 0;
… …
1528{ 1662{
1529 dec_t dec; 1663 dec_t dec;
1530 SV *sv; 1664 SV *sv;
1531 1665
1532 /* work around bugs in 5.10 where manipulating magic values 1666 /* work around bugs in 5.10 where manipulating magic values
1533 * will perl ignore the magic in subsequent accesses. 1667 * makes perl ignore the magic in subsequent accesses.
1534 * 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
1535 * state (SvPV should do that, but it's buggy, see below). 1669 * state (SvPV should do that, but it's buggy, see below).
1536 */ 1670 */
1537 /*SvGETMAGIC (string);*/ 1671 /*SvGETMAGIC (string);*/
1538 if (SvMAGICAL (string) || !SvPOK (string)) 1672 if (SvMAGICAL (string) || !SvPOK (string))
… …
1750 self->incr_mode = INCR_M_STR; 1884 self->incr_mode = INCR_M_STR;
1751 goto incr_m_str; 1885 goto incr_m_str;
1752 1886
1753 case '[': 1887 case '[':
1754 case '{': 1888 case '{':
1889 case '(':
1755 if (++self->incr_nest > self->max_depth) 1890 if (++self->incr_nest > self->max_depth)
1756 croak (ERR_NESTING_EXCEEDED); 1891 croak (ERR_NESTING_EXCEEDED);
1757 break; 1892 break;
1758 1893
1759 case ']': 1894 case ']':
1760 case '}': 1895 case '}':
1761 if (--self->incr_nest <= 0) 1896 if (--self->incr_nest <= 0)
1762 goto interrupt; 1897 goto interrupt;
1898 break;
1899
1900 case ')':
1901 --self->incr_nest;
1763 break; 1902 break;
1764 1903
1765 case '#': 1904 case '#':
1766 self->incr_mode = INCR_M_C1; 1905 self->incr_mode = INCR_M_C1;
1767 goto incr_m_c; 1906 goto incr_m_c;
… …
1793 i >= '0' && i <= '9' ? i - '0' 1932 i >= '0' && i <= '9' ? i - '0'
1794 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1933 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1795 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1934 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1796 : -1; 1935 : -1;
1797 1936
1798 json_stash = gv_stashpv ("JSON::XS" , 1); 1937 json_stash = gv_stashpv ("JSON::XS" , 1);
1799 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1938 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1800 1939
1801 json_true = get_bool ("JSON::XS::true"); 1940 types_true = get_bool ("Types::Serialiser::true");
1802 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);
1803 1945
1804 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 */
1805} 1947}
1806 1948
1807PROTOTYPES: DISABLE 1949PROTOTYPES: DISABLE
1808 1950
1809void CLONE (...) 1951void CLONE (...)
1810 CODE: 1952 CODE:
1811 json_stash = 0; 1953 json_stash = 0;
1812 json_boolean_stash = 0; 1954 types_boolean_stash = 0;
1813 1955
1814void new (char *klass) 1956void new (char *klass)
1815 PPCODE: 1957 PPCODE:
1816{ 1958{
1817 SV *pv = NEWSV (0, sizeof (JSON)); 1959 SV *pv = NEWSV (0, sizeof (JSON));
… …
1837 shrink = F_SHRINK 1979 shrink = F_SHRINK
1838 allow_blessed = F_ALLOW_BLESSED 1980 allow_blessed = F_ALLOW_BLESSED
1839 convert_blessed = F_CONV_BLESSED 1981 convert_blessed = F_CONV_BLESSED
1840 relaxed = F_RELAXED 1982 relaxed = F_RELAXED
1841 allow_unknown = F_ALLOW_UNKNOWN 1983 allow_unknown = F_ALLOW_UNKNOWN
1984 allow_tags = F_ALLOW_TAGS
1842 PPCODE: 1985 PPCODE:
1843{ 1986{
1844 if (enable) 1987 if (enable)
1845 self->flags |= ix; 1988 self->flags |= ix;
1846 else 1989 else
… …
1862 get_shrink = F_SHRINK 2005 get_shrink = F_SHRINK
1863 get_allow_blessed = F_ALLOW_BLESSED 2006 get_allow_blessed = F_ALLOW_BLESSED
1864 get_convert_blessed = F_CONV_BLESSED 2007 get_convert_blessed = F_CONV_BLESSED
1865 get_relaxed = F_RELAXED 2008 get_relaxed = F_RELAXED
1866 get_allow_unknown = F_ALLOW_UNKNOWN 2009 get_allow_unknown = F_ALLOW_UNKNOWN
2010 get_allow_tags = F_ALLOW_TAGS
1867 PPCODE: 2011 PPCODE:
1868 XPUSHs (boolSV (self->flags & ix)); 2012 XPUSHs (boolSV (self->flags & ix));
1869 2013
1870void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2014void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1871 PPCODE: 2015 PPCODE:
… …
2071 SvREFCNT_dec (self->incr_text); 2215 SvREFCNT_dec (self->incr_text);
2072 2216
2073PROTOTYPES: ENABLE 2217PROTOTYPES: ENABLE
2074 2218
2075void encode_json (SV *scalar) 2219void encode_json (SV *scalar)
2076 ALIAS:
2077 to_json_ = 0
2078 encode_json = F_UTF8
2079 PPCODE: 2220 PPCODE:
2080{ 2221{
2081 JSON json; 2222 JSON json;
2082 json_init (&json); 2223 json_init (&json);
2083 json.flags |= ix; 2224 json.flags |= F_UTF8;
2084 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN; 2225 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2085 XPUSHs (scalar); 2226 XPUSHs (scalar);
2086} 2227}
2087 2228
2088void decode_json (SV *jsonstr) 2229void decode_json (SV *jsonstr)
2089 ALIAS:
2090 from_json_ = 0
2091 decode_json = F_UTF8
2092 PPCODE: 2230 PPCODE:
2093{ 2231{
2094 JSON json; 2232 JSON json;
2095 json_init (&json); 2233 json_init (&json);
2096 json.flags |= ix; 2234 json.flags |= F_UTF8;
2097 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN; 2235 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2098 XPUSHs (jsonstr); 2236 XPUSHs (jsonstr);
2099} 2237}
2100 2238

Diff Legend

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