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.123 by root, Sun Dec 8 20:44:23 2013 UTC vs.
Revision 1.137 by root, Sun Feb 24 04:21:05 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
… …
49#define F_ALLOW_TAGS 0x00004000UL 50#define F_ALLOW_TAGS 0x00004000UL
50#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
51 52
52#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
53 54
54#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 64 // initial scalar size to be allocated
55#define INDENT_STEP 3 // spaces per indentation level 56#define INDENT_STEP 3 // spaces per indentation level
56 57
57#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
58 59
59#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8) 60#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
… …
77 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 78 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
78 79
79#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?)"
80 81
81#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
82# define JSON_SLOW 1
83# 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))
84#else 86#else
85# define JSON_SLOW 0
86# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash
89# define GET_BOOL(value) bool_ ## value
87#endif 90#endif
88 91
89// 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
90#define STACK_HES 64 93#define STACK_HES 64
91 94
92static HV *json_stash, *types_boolean_stash; // JSON::XS:: 95static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
93static SV *types_true, *types_false, *sv_json; 96static SV *bool_false, *bool_true;
97static SV *sv_json;
94 98
95enum { 99enum {
96 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
97 INCR_M_STR, // inside string 103 INCR_M_STR, // inside string
98 INCR_M_BS, // inside backslash 104 INCR_M_BS, // inside backslash
99 INCR_M_C0, // inside comment in initial whitespace sequence 105 INCR_M_C0, // inside comment in initial whitespace sequence
100 INCR_M_C1, // inside comment in other places 106 INCR_M_C1, // inside comment in other places
101 INCR_M_JSON // outside anything, count nesting 107 INCR_M_JSON // outside anything, count nesting
… …
114 // for the incremental parser 120 // for the incremental parser
115 SV *incr_text; // the source text so far 121 SV *incr_text; // the source text so far
116 STRLEN incr_pos; // the current offset into the text 122 STRLEN incr_pos; // the current offset into the text
117 int incr_nest; // {[]}-nesting level 123 int incr_nest; // {[]}-nesting level
118 unsigned char incr_mode; 124 unsigned char incr_mode;
125
126 SV *v_false, *v_true;
119} JSON; 127} JSON;
120 128
121INLINE void 129INLINE void
122json_init (JSON *json) 130json_init (JSON *json)
123{ 131{
124 Zero (json, 1, JSON); 132 static const JSON init = { F_ALLOW_NONREF, 512 };
125 json->max_depth = 512; 133
134 *json = init;
126} 135}
127 136
128///////////////////////////////////////////////////////////////////////////// 137/////////////////////////////////////////////////////////////////////////////
129// utility functions 138// utility functions
130 139
… …
152 SvPV_renew (sv, SvCUR (sv) + 1); 161 SvPV_renew (sv, SvCUR (sv) + 1);
153#endif 162#endif
154 } 163 }
155} 164}
156 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
157// 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
158// case of an error. 192// case of an error.
159// we special-case "safe" characters from U+80 .. U+7FF, 193// we special-case "safe" characters from U+80 .. U+7FF,
160// but use the very good perl function to parse anything else. 194// but use the very good perl function to parse anything else.
161// note that we never call this function for a ascii codepoints 195// note that we never call this function for a ascii codepoints
162INLINE UV 196INLINE UV
… …
299 // a recursion depth of ten gives us >>500 bits 333 // a recursion depth of ten gives us >>500 bits
300 json_atof_scan1 (s, &accum, &expo, 0, 10); 334 json_atof_scan1 (s, &accum, &expo, 0, 10);
301 335
302 return neg ? -accum : accum; 336 return neg ? -accum : accum;
303} 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
304///////////////////////////////////////////////////////////////////////////// 381/////////////////////////////////////////////////////////////////////////////
305// encoder 382// encoder
306 383
307// structure used for encoding JSON 384// structure used for encoding JSON
308typedef struct 385typedef struct
… …
316} enc_t; 393} enc_t;
317 394
318INLINE void 395INLINE void
319need (enc_t *enc, STRLEN len) 396need (enc_t *enc, STRLEN len)
320{ 397{
321 if (expect_false (enc->cur + len >= enc->end)) 398 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
322 { 399 {
323 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 400 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
324 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 401 char *buf = json_sv_grow (enc->sv, cur, len);
325 enc->cur = SvPVX (enc->sv) + cur; 402 enc->cur = buf + cur;
326 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 403 enc->end = buf + SvLEN (enc->sv) - 1;
327 } 404 }
328} 405}
329 406
330INLINE void 407INLINE void
331encode_ch (enc_t *enc, char ch) 408encode_ch (enc_t *enc, char ch)
… …
347 424
348 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 425 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
349 { 426 {
350 if (expect_false (ch == '"')) // but with slow exceptions 427 if (expect_false (ch == '"')) // but with slow exceptions
351 { 428 {
352 need (enc, len += 1); 429 need (enc, len + 1);
353 *enc->cur++ = '\\'; 430 *enc->cur++ = '\\';
354 *enc->cur++ = '"'; 431 *enc->cur++ = '"';
355 } 432 }
356 else if (expect_false (ch == '\\')) 433 else if (expect_false (ch == '\\'))
357 { 434 {
358 need (enc, len += 1); 435 need (enc, len + 1);
359 *enc->cur++ = '\\'; 436 *enc->cur++ = '\\';
360 *enc->cur++ = '\\'; 437 *enc->cur++ = '\\';
361 } 438 }
362 else 439 else
363 *enc->cur++ = ch; 440 *enc->cur++ = ch;
… …
366 } 443 }
367 else 444 else
368 { 445 {
369 switch (ch) 446 switch (ch)
370 { 447 {
371 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;
372 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;
373 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;
374 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;
375 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;
376 453
377 default: 454 default:
378 { 455 {
379 STRLEN clen; 456 STRLEN clen;
380 UV uch; 457 UV uch;
… …
396 if (uch >= 0x10000UL) 473 if (uch >= 0x10000UL)
397 { 474 {
398 if (uch >= 0x110000UL) 475 if (uch >= 0x110000UL)
399 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);
400 477
401 need (enc, len += 11); 478 need (enc, len + 11);
402 sprintf (enc->cur, "\\u%04x\\u%04x", 479 sprintf (enc->cur, "\\u%04x\\u%04x",
403 (int)((uch - 0x10000) / 0x400 + 0xD800), 480 (int)((uch - 0x10000) / 0x400 + 0xD800),
404 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 481 (int)((uch - 0x10000) % 0x400 + 0xDC00));
405 enc->cur += 12; 482 enc->cur += 12;
406 } 483 }
407 else 484 else
408 { 485 {
409 need (enc, len += 5); 486 need (enc, len + 5);
410 *enc->cur++ = '\\'; 487 *enc->cur++ = '\\';
411 *enc->cur++ = 'u'; 488 *enc->cur++ = 'u';
412 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 489 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
413 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 490 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
414 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 491 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
… …
422 *enc->cur++ = uch; 499 *enc->cur++ = uch;
423 str += clen; 500 str += clen;
424 } 501 }
425 else if (is_utf8) 502 else if (is_utf8)
426 { 503 {
427 need (enc, len += clen); 504 need (enc, len + clen);
428 do 505 do
429 { 506 {
430 *enc->cur++ = *str++; 507 *enc->cur++ = *str++;
431 } 508 }
432 while (--clen); 509 while (--clen);
433 } 510 }
434 else 511 else
435 { 512 {
436 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
437 enc->cur = encode_utf8 (enc->cur, uch); 514 enc->cur = encode_utf8 (enc->cur, uch);
438 ++str; 515 ++str;
439 } 516 }
440 } 517 }
441 } 518 }
… …
701 SvGETMAGIC (sv); 778 SvGETMAGIC (sv);
702 svt = SvTYPE (sv); 779 svt = SvTYPE (sv);
703 780
704 if (expect_false (SvOBJECT (sv))) 781 if (expect_false (SvOBJECT (sv)))
705 { 782 {
706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
707 ? types_boolean_stash
708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv); 783 HV *stash = SvSTASH (sv);
710 784
711 if (stash == boolean_stash) 785 if (stash == bool_stash)
712 { 786 {
713 if (SvIV (sv))
714 encode_str (enc, "true", 4, 0); 787 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
715 else
716 encode_str (enc, "false", 5, 0); 788 else encode_str (enc, "false", 5, 0);
717 } 789 }
718 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)))
719 { 791 {
720 int count; 792 int count;
721 dSP; 793 dSP;
722 794
723 ENTER; SAVETMPS; PUSHMARK (SP); 795 ENTER; SAVETMPS;
796 PUSHMARK (SP);
724 EXTEND (SP, 2); 797 EXTEND (SP, 2);
725 // 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
726 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 799 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
727 PUSHs (sv_json); 800 PUSHs (sv_json);
728 801
… …
739 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash)); 812 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
740 encode_ch (enc, '"'); 813 encode_ch (enc, '"');
741 encode_ch (enc, ')'); 814 encode_ch (enc, ')');
742 encode_ch (enc, '['); 815 encode_ch (enc, '[');
743 816
744 while (count) 817 if (count)
745 { 818 {
819 int i;
820
821 for (i = 0; i < count - 1; ++i)
822 {
746 encode_sv (enc, SP[1 - count--]); 823 encode_sv (enc, SP[i + 1 - count]);
747
748 if (count)
749 encode_ch (enc, ','); 824 encode_ch (enc, ',');
825 }
826
827 encode_sv (enc, TOPs);
828 SP -= count;
750 } 829 }
751 830
752 encode_ch (enc, ']'); 831 encode_ch (enc, ']');
753
754 PUTBACK;
755 832
756 FREETMPS; LEAVE; 833 FREETMPS; LEAVE;
757 } 834 }
758 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)))
759 { 836 {
760 dSP; 837 dSP;
761 838
762 ENTER; SAVETMPS; PUSHMARK (SP); 839 ENTER; SAVETMPS;
840 PUSHMARK (SP);
763 // 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
764 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 842 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
765 843
766 // 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
767 PUTBACK; 845 PUTBACK;
… …
789 encode_hv (enc, (HV *)sv); 867 encode_hv (enc, (HV *)sv);
790 else if (svt == SVt_PVAV) 868 else if (svt == SVt_PVAV)
791 encode_av (enc, (AV *)sv); 869 encode_av (enc, (AV *)sv);
792 else if (svt < SVt_PVAV) 870 else if (svt < SVt_PVAV)
793 { 871 {
794 STRLEN len = 0; 872 int bool_type = ref_bool_type (sv);
795 char *pv = svt ? SvPV (sv, len) : 0;
796 873
797 if (len == 1 && *pv == '1') 874 if (bool_type == 1)
798 encode_str (enc, "true", 4, 0); 875 encode_str (enc, "true", 4, 0);
799 else if (len == 1 && *pv == '0') 876 else if (bool_type == 0)
800 encode_str (enc, "false", 5, 0); 877 encode_str (enc, "false", 5, 0);
801 else if (enc->json.flags & F_ALLOW_UNKNOWN) 878 else if (enc->json.flags & F_ALLOW_UNKNOWN)
802 encode_str (enc, "null", 4, 0); 879 encode_str (enc, "null", 4, 0);
803 else 880 else
804 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",
… …
887static SV * 964static SV *
888encode_json (SV *scalar, JSON *json) 965encode_json (SV *scalar, JSON *json)
889{ 966{
890 enc_t enc; 967 enc_t enc;
891 968
892 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 969 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
893 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)");
894 971
895 enc.json = *json; 972 enc.json = *json;
896 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 973 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
897 enc.cur = SvPVX (enc.sv); 974 enc.cur = SvPVX (enc.sv);
… …
1104 *cur++ = *dec_cur++; 1181 *cur++ = *dec_cur++;
1105 while (--clen); 1182 while (--clen);
1106 1183
1107 utf8 = 1; 1184 utf8 = 1;
1108 } 1185 }
1186 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1187 *cur++ = ch;
1109 else 1188 else
1110 { 1189 {
1111 --dec_cur; 1190 --dec_cur;
1112 1191
1113 if (!ch) 1192 if (!ch)
… …
1123 1202
1124 if (sv) 1203 if (sv)
1125 { 1204 {
1126 STRLEN cur = SvCUR (sv); 1205 STRLEN cur = SvCUR (sv);
1127 1206
1128 if (SvLEN (sv) <= cur + len) 1207 if (SvLEN (sv) - cur <= len)
1129 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1208 json_sv_grow (sv, cur, len);
1130 1209
1131 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1210 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1132 SvCUR_set (sv, SvCUR (sv) + len); 1211 SvCUR_set (sv, SvCUR (sv) + len);
1133 } 1212 }
1134 else 1213 else
… …
1425 1504
1426 DEC_DEC_DEPTH; 1505 DEC_DEC_DEPTH;
1427 sv = newRV_noinc ((SV *)hv); 1506 sv = newRV_noinc ((SV *)hv);
1428 1507
1429 // check filter callbacks 1508 // check filter callbacks
1430 if (dec->json.flags & F_HOOK) 1509 if (expect_false (dec->json.flags & F_HOOK))
1431 { 1510 {
1432 if (dec->json.cb_sk_object && HvKEYS (hv) == 1) 1511 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1433 { 1512 {
1434 HE *cb, *he; 1513 HE *cb, *he;
1435 1514
1436 hv_iterinit (hv); 1515 hv_iterinit (hv);
1437 he = hv_iternext (hv); 1516 he = hv_iternext (hv);
1438 hv_iterinit (hv); 1517 hv_iterinit (hv);
1439 1518
1440 // the next line creates a mortal sv each time its called. 1519 // the next line creates a mortal sv each time it's called.
1441 // might want to optimise this for common cases. 1520 // might want to optimise this for common cases.
1442 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);
1443 1522
1444 if (cb) 1523 if (cb)
1445 { 1524 {
1446 dSP; 1525 dSP;
1447 int count; 1526 int count;
1448 1527
1449 ENTER; SAVETMPS; PUSHMARK (SP); 1528 ENTER; SAVETMPS;
1529 PUSHMARK (SP);
1450 XPUSHs (HeVAL (he)); 1530 XPUSHs (HeVAL (he));
1451 sv_2mortal (sv); 1531 sv_2mortal (sv);
1452 1532
1453 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1533 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1454 1534
… …
1456 { 1536 {
1457 sv = newSVsv (POPs); 1537 sv = newSVsv (POPs);
1458 FREETMPS; LEAVE; 1538 FREETMPS; LEAVE;
1459 return sv; 1539 return sv;
1460 } 1540 }
1541 else if (count)
1542 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1461 1543
1462 SvREFCNT_inc (sv); 1544 SvREFCNT_inc (sv);
1463 FREETMPS; LEAVE; 1545 FREETMPS; LEAVE;
1464 } 1546 }
1465 } 1547 }
… …
1467 if (dec->json.cb_object) 1549 if (dec->json.cb_object)
1468 { 1550 {
1469 dSP; 1551 dSP;
1470 int count; 1552 int count;
1471 1553
1472 ENTER; SAVETMPS; PUSHMARK (SP); 1554 ENTER; SAVETMPS;
1555 PUSHMARK (SP);
1473 XPUSHs (sv_2mortal (sv)); 1556 XPUSHs (sv_2mortal (sv));
1474 1557
1475 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1558 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1476 1559
1477 if (count == 1) 1560 if (count == 1)
1478 {
1479 sv = newSVsv (POPs); 1561 sv = newSVsv (POPs);
1480 FREETMPS; LEAVE; 1562 else if (count == 0)
1481 return sv;
1482 }
1483
1484 SvREFCNT_inc (sv); 1563 SvREFCNT_inc (sv);
1564 else
1565 croak ("filter_json_object callbacks must not return more than one scalar");
1566
1485 FREETMPS; LEAVE; 1567 FREETMPS; LEAVE;
1486 } 1568 }
1487 } 1569 }
1488 1570
1489 return sv; 1571 return sv;
… …
1544 if (!method) 1626 if (!method)
1545 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)");
1546 1628
1547 dSP; 1629 dSP;
1548 1630
1549 ENTER; SAVETMPS; PUSHMARK (SP); 1631 ENTER; SAVETMPS;
1632 PUSHMARK (SP);
1550 EXTEND (SP, len + 2); 1633 EXTEND (SP, len + 2);
1551 // 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
1552 PUSHs (tag); 1635 PUSHs (tag);
1553 PUSHs (sv_json); 1636 PUSHs (sv_json);
1554 1637
… …
1591 case '-': 1674 case '-':
1592 case '0': case '1': case '2': case '3': case '4': 1675 case '0': case '1': case '2': case '3': case '4':
1593 case '5': case '6': case '7': case '8': case '9': 1676 case '5': case '6': case '7': case '8': case '9':
1594 return decode_num (dec); 1677 return decode_num (dec);
1595 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
1596 case 't': 1694 case 't':
1597 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1695 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1598 { 1696 {
1599 dec->cur += 4; 1697 dec->cur += 4;
1600#if JSON_SLOW 1698
1601 types_true = get_bool ("Types::Serialiser::true"); 1699 if (expect_false (!dec->json.v_true))
1602#endif 1700 dec->json.v_true = GET_BOOL (true);
1701
1603 return newSVsv (types_true); 1702 return newSVsv (dec->json.v_true);
1604 } 1703 }
1605 else 1704 else
1606 ERR ("'true' expected"); 1705 ERR ("'true' expected");
1607
1608 break;
1609
1610 case 'f':
1611 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1612 {
1613 dec->cur += 5;
1614#if JSON_SLOW
1615 types_false = get_bool ("Types::Serialiser::false");
1616#endif
1617 return newSVsv (types_false);
1618 }
1619 else
1620 ERR ("'false' expected");
1621 1706
1622 break; 1707 break;
1623 1708
1624 case 'n': 1709 case 'n':
1625 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1710 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
… …
1640fail: 1725fail:
1641 return 0; 1726 return 0;
1642} 1727}
1643 1728
1644static SV * 1729static SV *
1645decode_json (SV *string, JSON *json, char **offset_return) 1730decode_json (SV *string, JSON *json, STRLEN *offset_return)
1646{ 1731{
1647 dec_t dec; 1732 dec_t dec;
1648 SV *sv; 1733 SV *sv;
1649 1734
1650 /* work around bugs in 5.10 where manipulating magic values 1735 /* work around bugs in 5.10 where manipulating magic values
1651 * makes perl ignore the magic in subsequent accesses. 1736 * makes perl ignore the magic in subsequent accesses.
1652 * 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
1653 * 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.
1654 */ 1742 */
1655 /*SvGETMAGIC (string);*/ 1743 /*SvGETMAGIC (string);*/
1656 if (SvMAGICAL (string) || !SvPOK (string)) 1744 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1657 string = sv_2mortal (newSVsv (string)); 1745 string = sv_2mortal (newSVsv (string));
1658 1746
1659 SvUPGRADE (string, SVt_PV); 1747 SvUPGRADE (string, SVt_PV);
1660 1748
1661 /* 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
… …
1700 1788
1701 decode_ws (&dec); 1789 decode_ws (&dec);
1702 sv = decode_sv (&dec); 1790 sv = decode_sv (&dec);
1703 1791
1704 if (offset_return) 1792 if (offset_return)
1705 *offset_return = dec.cur; 1793 *offset_return = dec.cur - SvPVX (string);
1706 1794 else if (sv)
1707 if (!(offset_return || !sv))
1708 { 1795 {
1709 // check for trailing garbage 1796 // check for trailing garbage
1710 decode_ws (&dec); 1797 decode_ws (&dec);
1711 1798
1712 if (*dec.cur) 1799 if (dec.cur != dec.end)
1713 { 1800 {
1714 dec.err = "garbage after JSON object"; 1801 dec.err = "garbage after JSON object";
1715 SvREFCNT_dec (sv); 1802 SvREFCNT_dec (sv);
1716 sv = 0; 1803 sv = 0;
1717 } 1804 }
… …
1736 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1823 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1737 } 1824 }
1738 1825
1739 sv = sv_2mortal (sv); 1826 sv = sv_2mortal (sv);
1740 1827
1741 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1828 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1742 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)");
1743 1830
1744 return sv; 1831 return sv;
1745} 1832}
1746 1833
… …
1755 // 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
1756 // but this would make it slower, so... 1843 // but this would make it slower, so...
1757 1844
1758 for (;;) 1845 for (;;)
1759 { 1846 {
1760 //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
1761 switch (self->incr_mode) 1847 switch (self->incr_mode)
1762 { 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
1763 // only used for initial whitespace skipping 1858 // only used for initial whitespace skipping
1764 case INCR_M_WS: 1859 case INCR_M_WS:
1765 for (;;) 1860 for (;;)
1766 { 1861 {
1767 if (*p > 0x20) 1862 if (*p > 0x20)
… …
1809 ++p; 1904 ++p;
1810 } 1905 }
1811 1906
1812 break; 1907 break;
1813 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
1814 // inside a string 1943 // inside a string
1815 case INCR_M_STR: 1944 case INCR_M_STR:
1816 incr_m_str: 1945 incr_m_str:
1817 for (;;) 1946 for (;;)
1818 { 1947 {
1819 if (*p == '"') 1948 if (*p == '"')
1820 { 1949 {
1821 ++p; 1950 ++p;
1822 self->incr_mode = INCR_M_JSON;
1823
1824 if (!self->incr_nest)
1825 goto interrupt;
1826
1827 goto incr_m_json; 1951 goto end_of_scalar;
1828 } 1952 }
1829 else if (*p == '\\') 1953 else if (*p == '\\')
1830 { 1954 {
1831 ++p; // "virtually" consumes character after \ 1955 ++p; // "virtually" consumes character after \
1832 1956
… …
1862 --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
1863 goto interrupt; 1987 goto interrupt;
1864 } 1988 }
1865 break; 1989 break;
1866 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
1867 case '"': 2006 case '"':
1868 self->incr_mode = INCR_M_STR; 2007 self->incr_mode = INCR_M_STR;
1869 goto incr_m_str; 2008 goto incr_m_str;
1870 2009
1871 case '[': 2010 case '[':
… …
1916 i >= '0' && i <= '9' ? i - '0' 2055 i >= '0' && i <= '9' ? i - '0'
1917 : i >= 'a' && i <= 'f' ? i - 'a' + 10 2056 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1918 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2057 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1919 : -1; 2058 : -1;
1920 2059
1921 json_stash = gv_stashpv ("JSON::XS" , 1); 2060 json_stash = gv_stashpv ("JSON::XS" , 1);
1922 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1); 2061 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1923
1924 types_true = get_bool ("Types::Serialiser::true");
1925 types_false = get_bool ("Types::Serialiser::false"); 2062 bool_false = get_bool ("Types::Serialiser::false");
2063 bool_true = get_bool ("Types::Serialiser::true");
1926 2064
1927 sv_json = newSVpv ("JSON", 0); 2065 sv_json = newSVpv ("JSON", 0);
1928 SvREADONLY_on (sv_json); 2066 SvREADONLY_on (sv_json);
1929 2067
1930 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 */
… …
1932 2070
1933PROTOTYPES: DISABLE 2071PROTOTYPES: DISABLE
1934 2072
1935void CLONE (...) 2073void CLONE (...)
1936 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.
1937 json_stash = 0; 2078 json_stash = 0;
1938 types_boolean_stash = 0; 2079 bool_stash = 0;
2080 bool_false = 0;
2081 bool_true = 0;
1939 2082
1940void new (char *klass) 2083void new (char *klass)
1941 PPCODE: 2084 PPCODE:
1942{ 2085{
1943 SV *pv = NEWSV (0, sizeof (JSON)); 2086 SV *pv = NEWSV (0, sizeof (JSON));
… …
1946 XPUSHs (sv_2mortal (sv_bless ( 2089 XPUSHs (sv_2mortal (sv_bless (
1947 newRV_noinc (pv), 2090 newRV_noinc (pv),
1948 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2091 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1949 ))); 2092 )));
1950} 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 }
1951 2109
1952void ascii (JSON *self, int enable = 1) 2110void ascii (JSON *self, int enable = 1)
1953 ALIAS: 2111 ALIAS:
1954 ascii = F_ASCII 2112 ascii = F_ASCII
1955 latin1 = F_LATIN1 2113 latin1 = F_LATIN1
… …
2048 XPUSHs (ST (0)); 2206 XPUSHs (ST (0));
2049} 2207}
2050 2208
2051void encode (JSON *self, SV *scalar) 2209void encode (JSON *self, SV *scalar)
2052 PPCODE: 2210 PPCODE:
2053 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN; 2211 PUTBACK; XPUSHs (encode_json (scalar, self));
2054 XPUSHs (scalar);
2055 2212
2056void decode (JSON *self, SV *jsonstr) 2213void decode (JSON *self, SV *jsonstr)
2057 PPCODE: 2214 PPCODE:
2058 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN; 2215 PUTBACK; XPUSHs (decode_json (jsonstr, self, 0));
2059 XPUSHs (jsonstr);
2060 2216
2061void decode_prefix (JSON *self, SV *jsonstr) 2217void decode_prefix (JSON *self, SV *jsonstr)
2062 PPCODE: 2218 PPCODE:
2063{ 2219{
2064 SV *sv; 2220 SV *sv;
2065 char *offset; 2221 STRLEN offset;
2066 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN; 2222 PUTBACK; sv = decode_json (jsonstr, self, &offset);
2067 EXTEND (SP, 2); 2223 EXTEND (SP, 2);
2068 PUSHs (sv); 2224 PUSHs (sv);
2069 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2225 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
2070} 2226}
2071 2227
2072void incr_parse (JSON *self, SV *jsonstr = 0) 2228void incr_parse (JSON *self, SV *jsonstr = 0)
2073 PPCODE: 2229 PPCODE:
2074{ 2230{
… …
2108 { 2264 {
2109 STRLEN len; 2265 STRLEN len;
2110 const char *str = SvPV (jsonstr, len); 2266 const char *str = SvPV (jsonstr, len);
2111 STRLEN cur = SvCUR (self->incr_text); 2267 STRLEN cur = SvCUR (self->incr_text);
2112 2268
2113 if (SvLEN (self->incr_text) <= cur + len) 2269 if (SvLEN (self->incr_text) - cur <= len)
2114 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2270 json_sv_grow (self->incr_text, cur, len);
2115 2271
2116 Move (str, SvEND (self->incr_text), len, char); 2272 Move (str, SvEND (self->incr_text), len, char);
2117 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2273 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
2118 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2274 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
2119 } 2275 }
… …
2121 2277
2122 if (GIMME_V != G_VOID) 2278 if (GIMME_V != G_VOID)
2123 do 2279 do
2124 { 2280 {
2125 SV *sv; 2281 SV *sv;
2126 char *offset; 2282 STRLEN offset;
2127 2283
2128 if (!INCR_DONE (self)) 2284 if (!INCR_DONE (self))
2129 { 2285 {
2130 incr_parse (self); 2286 incr_parse (self);
2131 2287
… …
2144 2300
2145 break; 2301 break;
2146 } 2302 }
2147 } 2303 }
2148 2304
2149 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN; 2305 PUTBACK; sv = decode_json (self->incr_text, self, &offset);
2150 XPUSHs (sv); 2306 XPUSHs (sv);
2151 2307
2152 self->incr_pos -= offset - SvPVX (self->incr_text); 2308 self->incr_pos -= offset;
2153 self->incr_nest = 0; 2309 self->incr_nest = 0;
2154 self->incr_mode = 0; 2310 self->incr_mode = 0;
2155 2311
2156 sv_chop (self->incr_text, offset); 2312 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2157 } 2313 }
2158 while (GIMME_V == G_ARRAY); 2314 while (GIMME_V == G_ARRAY);
2159} 2315}
2160 2316
2161SV *incr_text (JSON *self) 2317SV *incr_text (JSON *self)
… …
2192 self->incr_mode = 0; 2348 self->incr_mode = 0;
2193} 2349}
2194 2350
2195void DESTROY (JSON *self) 2351void DESTROY (JSON *self)
2196 CODE: 2352 CODE:
2353 SvREFCNT_dec (self->v_false);
2354 SvREFCNT_dec (self->v_true);
2197 SvREFCNT_dec (self->cb_sk_object); 2355 SvREFCNT_dec (self->cb_sk_object);
2198 SvREFCNT_dec (self->cb_object); 2356 SvREFCNT_dec (self->cb_object);
2199 SvREFCNT_dec (self->incr_text); 2357 SvREFCNT_dec (self->incr_text);
2200 2358
2201PROTOTYPES: ENABLE 2359PROTOTYPES: ENABLE
… …
2204 PPCODE: 2362 PPCODE:
2205{ 2363{
2206 JSON json; 2364 JSON json;
2207 json_init (&json); 2365 json_init (&json);
2208 json.flags |= F_UTF8; 2366 json.flags |= F_UTF8;
2209 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN; 2367 PUTBACK; XPUSHs (encode_json (scalar, &json));
2210 XPUSHs (scalar);
2211} 2368}
2212 2369
2213void decode_json (SV *jsonstr) 2370void decode_json (SV *jsonstr)
2214 PPCODE: 2371 PPCODE:
2215{ 2372{
2216 JSON json; 2373 JSON json;
2217 json_init (&json); 2374 json_init (&json);
2218 json.flags |= F_UTF8; 2375 json.flags |= F_UTF8;
2219 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN; 2376 PUTBACK; XPUSHs (decode_json (jsonstr, &json, 0));
2220 XPUSHs (jsonstr);
2221} 2377}
2222 2378

Diff Legend

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