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.121 by root, Tue Oct 29 00:06:40 2013 UTC vs.
Revision 1.138 by root, Wed Mar 6 07:21:17 2019 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
… …
38#define F_ALLOW_TAGS 0x00004000UL 50#define F_ALLOW_TAGS 0x00004000UL
39#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
40 52
41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
42 54
43#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 64 // initial scalar size to be allocated
44#define INDENT_STEP 3 // spaces per indentation level 56#define INDENT_STEP 3 // spaces per indentation level
45 57
46#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
47 59
48#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8) 60#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
… …
66 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 78 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
67 79
68#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?)"
69 81
70#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
71# define JSON_SLOW 1
72# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 83# define JSON_STASH (expect_true (json_stash) ? json_stash : gv_stashpv ("JSON::XS", 1))
84# define BOOL_STASH (expect_true (bool_stash) ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
85# define GET_BOOL(value) (expect_true (bool_ ## value) ? bool_ ## value : get_bool ("Types::Serialiser::" # value))
73#else 86#else
74# define JSON_SLOW 0
75# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash
89# define GET_BOOL(value) bool_ ## value
76#endif 90#endif
77 91
78// the amount of HEs to allocate on the stack, when sorting keys 92// the amount of HEs to allocate on the stack, when sorting keys
79#define STACK_HES 64 93#define STACK_HES 64
80 94
81static HV *json_stash, *types_boolean_stash; // JSON::XS:: 95static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
82static SV *types_true, *types_false, *sv_json; 96static SV *bool_false, *bool_true;
97static SV *sv_json;
83 98
84enum { 99enum {
85 INCR_M_WS = 0, // initial whitespace skipping, must be 0 100 INCR_M_WS = 0, // initial whitespace skipping, must be 0
101 INCR_M_TFN, // inside true/false/null
102 INCR_M_NUM, // inside number
86 INCR_M_STR, // inside string 103 INCR_M_STR, // inside string
87 INCR_M_BS, // inside backslash 104 INCR_M_BS, // inside backslash
88 INCR_M_C0, // inside comment in initial whitespace sequence 105 INCR_M_C0, // inside comment in initial whitespace sequence
89 INCR_M_C1, // inside comment in other places 106 INCR_M_C1, // inside comment in other places
90 INCR_M_JSON // outside anything, count nesting 107 INCR_M_JSON // outside anything, count nesting
… …
103 // for the incremental parser 120 // for the incremental parser
104 SV *incr_text; // the source text so far 121 SV *incr_text; // the source text so far
105 STRLEN incr_pos; // the current offset into the text 122 STRLEN incr_pos; // the current offset into the text
106 int incr_nest; // {[]}-nesting level 123 int incr_nest; // {[]}-nesting level
107 unsigned char incr_mode; 124 unsigned char incr_mode;
125
126 SV *v_false, *v_true;
108} JSON; 127} JSON;
109 128
110INLINE void 129INLINE void
111json_init (JSON *json) 130json_init (JSON *json)
112{ 131{
113 Zero (json, 1, JSON); 132 static const JSON init = { F_ALLOW_NONREF, 512 };
114 json->max_depth = 512; 133
134 *json = init;
115} 135}
116 136
117///////////////////////////////////////////////////////////////////////////// 137/////////////////////////////////////////////////////////////////////////////
118// utility functions 138// utility functions
119 139
… …
141 SvPV_renew (sv, SvCUR (sv) + 1); 161 SvPV_renew (sv, SvCUR (sv) + 1);
142#endif 162#endif
143 } 163 }
144} 164}
145 165
166/* adds two STRLENs together, slow, and with paranoia */
167STRLEN
168strlen_sum (STRLEN l1, STRLEN l2)
169{
170 size_t sum = l1 + l2;
171
172 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
173 croak ("JSON::XS: string size overflow");
174
175 return sum;
176}
177
178/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
179static char *
180json_sv_grow (SV *sv, size_t len1, size_t len2)
181{
182 len1 = strlen_sum (len1, len2);
183 len1 = strlen_sum (len1, len1 >> 1);
184
185 if (len1 > 4096 - 24)
186 len1 = (len1 | 4095) - 24;
187
188 return SvGROW (sv, len1);
189}
190
146// decode an utf-8 character and return it, or (UV)-1 in 191// decode a utf-8 character and return it, or (UV)-1 in
147// case of an error. 192// case of an error.
148// we special-case "safe" characters from U+80 .. U+7FF, 193// we special-case "safe" characters from U+80 .. U+7FF,
149// but use the very good perl function to parse anything else. 194// but use the very good perl function to parse anything else.
150// note that we never call this function for a ascii codepoints 195// note that we never call this function for a ascii codepoints
151INLINE UV 196INLINE UV
… …
288 // a recursion depth of ten gives us >>500 bits 333 // a recursion depth of ten gives us >>500 bits
289 json_atof_scan1 (s, &accum, &expo, 0, 10); 334 json_atof_scan1 (s, &accum, &expo, 0, 10);
290 335
291 return neg ? -accum : accum; 336 return neg ? -accum : accum;
292} 337}
338
339// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
340static int
341ref_bool_type (SV *sv)
342{
343 svtype svt = SvTYPE (sv);
344
345 if (svt < SVt_PVAV)
346 {
347 STRLEN len = 0;
348 char *pv = svt ? SvPV (sv, len) : 0;
349
350 if (len == 1)
351 if (*pv == '1')
352 return 1;
353 else if (*pv == '0')
354 return 0;
355 }
356
357 return -1;
358}
359
360// returns whether scalar is not a reference in the sense of allow_nonref
361static int
362json_nonref (SV *scalar)
363{
364 if (!SvROK (scalar))
365 return 1;
366
367 scalar = SvRV (scalar);
368
369 if (SvTYPE (scalar) >= SVt_PVMG)
370 {
371 if (SvSTASH (scalar) == bool_stash)
372 return 1;
373
374 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
375 return 1;
376 }
377
378 return 0;
379}
380
293///////////////////////////////////////////////////////////////////////////// 381/////////////////////////////////////////////////////////////////////////////
294// encoder 382// encoder
295 383
296// structure used for encoding JSON 384// structure used for encoding JSON
297typedef struct 385typedef struct
… …
305} enc_t; 393} enc_t;
306 394
307INLINE void 395INLINE void
308need (enc_t *enc, STRLEN len) 396need (enc_t *enc, STRLEN len)
309{ 397{
310 if (expect_false (enc->cur + len >= enc->end)) 398 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
311 { 399 {
312 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 400 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
313 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 401 char *buf = json_sv_grow (enc->sv, cur, len);
314 enc->cur = SvPVX (enc->sv) + cur; 402 enc->cur = buf + cur;
315 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 403 enc->end = buf + SvLEN (enc->sv) - 1;
316 } 404 }
317} 405}
318 406
319INLINE void 407INLINE void
320encode_ch (enc_t *enc, char ch) 408encode_ch (enc_t *enc, char ch)
… …
336 424
337 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 425 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
338 { 426 {
339 if (expect_false (ch == '"')) // but with slow exceptions 427 if (expect_false (ch == '"')) // but with slow exceptions
340 { 428 {
341 need (enc, len += 1); 429 need (enc, len + 1);
342 *enc->cur++ = '\\'; 430 *enc->cur++ = '\\';
343 *enc->cur++ = '"'; 431 *enc->cur++ = '"';
344 } 432 }
345 else if (expect_false (ch == '\\')) 433 else if (expect_false (ch == '\\'))
346 { 434 {
347 need (enc, len += 1); 435 need (enc, len + 1);
348 *enc->cur++ = '\\'; 436 *enc->cur++ = '\\';
349 *enc->cur++ = '\\'; 437 *enc->cur++ = '\\';
350 } 438 }
351 else 439 else
352 *enc->cur++ = ch; 440 *enc->cur++ = ch;
… …
355 } 443 }
356 else 444 else
357 { 445 {
358 switch (ch) 446 switch (ch)
359 { 447 {
360 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; 448 case '\010': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
361 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break; 449 case '\011': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
362 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break; 450 case '\012': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
363 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break; 451 case '\014': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
364 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break; 452 case '\015': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
365 453
366 default: 454 default:
367 { 455 {
368 STRLEN clen; 456 STRLEN clen;
369 UV uch; 457 UV uch;
… …
385 if (uch >= 0x10000UL) 473 if (uch >= 0x10000UL)
386 { 474 {
387 if (uch >= 0x110000UL) 475 if (uch >= 0x110000UL)
388 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 476 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
389 477
390 need (enc, len += 11); 478 need (enc, len + 11);
391 sprintf (enc->cur, "\\u%04x\\u%04x", 479 sprintf (enc->cur, "\\u%04x\\u%04x",
392 (int)((uch - 0x10000) / 0x400 + 0xD800), 480 (int)((uch - 0x10000) / 0x400 + 0xD800),
393 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 481 (int)((uch - 0x10000) % 0x400 + 0xDC00));
394 enc->cur += 12; 482 enc->cur += 12;
395 } 483 }
396 else 484 else
397 { 485 {
398 need (enc, len += 5); 486 need (enc, len + 5);
399 *enc->cur++ = '\\'; 487 *enc->cur++ = '\\';
400 *enc->cur++ = 'u'; 488 *enc->cur++ = 'u';
401 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 489 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
402 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 490 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
403 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 491 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
… …
411 *enc->cur++ = uch; 499 *enc->cur++ = uch;
412 str += clen; 500 str += clen;
413 } 501 }
414 else if (is_utf8) 502 else if (is_utf8)
415 { 503 {
416 need (enc, len += clen); 504 need (enc, len + clen);
417 do 505 do
418 { 506 {
419 *enc->cur++ = *str++; 507 *enc->cur++ = *str++;
420 } 508 }
421 while (--clen); 509 while (--clen);
422 } 510 }
423 else 511 else
424 { 512 {
425 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 513 need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
426 enc->cur = encode_utf8 (enc->cur, uch); 514 enc->cur = encode_utf8 (enc->cur, uch);
427 ++str; 515 ++str;
428 } 516 }
429 } 517 }
430 } 518 }
… …
690 SvGETMAGIC (sv); 778 SvGETMAGIC (sv);
691 svt = SvTYPE (sv); 779 svt = SvTYPE (sv);
692 780
693 if (expect_false (SvOBJECT (sv))) 781 if (expect_false (SvOBJECT (sv)))
694 { 782 {
695 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
696 ? types_boolean_stash
697 : gv_stashpv ("Types::Serialiser::Boolean", 1);
698 HV *stash = SvSTASH (sv); 783 HV *stash = SvSTASH (sv);
699 784
700 if (stash == boolean_stash) 785 if (stash == bool_stash)
701 { 786 {
702 if (SvIV (sv))
703 encode_str (enc, "true", 4, 0); 787 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
704 else
705 encode_str (enc, "false", 5, 0); 788 else encode_str (enc, "false", 5, 0);
706 } 789 }
707 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0))) 790 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
708 { 791 {
709 int count; 792 int count;
710 dSP; 793 dSP;
711 794
712 ENTER; SAVETMPS; PUSHMARK (SP); 795 ENTER; SAVETMPS;
796 PUSHMARK (SP);
713 EXTEND (SP, 2); 797 EXTEND (SP, 2);
714 // we re-bless the reference to get overload and other niceties right 798 // we re-bless the reference to get overload and other niceties right
715 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 799 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
716 PUSHs (sv_json); 800 PUSHs (sv_json);
717 801
… …
719 count = call_sv ((SV *)GvCV (method), G_ARRAY); 803 count = call_sv ((SV *)GvCV (method), G_ARRAY);
720 SPAGAIN; 804 SPAGAIN;
721 805
722 // catch this surprisingly common error 806 // catch this surprisingly common error
723 if (SvROK (TOPs) && SvRV (TOPs) == sv) 807 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))); 808 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
725 809
726 encode_ch (enc, '('); 810 encode_ch (enc, '(');
727 encode_ch (enc, '"'); 811 encode_ch (enc, '"');
728 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash)); 812 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
729 encode_ch (enc, '"'); 813 encode_ch (enc, '"');
730 encode_ch (enc, ')'); 814 encode_ch (enc, ')');
731 encode_ch (enc, '['); 815 encode_ch (enc, '[');
732 816
733 while (count) 817 if (count)
734 { 818 {
819 int i;
820
821 for (i = 0; i < count - 1; ++i)
822 {
735 encode_sv (enc, SP[1 - count--]); 823 encode_sv (enc, SP[i + 1 - count]);
736
737 if (count)
738 encode_ch (enc, ','); 824 encode_ch (enc, ',');
825 }
826
827 encode_sv (enc, TOPs);
828 SP -= count;
739 } 829 }
740 830
741 encode_ch (enc, ']'); 831 encode_ch (enc, ']');
742
743 PUTBACK;
744 832
745 FREETMPS; LEAVE; 833 FREETMPS; LEAVE;
746 } 834 }
747 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0))) 835 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
748 { 836 {
749 dSP; 837 dSP;
750 838
751 ENTER; SAVETMPS; PUSHMARK (SP); 839 ENTER; SAVETMPS;
840 PUSHMARK (SP);
752 // we re-bless the reference to get overload and other niceties right 841 // we re-bless the reference to get overload and other niceties right
753 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 842 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
754 843
755 // calling with G_SCALAR ensures that we always get a 1 return value 844 // calling with G_SCALAR ensures that we always get a 1 return value
756 PUTBACK; 845 PUTBACK;
… …
778 encode_hv (enc, (HV *)sv); 867 encode_hv (enc, (HV *)sv);
779 else if (svt == SVt_PVAV) 868 else if (svt == SVt_PVAV)
780 encode_av (enc, (AV *)sv); 869 encode_av (enc, (AV *)sv);
781 else if (svt < SVt_PVAV) 870 else if (svt < SVt_PVAV)
782 { 871 {
783 STRLEN len = 0; 872 int bool_type = ref_bool_type (sv);
784 char *pv = svt ? SvPV (sv, len) : 0;
785 873
786 if (len == 1 && *pv == '1') 874 if (bool_type == 1)
787 encode_str (enc, "true", 4, 0); 875 encode_str (enc, "true", 4, 0);
788 else if (len == 1 && *pv == '0') 876 else if (bool_type == 0)
789 encode_str (enc, "false", 5, 0); 877 encode_str (enc, "false", 5, 0);
790 else if (enc->json.flags & F_ALLOW_UNKNOWN) 878 else if (enc->json.flags & F_ALLOW_UNKNOWN)
791 encode_str (enc, "null", 4, 0); 879 encode_str (enc, "null", 4, 0);
792 else 880 else
793 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 881 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
… …
876static SV * 964static SV *
877encode_json (SV *scalar, JSON *json) 965encode_json (SV *scalar, JSON *json)
878{ 966{
879 enc_t enc; 967 enc_t enc;
880 968
881 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 969 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
882 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 970 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
883 971
884 enc.json = *json; 972 enc.json = *json;
885 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 973 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
886 enc.cur = SvPVX (enc.sv); 974 enc.cur = SvPVX (enc.sv);
… …
1093 *cur++ = *dec_cur++; 1181 *cur++ = *dec_cur++;
1094 while (--clen); 1182 while (--clen);
1095 1183
1096 utf8 = 1; 1184 utf8 = 1;
1097 } 1185 }
1186 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1187 *cur++ = ch;
1098 else 1188 else
1099 { 1189 {
1100 --dec_cur; 1190 --dec_cur;
1101 1191
1102 if (!ch) 1192 if (!ch)
… …
1112 1202
1113 if (sv) 1203 if (sv)
1114 { 1204 {
1115 STRLEN cur = SvCUR (sv); 1205 STRLEN cur = SvCUR (sv);
1116 1206
1117 if (SvLEN (sv) <= cur + len) 1207 if (SvLEN (sv) - cur <= len)
1118 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1208 json_sv_grow (sv, cur, len);
1119 1209
1120 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1210 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1121 SvCUR_set (sv, SvCUR (sv) + len); 1211 SvCUR_set (sv, SvCUR (sv) + len);
1122 } 1212 }
1123 else 1213 else
… …
1414 1504
1415 DEC_DEC_DEPTH; 1505 DEC_DEC_DEPTH;
1416 sv = newRV_noinc ((SV *)hv); 1506 sv = newRV_noinc ((SV *)hv);
1417 1507
1418 // check filter callbacks 1508 // check filter callbacks
1419 if (dec->json.flags & F_HOOK) 1509 if (expect_false (dec->json.flags & F_HOOK))
1420 { 1510 {
1421 if (dec->json.cb_sk_object && HvKEYS (hv) == 1) 1511 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1422 { 1512 {
1423 HE *cb, *he; 1513 HE *cb, *he;
1424 1514
1425 hv_iterinit (hv); 1515 hv_iterinit (hv);
1426 he = hv_iternext (hv); 1516 he = hv_iternext (hv);
1427 hv_iterinit (hv); 1517 hv_iterinit (hv);
1428 1518
1429 // the next line creates a mortal sv each time its called. 1519 // the next line creates a mortal sv each time it's called.
1430 // might want to optimise this for common cases. 1520 // might want to optimise this for common cases.
1431 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1521 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1432 1522
1433 if (cb) 1523 if (cb)
1434 { 1524 {
1435 dSP; 1525 dSP;
1436 int count; 1526 int count;
1437 1527
1438 ENTER; SAVETMPS; PUSHMARK (SP); 1528 ENTER; SAVETMPS;
1529 PUSHMARK (SP);
1439 XPUSHs (HeVAL (he)); 1530 XPUSHs (HeVAL (he));
1440 sv_2mortal (sv); 1531 sv_2mortal (sv);
1441 1532
1442 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1533 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1443 1534
… …
1445 { 1536 {
1446 sv = newSVsv (POPs); 1537 sv = newSVsv (POPs);
1447 FREETMPS; LEAVE; 1538 FREETMPS; LEAVE;
1448 return sv; 1539 return sv;
1449 } 1540 }
1541 else if (count)
1542 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1450 1543
1451 SvREFCNT_inc (sv); 1544 SvREFCNT_inc (sv);
1452 FREETMPS; LEAVE; 1545 FREETMPS; LEAVE;
1453 } 1546 }
1454 } 1547 }
… …
1456 if (dec->json.cb_object) 1549 if (dec->json.cb_object)
1457 { 1550 {
1458 dSP; 1551 dSP;
1459 int count; 1552 int count;
1460 1553
1461 ENTER; SAVETMPS; PUSHMARK (SP); 1554 ENTER; SAVETMPS;
1555 PUSHMARK (SP);
1462 XPUSHs (sv_2mortal (sv)); 1556 XPUSHs (sv_2mortal (sv));
1463 1557
1464 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1558 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1465 1559
1466 if (count == 1) 1560 if (count == 1)
1467 {
1468 sv = newSVsv (POPs); 1561 sv = newSVsv (POPs);
1469 FREETMPS; LEAVE; 1562 else if (count == 0)
1470 return sv;
1471 }
1472
1473 SvREFCNT_inc (sv); 1563 SvREFCNT_inc (sv);
1564 else
1565 croak ("filter_json_object callbacks must not return more than one scalar");
1566
1474 FREETMPS; LEAVE; 1567 FREETMPS; LEAVE;
1475 } 1568 }
1476 } 1569 }
1477 1570
1478 return sv; 1571 return sv;
… …
1533 if (!method) 1626 if (!method)
1534 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1627 ERR ("cannot decode perl-object (package does not have a THAW method)");
1535 1628
1536 dSP; 1629 dSP;
1537 1630
1538 ENTER; SAVETMPS; PUSHMARK (SP); 1631 ENTER; SAVETMPS;
1632 PUSHMARK (SP);
1539 EXTEND (SP, len + 2); 1633 EXTEND (SP, len + 2);
1540 // we re-bless the reference to get overload and other niceties right 1634 // we re-bless the reference to get overload and other niceties right
1541 PUSHs (tag); 1635 PUSHs (tag);
1542 PUSHs (sv_json); 1636 PUSHs (sv_json);
1543 1637
… …
1580 case '-': 1674 case '-':
1581 case '0': case '1': case '2': case '3': case '4': 1675 case '0': case '1': case '2': case '3': case '4':
1582 case '5': case '6': case '7': case '8': case '9': 1676 case '5': case '6': case '7': case '8': case '9':
1583 return decode_num (dec); 1677 return decode_num (dec);
1584 1678
1679 case 'f':
1680 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1681 {
1682 dec->cur += 5;
1683
1684 if (expect_false (!dec->json.v_false))
1685 dec->json.v_false = GET_BOOL (false);
1686
1687 return newSVsv (dec->json.v_false);
1688 }
1689 else
1690 ERR ("'false' expected");
1691
1692 break;
1693
1585 case 't': 1694 case 't':
1586 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1695 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1587 { 1696 {
1588 dec->cur += 4; 1697 dec->cur += 4;
1589#if JSON_SLOW 1698
1590 types_true = get_bool ("Types::Serialiser::true"); 1699 if (expect_false (!dec->json.v_true))
1591#endif 1700 dec->json.v_true = GET_BOOL (true);
1701
1592 return newSVsv (types_true); 1702 return newSVsv (dec->json.v_true);
1593 } 1703 }
1594 else 1704 else
1595 ERR ("'true' expected"); 1705 ERR ("'true' expected");
1596
1597 break;
1598
1599 case 'f':
1600 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1601 {
1602 dec->cur += 5;
1603#if JSON_SLOW
1604 types_false = get_bool ("Types::Serialiser::false");
1605#endif
1606 return newSVsv (types_false);
1607 }
1608 else
1609 ERR ("'false' expected");
1610 1706
1611 break; 1707 break;
1612 1708
1613 case 'n': 1709 case 'n':
1614 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1710 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
… …
1629fail: 1725fail:
1630 return 0; 1726 return 0;
1631} 1727}
1632 1728
1633static SV * 1729static SV *
1634decode_json (SV *string, JSON *json, char **offset_return) 1730decode_json (SV *string, JSON *json, STRLEN *offset_return)
1635{ 1731{
1636 dec_t dec; 1732 dec_t dec;
1637 SV *sv; 1733 SV *sv;
1638 1734
1639 /* work around bugs in 5.10 where manipulating magic values 1735 /* work around bugs in 5.10 where manipulating magic values
1640 * makes perl ignore the magic in subsequent accesses. 1736 * makes perl ignore the magic in subsequent accesses.
1641 * also make a copy of non-PV values, to get them into a clean 1737 * 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). 1738 * state (SvPV should do that, but it's buggy, see below).
1739 *
1740 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1741 * as reported by Reini Urban.
1643 */ 1742 */
1644 /*SvGETMAGIC (string);*/ 1743 /*SvGETMAGIC (string);*/
1645 if (SvMAGICAL (string) || !SvPOK (string)) 1744 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1646 string = sv_2mortal (newSVsv (string)); 1745 string = sv_2mortal (newSVsv (string));
1647 1746
1648 SvUPGRADE (string, SVt_PV); 1747 SvUPGRADE (string, SVt_PV);
1649 1748
1650 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1749 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1689 1788
1690 decode_ws (&dec); 1789 decode_ws (&dec);
1691 sv = decode_sv (&dec); 1790 sv = decode_sv (&dec);
1692 1791
1693 if (offset_return) 1792 if (offset_return)
1694 *offset_return = dec.cur; 1793 *offset_return = dec.cur - SvPVX (string);
1695 1794 else if (sv)
1696 if (!(offset_return || !sv))
1697 { 1795 {
1698 // check for trailing garbage 1796 // check for trailing garbage
1699 decode_ws (&dec); 1797 decode_ws (&dec);
1700 1798
1701 if (*dec.cur) 1799 if (dec.cur != dec.end)
1702 { 1800 {
1703 dec.err = "garbage after JSON object"; 1801 dec.err = "garbage after JSON object";
1704 SvREFCNT_dec (sv); 1802 SvREFCNT_dec (sv);
1705 sv = 0; 1803 sv = 0;
1706 } 1804 }
… …
1725 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1823 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1726 } 1824 }
1727 1825
1728 sv = sv_2mortal (sv); 1826 sv = sv_2mortal (sv);
1729 1827
1730 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1828 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1731 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1829 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1732 1830
1733 return sv; 1831 return sv;
1734} 1832}
1735 1833
… …
1744 // the state machine here is a bit convoluted and could be simplified a lot 1842 // the state machine here is a bit convoluted and could be simplified a lot
1745 // but this would make it slower, so... 1843 // but this would make it slower, so...
1746 1844
1747 for (;;) 1845 for (;;)
1748 { 1846 {
1749 //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
1750 switch (self->incr_mode) 1847 switch (self->incr_mode)
1751 { 1848 {
1849 // reached end of a scalar, see if we are inside a nested structure or not
1850 end_of_scalar:
1851 self->incr_mode = INCR_M_JSON;
1852
1853 if (self->incr_nest) // end of a scalar inside array, object or tag
1854 goto incr_m_json;
1855 else // end of scalar outside structure, json text ends here
1856 goto interrupt;
1857
1752 // only used for initial whitespace skipping 1858 // only used for initial whitespace skipping
1753 case INCR_M_WS: 1859 case INCR_M_WS:
1754 for (;;) 1860 for (;;)
1755 { 1861 {
1756 if (*p > 0x20) 1862 if (*p > 0x20)
… …
1798 ++p; 1904 ++p;
1799 } 1905 }
1800 1906
1801 break; 1907 break;
1802 1908
1909 // inside true/false/null
1910 case INCR_M_TFN:
1911 incr_m_tfn:
1912 for (;;)
1913 switch (*p++)
1914 {
1915 case 'r': case 'u': case 'e': // tRUE, falsE, nUll
1916 case 'a': case 'l': case 's': // fALSe, nuLL
1917 // allowed
1918 break;
1919
1920 default:
1921 --p;
1922 goto end_of_scalar;
1923 }
1924
1925 // inside a number
1926 case INCR_M_NUM:
1927 incr_m_num:
1928 for (;;)
1929 switch (*p++)
1930 {
1931 case 'e': case 'E': case '.': case '+':
1932 case '-':
1933 case '0': case '1': case '2': case '3': case '4':
1934 case '5': case '6': case '7': case '8': case '9':
1935 // allowed
1936 break;
1937
1938 default:
1939 --p;
1940 goto end_of_scalar;
1941 }
1942
1803 // inside a string 1943 // inside a string
1804 case INCR_M_STR: 1944 case INCR_M_STR:
1805 incr_m_str: 1945 incr_m_str:
1806 for (;;) 1946 for (;;)
1807 { 1947 {
1808 if (*p == '"') 1948 if (*p == '"')
1809 { 1949 {
1810 ++p; 1950 ++p;
1811 self->incr_mode = INCR_M_JSON;
1812
1813 if (!self->incr_nest)
1814 goto interrupt;
1815
1816 goto incr_m_json; 1951 goto end_of_scalar;
1817 } 1952 }
1818 else if (*p == '\\') 1953 else if (*p == '\\')
1819 { 1954 {
1820 ++p; // "virtually" consumes character after \ 1955 ++p; // "virtually" consumes character after \
1821 1956
… …
1851 --p; // do not eat the whitespace, let the next round do it 1986 --p; // do not eat the whitespace, let the next round do it
1852 goto interrupt; 1987 goto interrupt;
1853 } 1988 }
1854 break; 1989 break;
1855 1990
1991 // the following three blocks handle scalars. this makes the parser
1992 // more strict than required inside arrays or objects, and could
1993 // be moved to a special case on the toplevel (except strings)
1994 case 't':
1995 case 'f':
1996 case 'n':
1997 self->incr_mode = INCR_M_TFN;
1998 goto incr_m_tfn;
1999
2000 case '-':
2001 case '0': case '1': case '2': case '3': case '4':
2002 case '5': case '6': case '7': case '8': case '9':
2003 self->incr_mode = INCR_M_NUM;
2004 goto incr_m_num;
2005
1856 case '"': 2006 case '"':
1857 self->incr_mode = INCR_M_STR; 2007 self->incr_mode = INCR_M_STR;
1858 goto incr_m_str; 2008 goto incr_m_str;
1859 2009
1860 case '[': 2010 case '[':
… …
1905 i >= '0' && i <= '9' ? i - '0' 2055 i >= '0' && i <= '9' ? i - '0'
1906 : i >= 'a' && i <= 'f' ? i - 'a' + 10 2056 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1907 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2057 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1908 : -1; 2058 : -1;
1909 2059
1910 json_stash = gv_stashpv ("JSON::XS" , 1); 2060 json_stash = gv_stashpv ("JSON::XS" , 1);
1911 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1); 2061 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1912
1913 types_true = get_bool ("Types::Serialiser::true");
1914 types_false = get_bool ("Types::Serialiser::false"); 2062 bool_false = get_bool ("Types::Serialiser::false");
2063 bool_true = get_bool ("Types::Serialiser::true");
1915 2064
1916 sv_json = newSVpv ("JSON", 0); 2065 sv_json = newSVpv ("JSON", 0);
1917 SvREADONLY_on (sv_json); 2066 SvREADONLY_on (sv_json);
1918 2067
1919 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 2068 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
… …
1921 2070
1922PROTOTYPES: DISABLE 2071PROTOTYPES: DISABLE
1923 2072
1924void CLONE (...) 2073void CLONE (...)
1925 CODE: 2074 CODE:
2075 // as long as these writes are atomic, the race should not matter
2076 // as existing threads either already use 0, or use the old value,
2077 // which is sitll correct for the initial thread.
1926 json_stash = 0; 2078 json_stash = 0;
1927 types_boolean_stash = 0; 2079 bool_stash = 0;
2080 bool_false = 0;
2081 bool_true = 0;
1928 2082
1929void new (char *klass) 2083void new (char *klass)
1930 PPCODE: 2084 PPCODE:
1931{ 2085{
1932 SV *pv = NEWSV (0, sizeof (JSON)); 2086 SV *pv = NEWSV (0, sizeof (JSON));
… …
1935 XPUSHs (sv_2mortal (sv_bless ( 2089 XPUSHs (sv_2mortal (sv_bless (
1936 newRV_noinc (pv), 2090 newRV_noinc (pv),
1937 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2091 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1938 ))); 2092 )));
1939} 2093}
2094
2095void boolean_values (JSON *self, SV *v_false = 0, SV *v_true = 0)
2096 PPCODE:
2097 self->v_false = newSVsv (v_false);
2098 self->v_true = newSVsv (v_true);
2099 XPUSHs (ST (0));
2100
2101void get_boolean_values (JSON *self)
2102 PPCODE:
2103 if (self->v_false && self->v_true)
2104 {
2105 EXTEND (SP, 2);
2106 PUSHs (self->v_false);
2107 PUSHs (self->v_true);
2108 }
1940 2109
1941void ascii (JSON *self, int enable = 1) 2110void ascii (JSON *self, int enable = 1)
1942 ALIAS: 2111 ALIAS:
1943 ascii = F_ASCII 2112 ascii = F_ASCII
1944 latin1 = F_LATIN1 2113 latin1 = F_LATIN1
… …
2049 2218
2050void decode_prefix (JSON *self, SV *jsonstr) 2219void decode_prefix (JSON *self, SV *jsonstr)
2051 PPCODE: 2220 PPCODE:
2052{ 2221{
2053 SV *sv; 2222 SV *sv;
2054 char *offset; 2223 STRLEN offset;
2055 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN; 2224 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
2056 EXTEND (SP, 2); 2225 EXTEND (SP, 2);
2057 PUSHs (sv); 2226 PUSHs (sv);
2058 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2227 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
2059} 2228}
2060 2229
2061void incr_parse (JSON *self, SV *jsonstr = 0) 2230void incr_parse (JSON *self, SV *jsonstr = 0)
2062 PPCODE: 2231 PPCODE:
2063{ 2232{
… …
2097 { 2266 {
2098 STRLEN len; 2267 STRLEN len;
2099 const char *str = SvPV (jsonstr, len); 2268 const char *str = SvPV (jsonstr, len);
2100 STRLEN cur = SvCUR (self->incr_text); 2269 STRLEN cur = SvCUR (self->incr_text);
2101 2270
2102 if (SvLEN (self->incr_text) <= cur + len) 2271 if (SvLEN (self->incr_text) - cur <= len)
2103 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2272 json_sv_grow (self->incr_text, cur, len);
2104 2273
2105 Move (str, SvEND (self->incr_text), len, char); 2274 Move (str, SvEND (self->incr_text), len, char);
2106 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2275 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
2107 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2276 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
2108 } 2277 }
… …
2110 2279
2111 if (GIMME_V != G_VOID) 2280 if (GIMME_V != G_VOID)
2112 do 2281 do
2113 { 2282 {
2114 SV *sv; 2283 SV *sv;
2115 char *offset; 2284 STRLEN offset;
2116 2285
2117 if (!INCR_DONE (self)) 2286 if (!INCR_DONE (self))
2118 { 2287 {
2119 incr_parse (self); 2288 incr_parse (self);
2120 2289
… …
2136 } 2305 }
2137 2306
2138 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN; 2307 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2139 XPUSHs (sv); 2308 XPUSHs (sv);
2140 2309
2141 self->incr_pos -= offset - SvPVX (self->incr_text); 2310 self->incr_pos -= offset;
2142 self->incr_nest = 0; 2311 self->incr_nest = 0;
2143 self->incr_mode = 0; 2312 self->incr_mode = 0;
2144 2313
2145 sv_chop (self->incr_text, offset); 2314 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2146 } 2315 }
2147 while (GIMME_V == G_ARRAY); 2316 while (GIMME_V == G_ARRAY);
2148} 2317}
2149 2318
2150SV *incr_text (JSON *self) 2319SV *incr_text (JSON *self)
… …
2181 self->incr_mode = 0; 2350 self->incr_mode = 0;
2182} 2351}
2183 2352
2184void DESTROY (JSON *self) 2353void DESTROY (JSON *self)
2185 CODE: 2354 CODE:
2355 SvREFCNT_dec (self->v_false);
2356 SvREFCNT_dec (self->v_true);
2186 SvREFCNT_dec (self->cb_sk_object); 2357 SvREFCNT_dec (self->cb_sk_object);
2187 SvREFCNT_dec (self->cb_object); 2358 SvREFCNT_dec (self->cb_object);
2188 SvREFCNT_dec (self->incr_text); 2359 SvREFCNT_dec (self->incr_text);
2189 2360
2190PROTOTYPES: ENABLE 2361PROTOTYPES: ENABLE

Diff Legend

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