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.100 by root, Sat Sep 5 23:00:56 2009 UTC vs.
Revision 1.125 by root, Sun Feb 21 15:37:53 2016 UTC

… …
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 20#endif
21 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
31#endif
32
33// three extra for rounding, sign, and end of string
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2) 34#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23 35
24#define F_ASCII 0x00000001UL 36#define F_ASCII 0x00000001UL
25#define F_LATIN1 0x00000002UL 37#define F_LATIN1 0x00000002UL
26#define F_UTF8 0x00000004UL 38#define F_UTF8 0x00000004UL
27#define F_INDENT 0x00000008UL 39#define F_INDENT 0x00000008UL
… …
32#define F_SHRINK 0x00000200UL 44#define F_SHRINK 0x00000200UL
33#define F_ALLOW_BLESSED 0x00000400UL 45#define F_ALLOW_BLESSED 0x00000400UL
34#define F_CONV_BLESSED 0x00000800UL 46#define F_CONV_BLESSED 0x00000800UL
35#define F_RELAXED 0x00001000UL 47#define F_RELAXED 0x00001000UL
36#define F_ALLOW_UNKNOWN 0x00002000UL 48#define F_ALLOW_UNKNOWN 0x00002000UL
49#define F_ALLOW_TAGS 0x00004000UL
37#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 50#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
38 51
39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 52#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
40 53
41#define INIT_SIZE 32 // initial scalar size to be allocated 54#define INIT_SIZE 32 // initial scalar size to be allocated
42#define INDENT_STEP 3 // spaces per indentation level 55#define INDENT_STEP 3 // spaces per indentation level
43 56
44#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 57#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
58
59#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
45 60
46#define SB do { 61#define SB do {
47#define SE } while (0) 62#define SE } while (0)
48 63
49#if __GNUC__ >= 3 64#if __GNUC__ >= 3
… …
69#else 84#else
70# define JSON_SLOW 0 85# define JSON_SLOW 0
71# define JSON_STASH json_stash 86# define JSON_STASH json_stash
72#endif 87#endif
73 88
89// the amount of HEs to allocate on the stack, when sorting keys
90#define STACK_HES 64
91
74static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
75static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
76 94
77enum { 95enum {
78 INCR_M_WS = 0, // initial whitespace skipping, must be 0 96 INCR_M_WS = 0, // initial whitespace skipping, must be 0
79 INCR_M_STR, // inside string 97 INCR_M_STR, // inside string
80 INCR_M_BS, // inside backslash 98 INCR_M_BS, // inside backslash
99 INCR_M_C0, // inside comment in initial whitespace sequence
100 INCR_M_C1, // inside comment in other places
81 INCR_M_JSON // outside anything, count nesting 101 INCR_M_JSON // outside anything, count nesting
82}; 102};
83 103
84#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON) 104#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85 105
… …
184 return SvUTF8 (sv) 204 return SvUTF8 (sv)
185 ? utf8_distance (offset, SvPVX (sv)) 205 ? utf8_distance (offset, SvPVX (sv))
186 : offset - SvPVX (sv); 206 : offset - SvPVX (sv);
187} 207}
188 208
209/////////////////////////////////////////////////////////////////////////////
210// fp hell
211
212// scan a group of digits, and a trailing exponent
213static void
214json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
215{
216 UV uaccum = 0;
217 int eaccum = 0;
218
219 // if we recurse too deep, skip all remaining digits
220 // to avoid a stack overflow attack
221 if (expect_false (--maxdepth <= 0))
222 while (((U8)*s - '0') < 10)
223 ++s;
224
225 for (;;)
226 {
227 U8 dig = (U8)*s - '0';
228
229 if (expect_false (dig >= 10))
230 {
231 if (dig == (U8)((U8)'.' - (U8)'0'))
232 {
233 ++s;
234 json_atof_scan1 (s, accum, expo, 1, maxdepth);
235 }
236 else if ((dig | ' ') == 'e' - '0')
237 {
238 int exp2 = 0;
239 int neg = 0;
240
241 ++s;
242
243 if (*s == '-')
244 {
245 ++s;
246 neg = 1;
247 }
248 else if (*s == '+')
249 ++s;
250
251 while ((dig = (U8)*s - '0') < 10)
252 exp2 = exp2 * 10 + *s++ - '0';
253
254 *expo += neg ? -exp2 : exp2;
255 }
256
257 break;
258 }
259
260 ++s;
261
262 uaccum = uaccum * 10 + dig;
263 ++eaccum;
264
265 // if we have too many digits, then recurse for more
266 // we actually do this for rather few digits
267 if (uaccum >= (UV_MAX - 9) / 10)
268 {
269 if (postdp) *expo -= eaccum;
270 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
271 if (postdp) *expo += eaccum;
272
273 break;
274 }
275 }
276
277 // this relies greatly on the quality of the pow ()
278 // implementation of the platform, but a good
279 // implementation is hard to beat.
280 // (IEEE 754 conformant ones are required to be exact)
281 if (postdp) *expo -= eaccum;
282 *accum += uaccum * Perl_pow (10., *expo);
283 *expo += eaccum;
284}
285
286static NV
287json_atof (const char *s)
288{
289 NV accum = 0.;
290 int expo = 0;
291 int neg = 0;
292
293 if (*s == '-')
294 {
295 ++s;
296 neg = 1;
297 }
298
299 // a recursion depth of ten gives us >>500 bits
300 json_atof_scan1 (s, &accum, &expo, 0, 10);
301
302 return neg ? -accum : accum;
303}
189///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
190// encoder 305// encoder
191 306
192// structure used for encoding JSON 307// structure used for encoding JSON
193typedef struct 308typedef struct
… …
380 495
381 if (enc->indent >= enc->json.max_depth) 496 if (enc->indent >= enc->json.max_depth)
382 croak (ERR_NESTING_EXCEEDED); 497 croak (ERR_NESTING_EXCEEDED);
383 498
384 encode_ch (enc, '['); 499 encode_ch (enc, '[');
385 500
386 if (len >= 0) 501 if (len >= 0)
387 { 502 {
388 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
389 504
390 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
… …
402 encode_comma (enc); 517 encode_comma (enc);
403 } 518 }
404 519
405 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
406 } 521 }
407 522
408 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
409} 524}
410 525
411static void 526static void
412encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
… …
416 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
417 { 532 {
418 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
419 STRLEN len; 534 STRLEN len;
420 char *str; 535 char *str;
421 536
422 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
423 str = SvPV (sv, len); 538 str = SvPV (sv, len);
424 539
425 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
426 } 541 }
… …
492 } 607 }
493 608
494 if (count) 609 if (count)
495 { 610 {
496 int i, fast = 1; 611 int i, fast = 1;
497#if defined(__BORLANDC__) || defined(_MSC_VER) 612 HE *hes_stack [STACK_HES];
498 HE **hes = _alloca (count * sizeof (HE)); 613 HE **hes = hes_stack;
499#else 614
500 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 615 // allocate larger arrays on the heap
501#endif 616 if (count > STACK_HES)
617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
502 621
503 i = 0; 622 i = 0;
504 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
505 { 624 {
506 hes [i++] = he; 625 hes [i++] = he;
… …
575// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
576static void 695static void
577encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
578{ 697{
579 svtype svt; 698 svtype svt;
699 GV *method;
580 700
581 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
582 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
583 703
584 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
585 { 705 {
586 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
587 ? json_boolean_stash 707 ? types_boolean_stash
588 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
589 710
590 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
591 { 712 {
592 if (SvIV (sv)) 713 if (SvIV (sv))
593 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
594 else 715 else
595 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
596 } 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);
597 else 785 else
598 {
599#if 0
600 if (0 && sv_derived_from (rv, "JSON::Literal"))
601 {
602 // not yet
603 }
604#endif
605 if (enc->json.flags & F_CONV_BLESSED)
606 {
607 // we re-bless the reference to get overload and other niceties right
608 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
609
610 if (to_json)
611 {
612 dSP;
613
614 ENTER; SAVETMPS; PUSHMARK (SP);
615 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
616
617 // calling with G_SCALAR ensures that we always get a 1 return value
618 PUTBACK;
619 call_sv ((SV *)GvCV (to_json), G_SCALAR);
620 SPAGAIN;
621
622 // catch this surprisingly common error
623 if (SvROK (TOPs) && SvRV (TOPs) == sv)
624 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
625
626 sv = POPs;
627 PUTBACK;
628
629 encode_sv (enc, sv);
630
631 FREETMPS; LEAVE;
632 }
633 else if (enc->json.flags & F_ALLOW_BLESSED)
634 encode_str (enc, "null", 4, 0);
635 else
636 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
637 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
638 }
639 else if (enc->json.flags & F_ALLOW_BLESSED)
640 encode_str (enc, "null", 4, 0);
641 else
642 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)",
643 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 787 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
644 }
645 } 788 }
646 else if (svt == SVt_PVHV) 789 else if (svt == SVt_PVHV)
647 encode_hv (enc, (HV *)sv); 790 encode_hv (enc, (HV *)sv);
648 else if (svt == SVt_PVAV) 791 else if (svt == SVt_PVAV)
649 encode_av (enc, (AV *)sv); 792 encode_av (enc, (AV *)sv);
… …
725 } 868 }
726 else 869 else
727 { 870 {
728 // large integer, use the (rather slow) snprintf way. 871 // large integer, use the (rather slow) snprintf way.
729 need (enc, IVUV_MAXCHARS); 872 need (enc, IVUV_MAXCHARS);
730 enc->cur += 873 enc->cur +=
731 SvIsUV(sv) 874 SvIsUV(sv)
732 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 875 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
733 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 876 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
734 } 877 }
735 } 878 }
736 else if (SvROK (sv)) 879 else if (SvROK (sv))
737 encode_rv (enc, SvRV (sv)); 880 encode_rv (enc, SvRV (sv));
738 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 881 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
739 encode_str (enc, "null", 4, 0); 882 encode_str (enc, "null", 4, 0);
740 else 883 else
741 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",
742 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;
743} 894}
744 895
745static SV * 896static SV *
746encode_json (SV *scalar, JSON *json) 897encode_json (SV *scalar, JSON *json)
747{ 898{
748 enc_t enc; 899 enc_t enc;
749 900
750 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 901 if (!(json->flags & F_ALLOW_NONREF) && json_scalar (scalar))
751 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)");
752 903
753 enc.json = *json; 904 enc.json = *json;
754 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 905 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
755 enc.cur = SvPVX (enc.sv); 906 enc.cur = SvPVX (enc.sv);
… …
949 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1100 else if (expect_true (ch >= 0x20 && ch < 0x80))
950 *cur++ = ch; 1101 *cur++ = ch;
951 else if (ch >= 0x80) 1102 else if (ch >= 0x80)
952 { 1103 {
953 STRLEN clen; 1104 STRLEN clen;
954 UV uch;
955 1105
956 --dec_cur; 1106 --dec_cur;
957 1107
958 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1108 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
959 if (clen == (STRLEN)-1) 1109 if (clen == (STRLEN)-1)
960 ERR ("malformed UTF-8 character in JSON string"); 1110 ERR ("malformed UTF-8 character in JSON string");
961 1111
962 do 1112 do
963 *cur++ = *dec_cur++; 1113 *cur++ = *dec_cur++;
964 while (--clen); 1114 while (--clen);
965 1115
966 utf8 = 1; 1116 utf8 = 1;
967 } 1117 }
1118 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1119 *cur++ = ch;
968 else 1120 else
969 { 1121 {
970 --dec_cur; 1122 --dec_cur;
971 1123
972 if (!ch) 1124 if (!ch)
… …
1117 } 1269 }
1118 1270
1119 len -= *start == '-' ? 1 : 0; 1271 len -= *start == '-' ? 1 : 0;
1120 1272
1121 // does not fit into IV or UV, try NV 1273 // does not fit into IV or UV, try NV
1122 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1274 if (len <= NV_DIG)
1123 #if defined (LDBL_DIG)
1124 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1125 #endif
1126 )
1127 // fits into NV without loss of precision 1275 // fits into NV without loss of precision
1128 return newSVnv (Atof (start)); 1276 return newSVnv (json_atof (start));
1129 1277
1130 // everything else fails, convert it to a string 1278 // everything else fails, convert it to a string
1131 return newSVpvn (start, dec->cur - start); 1279 return newSVpvn (start, dec->cur - start);
1132 } 1280 }
1133 1281
1134 // loss of precision here 1282 // loss of precision here
1135 return newSVnv (Atof (start)); 1283 return newSVnv (json_atof (start));
1136 1284
1137fail: 1285fail:
1138 return 0; 1286 return 0;
1139} 1287}
1140 1288
… …
1164 if (*dec->cur == ']') 1312 if (*dec->cur == ']')
1165 { 1313 {
1166 ++dec->cur; 1314 ++dec->cur;
1167 break; 1315 break;
1168 } 1316 }
1169 1317
1170 if (*dec->cur != ',') 1318 if (*dec->cur != ',')
1171 ERR (", or ] expected while parsing array"); 1319 ERR (", or ] expected while parsing array");
1172 1320
1173 ++dec->cur; 1321 ++dec->cur;
1174 1322
… …
1298 1446
1299 hv_iterinit (hv); 1447 hv_iterinit (hv);
1300 he = hv_iternext (hv); 1448 he = hv_iternext (hv);
1301 hv_iterinit (hv); 1449 hv_iterinit (hv);
1302 1450
1303 // the next line creates a mortal sv each time its called. 1451 // the next line creates a mortal sv each time it's called.
1304 // might want to optimise this for common cases. 1452 // might want to optimise this for common cases.
1305 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);
1306 1454
1307 if (cb) 1455 if (cb)
1308 { 1456 {
1309 dSP; 1457 dSP;
1310 int count; 1458 int count;
1311 1459
1312 ENTER; SAVETMPS; PUSHMARK (SP); 1460 ENTER; SAVETMPS;
1461 SAVESTACK_POS ();
1462 PUSHMARK (SP);
1313 XPUSHs (HeVAL (he)); 1463 XPUSHs (HeVAL (he));
1464 sv_2mortal (sv);
1314 1465
1315 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1466 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1316 1467
1317 if (count == 1) 1468 if (count == 1)
1318 { 1469 {
1319 sv = newSVsv (POPs); 1470 sv = newSVsv (POPs);
1320 FREETMPS; LEAVE; 1471 FREETMPS; LEAVE;
1321 return sv; 1472 return sv;
1322 } 1473 }
1323 1474
1475 SvREFCNT_inc (sv);
1324 FREETMPS; LEAVE; 1476 FREETMPS; LEAVE;
1325 } 1477 }
1326 } 1478 }
1327 1479
1328 if (dec->json.cb_object) 1480 if (dec->json.cb_object)
1329 { 1481 {
1330 dSP; 1482 dSP;
1331 int count; 1483 int count;
1332 1484
1333 ENTER; SAVETMPS; PUSHMARK (SP); 1485 ENTER; SAVETMPS;
1486 SAVESTACK_POS ();
1487 PUSHMARK (SP);
1334 XPUSHs (sv_2mortal (sv)); 1488 XPUSHs (sv_2mortal (sv));
1335 1489
1336 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1490 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1337 1491
1338 if (count == 1) 1492 if (count == 1)
… …
1354 DEC_DEC_DEPTH; 1508 DEC_DEC_DEPTH;
1355 return 0; 1509 return 0;
1356} 1510}
1357 1511
1358static 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 *
1359decode_sv (dec_t *dec) 1596decode_sv (dec_t *dec)
1360{ 1597{
1361 // the beauty of JSON: you need exactly one character lookahead 1598 // the beauty of JSON: you need exactly one character lookahead
1362 // to parse everything. 1599 // to parse everything.
1363 switch (*dec->cur) 1600 switch (*dec->cur)
1364 { 1601 {
1365 case '"': ++dec->cur; return decode_str (dec); 1602 case '"': ++dec->cur; return decode_str (dec);
1366 case '[': ++dec->cur; return decode_av (dec); 1603 case '[': ++dec->cur; return decode_av (dec);
1367 case '{': ++dec->cur; return decode_hv (dec); 1604 case '{': ++dec->cur; return decode_hv (dec);
1605 case '(': return decode_tag (dec);
1368 1606
1369 case '-': 1607 case '-':
1370 case '0': case '1': case '2': case '3': case '4': 1608 case '0': case '1': case '2': case '3': case '4':
1371 case '5': case '6': case '7': case '8': case '9': 1609 case '5': case '6': case '7': case '8': case '9':
1372 return decode_num (dec); 1610 return decode_num (dec);
… …
1374 case 't': 1612 case 't':
1375 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1613 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1376 { 1614 {
1377 dec->cur += 4; 1615 dec->cur += 4;
1378#if JSON_SLOW 1616#if JSON_SLOW
1379 json_true = get_bool ("JSON::XS::true"); 1617 types_true = get_bool ("Types::Serialiser::true");
1380#endif 1618#endif
1381 return newSVsv (json_true); 1619 return newSVsv (types_true);
1382 } 1620 }
1383 else 1621 else
1384 ERR ("'true' expected"); 1622 ERR ("'true' expected");
1385 1623
1386 break; 1624 break;
… …
1388 case 'f': 1626 case 'f':
1389 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1627 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1390 { 1628 {
1391 dec->cur += 5; 1629 dec->cur += 5;
1392#if JSON_SLOW 1630#if JSON_SLOW
1393 json_false = get_bool ("JSON::XS::false"); 1631 types_false = get_bool ("Types::Serialiser::false");
1394#endif 1632#endif
1395 return newSVsv (json_false); 1633 return newSVsv (types_false);
1396 } 1634 }
1397 else 1635 else
1398 ERR ("'false' expected"); 1636 ERR ("'false' expected");
1399 1637
1400 break; 1638 break;
… …
1409 ERR ("'null' expected"); 1647 ERR ("'null' expected");
1410 1648
1411 break; 1649 break;
1412 1650
1413 default: 1651 default:
1414 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1652 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1415 break; 1653 break;
1416 } 1654 }
1417 1655
1418fail: 1656fail:
1419 return 0; 1657 return 0;
… …
1424{ 1662{
1425 dec_t dec; 1663 dec_t dec;
1426 SV *sv; 1664 SV *sv;
1427 1665
1428 /* work around bugs in 5.10 where manipulating magic values 1666 /* work around bugs in 5.10 where manipulating magic values
1429 * will perl ignore the magic in subsequent accesses 1667 * makes perl ignore the magic in subsequent accesses.
1668 * also make a copy of non-PV values, to get them into a clean
1669 * state (SvPV should do that, but it's buggy, see below).
1430 */ 1670 */
1431 /*SvGETMAGIC (string);*/ 1671 /*SvGETMAGIC (string);*/
1432 if (SvMAGICAL (string)) 1672 if (SvMAGICAL (string) || !SvPOK (string))
1433 string = sv_2mortal (newSVsv (string)); 1673 string = sv_2mortal (newSVsv (string));
1434 1674
1435 SvUPGRADE (string, SVt_PV); 1675 SvUPGRADE (string, SVt_PV);
1436 1676
1437 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1677 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1454 if (offset > json->max_size && json->max_size) 1694 if (offset > json->max_size && json->max_size)
1455 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1695 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1456 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1696 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1457 } 1697 }
1458 1698
1459 if (json->flags & F_UTF8) 1699 if (DECODE_WANTS_OCTETS (json))
1460 sv_utf8_downgrade (string, 0); 1700 sv_utf8_downgrade (string, 0);
1461 else 1701 else
1462 sv_utf8_upgrade (string); 1702 sv_utf8_upgrade (string);
1463 1703
1464 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1704 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1506 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);
1507 LEAVE; 1747 LEAVE;
1508 1748
1509 croak ("%s, at character offset %d (before \"%s\")", 1749 croak ("%s, at character offset %d (before \"%s\")",
1510 dec.err, 1750 dec.err,
1511 ptr_to_index (string, dec.cur), 1751 (int)ptr_to_index (string, dec.cur),
1512 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1752 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1513 } 1753 }
1514 1754
1515 sv = sv_2mortal (sv); 1755 sv = sv_2mortal (sv);
1516 1756
… …
1525 1765
1526static void 1766static void
1527incr_parse (JSON *self) 1767incr_parse (JSON *self)
1528{ 1768{
1529 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1769 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1770
1771 // the state machine here is a bit convoluted and could be simplified a lot
1772 // but this would make it slower, so...
1530 1773
1531 for (;;) 1774 for (;;)
1532 { 1775 {
1533 //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D 1776 //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D
1534 switch (self->incr_mode) 1777 switch (self->incr_mode)
1535 { 1778 {
1536 // only used for intiial whitespace skipping 1779 // only used for initial whitespace skipping
1537 case INCR_M_WS: 1780 case INCR_M_WS:
1538 for (;;) 1781 for (;;)
1539 { 1782 {
1540 if (*p > 0x20) 1783 if (*p > 0x20)
1541 { 1784 {
1785 if (*p == '#')
1786 {
1787 self->incr_mode = INCR_M_C0;
1788 goto incr_m_c;
1789 }
1790 else
1791 {
1542 self->incr_mode = INCR_M_JSON; 1792 self->incr_mode = INCR_M_JSON;
1543 goto incr_m_json; 1793 goto incr_m_json;
1794 }
1544 } 1795 }
1545 else if (!*p) 1796 else if (!*p)
1546 goto interrupt; 1797 goto interrupt;
1547 1798
1548 ++p; 1799 ++p;
… …
1554 goto interrupt; 1805 goto interrupt;
1555 1806
1556 ++p; 1807 ++p;
1557 self->incr_mode = INCR_M_STR; 1808 self->incr_mode = INCR_M_STR;
1558 goto incr_m_str; 1809 goto incr_m_str;
1810
1811 // inside #-style comments
1812 case INCR_M_C0:
1813 case INCR_M_C1:
1814 incr_m_c:
1815 for (;;)
1816 {
1817 if (*p == '\n')
1818 {
1819 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1820 break;
1821 }
1822 else if (!*p)
1823 goto interrupt;
1824
1825 ++p;
1826 }
1827
1828 break;
1559 1829
1560 // inside a string 1830 // inside a string
1561 case INCR_M_STR: 1831 case INCR_M_STR:
1562 incr_m_str: 1832 incr_m_str:
1563 for (;;) 1833 for (;;)
… …
1614 self->incr_mode = INCR_M_STR; 1884 self->incr_mode = INCR_M_STR;
1615 goto incr_m_str; 1885 goto incr_m_str;
1616 1886
1617 case '[': 1887 case '[':
1618 case '{': 1888 case '{':
1889 case '(':
1619 if (++self->incr_nest > self->max_depth) 1890 if (++self->incr_nest > self->max_depth)
1620 croak (ERR_NESTING_EXCEEDED); 1891 croak (ERR_NESTING_EXCEEDED);
1621 break; 1892 break;
1622 1893
1623 case ']': 1894 case ']':
1624 case '}': 1895 case '}':
1625 if (--self->incr_nest <= 0) 1896 if (--self->incr_nest <= 0)
1626 goto interrupt; 1897 goto interrupt;
1898 break;
1899
1900 case ')':
1901 --self->incr_nest;
1902 break;
1903
1904 case '#':
1905 self->incr_mode = INCR_M_C1;
1906 goto incr_m_c;
1627 } 1907 }
1628 } 1908 }
1629 } 1909 }
1630 1910
1631 modechange: 1911 modechange:
1632 ; 1912 ;
1633 } 1913 }
1634 1914
1635interrupt: 1915interrupt:
1636 self->incr_pos = p - SvPVX (self->incr_text); 1916 self->incr_pos = p - SvPVX (self->incr_text);
1917 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1637 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1918 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1638} 1919}
1639 1920
1640///////////////////////////////////////////////////////////////////////////// 1921/////////////////////////////////////////////////////////////////////////////
1641// XS interface functions 1922// XS interface functions
… …
1651 i >= '0' && i <= '9' ? i - '0' 1932 i >= '0' && i <= '9' ? i - '0'
1652 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1933 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1653 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1934 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1654 : -1; 1935 : -1;
1655 1936
1656 json_stash = gv_stashpv ("JSON::XS" , 1); 1937 json_stash = gv_stashpv ("JSON::XS" , 1);
1657 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1938 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1658 1939
1659 json_true = get_bool ("JSON::XS::true"); 1940 types_true = get_bool ("Types::Serialiser::true");
1660 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);
1661 1945
1662 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 */
1663} 1947}
1664 1948
1665PROTOTYPES: DISABLE 1949PROTOTYPES: DISABLE
1666 1950
1667void CLONE (...) 1951void CLONE (...)
1668 CODE: 1952 CODE:
1669 json_stash = 0; 1953 json_stash = 0;
1670 json_boolean_stash = 0; 1954 types_boolean_stash = 0;
1671 1955
1672void new (char *klass) 1956void new (char *klass)
1673 PPCODE: 1957 PPCODE:
1674{ 1958{
1675 SV *pv = NEWSV (0, sizeof (JSON)); 1959 SV *pv = NEWSV (0, sizeof (JSON));
1676 SvPOK_only (pv); 1960 SvPOK_only (pv);
1677 json_init ((JSON *)SvPVX (pv)); 1961 json_init ((JSON *)SvPVX (pv));
1678 XPUSHs (sv_2mortal (sv_bless ( 1962 XPUSHs (sv_2mortal (sv_bless (
1679 newRV_noinc (pv), 1963 newRV_noinc (pv),
1680 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1964 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1695 shrink = F_SHRINK 1979 shrink = F_SHRINK
1696 allow_blessed = F_ALLOW_BLESSED 1980 allow_blessed = F_ALLOW_BLESSED
1697 convert_blessed = F_CONV_BLESSED 1981 convert_blessed = F_CONV_BLESSED
1698 relaxed = F_RELAXED 1982 relaxed = F_RELAXED
1699 allow_unknown = F_ALLOW_UNKNOWN 1983 allow_unknown = F_ALLOW_UNKNOWN
1984 allow_tags = F_ALLOW_TAGS
1700 PPCODE: 1985 PPCODE:
1701{ 1986{
1702 if (enable) 1987 if (enable)
1703 self->flags |= ix; 1988 self->flags |= ix;
1704 else 1989 else
… …
1720 get_shrink = F_SHRINK 2005 get_shrink = F_SHRINK
1721 get_allow_blessed = F_ALLOW_BLESSED 2006 get_allow_blessed = F_ALLOW_BLESSED
1722 get_convert_blessed = F_CONV_BLESSED 2007 get_convert_blessed = F_CONV_BLESSED
1723 get_relaxed = F_RELAXED 2008 get_relaxed = F_RELAXED
1724 get_allow_unknown = F_ALLOW_UNKNOWN 2009 get_allow_unknown = F_ALLOW_UNKNOWN
2010 get_allow_tags = F_ALLOW_TAGS
1725 PPCODE: 2011 PPCODE:
1726 XPUSHs (boolSV (self->flags & ix)); 2012 XPUSHs (boolSV (self->flags & ix));
1727 2013
1728void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2014void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1729 PPCODE: 2015 PPCODE:
… …
1757} 2043}
1758 2044
1759void 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)
1760 PPCODE: 2046 PPCODE:
1761{ 2047{
1762 if (!self->cb_sk_object) 2048 if (!self->cb_sk_object)
1763 self->cb_sk_object = newHV (); 2049 self->cb_sk_object = newHV ();
1764 2050
1765 if (SvOK (cb)) 2051 if (SvOK (cb))
1766 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2052 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1767 else 2053 else
… …
1778 XPUSHs (ST (0)); 2064 XPUSHs (ST (0));
1779} 2065}
1780 2066
1781void encode (JSON *self, SV *scalar) 2067void encode (JSON *self, SV *scalar)
1782 PPCODE: 2068 PPCODE:
1783 XPUSHs (encode_json (scalar, self)); 2069 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2070 XPUSHs (scalar);
1784 2071
1785void decode (JSON *self, SV *jsonstr) 2072void decode (JSON *self, SV *jsonstr)
1786 PPCODE: 2073 PPCODE:
1787 XPUSHs (decode_json (jsonstr, self, 0)); 2074 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2075 XPUSHs (jsonstr);
1788 2076
1789void decode_prefix (JSON *self, SV *jsonstr) 2077void decode_prefix (JSON *self, SV *jsonstr)
1790 PPCODE: 2078 PPCODE:
1791{ 2079{
2080 SV *sv;
1792 char *offset; 2081 char *offset;
2082 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1793 EXTEND (SP, 2); 2083 EXTEND (SP, 2);
1794 PUSHs (decode_json (jsonstr, self, &offset)); 2084 PUSHs (sv);
1795 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2085 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1796} 2086}
1797 2087
1798void incr_parse (JSON *self, SV *jsonstr = 0) 2088void incr_parse (JSON *self, SV *jsonstr = 0)
1799 PPCODE: 2089 PPCODE:
1800{ 2090{
1801 if (!self->incr_text) 2091 if (!self->incr_text)
1802 self->incr_text = newSVpvn ("", 0); 2092 self->incr_text = newSVpvn ("", 0);
2093
2094 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2095 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2096 if (DECODE_WANTS_OCTETS (self))
2097 {
2098 if (self->incr_pos)
2099 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2100 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2101
2102 sv_utf8_downgrade (self->incr_text, 0);
2103 }
2104 else
2105 {
2106 sv_utf8_upgrade (self->incr_text);
2107
2108 if (self->incr_pos)
2109 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2110 - (U8 *)SvPVX (self->incr_text);
2111 }
1803 2112
1804 // append data, if any 2113 // append data, if any
1805 if (jsonstr) 2114 if (jsonstr)
1806 { 2115 {
2116 /* make sure both strings have same encoding */
2117 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1807 if (SvUTF8 (jsonstr)) 2118 if (SvUTF8 (jsonstr))
2119 sv_utf8_downgrade (jsonstr, 0);
1808 { 2120 else
1809 if (!SvUTF8 (self->incr_text))
1810 {
1811 /* utf-8-ness differs, need to upgrade */
1812 sv_utf8_upgrade (self->incr_text);
1813
1814 if (self->incr_pos)
1815 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1816 - (U8 *)SvPVX (self->incr_text);
1817 }
1818 }
1819 else if (SvUTF8 (self->incr_text))
1820 sv_utf8_upgrade (jsonstr); 2121 sv_utf8_upgrade (jsonstr);
1821 2122
2123 /* and then just blindly append */
1822 { 2124 {
1823 STRLEN len; 2125 STRLEN len;
1824 const char *str = SvPV (jsonstr, len); 2126 const char *str = SvPV (jsonstr, len);
1825 STRLEN cur = SvCUR (self->incr_text); 2127 STRLEN cur = SvCUR (self->incr_text);
1826 2128
… …
1834 } 2136 }
1835 2137
1836 if (GIMME_V != G_VOID) 2138 if (GIMME_V != G_VOID)
1837 do 2139 do
1838 { 2140 {
2141 SV *sv;
1839 char *offset; 2142 char *offset;
1840 2143
1841 if (!INCR_DONE (self)) 2144 if (!INCR_DONE (self))
1842 { 2145 {
1843 incr_parse (self); 2146 incr_parse (self);
… …
1845 if (self->incr_pos > self->max_size && self->max_size) 2148 if (self->incr_pos > self->max_size && self->max_size)
1846 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2149 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1847 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2150 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1848 2151
1849 if (!INCR_DONE (self)) 2152 if (!INCR_DONE (self))
2153 {
2154 // as an optimisation, do not accumulate white space in the incr buffer
2155 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2156 {
2157 self->incr_pos = 0;
2158 SvCUR_set (self->incr_text, 0);
2159 }
2160
1850 break; 2161 break;
2162 }
1851 } 2163 }
1852 2164
1853 XPUSHs (decode_json (self->incr_text, self, &offset)); 2165 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2166 XPUSHs (sv);
1854 2167
1855 self->incr_pos -= offset - SvPVX (self->incr_text); 2168 self->incr_pos -= offset - SvPVX (self->incr_text);
1856 self->incr_nest = 0; 2169 self->incr_nest = 0;
1857 self->incr_mode = 0; 2170 self->incr_mode = 0;
1858 2171
… …
1902 SvREFCNT_dec (self->incr_text); 2215 SvREFCNT_dec (self->incr_text);
1903 2216
1904PROTOTYPES: ENABLE 2217PROTOTYPES: ENABLE
1905 2218
1906void encode_json (SV *scalar) 2219void encode_json (SV *scalar)
1907 ALIAS:
1908 to_json_ = 0
1909 encode_json = F_UTF8
1910 PPCODE: 2220 PPCODE:
1911{ 2221{
1912 JSON json; 2222 JSON json;
1913 json_init (&json); 2223 json_init (&json);
1914 json.flags |= ix; 2224 json.flags |= F_UTF8;
1915 XPUSHs (encode_json (scalar, &json)); 2225 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2226 XPUSHs (scalar);
1916} 2227}
1917 2228
1918void decode_json (SV *jsonstr) 2229void decode_json (SV *jsonstr)
1919 ALIAS:
1920 from_json_ = 0
1921 decode_json = F_UTF8
1922 PPCODE: 2230 PPCODE:
1923{ 2231{
1924 JSON json; 2232 JSON json;
1925 json_init (&json); 2233 json_init (&json);
1926 json.flags |= ix; 2234 json.flags |= F_UTF8;
1927 XPUSHs (decode_json (jsonstr, &json, 0)); 2235 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2236 XPUSHs (jsonstr);
1928} 2237}
1929 2238
1930

Diff Legend

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