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.105 by root, Tue Jan 19 01:07:27 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
… …
192///////////////////////////////////////////////////////////////////////////// 198/////////////////////////////////////////////////////////////////////////////
193// fp hell 199// fp hell
194 200
195// scan a group of digits, and a trailing exponent 201// scan a group of digits, and a trailing exponent
196static void 202static void
197json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp) 203json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
198{ 204{
199 UV uaccum = 0; 205 UV uaccum = 0;
200 int eaccum = 0; 206 int eaccum = 0;
207
208 // if we recurse too deep, skip all remaining digits
209 // to avoid a stack overflow attack
210 if (expect_false (--maxdepth <= 0))
211 while (((U8)*s - '0') < 10)
212 ++s;
201 213
202 for (;;) 214 for (;;)
203 { 215 {
204 U8 dig = (U8)*s - '0'; 216 U8 dig = (U8)*s - '0';
205 217
206 if (expect_false (dig >= 10)) 218 if (expect_false (dig >= 10))
207 { 219 {
208 if (dig == (U8)((U8)'.' - (U8)'0')) 220 if (dig == (U8)((U8)'.' - (U8)'0'))
209 { 221 {
210 ++s; 222 ++s;
211 json_atof_scan1 (s, accum, expo, 1); 223 json_atof_scan1 (s, accum, expo, 1, maxdepth);
212 } 224 }
213 else if ((dig | ' ') == 'e' - '0') 225 else if ((dig | ' ') == 'e' - '0')
214 { 226 {
215 int exp2 = 0; 227 int exp2 = 0;
216 int neg = 0; 228 int neg = 0;
… …
242 // if we have too many digits, then recurse for more 254 // if we have too many digits, then recurse for more
243 // we actually do this for rather few digits 255 // we actually do this for rather few digits
244 if (uaccum >= (UV_MAX - 9) / 10) 256 if (uaccum >= (UV_MAX - 9) / 10)
245 { 257 {
246 if (postdp) *expo -= eaccum; 258 if (postdp) *expo -= eaccum;
247 json_atof_scan1 (s, accum, expo, postdp); 259 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
248 if (postdp) *expo += eaccum; 260 if (postdp) *expo += eaccum;
249 261
250 break; 262 break;
251 } 263 }
252 } 264 }
253 265
254 // this relies greatly on the quality of the pow () 266 // this relies greatly on the quality of the pow ()
255 // implementation of the platform, but a good 267 // implementation of the platform, but a good
256 // implementation is hard to beat. 268 // implementation is hard to beat.
269 // (IEEE 754 conformant ones are required to be exact)
257 if (postdp) *expo -= eaccum; 270 if (postdp) *expo -= eaccum;
258 *accum += uaccum * Perl_pow (10., *expo); 271 *accum += uaccum * Perl_pow (10., *expo);
259 *expo += eaccum; 272 *expo += eaccum;
260} 273}
261 274
… …
270 { 283 {
271 ++s; 284 ++s;
272 neg = 1; 285 neg = 1;
273 } 286 }
274 287
288 // a recursion depth of ten gives us >>500 bits
275 json_atof_scan1 (s, &accum, &expo, 0); 289 json_atof_scan1 (s, &accum, &expo, 0, 10);
276 290
277 return neg ? -accum : accum; 291 return neg ? -accum : accum;
278} 292}
279///////////////////////////////////////////////////////////////////////////// 293/////////////////////////////////////////////////////////////////////////////
280// encoder 294// encoder
… …
470 484
471 if (enc->indent >= enc->json.max_depth) 485 if (enc->indent >= enc->json.max_depth)
472 croak (ERR_NESTING_EXCEEDED); 486 croak (ERR_NESTING_EXCEEDED);
473 487
474 encode_ch (enc, '['); 488 encode_ch (enc, '[');
475 489
476 if (len >= 0) 490 if (len >= 0)
477 { 491 {
478 encode_nl (enc); ++enc->indent; 492 encode_nl (enc); ++enc->indent;
479 493
480 for (i = 0; i <= len; ++i) 494 for (i = 0; i <= len; ++i)
… …
492 encode_comma (enc); 506 encode_comma (enc);
493 } 507 }
494 508
495 encode_nl (enc); --enc->indent; encode_indent (enc); 509 encode_nl (enc); --enc->indent; encode_indent (enc);
496 } 510 }
497 511
498 encode_ch (enc, ']'); 512 encode_ch (enc, ']');
499} 513}
500 514
501static void 515static void
502encode_hk (enc_t *enc, HE *he) 516encode_hk (enc_t *enc, HE *he)
… …
506 if (HeKLEN (he) == HEf_SVKEY) 520 if (HeKLEN (he) == HEf_SVKEY)
507 { 521 {
508 SV *sv = HeSVKEY (he); 522 SV *sv = HeSVKEY (he);
509 STRLEN len; 523 STRLEN len;
510 char *str; 524 char *str;
511 525
512 SvGETMAGIC (sv); 526 SvGETMAGIC (sv);
513 str = SvPV (sv, len); 527 str = SvPV (sv, len);
514 528
515 encode_str (enc, str, len, SvUTF8 (sv)); 529 encode_str (enc, str, len, SvUTF8 (sv));
516 } 530 }
… …
582 } 596 }
583 597
584 if (count) 598 if (count)
585 { 599 {
586 int i, fast = 1; 600 int i, fast = 1;
587#if defined(__BORLANDC__) || defined(_MSC_VER) 601 HE *hes_stack [STACK_HES];
588 HE **hes = _alloca (count * sizeof (HE)); 602 HE **hes = hes_stack;
589#else 603
590 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 604 // allocate larger arrays on the heap
591#endif 605 if (count > STACK_HES)
606 {
607 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
608 hes = (HE **)SvPVX (sv);
609 }
592 610
593 i = 0; 611 i = 0;
594 while ((he = hv_iternext (hv))) 612 while ((he = hv_iternext (hv)))
595 { 613 {
596 hes [i++] = he; 614 hes [i++] = he;
… …
665// encode objects, arrays and special \0=false and \1=true values. 683// encode objects, arrays and special \0=false and \1=true values.
666static void 684static void
667encode_rv (enc_t *enc, SV *sv) 685encode_rv (enc_t *enc, SV *sv)
668{ 686{
669 svtype svt; 687 svtype svt;
688 GV *method;
670 689
671 SvGETMAGIC (sv); 690 SvGETMAGIC (sv);
672 svt = SvTYPE (sv); 691 svt = SvTYPE (sv);
673 692
674 if (expect_false (SvOBJECT (sv))) 693 if (expect_false (SvOBJECT (sv)))
675 { 694 {
676 HV *stash = !JSON_SLOW || json_boolean_stash 695 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
677 ? json_boolean_stash 696 ? types_boolean_stash
678 : gv_stashpv ("JSON::XS::Boolean", 1); 697 : gv_stashpv ("Types::Serialiser::Boolean", 1);
698 HV *stash = SvSTASH (sv);
679 699
680 if (SvSTASH (sv) == stash) 700 if (stash == boolean_stash)
681 { 701 {
682 if (SvIV (sv)) 702 if (SvIV (sv))
683 encode_str (enc, "true", 4, 0); 703 encode_str (enc, "true", 4, 0);
684 else 704 else
685 encode_str (enc, "false", 5, 0); 705 encode_str (enc, "false", 5, 0);
686 } 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);
687 else 773 else
688 {
689#if 0
690 if (0 && sv_derived_from (rv, "JSON::Literal"))
691 {
692 // not yet
693 }
694#endif
695 if (enc->json.flags & F_CONV_BLESSED)
696 {
697 // we re-bless the reference to get overload and other niceties right
698 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
699
700 if (to_json)
701 {
702 dSP;
703
704 ENTER; SAVETMPS; PUSHMARK (SP);
705 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
706
707 // calling with G_SCALAR ensures that we always get a 1 return value
708 PUTBACK;
709 call_sv ((SV *)GvCV (to_json), G_SCALAR);
710 SPAGAIN;
711
712 // catch this surprisingly common error
713 if (SvROK (TOPs) && SvRV (TOPs) == sv)
714 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
715
716 sv = POPs;
717 PUTBACK;
718
719 encode_sv (enc, sv);
720
721 FREETMPS; LEAVE;
722 }
723 else if (enc->json.flags & F_ALLOW_BLESSED)
724 encode_str (enc, "null", 4, 0);
725 else
726 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
727 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
728 }
729 else if (enc->json.flags & F_ALLOW_BLESSED)
730 encode_str (enc, "null", 4, 0);
731 else
732 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)",
733 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 775 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
734 }
735 } 776 }
736 else if (svt == SVt_PVHV) 777 else if (svt == SVt_PVHV)
737 encode_hv (enc, (HV *)sv); 778 encode_hv (enc, (HV *)sv);
738 else if (svt == SVt_PVAV) 779 else if (svt == SVt_PVAV)
739 encode_av (enc, (AV *)sv); 780 encode_av (enc, (AV *)sv);
… …
815 } 856 }
816 else 857 else
817 { 858 {
818 // large integer, use the (rather slow) snprintf way. 859 // large integer, use the (rather slow) snprintf way.
819 need (enc, IVUV_MAXCHARS); 860 need (enc, IVUV_MAXCHARS);
820 enc->cur += 861 enc->cur +=
821 SvIsUV(sv) 862 SvIsUV(sv)
822 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 863 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
823 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 864 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
824 } 865 }
825 } 866 }
826 else if (SvROK (sv)) 867 else if (SvROK (sv))
827 encode_rv (enc, SvRV (sv)); 868 encode_rv (enc, SvRV (sv));
828 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 869 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
829 encode_str (enc, "null", 4, 0); 870 encode_str (enc, "null", 4, 0);
830 else 871 else
831 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",
832 SvPV_nolen (sv), SvFLAGS (sv)); 873 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
833} 874}
834 875
835static SV * 876static SV *
836encode_json (SV *scalar, JSON *json) 877encode_json (SV *scalar, JSON *json)
837{ 878{
… …
1249 if (*dec->cur == ']') 1290 if (*dec->cur == ']')
1250 { 1291 {
1251 ++dec->cur; 1292 ++dec->cur;
1252 break; 1293 break;
1253 } 1294 }
1254 1295
1255 if (*dec->cur != ',') 1296 if (*dec->cur != ',')
1256 ERR (", or ] expected while parsing array"); 1297 ERR (", or ] expected while parsing array");
1257 1298
1258 ++dec->cur; 1299 ++dec->cur;
1259 1300
… …
1394 dSP; 1435 dSP;
1395 int count; 1436 int count;
1396 1437
1397 ENTER; SAVETMPS; PUSHMARK (SP); 1438 ENTER; SAVETMPS; PUSHMARK (SP);
1398 XPUSHs (HeVAL (he)); 1439 XPUSHs (HeVAL (he));
1440 sv_2mortal (sv);
1399 1441
1400 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1442 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1401 1443
1402 if (count == 1) 1444 if (count == 1)
1403 { 1445 {
1404 sv = newSVsv (POPs); 1446 sv = newSVsv (POPs);
1405 FREETMPS; LEAVE; 1447 FREETMPS; LEAVE;
1406 return sv; 1448 return sv;
1407 } 1449 }
1408 1450
1451 SvREFCNT_inc (sv);
1409 FREETMPS; LEAVE; 1452 FREETMPS; LEAVE;
1410 } 1453 }
1411 } 1454 }
1412 1455
1413 if (dec->json.cb_object) 1456 if (dec->json.cb_object)
… …
1439 DEC_DEC_DEPTH; 1482 DEC_DEC_DEPTH;
1440 return 0; 1483 return 0;
1441} 1484}
1442 1485
1443static 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 *
1444decode_sv (dec_t *dec) 1569decode_sv (dec_t *dec)
1445{ 1570{
1446 // the beauty of JSON: you need exactly one character lookahead 1571 // the beauty of JSON: you need exactly one character lookahead
1447 // to parse everything. 1572 // to parse everything.
1448 switch (*dec->cur) 1573 switch (*dec->cur)
1449 { 1574 {
1450 case '"': ++dec->cur; return decode_str (dec); 1575 case '"': ++dec->cur; return decode_str (dec);
1451 case '[': ++dec->cur; return decode_av (dec); 1576 case '[': ++dec->cur; return decode_av (dec);
1452 case '{': ++dec->cur; return decode_hv (dec); 1577 case '{': ++dec->cur; return decode_hv (dec);
1578 case '(': return decode_tag (dec);
1453 1579
1454 case '-': 1580 case '-':
1455 case '0': case '1': case '2': case '3': case '4': 1581 case '0': case '1': case '2': case '3': case '4':
1456 case '5': case '6': case '7': case '8': case '9': 1582 case '5': case '6': case '7': case '8': case '9':
1457 return decode_num (dec); 1583 return decode_num (dec);
… …
1459 case 't': 1585 case 't':
1460 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1586 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1461 { 1587 {
1462 dec->cur += 4; 1588 dec->cur += 4;
1463#if JSON_SLOW 1589#if JSON_SLOW
1464 json_true = get_bool ("JSON::XS::true"); 1590 types_true = get_bool ("Types::Serialiser::true");
1465#endif 1591#endif
1466 return newSVsv (json_true); 1592 return newSVsv (types_true);
1467 } 1593 }
1468 else 1594 else
1469 ERR ("'true' expected"); 1595 ERR ("'true' expected");
1470 1596
1471 break; 1597 break;
… …
1473 case 'f': 1599 case 'f':
1474 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1600 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1475 { 1601 {
1476 dec->cur += 5; 1602 dec->cur += 5;
1477#if JSON_SLOW 1603#if JSON_SLOW
1478 json_false = get_bool ("JSON::XS::false"); 1604 types_false = get_bool ("Types::Serialiser::false");
1479#endif 1605#endif
1480 return newSVsv (json_false); 1606 return newSVsv (types_false);
1481 } 1607 }
1482 else 1608 else
1483 ERR ("'false' expected"); 1609 ERR ("'false' expected");
1484 1610
1485 break; 1611 break;
… …
1494 ERR ("'null' expected"); 1620 ERR ("'null' expected");
1495 1621
1496 break; 1622 break;
1497 1623
1498 default: 1624 default:
1499 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1625 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1500 break; 1626 break;
1501 } 1627 }
1502 1628
1503fail: 1629fail:
1504 return 0; 1630 return 0;
… …
1509{ 1635{
1510 dec_t dec; 1636 dec_t dec;
1511 SV *sv; 1637 SV *sv;
1512 1638
1513 /* work around bugs in 5.10 where manipulating magic values 1639 /* work around bugs in 5.10 where manipulating magic values
1514 * 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).
1515 */ 1643 */
1516 /*SvGETMAGIC (string);*/ 1644 /*SvGETMAGIC (string);*/
1517 if (SvMAGICAL (string)) 1645 if (SvMAGICAL (string) || !SvPOK (string))
1518 string = sv_2mortal (newSVsv (string)); 1646 string = sv_2mortal (newSVsv (string));
1519 1647
1520 SvUPGRADE (string, SVt_PV); 1648 SvUPGRADE (string, SVt_PV);
1521 1649
1522 /* 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
… …
1539 if (offset > json->max_size && json->max_size) 1667 if (offset > json->max_size && json->max_size)
1540 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",
1541 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1669 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1542 } 1670 }
1543 1671
1544 if (json->flags & F_UTF8) 1672 if (DECODE_WANTS_OCTETS (json))
1545 sv_utf8_downgrade (string, 0); 1673 sv_utf8_downgrade (string, 0);
1546 else 1674 else
1547 sv_utf8_upgrade (string); 1675 sv_utf8_upgrade (string);
1548 1676
1549 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1677 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1591 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);
1592 LEAVE; 1720 LEAVE;
1593 1721
1594 croak ("%s, at character offset %d (before \"%s\")", 1722 croak ("%s, at character offset %d (before \"%s\")",
1595 dec.err, 1723 dec.err,
1596 ptr_to_index (string, dec.cur), 1724 (int)ptr_to_index (string, dec.cur),
1597 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1725 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1598 } 1726 }
1599 1727
1600 sv = sv_2mortal (sv); 1728 sv = sv_2mortal (sv);
1601 1729
… …
1729 self->incr_mode = INCR_M_STR; 1857 self->incr_mode = INCR_M_STR;
1730 goto incr_m_str; 1858 goto incr_m_str;
1731 1859
1732 case '[': 1860 case '[':
1733 case '{': 1861 case '{':
1862 case '(':
1734 if (++self->incr_nest > self->max_depth) 1863 if (++self->incr_nest > self->max_depth)
1735 croak (ERR_NESTING_EXCEEDED); 1864 croak (ERR_NESTING_EXCEEDED);
1736 break; 1865 break;
1737 1866
1738 case ']': 1867 case ']':
1739 case '}': 1868 case '}':
1740 if (--self->incr_nest <= 0) 1869 if (--self->incr_nest <= 0)
1741 goto interrupt; 1870 goto interrupt;
1871 break;
1872
1873 case ')':
1874 --self->incr_nest;
1742 break; 1875 break;
1743 1876
1744 case '#': 1877 case '#':
1745 self->incr_mode = INCR_M_C1; 1878 self->incr_mode = INCR_M_C1;
1746 goto incr_m_c; 1879 goto incr_m_c;
… …
1772 i >= '0' && i <= '9' ? i - '0' 1905 i >= '0' && i <= '9' ? i - '0'
1773 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1906 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1774 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1907 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1775 : -1; 1908 : -1;
1776 1909
1777 json_stash = gv_stashpv ("JSON::XS" , 1); 1910 json_stash = gv_stashpv ("JSON::XS" , 1);
1778 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1911 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1779 1912
1780 json_true = get_bool ("JSON::XS::true"); 1913 types_true = get_bool ("Types::Serialiser::true");
1781 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);
1782 1918
1783 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 */
1784} 1920}
1785 1921
1786PROTOTYPES: DISABLE 1922PROTOTYPES: DISABLE
1787 1923
1788void CLONE (...) 1924void CLONE (...)
1789 CODE: 1925 CODE:
1790 json_stash = 0; 1926 json_stash = 0;
1791 json_boolean_stash = 0; 1927 types_boolean_stash = 0;
1792 1928
1793void new (char *klass) 1929void new (char *klass)
1794 PPCODE: 1930 PPCODE:
1795{ 1931{
1796 SV *pv = NEWSV (0, sizeof (JSON)); 1932 SV *pv = NEWSV (0, sizeof (JSON));
1797 SvPOK_only (pv); 1933 SvPOK_only (pv);
1798 json_init ((JSON *)SvPVX (pv)); 1934 json_init ((JSON *)SvPVX (pv));
1799 XPUSHs (sv_2mortal (sv_bless ( 1935 XPUSHs (sv_2mortal (sv_bless (
1800 newRV_noinc (pv), 1936 newRV_noinc (pv),
1801 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1937 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1816 shrink = F_SHRINK 1952 shrink = F_SHRINK
1817 allow_blessed = F_ALLOW_BLESSED 1953 allow_blessed = F_ALLOW_BLESSED
1818 convert_blessed = F_CONV_BLESSED 1954 convert_blessed = F_CONV_BLESSED
1819 relaxed = F_RELAXED 1955 relaxed = F_RELAXED
1820 allow_unknown = F_ALLOW_UNKNOWN 1956 allow_unknown = F_ALLOW_UNKNOWN
1957 allow_tags = F_ALLOW_TAGS
1821 PPCODE: 1958 PPCODE:
1822{ 1959{
1823 if (enable) 1960 if (enable)
1824 self->flags |= ix; 1961 self->flags |= ix;
1825 else 1962 else
… …
1841 get_shrink = F_SHRINK 1978 get_shrink = F_SHRINK
1842 get_allow_blessed = F_ALLOW_BLESSED 1979 get_allow_blessed = F_ALLOW_BLESSED
1843 get_convert_blessed = F_CONV_BLESSED 1980 get_convert_blessed = F_CONV_BLESSED
1844 get_relaxed = F_RELAXED 1981 get_relaxed = F_RELAXED
1845 get_allow_unknown = F_ALLOW_UNKNOWN 1982 get_allow_unknown = F_ALLOW_UNKNOWN
1983 get_allow_tags = F_ALLOW_TAGS
1846 PPCODE: 1984 PPCODE:
1847 XPUSHs (boolSV (self->flags & ix)); 1985 XPUSHs (boolSV (self->flags & ix));
1848 1986
1849void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 1987void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1850 PPCODE: 1988 PPCODE:
… …
1878} 2016}
1879 2017
1880void 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)
1881 PPCODE: 2019 PPCODE:
1882{ 2020{
1883 if (!self->cb_sk_object) 2021 if (!self->cb_sk_object)
1884 self->cb_sk_object = newHV (); 2022 self->cb_sk_object = newHV ();
1885 2023
1886 if (SvOK (cb)) 2024 if (SvOK (cb))
1887 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2025 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1888 else 2026 else
… …
1899 XPUSHs (ST (0)); 2037 XPUSHs (ST (0));
1900} 2038}
1901 2039
1902void encode (JSON *self, SV *scalar) 2040void encode (JSON *self, SV *scalar)
1903 PPCODE: 2041 PPCODE:
1904 XPUSHs (encode_json (scalar, self)); 2042 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2043 XPUSHs (scalar);
1905 2044
1906void decode (JSON *self, SV *jsonstr) 2045void decode (JSON *self, SV *jsonstr)
1907 PPCODE: 2046 PPCODE:
1908 XPUSHs (decode_json (jsonstr, self, 0)); 2047 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2048 XPUSHs (jsonstr);
1909 2049
1910void decode_prefix (JSON *self, SV *jsonstr) 2050void decode_prefix (JSON *self, SV *jsonstr)
1911 PPCODE: 2051 PPCODE:
1912{ 2052{
2053 SV *sv;
1913 char *offset; 2054 char *offset;
2055 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1914 EXTEND (SP, 2); 2056 EXTEND (SP, 2);
1915 PUSHs (decode_json (jsonstr, self, &offset)); 2057 PUSHs (sv);
1916 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2058 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1917} 2059}
1918 2060
1919void incr_parse (JSON *self, SV *jsonstr = 0) 2061void incr_parse (JSON *self, SV *jsonstr = 0)
1920 PPCODE: 2062 PPCODE:
1921{ 2063{
1922 if (!self->incr_text) 2064 if (!self->incr_text)
1923 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 }
1924 2085
1925 // append data, if any 2086 // append data, if any
1926 if (jsonstr) 2087 if (jsonstr)
1927 { 2088 {
2089 /* make sure both strings have same encoding */
2090 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1928 if (SvUTF8 (jsonstr)) 2091 if (SvUTF8 (jsonstr))
2092 sv_utf8_downgrade (jsonstr, 0);
1929 { 2093 else
1930 if (!SvUTF8 (self->incr_text))
1931 {
1932 /* utf-8-ness differs, need to upgrade */
1933 sv_utf8_upgrade (self->incr_text);
1934
1935 if (self->incr_pos)
1936 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1937 - (U8 *)SvPVX (self->incr_text);
1938 }
1939 }
1940 else if (SvUTF8 (self->incr_text))
1941 sv_utf8_upgrade (jsonstr); 2094 sv_utf8_upgrade (jsonstr);
1942 2095
2096 /* and then just blindly append */
1943 { 2097 {
1944 STRLEN len; 2098 STRLEN len;
1945 const char *str = SvPV (jsonstr, len); 2099 const char *str = SvPV (jsonstr, len);
1946 STRLEN cur = SvCUR (self->incr_text); 2100 STRLEN cur = SvCUR (self->incr_text);
1947 2101
… …
1955 } 2109 }
1956 2110
1957 if (GIMME_V != G_VOID) 2111 if (GIMME_V != G_VOID)
1958 do 2112 do
1959 { 2113 {
2114 SV *sv;
1960 char *offset; 2115 char *offset;
1961 2116
1962 if (!INCR_DONE (self)) 2117 if (!INCR_DONE (self))
1963 { 2118 {
1964 incr_parse (self); 2119 incr_parse (self);
… …
1966 if (self->incr_pos > self->max_size && self->max_size) 2121 if (self->incr_pos > self->max_size && self->max_size)
1967 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",
1968 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2123 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1969 2124
1970 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
1971 break; 2134 break;
2135 }
1972 } 2136 }
1973 2137
1974 XPUSHs (decode_json (self->incr_text, self, &offset)); 2138 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2139 XPUSHs (sv);
1975 2140
1976 self->incr_pos -= offset - SvPVX (self->incr_text); 2141 self->incr_pos -= offset - SvPVX (self->incr_text);
1977 self->incr_nest = 0; 2142 self->incr_nest = 0;
1978 self->incr_mode = 0; 2143 self->incr_mode = 0;
1979 2144
… …
2023 SvREFCNT_dec (self->incr_text); 2188 SvREFCNT_dec (self->incr_text);
2024 2189
2025PROTOTYPES: ENABLE 2190PROTOTYPES: ENABLE
2026 2191
2027void encode_json (SV *scalar) 2192void encode_json (SV *scalar)
2028 ALIAS:
2029 to_json_ = 0
2030 encode_json = F_UTF8
2031 PPCODE: 2193 PPCODE:
2032{ 2194{
2033 JSON json; 2195 JSON json;
2034 json_init (&json); 2196 json_init (&json);
2035 json.flags |= ix; 2197 json.flags |= F_UTF8;
2036 XPUSHs (encode_json (scalar, &json)); 2198 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2199 XPUSHs (scalar);
2037} 2200}
2038 2201
2039void decode_json (SV *jsonstr) 2202void decode_json (SV *jsonstr)
2040 ALIAS:
2041 from_json_ = 0
2042 decode_json = F_UTF8
2043 PPCODE: 2203 PPCODE:
2044{ 2204{
2045 JSON json; 2205 JSON json;
2046 json_init (&json); 2206 json_init (&json);
2047 json.flags |= ix; 2207 json.flags |= F_UTF8;
2048 XPUSHs (decode_json (jsonstr, &json, 0)); 2208 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2209 XPUSHs (jsonstr);
2049} 2210}
2050 2211

Diff Legend

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