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.106 by root, Tue Jan 19 01:36:34 2010 UTC vs.
Revision 1.121 by root, Tue Oct 29 00:06:40 2013 UTC

… …
33#define F_SHRINK 0x00000200UL 33#define F_SHRINK 0x00000200UL
34#define F_ALLOW_BLESSED 0x00000400UL 34#define F_ALLOW_BLESSED 0x00000400UL
35#define F_CONV_BLESSED 0x00000800UL 35#define F_CONV_BLESSED 0x00000800UL
36#define F_RELAXED 0x00001000UL 36#define F_RELAXED 0x00001000UL
37#define F_ALLOW_UNKNOWN 0x00002000UL 37#define F_ALLOW_UNKNOWN 0x00002000UL
38#define F_ALLOW_TAGS 0x00004000UL
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 39#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 40
40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
41 42
42#define INIT_SIZE 32 // initial scalar size to be allocated 43#define INIT_SIZE 32 // initial scalar size to be allocated
43#define INDENT_STEP 3 // spaces per indentation level 44#define INDENT_STEP 3 // spaces per indentation level
44 45
45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 46#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
47
48#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
46 49
47#define SB do { 50#define SB do {
48#define SE } while (0) 51#define SE } while (0)
49 52
50#if __GNUC__ >= 3 53#if __GNUC__ >= 3
… …
70#else 73#else
71# define JSON_SLOW 0 74# define JSON_SLOW 0
72# define JSON_STASH json_stash 75# define JSON_STASH json_stash
73#endif 76#endif
74 77
78// the amount of HEs to allocate on the stack, when sorting keys
79#define STACK_HES 64
80
75static HV *json_stash, *json_boolean_stash; // JSON::XS:: 81static HV *json_stash, *types_boolean_stash; // JSON::XS::
76static SV *json_true, *json_false; 82static SV *types_true, *types_false, *sv_json;
77 83
78enum { 84enum {
79 INCR_M_WS = 0, // initial whitespace skipping, must be 0 85 INCR_M_WS = 0, // initial whitespace skipping, must be 0
80 INCR_M_STR, // inside string 86 INCR_M_STR, // inside string
81 INCR_M_BS, // inside backslash 87 INCR_M_BS, // inside backslash
… …
258 } 264 }
259 265
260 // this relies greatly on the quality of the pow () 266 // this relies greatly on the quality of the pow ()
261 // implementation of the platform, but a good 267 // implementation of the platform, but a good
262 // implementation is hard to beat. 268 // implementation is hard to beat.
269 // (IEEE 754 conformant ones are required to be exact)
263 if (postdp) *expo -= eaccum; 270 if (postdp) *expo -= eaccum;
264 *accum += uaccum * Perl_pow (10., *expo); 271 *accum += uaccum * Perl_pow (10., *expo);
265 *expo += eaccum; 272 *expo += eaccum;
266} 273}
267 274
… …
477 484
478 if (enc->indent >= enc->json.max_depth) 485 if (enc->indent >= enc->json.max_depth)
479 croak (ERR_NESTING_EXCEEDED); 486 croak (ERR_NESTING_EXCEEDED);
480 487
481 encode_ch (enc, '['); 488 encode_ch (enc, '[');
482 489
483 if (len >= 0) 490 if (len >= 0)
484 { 491 {
485 encode_nl (enc); ++enc->indent; 492 encode_nl (enc); ++enc->indent;
486 493
487 for (i = 0; i <= len; ++i) 494 for (i = 0; i <= len; ++i)
… …
499 encode_comma (enc); 506 encode_comma (enc);
500 } 507 }
501 508
502 encode_nl (enc); --enc->indent; encode_indent (enc); 509 encode_nl (enc); --enc->indent; encode_indent (enc);
503 } 510 }
504 511
505 encode_ch (enc, ']'); 512 encode_ch (enc, ']');
506} 513}
507 514
508static void 515static void
509encode_hk (enc_t *enc, HE *he) 516encode_hk (enc_t *enc, HE *he)
… …
513 if (HeKLEN (he) == HEf_SVKEY) 520 if (HeKLEN (he) == HEf_SVKEY)
514 { 521 {
515 SV *sv = HeSVKEY (he); 522 SV *sv = HeSVKEY (he);
516 STRLEN len; 523 STRLEN len;
517 char *str; 524 char *str;
518 525
519 SvGETMAGIC (sv); 526 SvGETMAGIC (sv);
520 str = SvPV (sv, len); 527 str = SvPV (sv, len);
521 528
522 encode_str (enc, str, len, SvUTF8 (sv)); 529 encode_str (enc, str, len, SvUTF8 (sv));
523 } 530 }
… …
589 } 596 }
590 597
591 if (count) 598 if (count)
592 { 599 {
593 int i, fast = 1; 600 int i, fast = 1;
594#if defined(__BORLANDC__) || defined(_MSC_VER) 601 HE *hes_stack [STACK_HES];
595 HE **hes = _alloca (count * sizeof (HE)); 602 HE **hes = hes_stack;
596#else 603
597 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 604 // allocate larger arrays on the heap
598#endif 605 if (count > STACK_HES)
606 {
607 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
608 hes = (HE **)SvPVX (sv);
609 }
599 610
600 i = 0; 611 i = 0;
601 while ((he = hv_iternext (hv))) 612 while ((he = hv_iternext (hv)))
602 { 613 {
603 hes [i++] = he; 614 hes [i++] = he;
… …
672// encode objects, arrays and special \0=false and \1=true values. 683// encode objects, arrays and special \0=false and \1=true values.
673static void 684static void
674encode_rv (enc_t *enc, SV *sv) 685encode_rv (enc_t *enc, SV *sv)
675{ 686{
676 svtype svt; 687 svtype svt;
688 GV *method;
677 689
678 SvGETMAGIC (sv); 690 SvGETMAGIC (sv);
679 svt = SvTYPE (sv); 691 svt = SvTYPE (sv);
680 692
681 if (expect_false (SvOBJECT (sv))) 693 if (expect_false (SvOBJECT (sv)))
682 { 694 {
683 HV *stash = !JSON_SLOW || json_boolean_stash 695 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
684 ? json_boolean_stash 696 ? types_boolean_stash
685 : gv_stashpv ("JSON::XS::Boolean", 1); 697 : gv_stashpv ("Types::Serialiser::Boolean", 1);
698 HV *stash = SvSTASH (sv);
686 699
687 if (SvSTASH (sv) == stash) 700 if (stash == boolean_stash)
688 { 701 {
689 if (SvIV (sv)) 702 if (SvIV (sv))
690 encode_str (enc, "true", 4, 0); 703 encode_str (enc, "true", 4, 0);
691 else 704 else
692 encode_str (enc, "false", 5, 0); 705 encode_str (enc, "false", 5, 0);
693 } 706 }
707 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
708 {
709 int count;
710 dSP;
711
712 ENTER; SAVETMPS; PUSHMARK (SP);
713 EXTEND (SP, 2);
714 // we re-bless the reference to get overload and other niceties right
715 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
716 PUSHs (sv_json);
717
718 PUTBACK;
719 count = call_sv ((SV *)GvCV (method), G_ARRAY);
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 encode_ch (enc, '(');
727 encode_ch (enc, '"');
728 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
729 encode_ch (enc, '"');
730 encode_ch (enc, ')');
731 encode_ch (enc, '[');
732
733 while (count)
734 {
735 encode_sv (enc, SP[1 - count--]);
736
737 if (count)
738 encode_ch (enc, ',');
739 }
740
741 encode_ch (enc, ']');
742
743 PUTBACK;
744
745 FREETMPS; LEAVE;
746 }
747 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
748 {
749 dSP;
750
751 ENTER; SAVETMPS; PUSHMARK (SP);
752 // we re-bless the reference to get overload and other niceties right
753 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
754
755 // calling with G_SCALAR ensures that we always get a 1 return value
756 PUTBACK;
757 call_sv ((SV *)GvCV (method), G_SCALAR);
758 SPAGAIN;
759
760 // catch this surprisingly common error
761 if (SvROK (TOPs) && SvRV (TOPs) == sv)
762 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
763
764 sv = POPs;
765 PUTBACK;
766
767 encode_sv (enc, sv);
768
769 FREETMPS; LEAVE;
770 }
771 else if (enc->json.flags & F_ALLOW_BLESSED)
772 encode_str (enc, "null", 4, 0);
694 else 773 else
695 {
696#if 0
697 if (0 && sv_derived_from (rv, "JSON::Literal"))
698 {
699 // not yet
700 }
701#endif
702 if (enc->json.flags & F_CONV_BLESSED)
703 {
704 // we re-bless the reference to get overload and other niceties right
705 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
706
707 if (to_json)
708 {
709 dSP;
710
711 ENTER; SAVETMPS; PUSHMARK (SP);
712 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
713
714 // calling with G_SCALAR ensures that we always get a 1 return value
715 PUTBACK;
716 call_sv ((SV *)GvCV (to_json), G_SCALAR);
717 SPAGAIN;
718
719 // catch this surprisingly common error
720 if (SvROK (TOPs) && SvRV (TOPs) == sv)
721 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
722
723 sv = POPs;
724 PUTBACK;
725
726 encode_sv (enc, sv);
727
728 FREETMPS; LEAVE;
729 }
730 else if (enc->json.flags & F_ALLOW_BLESSED)
731 encode_str (enc, "null", 4, 0);
732 else
733 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
734 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
735 }
736 else if (enc->json.flags & F_ALLOW_BLESSED)
737 encode_str (enc, "null", 4, 0);
738 else
739 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 774 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
740 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 775 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
741 }
742 } 776 }
743 else if (svt == SVt_PVHV) 777 else if (svt == SVt_PVHV)
744 encode_hv (enc, (HV *)sv); 778 encode_hv (enc, (HV *)sv);
745 else if (svt == SVt_PVAV) 779 else if (svt == SVt_PVAV)
746 encode_av (enc, (AV *)sv); 780 encode_av (enc, (AV *)sv);
… …
822 } 856 }
823 else 857 else
824 { 858 {
825 // large integer, use the (rather slow) snprintf way. 859 // large integer, use the (rather slow) snprintf way.
826 need (enc, IVUV_MAXCHARS); 860 need (enc, IVUV_MAXCHARS);
827 enc->cur += 861 enc->cur +=
828 SvIsUV(sv) 862 SvIsUV(sv)
829 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 863 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
830 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 864 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
831 } 865 }
832 } 866 }
833 else if (SvROK (sv)) 867 else if (SvROK (sv))
834 encode_rv (enc, SvRV (sv)); 868 encode_rv (enc, SvRV (sv));
835 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 869 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
836 encode_str (enc, "null", 4, 0); 870 encode_str (enc, "null", 4, 0);
837 else 871 else
838 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 872 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
839 SvPV_nolen (sv), SvFLAGS (sv)); 873 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
840} 874}
841 875
842static SV * 876static SV *
843encode_json (SV *scalar, JSON *json) 877encode_json (SV *scalar, JSON *json)
844{ 878{
… …
1256 if (*dec->cur == ']') 1290 if (*dec->cur == ']')
1257 { 1291 {
1258 ++dec->cur; 1292 ++dec->cur;
1259 break; 1293 break;
1260 } 1294 }
1261 1295
1262 if (*dec->cur != ',') 1296 if (*dec->cur != ',')
1263 ERR (", or ] expected while parsing array"); 1297 ERR (", or ] expected while parsing array");
1264 1298
1265 ++dec->cur; 1299 ++dec->cur;
1266 1300
… …
1401 dSP; 1435 dSP;
1402 int count; 1436 int count;
1403 1437
1404 ENTER; SAVETMPS; PUSHMARK (SP); 1438 ENTER; SAVETMPS; PUSHMARK (SP);
1405 XPUSHs (HeVAL (he)); 1439 XPUSHs (HeVAL (he));
1440 sv_2mortal (sv);
1406 1441
1407 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1442 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1408 1443
1409 if (count == 1) 1444 if (count == 1)
1410 { 1445 {
1411 sv = newSVsv (POPs); 1446 sv = newSVsv (POPs);
1412 FREETMPS; LEAVE; 1447 FREETMPS; LEAVE;
1413 return sv; 1448 return sv;
1414 } 1449 }
1415 1450
1451 SvREFCNT_inc (sv);
1416 FREETMPS; LEAVE; 1452 FREETMPS; LEAVE;
1417 } 1453 }
1418 } 1454 }
1419 1455
1420 if (dec->json.cb_object) 1456 if (dec->json.cb_object)
… …
1446 DEC_DEC_DEPTH; 1482 DEC_DEC_DEPTH;
1447 return 0; 1483 return 0;
1448} 1484}
1449 1485
1450static SV * 1486static SV *
1487decode_tag (dec_t *dec)
1488{
1489 SV *tag = 0;
1490 SV *val = 0;
1491
1492 if (!(dec->json.flags & F_ALLOW_TAGS))
1493 ERR ("malformed JSON string, neither array, object, number, string or atom");
1494
1495 ++dec->cur;
1496
1497 decode_ws (dec);
1498
1499 tag = decode_sv (dec);
1500 if (!tag)
1501 goto fail;
1502
1503 if (!SvPOK (tag))
1504 ERR ("malformed JSON string, (tag) must be a string");
1505
1506 decode_ws (dec);
1507
1508 if (*dec->cur != ')')
1509 ERR (") expected after tag");
1510
1511 ++dec->cur;
1512
1513 decode_ws (dec);
1514
1515 val = decode_sv (dec);
1516 if (!val)
1517 goto fail;
1518
1519 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1520 ERR ("malformed JSON string, tag value must be an array");
1521
1522 {
1523 AV *av = (AV *)SvRV (val);
1524 int i, len = av_len (av) + 1;
1525 HV *stash = gv_stashsv (tag, 0);
1526 SV *sv;
1527
1528 if (!stash)
1529 ERR ("cannot decode perl-object (package does not exist)");
1530
1531 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1532
1533 if (!method)
1534 ERR ("cannot decode perl-object (package does not have a THAW method)");
1535
1536 dSP;
1537
1538 ENTER; SAVETMPS; PUSHMARK (SP);
1539 EXTEND (SP, len + 2);
1540 // we re-bless the reference to get overload and other niceties right
1541 PUSHs (tag);
1542 PUSHs (sv_json);
1543
1544 for (i = 0; i < len; ++i)
1545 PUSHs (*av_fetch (av, i, 1));
1546
1547 PUTBACK;
1548 call_sv ((SV *)GvCV (method), G_SCALAR);
1549 SPAGAIN;
1550
1551 SvREFCNT_dec (tag);
1552 SvREFCNT_dec (val);
1553 sv = SvREFCNT_inc (POPs);
1554
1555 PUTBACK;
1556
1557 FREETMPS; LEAVE;
1558
1559 return sv;
1560 }
1561
1562fail:
1563 SvREFCNT_dec (tag);
1564 SvREFCNT_dec (val);
1565 return 0;
1566}
1567
1568static SV *
1451decode_sv (dec_t *dec) 1569decode_sv (dec_t *dec)
1452{ 1570{
1453 // the beauty of JSON: you need exactly one character lookahead 1571 // the beauty of JSON: you need exactly one character lookahead
1454 // to parse everything. 1572 // to parse everything.
1455 switch (*dec->cur) 1573 switch (*dec->cur)
1456 { 1574 {
1457 case '"': ++dec->cur; return decode_str (dec); 1575 case '"': ++dec->cur; return decode_str (dec);
1458 case '[': ++dec->cur; return decode_av (dec); 1576 case '[': ++dec->cur; return decode_av (dec);
1459 case '{': ++dec->cur; return decode_hv (dec); 1577 case '{': ++dec->cur; return decode_hv (dec);
1578 case '(': return decode_tag (dec);
1460 1579
1461 case '-': 1580 case '-':
1462 case '0': case '1': case '2': case '3': case '4': 1581 case '0': case '1': case '2': case '3': case '4':
1463 case '5': case '6': case '7': case '8': case '9': 1582 case '5': case '6': case '7': case '8': case '9':
1464 return decode_num (dec); 1583 return decode_num (dec);
… …
1466 case 't': 1585 case 't':
1467 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1586 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1468 { 1587 {
1469 dec->cur += 4; 1588 dec->cur += 4;
1470#if JSON_SLOW 1589#if JSON_SLOW
1471 json_true = get_bool ("JSON::XS::true"); 1590 types_true = get_bool ("Types::Serialiser::true");
1472#endif 1591#endif
1473 return newSVsv (json_true); 1592 return newSVsv (types_true);
1474 } 1593 }
1475 else 1594 else
1476 ERR ("'true' expected"); 1595 ERR ("'true' expected");
1477 1596
1478 break; 1597 break;
… …
1480 case 'f': 1599 case 'f':
1481 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1600 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1482 { 1601 {
1483 dec->cur += 5; 1602 dec->cur += 5;
1484#if JSON_SLOW 1603#if JSON_SLOW
1485 json_false = get_bool ("JSON::XS::false"); 1604 types_false = get_bool ("Types::Serialiser::false");
1486#endif 1605#endif
1487 return newSVsv (json_false); 1606 return newSVsv (types_false);
1488 } 1607 }
1489 else 1608 else
1490 ERR ("'false' expected"); 1609 ERR ("'false' expected");
1491 1610
1492 break; 1611 break;
… …
1501 ERR ("'null' expected"); 1620 ERR ("'null' expected");
1502 1621
1503 break; 1622 break;
1504 1623
1505 default: 1624 default:
1506 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1625 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1507 break; 1626 break;
1508 } 1627 }
1509 1628
1510fail: 1629fail:
1511 return 0; 1630 return 0;
… …
1516{ 1635{
1517 dec_t dec; 1636 dec_t dec;
1518 SV *sv; 1637 SV *sv;
1519 1638
1520 /* work around bugs in 5.10 where manipulating magic values 1639 /* work around bugs in 5.10 where manipulating magic values
1521 * will perl ignore the magic in subsequent accesses 1640 * makes perl ignore the magic in subsequent accesses.
1641 * also make a copy of non-PV values, to get them into a clean
1642 * state (SvPV should do that, but it's buggy, see below).
1522 */ 1643 */
1523 /*SvGETMAGIC (string);*/ 1644 /*SvGETMAGIC (string);*/
1524 if (SvMAGICAL (string)) 1645 if (SvMAGICAL (string) || !SvPOK (string))
1525 string = sv_2mortal (newSVsv (string)); 1646 string = sv_2mortal (newSVsv (string));
1526 1647
1527 SvUPGRADE (string, SVt_PV); 1648 SvUPGRADE (string, SVt_PV);
1528 1649
1529 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1650 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1546 if (offset > json->max_size && json->max_size) 1667 if (offset > json->max_size && json->max_size)
1547 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1668 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1548 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1669 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1549 } 1670 }
1550 1671
1551 if (json->flags & F_UTF8) 1672 if (DECODE_WANTS_OCTETS (json))
1552 sv_utf8_downgrade (string, 0); 1673 sv_utf8_downgrade (string, 0);
1553 else 1674 else
1554 sv_utf8_upgrade (string); 1675 sv_utf8_upgrade (string);
1555 1676
1556 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1677 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1598 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1719 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1599 LEAVE; 1720 LEAVE;
1600 1721
1601 croak ("%s, at character offset %d (before \"%s\")", 1722 croak ("%s, at character offset %d (before \"%s\")",
1602 dec.err, 1723 dec.err,
1603 ptr_to_index (string, dec.cur), 1724 (int)ptr_to_index (string, dec.cur),
1604 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1725 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1605 } 1726 }
1606 1727
1607 sv = sv_2mortal (sv); 1728 sv = sv_2mortal (sv);
1608 1729
… …
1736 self->incr_mode = INCR_M_STR; 1857 self->incr_mode = INCR_M_STR;
1737 goto incr_m_str; 1858 goto incr_m_str;
1738 1859
1739 case '[': 1860 case '[':
1740 case '{': 1861 case '{':
1862 case '(':
1741 if (++self->incr_nest > self->max_depth) 1863 if (++self->incr_nest > self->max_depth)
1742 croak (ERR_NESTING_EXCEEDED); 1864 croak (ERR_NESTING_EXCEEDED);
1743 break; 1865 break;
1744 1866
1745 case ']': 1867 case ']':
1746 case '}': 1868 case '}':
1747 if (--self->incr_nest <= 0) 1869 if (--self->incr_nest <= 0)
1748 goto interrupt; 1870 goto interrupt;
1871 break;
1872
1873 case ')':
1874 --self->incr_nest;
1749 break; 1875 break;
1750 1876
1751 case '#': 1877 case '#':
1752 self->incr_mode = INCR_M_C1; 1878 self->incr_mode = INCR_M_C1;
1753 goto incr_m_c; 1879 goto incr_m_c;
… …
1779 i >= '0' && i <= '9' ? i - '0' 1905 i >= '0' && i <= '9' ? i - '0'
1780 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1906 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1781 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1907 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1782 : -1; 1908 : -1;
1783 1909
1784 json_stash = gv_stashpv ("JSON::XS" , 1); 1910 json_stash = gv_stashpv ("JSON::XS" , 1);
1785 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1911 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1786 1912
1787 json_true = get_bool ("JSON::XS::true"); 1913 types_true = get_bool ("Types::Serialiser::true");
1788 json_false = get_bool ("JSON::XS::false"); 1914 types_false = get_bool ("Types::Serialiser::false");
1915
1916 sv_json = newSVpv ("JSON", 0);
1917 SvREADONLY_on (sv_json);
1789 1918
1790 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1919 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1791} 1920}
1792 1921
1793PROTOTYPES: DISABLE 1922PROTOTYPES: DISABLE
1794 1923
1795void CLONE (...) 1924void CLONE (...)
1796 CODE: 1925 CODE:
1797 json_stash = 0; 1926 json_stash = 0;
1798 json_boolean_stash = 0; 1927 types_boolean_stash = 0;
1799 1928
1800void new (char *klass) 1929void new (char *klass)
1801 PPCODE: 1930 PPCODE:
1802{ 1931{
1803 SV *pv = NEWSV (0, sizeof (JSON)); 1932 SV *pv = NEWSV (0, sizeof (JSON));
1804 SvPOK_only (pv); 1933 SvPOK_only (pv);
1805 json_init ((JSON *)SvPVX (pv)); 1934 json_init ((JSON *)SvPVX (pv));
1806 XPUSHs (sv_2mortal (sv_bless ( 1935 XPUSHs (sv_2mortal (sv_bless (
1807 newRV_noinc (pv), 1936 newRV_noinc (pv),
1808 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1937 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1823 shrink = F_SHRINK 1952 shrink = F_SHRINK
1824 allow_blessed = F_ALLOW_BLESSED 1953 allow_blessed = F_ALLOW_BLESSED
1825 convert_blessed = F_CONV_BLESSED 1954 convert_blessed = F_CONV_BLESSED
1826 relaxed = F_RELAXED 1955 relaxed = F_RELAXED
1827 allow_unknown = F_ALLOW_UNKNOWN 1956 allow_unknown = F_ALLOW_UNKNOWN
1957 allow_tags = F_ALLOW_TAGS
1828 PPCODE: 1958 PPCODE:
1829{ 1959{
1830 if (enable) 1960 if (enable)
1831 self->flags |= ix; 1961 self->flags |= ix;
1832 else 1962 else
… …
1848 get_shrink = F_SHRINK 1978 get_shrink = F_SHRINK
1849 get_allow_blessed = F_ALLOW_BLESSED 1979 get_allow_blessed = F_ALLOW_BLESSED
1850 get_convert_blessed = F_CONV_BLESSED 1980 get_convert_blessed = F_CONV_BLESSED
1851 get_relaxed = F_RELAXED 1981 get_relaxed = F_RELAXED
1852 get_allow_unknown = F_ALLOW_UNKNOWN 1982 get_allow_unknown = F_ALLOW_UNKNOWN
1983 get_allow_tags = F_ALLOW_TAGS
1853 PPCODE: 1984 PPCODE:
1854 XPUSHs (boolSV (self->flags & ix)); 1985 XPUSHs (boolSV (self->flags & ix));
1855 1986
1856void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 1987void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1857 PPCODE: 1988 PPCODE:
… …
1885} 2016}
1886 2017
1887void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2018void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1888 PPCODE: 2019 PPCODE:
1889{ 2020{
1890 if (!self->cb_sk_object) 2021 if (!self->cb_sk_object)
1891 self->cb_sk_object = newHV (); 2022 self->cb_sk_object = newHV ();
1892 2023
1893 if (SvOK (cb)) 2024 if (SvOK (cb))
1894 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2025 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1895 else 2026 else
… …
1906 XPUSHs (ST (0)); 2037 XPUSHs (ST (0));
1907} 2038}
1908 2039
1909void encode (JSON *self, SV *scalar) 2040void encode (JSON *self, SV *scalar)
1910 PPCODE: 2041 PPCODE:
1911 XPUSHs (encode_json (scalar, self)); 2042 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2043 XPUSHs (scalar);
1912 2044
1913void decode (JSON *self, SV *jsonstr) 2045void decode (JSON *self, SV *jsonstr)
1914 PPCODE: 2046 PPCODE:
1915 XPUSHs (decode_json (jsonstr, self, 0)); 2047 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2048 XPUSHs (jsonstr);
1916 2049
1917void decode_prefix (JSON *self, SV *jsonstr) 2050void decode_prefix (JSON *self, SV *jsonstr)
1918 PPCODE: 2051 PPCODE:
1919{ 2052{
2053 SV *sv;
1920 char *offset; 2054 char *offset;
2055 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1921 EXTEND (SP, 2); 2056 EXTEND (SP, 2);
1922 PUSHs (decode_json (jsonstr, self, &offset)); 2057 PUSHs (sv);
1923 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2058 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1924} 2059}
1925 2060
1926void incr_parse (JSON *self, SV *jsonstr = 0) 2061void incr_parse (JSON *self, SV *jsonstr = 0)
1927 PPCODE: 2062 PPCODE:
1928{ 2063{
1929 if (!self->incr_text) 2064 if (!self->incr_text)
1930 self->incr_text = newSVpvn ("", 0); 2065 self->incr_text = newSVpvn ("", 0);
2066
2067 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2068 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2069 if (DECODE_WANTS_OCTETS (self))
2070 {
2071 if (self->incr_pos)
2072 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2073 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2074
2075 sv_utf8_downgrade (self->incr_text, 0);
2076 }
2077 else
2078 {
2079 sv_utf8_upgrade (self->incr_text);
2080
2081 if (self->incr_pos)
2082 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2083 - (U8 *)SvPVX (self->incr_text);
2084 }
1931 2085
1932 // append data, if any 2086 // append data, if any
1933 if (jsonstr) 2087 if (jsonstr)
1934 { 2088 {
2089 /* make sure both strings have same encoding */
2090 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1935 if (SvUTF8 (jsonstr)) 2091 if (SvUTF8 (jsonstr))
2092 sv_utf8_downgrade (jsonstr, 0);
1936 { 2093 else
1937 if (!SvUTF8 (self->incr_text))
1938 {
1939 /* utf-8-ness differs, need to upgrade */
1940 sv_utf8_upgrade (self->incr_text);
1941
1942 if (self->incr_pos)
1943 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1944 - (U8 *)SvPVX (self->incr_text);
1945 }
1946 }
1947 else if (SvUTF8 (self->incr_text))
1948 sv_utf8_upgrade (jsonstr); 2094 sv_utf8_upgrade (jsonstr);
1949 2095
2096 /* and then just blindly append */
1950 { 2097 {
1951 STRLEN len; 2098 STRLEN len;
1952 const char *str = SvPV (jsonstr, len); 2099 const char *str = SvPV (jsonstr, len);
1953 STRLEN cur = SvCUR (self->incr_text); 2100 STRLEN cur = SvCUR (self->incr_text);
1954 2101
… …
1962 } 2109 }
1963 2110
1964 if (GIMME_V != G_VOID) 2111 if (GIMME_V != G_VOID)
1965 do 2112 do
1966 { 2113 {
2114 SV *sv;
1967 char *offset; 2115 char *offset;
1968 2116
1969 if (!INCR_DONE (self)) 2117 if (!INCR_DONE (self))
1970 { 2118 {
1971 incr_parse (self); 2119 incr_parse (self);
… …
1973 if (self->incr_pos > self->max_size && self->max_size) 2121 if (self->incr_pos > self->max_size && self->max_size)
1974 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2122 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1975 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2123 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1976 2124
1977 if (!INCR_DONE (self)) 2125 if (!INCR_DONE (self))
2126 {
2127 // as an optimisation, do not accumulate white space in the incr buffer
2128 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2129 {
2130 self->incr_pos = 0;
2131 SvCUR_set (self->incr_text, 0);
2132 }
2133
1978 break; 2134 break;
2135 }
1979 } 2136 }
1980 2137
1981 XPUSHs (decode_json (self->incr_text, self, &offset)); 2138 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2139 XPUSHs (sv);
1982 2140
1983 self->incr_pos -= offset - SvPVX (self->incr_text); 2141 self->incr_pos -= offset - SvPVX (self->incr_text);
1984 self->incr_nest = 0; 2142 self->incr_nest = 0;
1985 self->incr_mode = 0; 2143 self->incr_mode = 0;
1986 2144
… …
2030 SvREFCNT_dec (self->incr_text); 2188 SvREFCNT_dec (self->incr_text);
2031 2189
2032PROTOTYPES: ENABLE 2190PROTOTYPES: ENABLE
2033 2191
2034void encode_json (SV *scalar) 2192void encode_json (SV *scalar)
2035 ALIAS:
2036 to_json_ = 0
2037 encode_json = F_UTF8
2038 PPCODE: 2193 PPCODE:
2039{ 2194{
2040 JSON json; 2195 JSON json;
2041 json_init (&json); 2196 json_init (&json);
2042 json.flags |= ix; 2197 json.flags |= F_UTF8;
2043 XPUSHs (encode_json (scalar, &json)); 2198 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2199 XPUSHs (scalar);
2044} 2200}
2045 2201
2046void decode_json (SV *jsonstr) 2202void decode_json (SV *jsonstr)
2047 ALIAS:
2048 from_json_ = 0
2049 decode_json = F_UTF8
2050 PPCODE: 2203 PPCODE:
2051{ 2204{
2052 JSON json; 2205 JSON json;
2053 json_init (&json); 2206 json_init (&json);
2054 json.flags |= ix; 2207 json.flags |= F_UTF8;
2055 XPUSHs (decode_json (jsonstr, &json, 0)); 2208 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2209 XPUSHs (jsonstr);
2056} 2210}
2057 2211

Diff Legend

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