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.132 by root, Tue Sep 5 13:07:09 2017 UTC

… …
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11#include <inttypes.h>
11 12
12#if defined(__BORLANDC__) || defined(_MSC_VER) 13#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 14# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 15#endif
15 16
16// some old perls do not have this, try to make it work, no 17// some old perls do not have this, try to make it work, no
17// guarantees, though. if it breaks, you get to keep the pieces. 18// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 19#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 20# define UTF8_MAXBYTES 13
21#endif
22
23// compatibility with perl <5.18
24#ifndef HvNAMELEN_get
25# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
26#endif
27#ifndef HvNAMELEN
28# define HvNAMELEN(hv) HvNAMELEN_get (hv)
29#endif
30#ifndef HvNAMEUTF8
31# define HvNAMEUTF8(hv) 0
20#endif 32#endif
21 33
22// three extra for rounding, sign, and end of string 34// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3) 35#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
24 36
… …
33#define F_SHRINK 0x00000200UL 45#define F_SHRINK 0x00000200UL
34#define F_ALLOW_BLESSED 0x00000400UL 46#define F_ALLOW_BLESSED 0x00000400UL
35#define F_CONV_BLESSED 0x00000800UL 47#define F_CONV_BLESSED 0x00000800UL
36#define F_RELAXED 0x00001000UL 48#define F_RELAXED 0x00001000UL
37#define F_ALLOW_UNKNOWN 0x00002000UL 49#define F_ALLOW_UNKNOWN 0x00002000UL
50#define F_ALLOW_TAGS 0x00004000UL
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 52
40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
41 54
42#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 32 // initial scalar size to be allocated
43#define INDENT_STEP 3 // spaces per indentation level 56#define INDENT_STEP 3 // spaces per indentation level
44 57
45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 58#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
59
60#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
46 61
47#define SB do { 62#define SB do {
48#define SE } while (0) 63#define SE } while (0)
49 64
50#if __GNUC__ >= 3 65#if __GNUC__ >= 3
… …
65#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)" 80#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
66 81
67#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
68# define JSON_SLOW 1 83# define JSON_SLOW 1
69# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 84# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
85# define BOOL_STASH (bool_stash ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
70#else 86#else
71# define JSON_SLOW 0 87# define JSON_SLOW 0
72# define JSON_STASH json_stash 88# define JSON_STASH json_stash
89# define BOOL_STASH bool_stash
73#endif 90#endif
74 91
75static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92// the amount of HEs to allocate on the stack, when sorting keys
76static SV *json_true, *json_false; 93#define STACK_HES 64
94
95static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
96static SV *bool_true, *bool_false, *sv_json;
77 97
78enum { 98enum {
79 INCR_M_WS = 0, // initial whitespace skipping, must be 0 99 INCR_M_WS = 0, // initial whitespace skipping, must be 0
80 INCR_M_STR, // inside string 100 INCR_M_STR, // inside string
81 INCR_M_BS, // inside backslash 101 INCR_M_BS, // inside backslash
… …
135 SvPV_renew (sv, SvCUR (sv) + 1); 155 SvPV_renew (sv, SvCUR (sv) + 1);
136#endif 156#endif
137 } 157 }
138} 158}
139 159
160/* adds two STRLENs together, slow, and with paranoia */
161STRLEN
162strlen_sum (STRLEN l1, STRLEN l2)
163{
164 size_t sum = l1 + l2;
165
166 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
167 croak ("JSON::XS: string size overflow");
168
169 return sum;
170}
171
172/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
173static char *
174json_sv_grow (SV *sv, size_t len1, size_t len2)
175{
176 len1 = strlen_sum (len1, len2);
177 len1 = strlen_sum (len1, len1 >> 1);
178
179 if (len1 > 4096 - 24)
180 len1 = (len1 | 4095) - 24;
181
182 return SvGROW (sv, len1);
183}
184
140// decode an utf-8 character and return it, or (UV)-1 in 185// decode a utf-8 character and return it, or (UV)-1 in
141// case of an error. 186// case of an error.
142// we special-case "safe" characters from U+80 .. U+7FF, 187// we special-case "safe" characters from U+80 .. U+7FF,
143// but use the very good perl function to parse anything else. 188// but use the very good perl function to parse anything else.
144// note that we never call this function for a ascii codepoints 189// note that we never call this function for a ascii codepoints
145INLINE UV 190INLINE UV
… …
258 } 303 }
259 304
260 // this relies greatly on the quality of the pow () 305 // this relies greatly on the quality of the pow ()
261 // implementation of the platform, but a good 306 // implementation of the platform, but a good
262 // implementation is hard to beat. 307 // implementation is hard to beat.
308 // (IEEE 754 conformant ones are required to be exact)
263 if (postdp) *expo -= eaccum; 309 if (postdp) *expo -= eaccum;
264 *accum += uaccum * Perl_pow (10., *expo); 310 *accum += uaccum * Perl_pow (10., *expo);
265 *expo += eaccum; 311 *expo += eaccum;
266} 312}
267 313
… …
281 // a recursion depth of ten gives us >>500 bits 327 // a recursion depth of ten gives us >>500 bits
282 json_atof_scan1 (s, &accum, &expo, 0, 10); 328 json_atof_scan1 (s, &accum, &expo, 0, 10);
283 329
284 return neg ? -accum : accum; 330 return neg ? -accum : accum;
285} 331}
332
333// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
334static int
335ref_bool_type (SV *sv)
336{
337 svtype svt = SvTYPE (sv);
338
339 if (svt < SVt_PVAV)
340 {
341 STRLEN len = 0;
342 char *pv = svt ? SvPV (sv, len) : 0;
343
344 if (len == 1)
345 if (*pv == '1')
346 return 1;
347 else if (*pv == '0')
348 return 0;
349 }
350
351 return -1;
352}
353
354// returns whether scalar is not a reference in the sense of allow_nonref
355static int
356json_nonref (SV *scalar)
357{
358 if (!SvROK (scalar))
359 return 1;
360
361 scalar = SvRV (scalar);
362
363 if (SvTYPE (scalar) >= SVt_PVMG)
364 {
365 if (SvSTASH (scalar) == bool_stash)
366 return 1;
367
368 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
369 return 1;
370 }
371
372 return 0;
373}
374
286///////////////////////////////////////////////////////////////////////////// 375/////////////////////////////////////////////////////////////////////////////
287// encoder 376// encoder
288 377
289// structure used for encoding JSON 378// structure used for encoding JSON
290typedef struct 379typedef struct
… …
298} enc_t; 387} enc_t;
299 388
300INLINE void 389INLINE void
301need (enc_t *enc, STRLEN len) 390need (enc_t *enc, STRLEN len)
302{ 391{
303 if (expect_false (enc->cur + len >= enc->end)) 392 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
304 { 393 {
305 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 394 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
306 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 395 char *buf = json_sv_grow (enc->sv, cur, len);
307 enc->cur = SvPVX (enc->sv) + cur; 396 enc->cur = buf + cur;
308 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 397 enc->end = buf + SvLEN (enc->sv) - 1;
309 } 398 }
310} 399}
311 400
312INLINE void 401INLINE void
313encode_ch (enc_t *enc, char ch) 402encode_ch (enc_t *enc, char ch)
… …
329 418
330 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 419 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
331 { 420 {
332 if (expect_false (ch == '"')) // but with slow exceptions 421 if (expect_false (ch == '"')) // but with slow exceptions
333 { 422 {
334 need (enc, len += 1); 423 need (enc, len + 1);
335 *enc->cur++ = '\\'; 424 *enc->cur++ = '\\';
336 *enc->cur++ = '"'; 425 *enc->cur++ = '"';
337 } 426 }
338 else if (expect_false (ch == '\\')) 427 else if (expect_false (ch == '\\'))
339 { 428 {
340 need (enc, len += 1); 429 need (enc, len + 1);
341 *enc->cur++ = '\\'; 430 *enc->cur++ = '\\';
342 *enc->cur++ = '\\'; 431 *enc->cur++ = '\\';
343 } 432 }
344 else 433 else
345 *enc->cur++ = ch; 434 *enc->cur++ = ch;
… …
348 } 437 }
349 else 438 else
350 { 439 {
351 switch (ch) 440 switch (ch)
352 { 441 {
353 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; 442 case '\010': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
354 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break; 443 case '\011': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
355 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break; 444 case '\012': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
356 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break; 445 case '\014': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
357 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break; 446 case '\015': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
358 447
359 default: 448 default:
360 { 449 {
361 STRLEN clen; 450 STRLEN clen;
362 UV uch; 451 UV uch;
… …
378 if (uch >= 0x10000UL) 467 if (uch >= 0x10000UL)
379 { 468 {
380 if (uch >= 0x110000UL) 469 if (uch >= 0x110000UL)
381 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 470 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
382 471
383 need (enc, len += 11); 472 need (enc, len + 11);
384 sprintf (enc->cur, "\\u%04x\\u%04x", 473 sprintf (enc->cur, "\\u%04x\\u%04x",
385 (int)((uch - 0x10000) / 0x400 + 0xD800), 474 (int)((uch - 0x10000) / 0x400 + 0xD800),
386 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 475 (int)((uch - 0x10000) % 0x400 + 0xDC00));
387 enc->cur += 12; 476 enc->cur += 12;
388 } 477 }
389 else 478 else
390 { 479 {
391 need (enc, len += 5); 480 need (enc, len + 5);
392 *enc->cur++ = '\\'; 481 *enc->cur++ = '\\';
393 *enc->cur++ = 'u'; 482 *enc->cur++ = 'u';
394 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 483 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
395 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 484 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
396 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 485 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
… …
404 *enc->cur++ = uch; 493 *enc->cur++ = uch;
405 str += clen; 494 str += clen;
406 } 495 }
407 else if (is_utf8) 496 else if (is_utf8)
408 { 497 {
409 need (enc, len += clen); 498 need (enc, len + clen);
410 do 499 do
411 { 500 {
412 *enc->cur++ = *str++; 501 *enc->cur++ = *str++;
413 } 502 }
414 while (--clen); 503 while (--clen);
415 } 504 }
416 else 505 else
417 { 506 {
418 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 507 need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
419 enc->cur = encode_utf8 (enc->cur, uch); 508 enc->cur = encode_utf8 (enc->cur, uch);
420 ++str; 509 ++str;
421 } 510 }
422 } 511 }
423 } 512 }
… …
477 566
478 if (enc->indent >= enc->json.max_depth) 567 if (enc->indent >= enc->json.max_depth)
479 croak (ERR_NESTING_EXCEEDED); 568 croak (ERR_NESTING_EXCEEDED);
480 569
481 encode_ch (enc, '['); 570 encode_ch (enc, '[');
482 571
483 if (len >= 0) 572 if (len >= 0)
484 { 573 {
485 encode_nl (enc); ++enc->indent; 574 encode_nl (enc); ++enc->indent;
486 575
487 for (i = 0; i <= len; ++i) 576 for (i = 0; i <= len; ++i)
… …
499 encode_comma (enc); 588 encode_comma (enc);
500 } 589 }
501 590
502 encode_nl (enc); --enc->indent; encode_indent (enc); 591 encode_nl (enc); --enc->indent; encode_indent (enc);
503 } 592 }
504 593
505 encode_ch (enc, ']'); 594 encode_ch (enc, ']');
506} 595}
507 596
508static void 597static void
509encode_hk (enc_t *enc, HE *he) 598encode_hk (enc_t *enc, HE *he)
… …
513 if (HeKLEN (he) == HEf_SVKEY) 602 if (HeKLEN (he) == HEf_SVKEY)
514 { 603 {
515 SV *sv = HeSVKEY (he); 604 SV *sv = HeSVKEY (he);
516 STRLEN len; 605 STRLEN len;
517 char *str; 606 char *str;
518 607
519 SvGETMAGIC (sv); 608 SvGETMAGIC (sv);
520 str = SvPV (sv, len); 609 str = SvPV (sv, len);
521 610
522 encode_str (enc, str, len, SvUTF8 (sv)); 611 encode_str (enc, str, len, SvUTF8 (sv));
523 } 612 }
… …
589 } 678 }
590 679
591 if (count) 680 if (count)
592 { 681 {
593 int i, fast = 1; 682 int i, fast = 1;
594#if defined(__BORLANDC__) || defined(_MSC_VER) 683 HE *hes_stack [STACK_HES];
595 HE **hes = _alloca (count * sizeof (HE)); 684 HE **hes = hes_stack;
596#else 685
597 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 686 // allocate larger arrays on the heap
598#endif 687 if (count > STACK_HES)
688 {
689 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
690 hes = (HE **)SvPVX (sv);
691 }
599 692
600 i = 0; 693 i = 0;
601 while ((he = hv_iternext (hv))) 694 while ((he = hv_iternext (hv)))
602 { 695 {
603 hes [i++] = he; 696 hes [i++] = he;
… …
672// encode objects, arrays and special \0=false and \1=true values. 765// encode objects, arrays and special \0=false and \1=true values.
673static void 766static void
674encode_rv (enc_t *enc, SV *sv) 767encode_rv (enc_t *enc, SV *sv)
675{ 768{
676 svtype svt; 769 svtype svt;
770 GV *method;
677 771
678 SvGETMAGIC (sv); 772 SvGETMAGIC (sv);
679 svt = SvTYPE (sv); 773 svt = SvTYPE (sv);
680 774
681 if (expect_false (SvOBJECT (sv))) 775 if (expect_false (SvOBJECT (sv)))
682 { 776 {
683 HV *stash = !JSON_SLOW || json_boolean_stash 777 HV *stash = SvSTASH (sv);
684 ? json_boolean_stash
685 : gv_stashpv ("JSON::XS::Boolean", 1);
686 778
687 if (SvSTASH (sv) == stash) 779 if (stash == bool_stash)
688 { 780 {
689 if (SvIV (sv)) 781 if (SvIV (sv))
690 encode_str (enc, "true", 4, 0); 782 encode_str (enc, "true", 4, 0);
691 else 783 else
692 encode_str (enc, "false", 5, 0); 784 encode_str (enc, "false", 5, 0);
693 } 785 }
786 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
787 {
788 int count;
789 dSP;
790
791 ENTER; SAVETMPS;
792 SAVESTACK_POS ();
793 PUSHMARK (SP);
794 EXTEND (SP, 2);
795 // we re-bless the reference to get overload and other niceties right
796 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
797 PUSHs (sv_json);
798
799 PUTBACK;
800 count = call_sv ((SV *)GvCV (method), G_ARRAY);
801 SPAGAIN;
802
803 // catch this surprisingly common error
804 if (SvROK (TOPs) && SvRV (TOPs) == sv)
805 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
806
807 encode_ch (enc, '(');
808 encode_ch (enc, '"');
809 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
810 encode_ch (enc, '"');
811 encode_ch (enc, ')');
812 encode_ch (enc, '[');
813
814 while (count)
815 {
816 encode_sv (enc, SP[1 - count--]);
817
818 if (count)
819 encode_ch (enc, ',');
820 }
821
822 encode_ch (enc, ']');
823
824 FREETMPS; LEAVE;
825 }
826 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
827 {
828 dSP;
829
830 ENTER; SAVETMPS;
831 PUSHMARK (SP);
832 // we re-bless the reference to get overload and other niceties right
833 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
834
835 // calling with G_SCALAR ensures that we always get a 1 return value
836 PUTBACK;
837 call_sv ((SV *)GvCV (method), G_SCALAR);
838 SPAGAIN;
839
840 // catch this surprisingly common error
841 if (SvROK (TOPs) && SvRV (TOPs) == sv)
842 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
843
844 sv = POPs;
845 PUTBACK;
846
847 encode_sv (enc, sv);
848
849 FREETMPS; LEAVE;
850 }
851 else if (enc->json.flags & F_ALLOW_BLESSED)
852 encode_str (enc, "null", 4, 0);
694 else 853 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", 854 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)))); 855 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
741 }
742 } 856 }
743 else if (svt == SVt_PVHV) 857 else if (svt == SVt_PVHV)
744 encode_hv (enc, (HV *)sv); 858 encode_hv (enc, (HV *)sv);
745 else if (svt == SVt_PVAV) 859 else if (svt == SVt_PVAV)
746 encode_av (enc, (AV *)sv); 860 encode_av (enc, (AV *)sv);
747 else if (svt < SVt_PVAV) 861 else if (svt < SVt_PVAV)
748 { 862 {
749 STRLEN len = 0; 863 int bool_type = ref_bool_type (sv);
750 char *pv = svt ? SvPV (sv, len) : 0;
751 864
752 if (len == 1 && *pv == '1') 865 if (bool_type == 1)
753 encode_str (enc, "true", 4, 0); 866 encode_str (enc, "true", 4, 0);
754 else if (len == 1 && *pv == '0') 867 else if (bool_type == 0)
755 encode_str (enc, "false", 5, 0); 868 encode_str (enc, "false", 5, 0);
756 else if (enc->json.flags & F_ALLOW_UNKNOWN) 869 else if (enc->json.flags & F_ALLOW_UNKNOWN)
757 encode_str (enc, "null", 4, 0); 870 encode_str (enc, "null", 4, 0);
758 else 871 else
759 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 872 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
… …
822 } 935 }
823 else 936 else
824 { 937 {
825 // large integer, use the (rather slow) snprintf way. 938 // large integer, use the (rather slow) snprintf way.
826 need (enc, IVUV_MAXCHARS); 939 need (enc, IVUV_MAXCHARS);
827 enc->cur += 940 enc->cur +=
828 SvIsUV(sv) 941 SvIsUV(sv)
829 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 942 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
830 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 943 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
831 } 944 }
832 } 945 }
833 else if (SvROK (sv)) 946 else if (SvROK (sv))
834 encode_rv (enc, SvRV (sv)); 947 encode_rv (enc, SvRV (sv));
835 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 948 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
836 encode_str (enc, "null", 4, 0); 949 encode_str (enc, "null", 4, 0);
837 else 950 else
838 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 951 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
839 SvPV_nolen (sv), SvFLAGS (sv)); 952 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
840} 953}
841 954
842static SV * 955static SV *
843encode_json (SV *scalar, JSON *json) 956encode_json (SV *scalar, JSON *json)
844{ 957{
845 enc_t enc; 958 enc_t enc;
846 959
847 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 960 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
848 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 961 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
849 962
850 enc.json = *json; 963 enc.json = *json;
851 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 964 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
852 enc.cur = SvPVX (enc.sv); 965 enc.cur = SvPVX (enc.sv);
… …
1059 *cur++ = *dec_cur++; 1172 *cur++ = *dec_cur++;
1060 while (--clen); 1173 while (--clen);
1061 1174
1062 utf8 = 1; 1175 utf8 = 1;
1063 } 1176 }
1177 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1178 *cur++ = ch;
1064 else 1179 else
1065 { 1180 {
1066 --dec_cur; 1181 --dec_cur;
1067 1182
1068 if (!ch) 1183 if (!ch)
… …
1078 1193
1079 if (sv) 1194 if (sv)
1080 { 1195 {
1081 STRLEN cur = SvCUR (sv); 1196 STRLEN cur = SvCUR (sv);
1082 1197
1083 if (SvLEN (sv) <= cur + len) 1198 if (SvLEN (sv) - cur <= len)
1084 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1199 json_sv_grow (sv, cur, len);
1085 1200
1086 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1201 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1087 SvCUR_set (sv, SvCUR (sv) + len); 1202 SvCUR_set (sv, SvCUR (sv) + len);
1088 } 1203 }
1089 else 1204 else
… …
1256 if (*dec->cur == ']') 1371 if (*dec->cur == ']')
1257 { 1372 {
1258 ++dec->cur; 1373 ++dec->cur;
1259 break; 1374 break;
1260 } 1375 }
1261 1376
1262 if (*dec->cur != ',') 1377 if (*dec->cur != ',')
1263 ERR (", or ] expected while parsing array"); 1378 ERR (", or ] expected while parsing array");
1264 1379
1265 ++dec->cur; 1380 ++dec->cur;
1266 1381
… …
1390 1505
1391 hv_iterinit (hv); 1506 hv_iterinit (hv);
1392 he = hv_iternext (hv); 1507 he = hv_iternext (hv);
1393 hv_iterinit (hv); 1508 hv_iterinit (hv);
1394 1509
1395 // the next line creates a mortal sv each time its called. 1510 // the next line creates a mortal sv each time it's called.
1396 // might want to optimise this for common cases. 1511 // might want to optimise this for common cases.
1397 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1512 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1398 1513
1399 if (cb) 1514 if (cb)
1400 { 1515 {
1401 dSP; 1516 dSP;
1402 int count; 1517 int count;
1403 1518
1404 ENTER; SAVETMPS; PUSHMARK (SP); 1519 ENTER; SAVETMPS;
1520 SAVESTACK_POS ();
1521 PUSHMARK (SP);
1405 XPUSHs (HeVAL (he)); 1522 XPUSHs (HeVAL (he));
1523 sv_2mortal (sv);
1406 1524
1407 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1525 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1408 1526
1409 if (count == 1) 1527 if (count == 1)
1410 { 1528 {
1411 sv = newSVsv (POPs); 1529 sv = newSVsv (POPs);
1412 FREETMPS; LEAVE; 1530 FREETMPS; LEAVE;
1413 return sv; 1531 return sv;
1414 } 1532 }
1415 1533
1534 SvREFCNT_inc (sv);
1416 FREETMPS; LEAVE; 1535 FREETMPS; LEAVE;
1417 } 1536 }
1418 } 1537 }
1419 1538
1420 if (dec->json.cb_object) 1539 if (dec->json.cb_object)
1421 { 1540 {
1422 dSP; 1541 dSP;
1423 int count; 1542 int count;
1424 1543
1425 ENTER; SAVETMPS; PUSHMARK (SP); 1544 ENTER; SAVETMPS;
1545 SAVESTACK_POS ();
1546 PUSHMARK (SP);
1426 XPUSHs (sv_2mortal (sv)); 1547 XPUSHs (sv_2mortal (sv));
1427 1548
1428 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1549 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1429 1550
1430 if (count == 1) 1551 if (count == 1)
… …
1446 DEC_DEC_DEPTH; 1567 DEC_DEC_DEPTH;
1447 return 0; 1568 return 0;
1448} 1569}
1449 1570
1450static SV * 1571static SV *
1572decode_tag (dec_t *dec)
1573{
1574 SV *tag = 0;
1575 SV *val = 0;
1576
1577 if (!(dec->json.flags & F_ALLOW_TAGS))
1578 ERR ("malformed JSON string, neither array, object, number, string or atom");
1579
1580 ++dec->cur;
1581
1582 decode_ws (dec);
1583
1584 tag = decode_sv (dec);
1585 if (!tag)
1586 goto fail;
1587
1588 if (!SvPOK (tag))
1589 ERR ("malformed JSON string, (tag) must be a string");
1590
1591 decode_ws (dec);
1592
1593 if (*dec->cur != ')')
1594 ERR (") expected after tag");
1595
1596 ++dec->cur;
1597
1598 decode_ws (dec);
1599
1600 val = decode_sv (dec);
1601 if (!val)
1602 goto fail;
1603
1604 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1605 ERR ("malformed JSON string, tag value must be an array");
1606
1607 {
1608 AV *av = (AV *)SvRV (val);
1609 int i, len = av_len (av) + 1;
1610 HV *stash = gv_stashsv (tag, 0);
1611 SV *sv;
1612
1613 if (!stash)
1614 ERR ("cannot decode perl-object (package does not exist)");
1615
1616 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1617
1618 if (!method)
1619 ERR ("cannot decode perl-object (package does not have a THAW method)");
1620
1621 dSP;
1622
1623 ENTER; SAVETMPS;
1624 PUSHMARK (SP);
1625 EXTEND (SP, len + 2);
1626 // we re-bless the reference to get overload and other niceties right
1627 PUSHs (tag);
1628 PUSHs (sv_json);
1629
1630 for (i = 0; i < len; ++i)
1631 PUSHs (*av_fetch (av, i, 1));
1632
1633 PUTBACK;
1634 call_sv ((SV *)GvCV (method), G_SCALAR);
1635 SPAGAIN;
1636
1637 SvREFCNT_dec (tag);
1638 SvREFCNT_dec (val);
1639 sv = SvREFCNT_inc (POPs);
1640
1641 PUTBACK;
1642
1643 FREETMPS; LEAVE;
1644
1645 return sv;
1646 }
1647
1648fail:
1649 SvREFCNT_dec (tag);
1650 SvREFCNT_dec (val);
1651 return 0;
1652}
1653
1654static SV *
1451decode_sv (dec_t *dec) 1655decode_sv (dec_t *dec)
1452{ 1656{
1453 // the beauty of JSON: you need exactly one character lookahead 1657 // the beauty of JSON: you need exactly one character lookahead
1454 // to parse everything. 1658 // to parse everything.
1455 switch (*dec->cur) 1659 switch (*dec->cur)
1456 { 1660 {
1457 case '"': ++dec->cur; return decode_str (dec); 1661 case '"': ++dec->cur; return decode_str (dec);
1458 case '[': ++dec->cur; return decode_av (dec); 1662 case '[': ++dec->cur; return decode_av (dec);
1459 case '{': ++dec->cur; return decode_hv (dec); 1663 case '{': ++dec->cur; return decode_hv (dec);
1664 case '(': return decode_tag (dec);
1460 1665
1461 case '-': 1666 case '-':
1462 case '0': case '1': case '2': case '3': case '4': 1667 case '0': case '1': case '2': case '3': case '4':
1463 case '5': case '6': case '7': case '8': case '9': 1668 case '5': case '6': case '7': case '8': case '9':
1464 return decode_num (dec); 1669 return decode_num (dec);
… …
1466 case 't': 1671 case 't':
1467 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1672 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1468 { 1673 {
1469 dec->cur += 4; 1674 dec->cur += 4;
1470#if JSON_SLOW 1675#if JSON_SLOW
1471 json_true = get_bool ("JSON::XS::true"); 1676 bool_true = get_bool ("Types::Serialiser::true");
1472#endif 1677#endif
1473 return newSVsv (json_true); 1678 return newSVsv (bool_true);
1474 } 1679 }
1475 else 1680 else
1476 ERR ("'true' expected"); 1681 ERR ("'true' expected");
1477 1682
1478 break; 1683 break;
… …
1480 case 'f': 1685 case 'f':
1481 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1686 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1482 { 1687 {
1483 dec->cur += 5; 1688 dec->cur += 5;
1484#if JSON_SLOW 1689#if JSON_SLOW
1485 json_false = get_bool ("JSON::XS::false"); 1690 bool_false = get_bool ("Types::Serialiser::false");
1486#endif 1691#endif
1487 return newSVsv (json_false); 1692 return newSVsv (bool_false);
1488 } 1693 }
1489 else 1694 else
1490 ERR ("'false' expected"); 1695 ERR ("'false' expected");
1491 1696
1492 break; 1697 break;
… …
1501 ERR ("'null' expected"); 1706 ERR ("'null' expected");
1502 1707
1503 break; 1708 break;
1504 1709
1505 default: 1710 default:
1506 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1711 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1507 break; 1712 break;
1508 } 1713 }
1509 1714
1510fail: 1715fail:
1511 return 0; 1716 return 0;
1512} 1717}
1513 1718
1514static SV * 1719static SV *
1515decode_json (SV *string, JSON *json, char **offset_return) 1720decode_json (SV *string, JSON *json, STRLEN *offset_return)
1516{ 1721{
1517 dec_t dec; 1722 dec_t dec;
1518 SV *sv; 1723 SV *sv;
1519 1724
1520 /* work around bugs in 5.10 where manipulating magic values 1725 /* work around bugs in 5.10 where manipulating magic values
1521 * will perl ignore the magic in subsequent accesses 1726 * makes perl ignore the magic in subsequent accesses.
1727 * also make a copy of non-PV values, to get them into a clean
1728 * state (SvPV should do that, but it's buggy, see below).
1729 *
1730 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1731 * as reported by Reini Urban.
1522 */ 1732 */
1523 /*SvGETMAGIC (string);*/ 1733 /*SvGETMAGIC (string);*/
1524 if (SvMAGICAL (string)) 1734 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1525 string = sv_2mortal (newSVsv (string)); 1735 string = sv_2mortal (newSVsv (string));
1526 1736
1527 SvUPGRADE (string, SVt_PV); 1737 SvUPGRADE (string, SVt_PV);
1528 1738
1529 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1739 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1546 if (offset > json->max_size && json->max_size) 1756 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", 1757 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); 1758 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1549 } 1759 }
1550 1760
1551 if (json->flags & F_UTF8) 1761 if (DECODE_WANTS_OCTETS (json))
1552 sv_utf8_downgrade (string, 0); 1762 sv_utf8_downgrade (string, 0);
1553 else 1763 else
1554 sv_utf8_upgrade (string); 1764 sv_utf8_upgrade (string);
1555 1765
1556 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1766 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1568 1778
1569 decode_ws (&dec); 1779 decode_ws (&dec);
1570 sv = decode_sv (&dec); 1780 sv = decode_sv (&dec);
1571 1781
1572 if (offset_return) 1782 if (offset_return)
1573 *offset_return = dec.cur; 1783 *offset_return = dec.cur - SvPVX (string);
1574 1784 else if (sv)
1575 if (!(offset_return || !sv))
1576 { 1785 {
1577 // check for trailing garbage 1786 // check for trailing garbage
1578 decode_ws (&dec); 1787 decode_ws (&dec);
1579 1788
1580 if (*dec.cur) 1789 if (*dec.cur)
… …
1598 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1807 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1599 LEAVE; 1808 LEAVE;
1600 1809
1601 croak ("%s, at character offset %d (before \"%s\")", 1810 croak ("%s, at character offset %d (before \"%s\")",
1602 dec.err, 1811 dec.err,
1603 ptr_to_index (string, dec.cur), 1812 (int)ptr_to_index (string, dec.cur),
1604 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1813 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1605 } 1814 }
1606 1815
1607 sv = sv_2mortal (sv); 1816 sv = sv_2mortal (sv);
1608 1817
1609 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1818 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1610 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1819 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1611 1820
1612 return sv; 1821 return sv;
1613} 1822}
1614 1823
… …
1736 self->incr_mode = INCR_M_STR; 1945 self->incr_mode = INCR_M_STR;
1737 goto incr_m_str; 1946 goto incr_m_str;
1738 1947
1739 case '[': 1948 case '[':
1740 case '{': 1949 case '{':
1950 case '(':
1741 if (++self->incr_nest > self->max_depth) 1951 if (++self->incr_nest > self->max_depth)
1742 croak (ERR_NESTING_EXCEEDED); 1952 croak (ERR_NESTING_EXCEEDED);
1743 break; 1953 break;
1744 1954
1745 case ']': 1955 case ']':
1746 case '}': 1956 case '}':
1747 if (--self->incr_nest <= 0) 1957 if (--self->incr_nest <= 0)
1748 goto interrupt; 1958 goto interrupt;
1959 break;
1960
1961 case ')':
1962 --self->incr_nest;
1749 break; 1963 break;
1750 1964
1751 case '#': 1965 case '#':
1752 self->incr_mode = INCR_M_C1; 1966 self->incr_mode = INCR_M_C1;
1753 goto incr_m_c; 1967 goto incr_m_c;
… …
1779 i >= '0' && i <= '9' ? i - '0' 1993 i >= '0' && i <= '9' ? i - '0'
1780 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1994 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1781 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1995 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1782 : -1; 1996 : -1;
1783 1997
1784 json_stash = gv_stashpv ("JSON::XS" , 1); 1998 json_stash = gv_stashpv ("JSON::XS" , 1);
1785 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1999 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1786
1787 json_true = get_bool ("JSON::XS::true"); 2000 bool_true = get_bool ("Types::Serialiser::true");
1788 json_false = get_bool ("JSON::XS::false"); 2001 bool_false = get_bool ("Types::Serialiser::false");
2002
2003 sv_json = newSVpv ("JSON", 0);
2004 SvREADONLY_on (sv_json);
1789 2005
1790 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 2006 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1791} 2007}
1792 2008
1793PROTOTYPES: DISABLE 2009PROTOTYPES: DISABLE
1794 2010
1795void CLONE (...) 2011void CLONE (...)
1796 CODE: 2012 CODE:
1797 json_stash = 0; 2013 json_stash = 0;
1798 json_boolean_stash = 0; 2014 bool_stash = 0;
1799 2015
1800void new (char *klass) 2016void new (char *klass)
1801 PPCODE: 2017 PPCODE:
1802{ 2018{
1803 SV *pv = NEWSV (0, sizeof (JSON)); 2019 SV *pv = NEWSV (0, sizeof (JSON));
1804 SvPOK_only (pv); 2020 SvPOK_only (pv);
1805 json_init ((JSON *)SvPVX (pv)); 2021 json_init ((JSON *)SvPVX (pv));
1806 XPUSHs (sv_2mortal (sv_bless ( 2022 XPUSHs (sv_2mortal (sv_bless (
1807 newRV_noinc (pv), 2023 newRV_noinc (pv),
1808 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2024 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1823 shrink = F_SHRINK 2039 shrink = F_SHRINK
1824 allow_blessed = F_ALLOW_BLESSED 2040 allow_blessed = F_ALLOW_BLESSED
1825 convert_blessed = F_CONV_BLESSED 2041 convert_blessed = F_CONV_BLESSED
1826 relaxed = F_RELAXED 2042 relaxed = F_RELAXED
1827 allow_unknown = F_ALLOW_UNKNOWN 2043 allow_unknown = F_ALLOW_UNKNOWN
2044 allow_tags = F_ALLOW_TAGS
1828 PPCODE: 2045 PPCODE:
1829{ 2046{
1830 if (enable) 2047 if (enable)
1831 self->flags |= ix; 2048 self->flags |= ix;
1832 else 2049 else
… …
1848 get_shrink = F_SHRINK 2065 get_shrink = F_SHRINK
1849 get_allow_blessed = F_ALLOW_BLESSED 2066 get_allow_blessed = F_ALLOW_BLESSED
1850 get_convert_blessed = F_CONV_BLESSED 2067 get_convert_blessed = F_CONV_BLESSED
1851 get_relaxed = F_RELAXED 2068 get_relaxed = F_RELAXED
1852 get_allow_unknown = F_ALLOW_UNKNOWN 2069 get_allow_unknown = F_ALLOW_UNKNOWN
2070 get_allow_tags = F_ALLOW_TAGS
1853 PPCODE: 2071 PPCODE:
1854 XPUSHs (boolSV (self->flags & ix)); 2072 XPUSHs (boolSV (self->flags & ix));
1855 2073
1856void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2074void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1857 PPCODE: 2075 PPCODE:
… …
1885} 2103}
1886 2104
1887void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2105void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1888 PPCODE: 2106 PPCODE:
1889{ 2107{
1890 if (!self->cb_sk_object) 2108 if (!self->cb_sk_object)
1891 self->cb_sk_object = newHV (); 2109 self->cb_sk_object = newHV ();
1892 2110
1893 if (SvOK (cb)) 2111 if (SvOK (cb))
1894 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2112 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1895 else 2113 else
… …
1906 XPUSHs (ST (0)); 2124 XPUSHs (ST (0));
1907} 2125}
1908 2126
1909void encode (JSON *self, SV *scalar) 2127void encode (JSON *self, SV *scalar)
1910 PPCODE: 2128 PPCODE:
1911 XPUSHs (encode_json (scalar, self)); 2129 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2130 XPUSHs (scalar);
1912 2131
1913void decode (JSON *self, SV *jsonstr) 2132void decode (JSON *self, SV *jsonstr)
1914 PPCODE: 2133 PPCODE:
1915 XPUSHs (decode_json (jsonstr, self, 0)); 2134 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2135 XPUSHs (jsonstr);
1916 2136
1917void decode_prefix (JSON *self, SV *jsonstr) 2137void decode_prefix (JSON *self, SV *jsonstr)
1918 PPCODE: 2138 PPCODE:
1919{ 2139{
1920 char *offset; 2140 SV *sv;
2141 STRLEN offset;
2142 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1921 EXTEND (SP, 2); 2143 EXTEND (SP, 2);
1922 PUSHs (decode_json (jsonstr, self, &offset)); 2144 PUSHs (sv);
1923 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2145 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1924} 2146}
1925 2147
1926void incr_parse (JSON *self, SV *jsonstr = 0) 2148void incr_parse (JSON *self, SV *jsonstr = 0)
1927 PPCODE: 2149 PPCODE:
1928{ 2150{
1929 if (!self->incr_text) 2151 if (!self->incr_text)
1930 self->incr_text = newSVpvn ("", 0); 2152 self->incr_text = newSVpvn ("", 0);
2153
2154 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2155 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2156 if (DECODE_WANTS_OCTETS (self))
2157 {
2158 if (self->incr_pos)
2159 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2160 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2161
2162 sv_utf8_downgrade (self->incr_text, 0);
2163 }
2164 else
2165 {
2166 sv_utf8_upgrade (self->incr_text);
2167
2168 if (self->incr_pos)
2169 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2170 - (U8 *)SvPVX (self->incr_text);
2171 }
1931 2172
1932 // append data, if any 2173 // append data, if any
1933 if (jsonstr) 2174 if (jsonstr)
1934 { 2175 {
2176 /* make sure both strings have same encoding */
2177 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1935 if (SvUTF8 (jsonstr)) 2178 if (SvUTF8 (jsonstr))
2179 sv_utf8_downgrade (jsonstr, 0);
1936 { 2180 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); 2181 sv_utf8_upgrade (jsonstr);
1949 2182
2183 /* and then just blindly append */
1950 { 2184 {
1951 STRLEN len; 2185 STRLEN len;
1952 const char *str = SvPV (jsonstr, len); 2186 const char *str = SvPV (jsonstr, len);
1953 STRLEN cur = SvCUR (self->incr_text); 2187 STRLEN cur = SvCUR (self->incr_text);
1954 2188
1955 if (SvLEN (self->incr_text) <= cur + len) 2189 if (SvLEN (self->incr_text) - cur <= len)
1956 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2190 json_sv_grow (self->incr_text, cur, len);
1957 2191
1958 Move (str, SvEND (self->incr_text), len, char); 2192 Move (str, SvEND (self->incr_text), len, char);
1959 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2193 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1960 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2194 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1961 } 2195 }
1962 } 2196 }
1963 2197
1964 if (GIMME_V != G_VOID) 2198 if (GIMME_V != G_VOID)
1965 do 2199 do
1966 { 2200 {
2201 SV *sv;
1967 char *offset; 2202 STRLEN offset;
1968 2203
1969 if (!INCR_DONE (self)) 2204 if (!INCR_DONE (self))
1970 { 2205 {
1971 incr_parse (self); 2206 incr_parse (self);
1972 2207
1973 if (self->incr_pos > self->max_size && self->max_size) 2208 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", 2209 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); 2210 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1976 2211
1977 if (!INCR_DONE (self)) 2212 if (!INCR_DONE (self))
2213 {
2214 // as an optimisation, do not accumulate white space in the incr buffer
2215 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2216 {
2217 self->incr_pos = 0;
2218 SvCUR_set (self->incr_text, 0);
2219 }
2220
1978 break; 2221 break;
2222 }
1979 } 2223 }
1980 2224
1981 XPUSHs (decode_json (self->incr_text, self, &offset)); 2225 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2226 XPUSHs (sv);
1982 2227
1983 self->incr_pos -= offset - SvPVX (self->incr_text); 2228 self->incr_pos -= offset;
1984 self->incr_nest = 0; 2229 self->incr_nest = 0;
1985 self->incr_mode = 0; 2230 self->incr_mode = 0;
1986 2231
1987 sv_chop (self->incr_text, offset); 2232 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
1988 } 2233 }
1989 while (GIMME_V == G_ARRAY); 2234 while (GIMME_V == G_ARRAY);
1990} 2235}
1991 2236
1992SV *incr_text (JSON *self) 2237SV *incr_text (JSON *self)
… …
2030 SvREFCNT_dec (self->incr_text); 2275 SvREFCNT_dec (self->incr_text);
2031 2276
2032PROTOTYPES: ENABLE 2277PROTOTYPES: ENABLE
2033 2278
2034void encode_json (SV *scalar) 2279void encode_json (SV *scalar)
2035 ALIAS:
2036 to_json_ = 0
2037 encode_json = F_UTF8
2038 PPCODE: 2280 PPCODE:
2039{ 2281{
2040 JSON json; 2282 JSON json;
2041 json_init (&json); 2283 json_init (&json);
2042 json.flags |= ix; 2284 json.flags |= F_UTF8;
2043 XPUSHs (encode_json (scalar, &json)); 2285 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2286 XPUSHs (scalar);
2044} 2287}
2045 2288
2046void decode_json (SV *jsonstr) 2289void decode_json (SV *jsonstr)
2047 ALIAS:
2048 from_json_ = 0
2049 decode_json = F_UTF8
2050 PPCODE: 2290 PPCODE:
2051{ 2291{
2052 JSON json; 2292 JSON json;
2053 json_init (&json); 2293 json_init (&json);
2054 json.flags |= ix; 2294 json.flags |= F_UTF8;
2055 XPUSHs (decode_json (jsonstr, &json, 0)); 2295 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2296 XPUSHs (jsonstr);
2056} 2297}
2057 2298

Diff Legend

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