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.90 by root, Sun Jul 20 17:55:19 2008 UTC vs.
Revision 1.118 by root, Fri Oct 25 20:27:57 2013 UTC

… …
12#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 14#endif
15 15
16// some old perls do not have this, try to make it work, no 16// some old perls do not have this, try to make it work, no
17// guarentees, though. if it breaks, you get to keep the pieces. 17// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
20#endif 20#endif
21 21
22// three extra for rounding, sign, and end of string
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2) 23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23 24
24#define F_ASCII 0x00000001UL 25#define F_ASCII 0x00000001UL
25#define F_LATIN1 0x00000002UL 26#define F_LATIN1 0x00000002UL
26#define F_UTF8 0x00000004UL 27#define F_UTF8 0x00000004UL
27#define F_INDENT 0x00000008UL 28#define F_INDENT 0x00000008UL
… …
41#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
42#define INDENT_STEP 3 // spaces per indentation level 43#define INDENT_STEP 3 // spaces per indentation level
43 44
44#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
45 46
47#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
48
46#define SB do { 49#define SB do {
47#define SE } while (0) 50#define SE } while (0)
48 51
49#if __GNUC__ >= 3 52#if __GNUC__ >= 3
50# define expect(expr,value) __builtin_expect ((expr), (value)) 53# define expect(expr,value) __builtin_expect ((expr), (value))
… …
69#else 72#else
70# define JSON_SLOW 0 73# define JSON_SLOW 0
71# define JSON_STASH json_stash 74# define JSON_STASH json_stash
72#endif 75#endif
73 76
77// the amount of HEs to allocate on the stack, when sorting keys
78#define STACK_HES 64
79
74static HV *json_stash, *json_boolean_stash; // JSON::XS:: 80static HV *json_stash, *json_boolean_stash; // JSON::XS::
75static SV *json_true, *json_false; 81static SV *json_true, *json_false;
76 82
77enum { 83enum {
78 INCR_M_WS = 0, // initial whitespace skipping, must be 0 84 INCR_M_WS = 0, // initial whitespace skipping, must be 0
79 INCR_M_STR, // inside string 85 INCR_M_STR, // inside string
80 INCR_M_BS, // inside backslash 86 INCR_M_BS, // inside backslash
87 INCR_M_C0, // inside comment in initial whitespace sequence
88 INCR_M_C1, // inside comment in other places
81 INCR_M_JSON // outside anything, count nesting 89 INCR_M_JSON // outside anything, count nesting
82}; 90};
83 91
84#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON) 92#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85 93
… …
175 *s++ = 0x80 | ( ch & 0x3f); 183 *s++ = 0x80 | ( ch & 0x3f);
176 184
177 return s; 185 return s;
178} 186}
179 187
188// convert offset pointer to character index, sv must be string
189static STRLEN
190ptr_to_index (SV *sv, char *offset)
191{
192 return SvUTF8 (sv)
193 ? utf8_distance (offset, SvPVX (sv))
194 : offset - SvPVX (sv);
195}
196
197/////////////////////////////////////////////////////////////////////////////
198// fp hell
199
200// scan a group of digits, and a trailing exponent
201static void
202json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
203{
204 UV uaccum = 0;
205 int eaccum = 0;
206
207 // if we recurse too deep, skip all remaining digits
208 // to avoid a stack overflow attack
209 if (expect_false (--maxdepth <= 0))
210 while (((U8)*s - '0') < 10)
211 ++s;
212
213 for (;;)
214 {
215 U8 dig = (U8)*s - '0';
216
217 if (expect_false (dig >= 10))
218 {
219 if (dig == (U8)((U8)'.' - (U8)'0'))
220 {
221 ++s;
222 json_atof_scan1 (s, accum, expo, 1, maxdepth);
223 }
224 else if ((dig | ' ') == 'e' - '0')
225 {
226 int exp2 = 0;
227 int neg = 0;
228
229 ++s;
230
231 if (*s == '-')
232 {
233 ++s;
234 neg = 1;
235 }
236 else if (*s == '+')
237 ++s;
238
239 while ((dig = (U8)*s - '0') < 10)
240 exp2 = exp2 * 10 + *s++ - '0';
241
242 *expo += neg ? -exp2 : exp2;
243 }
244
245 break;
246 }
247
248 ++s;
249
250 uaccum = uaccum * 10 + dig;
251 ++eaccum;
252
253 // if we have too many digits, then recurse for more
254 // we actually do this for rather few digits
255 if (uaccum >= (UV_MAX - 9) / 10)
256 {
257 if (postdp) *expo -= eaccum;
258 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
259 if (postdp) *expo += eaccum;
260
261 break;
262 }
263 }
264
265 // this relies greatly on the quality of the pow ()
266 // implementation of the platform, but a good
267 // implementation is hard to beat.
268 // (IEEE 754 conformant ones are required to be exact)
269 if (postdp) *expo -= eaccum;
270 *accum += uaccum * Perl_pow (10., *expo);
271 *expo += eaccum;
272}
273
274static NV
275json_atof (const char *s)
276{
277 NV accum = 0.;
278 int expo = 0;
279 int neg = 0;
280
281 if (*s == '-')
282 {
283 ++s;
284 neg = 1;
285 }
286
287 // a recursion depth of ten gives us >>500 bits
288 json_atof_scan1 (s, &accum, &expo, 0, 10);
289
290 return neg ? -accum : accum;
291}
180///////////////////////////////////////////////////////////////////////////// 292/////////////////////////////////////////////////////////////////////////////
181// encoder 293// encoder
182 294
183// structure used for encoding JSON 295// structure used for encoding JSON
184typedef struct 296typedef struct
… …
194INLINE void 306INLINE void
195need (enc_t *enc, STRLEN len) 307need (enc_t *enc, STRLEN len)
196{ 308{
197 if (expect_false (enc->cur + len >= enc->end)) 309 if (expect_false (enc->cur + len >= enc->end))
198 { 310 {
199 STRLEN cur = enc->cur - SvPVX (enc->sv); 311 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
200 SvGROW (enc->sv, cur + len + 1); 312 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
201 enc->cur = SvPVX (enc->sv) + cur; 313 enc->cur = SvPVX (enc->sv) + cur;
202 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 314 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
203 } 315 }
204} 316}
205 317
… …
280 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 392 (int)((uch - 0x10000) % 0x400 + 0xDC00));
281 enc->cur += 12; 393 enc->cur += 12;
282 } 394 }
283 else 395 else
284 { 396 {
285 static char hexdigit [16] = "0123456789abcdef";
286 need (enc, len += 5); 397 need (enc, len += 5);
287 *enc->cur++ = '\\'; 398 *enc->cur++ = '\\';
288 *enc->cur++ = 'u'; 399 *enc->cur++ = 'u';
289 *enc->cur++ = hexdigit [ uch >> 12 ]; 400 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
290 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 401 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
291 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 402 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
292 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 403 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
293 } 404 }
294 405
295 str += clen; 406 str += clen;
296 } 407 }
297 else if (enc->json.flags & F_LATIN1) 408 else if (enc->json.flags & F_LATIN1)
… …
372 483
373 if (enc->indent >= enc->json.max_depth) 484 if (enc->indent >= enc->json.max_depth)
374 croak (ERR_NESTING_EXCEEDED); 485 croak (ERR_NESTING_EXCEEDED);
375 486
376 encode_ch (enc, '['); 487 encode_ch (enc, '[');
377 488
378 if (len >= 0) 489 if (len >= 0)
379 { 490 {
380 encode_nl (enc); ++enc->indent; 491 encode_nl (enc); ++enc->indent;
381 492
382 for (i = 0; i <= len; ++i) 493 for (i = 0; i <= len; ++i)
… …
394 encode_comma (enc); 505 encode_comma (enc);
395 } 506 }
396 507
397 encode_nl (enc); --enc->indent; encode_indent (enc); 508 encode_nl (enc); --enc->indent; encode_indent (enc);
398 } 509 }
399 510
400 encode_ch (enc, ']'); 511 encode_ch (enc, ']');
401} 512}
402 513
403static void 514static void
404encode_hk (enc_t *enc, HE *he) 515encode_hk (enc_t *enc, HE *he)
… …
408 if (HeKLEN (he) == HEf_SVKEY) 519 if (HeKLEN (he) == HEf_SVKEY)
409 { 520 {
410 SV *sv = HeSVKEY (he); 521 SV *sv = HeSVKEY (he);
411 STRLEN len; 522 STRLEN len;
412 char *str; 523 char *str;
413 524
414 SvGETMAGIC (sv); 525 SvGETMAGIC (sv);
415 str = SvPV (sv, len); 526 str = SvPV (sv, len);
416 527
417 encode_str (enc, str, len, SvUTF8 (sv)); 528 encode_str (enc, str, len, SvUTF8 (sv));
418 } 529 }
… …
461 572
462 encode_ch (enc, '{'); 573 encode_ch (enc, '{');
463 574
464 // for canonical output we have to sort by keys first 575 // for canonical output we have to sort by keys first
465 // actually, this is mostly due to the stupid so-called 576 // actually, this is mostly due to the stupid so-called
466 // security workaround added somewhere in 5.8.x. 577 // security workaround added somewhere in 5.8.x
467 // that randomises hash orderings 578 // that randomises hash orderings
468 if (enc->json.flags & F_CANONICAL) 579 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
469 { 580 {
470 int count = hv_iterinit (hv); 581 int count = hv_iterinit (hv);
471 582
472 if (SvMAGICAL (hv)) 583 if (SvMAGICAL (hv))
473 { 584 {
… …
484 } 595 }
485 596
486 if (count) 597 if (count)
487 { 598 {
488 int i, fast = 1; 599 int i, fast = 1;
489#if defined(__BORLANDC__) || defined(_MSC_VER) 600 HE *hes_stack [STACK_HES];
490 HE **hes = _alloca (count * sizeof (HE)); 601 HE **hes = hes_stack;
491#else 602
492 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 603 // allocate larger arrays on the heap
493#endif 604 if (count > STACK_HES)
605 {
606 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
607 hes = (HE **)SvPVX (sv);
608 }
494 609
495 i = 0; 610 i = 0;
496 while ((he = hv_iternext (hv))) 611 while ((he = hv_iternext (hv)))
497 { 612 {
498 hes [i++] = he; 613 hes [i++] = he;
… …
717 } 832 }
718 else 833 else
719 { 834 {
720 // large integer, use the (rather slow) snprintf way. 835 // large integer, use the (rather slow) snprintf way.
721 need (enc, IVUV_MAXCHARS); 836 need (enc, IVUV_MAXCHARS);
722 enc->cur += 837 enc->cur +=
723 SvIsUV(sv) 838 SvIsUV(sv)
724 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 839 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
725 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 840 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
726 } 841 }
727 } 842 }
728 else if (SvROK (sv)) 843 else if (SvROK (sv))
729 encode_rv (enc, SvRV (sv)); 844 encode_rv (enc, SvRV (sv));
730 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 845 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
731 encode_str (enc, "null", 4, 0); 846 encode_str (enc, "null", 4, 0);
732 else 847 else
733 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 848 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
734 SvPV_nolen (sv), SvFLAGS (sv)); 849 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
735} 850}
736 851
737static SV * 852static SV *
738encode_json (SV *scalar, JSON *json) 853encode_json (SV *scalar, JSON *json)
739{ 854{
… …
751 : enc.json.flags & F_LATIN1 ? 0x000100UL 866 : enc.json.flags & F_LATIN1 ? 0x000100UL
752 : 0x110000UL; 867 : 0x110000UL;
753 868
754 SvPOK_only (enc.sv); 869 SvPOK_only (enc.sv);
755 encode_sv (&enc, scalar); 870 encode_sv (&enc, scalar);
871 encode_nl (&enc);
756 872
757 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 873 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
758 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 874 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
759 875
760 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 876 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
940 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1056 else if (expect_true (ch >= 0x20 && ch < 0x80))
941 *cur++ = ch; 1057 *cur++ = ch;
942 else if (ch >= 0x80) 1058 else if (ch >= 0x80)
943 { 1059 {
944 STRLEN clen; 1060 STRLEN clen;
945 UV uch;
946 1061
947 --dec_cur; 1062 --dec_cur;
948 1063
949 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1064 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
950 if (clen == (STRLEN)-1) 1065 if (clen == (STRLEN)-1)
951 ERR ("malformed UTF-8 character in JSON string"); 1066 ERR ("malformed UTF-8 character in JSON string");
952 1067
953 do 1068 do
954 *cur++ = *dec_cur++; 1069 *cur++ = *dec_cur++;
… …
971 { 1086 {
972 STRLEN len = cur - buf; 1087 STRLEN len = cur - buf;
973 1088
974 if (sv) 1089 if (sv)
975 { 1090 {
976 SvGROW (sv, SvCUR (sv) + len + 1); 1091 STRLEN cur = SvCUR (sv);
1092
1093 if (SvLEN (sv) <= cur + len)
1094 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1095
977 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1096 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
978 SvCUR_set (sv, SvCUR (sv) + len); 1097 SvCUR_set (sv, SvCUR (sv) + len);
979 } 1098 }
980 else 1099 else
981 sv = newSVpvn (buf, len); 1100 sv = newSVpvn (buf, len);
… …
1072 1191
1073 // special case the rather common 1..5-digit-int case 1192 // special case the rather common 1..5-digit-int case
1074 if (*start == '-') 1193 if (*start == '-')
1075 switch (len) 1194 switch (len)
1076 { 1195 {
1077 case 2: return newSViv (-( start [1] - '0' * 1)); 1196 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1078 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1197 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1079 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1198 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1080 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1199 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1081 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1200 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1082 } 1201 }
1083 else 1202 else
1084 switch (len) 1203 switch (len)
1085 { 1204 {
1086 case 1: return newSViv ( start [0] - '0' * 1); 1205 case 1: return newSViv ( start [0] - '0' * 1);
1087 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1206 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1088 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1207 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1089 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1208 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1090 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1209 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1091 } 1210 }
1092 1211
1093 { 1212 {
1094 UV uv; 1213 UV uv;
1095 int numtype = grok_number (start, len, &uv); 1214 int numtype = grok_number (start, len, &uv);
… …
1104 } 1223 }
1105 1224
1106 len -= *start == '-' ? 1 : 0; 1225 len -= *start == '-' ? 1 : 0;
1107 1226
1108 // does not fit into IV or UV, try NV 1227 // does not fit into IV or UV, try NV
1109 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1228 if (len <= NV_DIG)
1110 #if defined (LDBL_DIG)
1111 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1112 #endif
1113 )
1114 // fits into NV without loss of precision 1229 // fits into NV without loss of precision
1115 return newSVnv (Atof (start)); 1230 return newSVnv (json_atof (start));
1116 1231
1117 // everything else fails, convert it to a string 1232 // everything else fails, convert it to a string
1118 return newSVpvn (start, dec->cur - start); 1233 return newSVpvn (start, dec->cur - start);
1119 } 1234 }
1120 1235
1121 // loss of precision here 1236 // loss of precision here
1122 return newSVnv (Atof (start)); 1237 return newSVnv (json_atof (start));
1123 1238
1124fail: 1239fail:
1125 return 0; 1240 return 0;
1126} 1241}
1127 1242
… …
1151 if (*dec->cur == ']') 1266 if (*dec->cur == ']')
1152 { 1267 {
1153 ++dec->cur; 1268 ++dec->cur;
1154 break; 1269 break;
1155 } 1270 }
1156 1271
1157 if (*dec->cur != ',') 1272 if (*dec->cur != ',')
1158 ERR (", or ] expected while parsing array"); 1273 ERR (", or ] expected while parsing array");
1159 1274
1160 ++dec->cur; 1275 ++dec->cur;
1161 1276
… …
1296 dSP; 1411 dSP;
1297 int count; 1412 int count;
1298 1413
1299 ENTER; SAVETMPS; PUSHMARK (SP); 1414 ENTER; SAVETMPS; PUSHMARK (SP);
1300 XPUSHs (HeVAL (he)); 1415 XPUSHs (HeVAL (he));
1416 sv_2mortal (sv);
1301 1417
1302 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1418 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1303 1419
1304 if (count == 1) 1420 if (count == 1)
1305 { 1421 {
1306 sv = newSVsv (POPs); 1422 sv = newSVsv (POPs);
1307 FREETMPS; LEAVE; 1423 FREETMPS; LEAVE;
1308 return sv; 1424 return sv;
1309 } 1425 }
1310 1426
1427 SvREFCNT_inc (sv);
1311 FREETMPS; LEAVE; 1428 FREETMPS; LEAVE;
1312 } 1429 }
1313 } 1430 }
1314 1431
1315 if (dec->json.cb_object) 1432 if (dec->json.cb_object)
… …
1347{ 1464{
1348 // the beauty of JSON: you need exactly one character lookahead 1465 // the beauty of JSON: you need exactly one character lookahead
1349 // to parse everything. 1466 // to parse everything.
1350 switch (*dec->cur) 1467 switch (*dec->cur)
1351 { 1468 {
1352 case '"': ++dec->cur; return decode_str (dec); 1469 case '"': ++dec->cur; return decode_str (dec);
1353 case '[': ++dec->cur; return decode_av (dec); 1470 case '[': ++dec->cur; return decode_av (dec);
1354 case '{': ++dec->cur; return decode_hv (dec); 1471 case '{': ++dec->cur; return decode_hv (dec);
1355 1472
1356 case '-': 1473 case '-':
1357 case '0': case '1': case '2': case '3': case '4': 1474 case '0': case '1': case '2': case '3': case '4':
1358 case '5': case '6': case '7': case '8': case '9': 1475 case '5': case '6': case '7': case '8': case '9':
… …
1405fail: 1522fail:
1406 return 0; 1523 return 0;
1407} 1524}
1408 1525
1409static SV * 1526static SV *
1410decode_json (SV *string, JSON *json, STRLEN *offset_return) 1527decode_json (SV *string, JSON *json, char **offset_return)
1411{ 1528{
1412 dec_t dec; 1529 dec_t dec;
1413 STRLEN offset;
1414 SV *sv; 1530 SV *sv;
1415 1531
1532 /* work around bugs in 5.10 where manipulating magic values
1533 * makes perl ignore the magic in subsequent accesses.
1534 * also make a copy of non-PV values, to get them into a clean
1535 * state (SvPV should do that, but it's buggy, see below).
1536 */
1416 SvGETMAGIC (string); 1537 /*SvGETMAGIC (string);*/
1538 if (SvMAGICAL (string) || !SvPOK (string))
1539 string = sv_2mortal (newSVsv (string));
1540
1417 SvUPGRADE (string, SVt_PV); 1541 SvUPGRADE (string, SVt_PV);
1418 1542
1419 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1543 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1420 * assertion with -DDEBUGGING, although SvCUR is documented to 1544 * assertion with -DDEBUGGING, although SvCUR is documented to
1421 * return the xpv_cur field which certainly exists after upgrading. 1545 * return the xpv_cur field which certainly exists after upgrading.
… …
1424 * and hope for the best. 1548 * and hope for the best.
1425 * Damnit, SvPV_nolen still trips over yet another assertion. This 1549 * Damnit, SvPV_nolen still trips over yet another assertion. This
1426 * assertion business is seriously broken, try yet another workaround 1550 * assertion business is seriously broken, try yet another workaround
1427 * for the broken -DDEBUGGING. 1551 * for the broken -DDEBUGGING.
1428 */ 1552 */
1553 {
1429#ifdef DEBUGGING 1554#ifdef DEBUGGING
1430 offset = SvOK (string) ? sv_len (string) : 0; 1555 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1431#else 1556#else
1432 offset = SvCUR (string); 1557 STRLEN offset = SvCUR (string);
1433#endif 1558#endif
1434 1559
1435 if (offset > json->max_size && json->max_size) 1560 if (offset > json->max_size && json->max_size)
1436 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1561 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1437 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1562 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1563 }
1438 1564
1439 if (json->flags & F_UTF8) 1565 if (DECODE_WANTS_OCTETS (json))
1440 sv_utf8_downgrade (string, 0); 1566 sv_utf8_downgrade (string, 0);
1441 else 1567 else
1442 sv_utf8_upgrade (string); 1568 sv_utf8_upgrade (string);
1443 1569
1444 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1570 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1454 1580
1455 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1581 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1456 1582
1457 decode_ws (&dec); 1583 decode_ws (&dec);
1458 sv = decode_sv (&dec); 1584 sv = decode_sv (&dec);
1585
1586 if (offset_return)
1587 *offset_return = dec.cur;
1459 1588
1460 if (!(offset_return || !sv)) 1589 if (!(offset_return || !sv))
1461 { 1590 {
1462 // check for trailing garbage 1591 // check for trailing garbage
1463 decode_ws (&dec); 1592 decode_ws (&dec);
… …
1466 { 1595 {
1467 dec.err = "garbage after JSON object"; 1596 dec.err = "garbage after JSON object";
1468 SvREFCNT_dec (sv); 1597 SvREFCNT_dec (sv);
1469 sv = 0; 1598 sv = 0;
1470 } 1599 }
1471 }
1472
1473 if (offset_return || !sv)
1474 {
1475 offset = dec.json.flags & F_UTF8
1476 ? dec.cur - SvPVX (string)
1477 : utf8_distance (dec.cur, SvPVX (string));
1478
1479 if (offset_return)
1480 *offset_return = offset;
1481 } 1600 }
1482 1601
1483 if (!sv) 1602 if (!sv)
1484 { 1603 {
1485 SV *uni = sv_newmortal (); 1604 SV *uni = sv_newmortal ();
… …
1491 SAVEVPTR (PL_curcop); 1610 SAVEVPTR (PL_curcop);
1492 PL_curcop = &cop; 1611 PL_curcop = &cop;
1493 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1612 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1494 LEAVE; 1613 LEAVE;
1495 1614
1496 croak ("%s, at character offset %d [\"%s\"]", 1615 croak ("%s, at character offset %d (before \"%s\")",
1497 dec.err, 1616 dec.err,
1498 (int)offset, 1617 (int)ptr_to_index (string, dec.cur),
1499 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1618 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1500 } 1619 }
1501 1620
1502 sv = sv_2mortal (sv); 1621 sv = sv_2mortal (sv);
1503 1622
… …
1512 1631
1513static void 1632static void
1514incr_parse (JSON *self) 1633incr_parse (JSON *self)
1515{ 1634{
1516 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1635 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1636
1637 // the state machine here is a bit convoluted and could be simplified a lot
1638 // but this would make it slower, so...
1517 1639
1518 for (;;) 1640 for (;;)
1519 { 1641 {
1520 //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 1642 //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
1521 switch (self->incr_mode) 1643 switch (self->incr_mode)
1522 { 1644 {
1523 // only used for intiial whitespace skipping 1645 // only used for initial whitespace skipping
1524 case INCR_M_WS: 1646 case INCR_M_WS:
1525 for (;;) 1647 for (;;)
1526 { 1648 {
1527 if (*p > 0x20) 1649 if (*p > 0x20)
1528 { 1650 {
1651 if (*p == '#')
1652 {
1653 self->incr_mode = INCR_M_C0;
1654 goto incr_m_c;
1655 }
1656 else
1657 {
1529 self->incr_mode = INCR_M_JSON; 1658 self->incr_mode = INCR_M_JSON;
1530 goto incr_m_json; 1659 goto incr_m_json;
1660 }
1531 } 1661 }
1532 else if (!*p) 1662 else if (!*p)
1533 goto interrupt; 1663 goto interrupt;
1534 1664
1535 ++p; 1665 ++p;
… …
1541 goto interrupt; 1671 goto interrupt;
1542 1672
1543 ++p; 1673 ++p;
1544 self->incr_mode = INCR_M_STR; 1674 self->incr_mode = INCR_M_STR;
1545 goto incr_m_str; 1675 goto incr_m_str;
1676
1677 // inside #-style comments
1678 case INCR_M_C0:
1679 case INCR_M_C1:
1680 incr_m_c:
1681 for (;;)
1682 {
1683 if (*p == '\n')
1684 {
1685 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1686 break;
1687 }
1688 else if (!*p)
1689 goto interrupt;
1690
1691 ++p;
1692 }
1693
1694 break;
1546 1695
1547 // inside a string 1696 // inside a string
1548 case INCR_M_STR: 1697 case INCR_M_STR:
1549 incr_m_str: 1698 incr_m_str:
1550 for (;;) 1699 for (;;)
… …
1609 1758
1610 case ']': 1759 case ']':
1611 case '}': 1760 case '}':
1612 if (--self->incr_nest <= 0) 1761 if (--self->incr_nest <= 0)
1613 goto interrupt; 1762 goto interrupt;
1763 break;
1764
1765 case '#':
1766 self->incr_mode = INCR_M_C1;
1767 goto incr_m_c;
1614 } 1768 }
1615 } 1769 }
1616 } 1770 }
1617 1771
1618 modechange: 1772 modechange:
1619 ; 1773 ;
1620 } 1774 }
1621 1775
1622interrupt: 1776interrupt:
1623 self->incr_pos = p - SvPVX (self->incr_text); 1777 self->incr_pos = p - SvPVX (self->incr_text);
1778 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1624 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1779 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1625} 1780}
1626 1781
1627///////////////////////////////////////////////////////////////////////////// 1782/////////////////////////////////////////////////////////////////////////////
1628// XS interface functions 1783// XS interface functions
… …
1643 json_stash = gv_stashpv ("JSON::XS" , 1); 1798 json_stash = gv_stashpv ("JSON::XS" , 1);
1644 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1799 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1645 1800
1646 json_true = get_bool ("JSON::XS::true"); 1801 json_true = get_bool ("JSON::XS::true");
1647 json_false = get_bool ("JSON::XS::false"); 1802 json_false = get_bool ("JSON::XS::false");
1803
1804 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1648} 1805}
1649 1806
1650PROTOTYPES: DISABLE 1807PROTOTYPES: DISABLE
1651 1808
1652void CLONE (...) 1809void CLONE (...)
… …
1655 json_boolean_stash = 0; 1812 json_boolean_stash = 0;
1656 1813
1657void new (char *klass) 1814void new (char *klass)
1658 PPCODE: 1815 PPCODE:
1659{ 1816{
1660 SV *pv = NEWSV (0, sizeof (JSON)); 1817 SV *pv = NEWSV (0, sizeof (JSON));
1661 SvPOK_only (pv); 1818 SvPOK_only (pv);
1662 json_init ((JSON *)SvPVX (pv)); 1819 json_init ((JSON *)SvPVX (pv));
1663 XPUSHs (sv_2mortal (sv_bless ( 1820 XPUSHs (sv_2mortal (sv_bless (
1664 newRV_noinc (pv), 1821 newRV_noinc (pv),
1665 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1822 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1742} 1899}
1743 1900
1744void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 1901void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1745 PPCODE: 1902 PPCODE:
1746{ 1903{
1747 if (!self->cb_sk_object) 1904 if (!self->cb_sk_object)
1748 self->cb_sk_object = newHV (); 1905 self->cb_sk_object = newHV ();
1749 1906
1750 if (SvOK (cb)) 1907 if (SvOK (cb))
1751 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 1908 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1752 else 1909 else
… …
1763 XPUSHs (ST (0)); 1920 XPUSHs (ST (0));
1764} 1921}
1765 1922
1766void encode (JSON *self, SV *scalar) 1923void encode (JSON *self, SV *scalar)
1767 PPCODE: 1924 PPCODE:
1768 XPUSHs (encode_json (scalar, self)); 1925 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
1926 XPUSHs (scalar);
1769 1927
1770void decode (JSON *self, SV *jsonstr) 1928void decode (JSON *self, SV *jsonstr)
1771 PPCODE: 1929 PPCODE:
1772 XPUSHs (decode_json (jsonstr, self, 0)); 1930 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
1931 XPUSHs (jsonstr);
1773 1932
1774void decode_prefix (JSON *self, SV *jsonstr) 1933void decode_prefix (JSON *self, SV *jsonstr)
1775 PPCODE: 1934 PPCODE:
1776{ 1935{
1777 STRLEN offset; 1936 SV *sv;
1937 char *offset;
1938 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1778 EXTEND (SP, 2); 1939 EXTEND (SP, 2);
1779 PUSHs (decode_json (jsonstr, self, &offset)); 1940 PUSHs (sv);
1780 PUSHs (sv_2mortal (newSVuv (offset))); 1941 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1781} 1942}
1782 1943
1783void incr_parse (JSON *self, SV *jsonstr = 0) 1944void incr_parse (JSON *self, SV *jsonstr = 0)
1784 PPCODE: 1945 PPCODE:
1785{ 1946{
1786 if (!self->incr_text) 1947 if (!self->incr_text)
1787 self->incr_text = newSVpvn ("", 0); 1948 self->incr_text = newSVpvn ("", 0);
1949
1950 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
1951 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
1952 if (DECODE_WANTS_OCTETS (self))
1953 {
1954 if (self->incr_pos)
1955 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
1956 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
1957
1958 sv_utf8_downgrade (self->incr_text, 0);
1959 }
1960 else
1961 {
1962 sv_utf8_upgrade (self->incr_text);
1963
1964 if (self->incr_pos)
1965 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1966 - (U8 *)SvPVX (self->incr_text);
1967 }
1788 1968
1789 // append data, if any 1969 // append data, if any
1790 if (jsonstr) 1970 if (jsonstr)
1791 { 1971 {
1972 /* make sure both strings have same encoding */
1792 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 1973 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1974 if (SvUTF8 (jsonstr))
1975 sv_utf8_downgrade (jsonstr, 0);
1793 { 1976 else
1794 /* utf-8-ness differs, need to upgrade */
1795 sv_utf8_upgrade (self->incr_text); 1977 sv_utf8_upgrade (jsonstr);
1796 1978
1797 if (self->incr_pos) 1979 /* and then just blindly append */
1798 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1799 - (U8 *)SvPVX (self->incr_text);
1800 }
1801
1802 { 1980 {
1803 STRLEN len; 1981 STRLEN len;
1804 const char *str = SvPV (jsonstr, len); 1982 const char *str = SvPV (jsonstr, len);
1805 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1); 1983 STRLEN cur = SvCUR (self->incr_text);
1984
1985 if (SvLEN (self->incr_text) <= cur + len)
1986 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1987
1806 Move (str, SvEND (self->incr_text), len, char); 1988 Move (str, SvEND (self->incr_text), len, char);
1807 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 1989 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1808 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 1990 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1809 } 1991 }
1810 } 1992 }
1811 1993
1812 if (GIMME_V != G_VOID) 1994 if (GIMME_V != G_VOID)
1813 do 1995 do
1814 { 1996 {
1997 SV *sv;
1815 STRLEN offset; 1998 char *offset;
1816 1999
1817 if (!INCR_DONE (self)) 2000 if (!INCR_DONE (self))
1818 { 2001 {
1819 incr_parse (self); 2002 incr_parse (self);
1820 2003
1821 if (self->incr_pos > self->max_size && self->max_size) 2004 if (self->incr_pos > self->max_size && self->max_size)
1822 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2005 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1823 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2006 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1824 2007
1825 if (!INCR_DONE (self)) 2008 if (!INCR_DONE (self))
2009 {
2010 // as an optimisation, do not accumulate white space in the incr buffer
2011 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2012 {
2013 self->incr_pos = 0;
2014 SvCUR_set (self->incr_text, 0);
2015 }
2016
1826 break; 2017 break;
2018 }
1827 } 2019 }
1828 2020
1829 XPUSHs (decode_json (self->incr_text, self, &offset)); 2021 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2022 XPUSHs (sv);
1830 2023
1831 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1832 self->incr_pos -= offset; 2024 self->incr_pos -= offset - SvPVX (self->incr_text);
1833 self->incr_nest = 0; 2025 self->incr_nest = 0;
1834 self->incr_mode = 0; 2026 self->incr_mode = 0;
2027
2028 sv_chop (self->incr_text, offset);
1835 } 2029 }
1836 while (GIMME_V == G_ARRAY); 2030 while (GIMME_V == G_ARRAY);
1837} 2031}
1838 2032
1839SV *incr_text (JSON *self) 2033SV *incr_text (JSON *self)
… …
1877 SvREFCNT_dec (self->incr_text); 2071 SvREFCNT_dec (self->incr_text);
1878 2072
1879PROTOTYPES: ENABLE 2073PROTOTYPES: ENABLE
1880 2074
1881void encode_json (SV *scalar) 2075void encode_json (SV *scalar)
1882 ALIAS:
1883 to_json_ = 0
1884 encode_json = F_UTF8
1885 PPCODE: 2076 PPCODE:
1886{ 2077{
1887 JSON json; 2078 JSON json;
1888 json_init (&json); 2079 json_init (&json);
1889 json.flags |= ix; 2080 json.flags |= F_UTF8;
1890 XPUSHs (encode_json (scalar, &json)); 2081 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2082 XPUSHs (scalar);
1891} 2083}
1892 2084
1893void decode_json (SV *jsonstr) 2085void decode_json (SV *jsonstr)
1894 ALIAS:
1895 from_json_ = 0
1896 decode_json = F_UTF8
1897 PPCODE: 2086 PPCODE:
1898{ 2087{
1899 JSON json; 2088 JSON json;
1900 json_init (&json); 2089 json_init (&json);
1901 json.flags |= ix; 2090 json.flags |= F_UTF8;
1902 XPUSHs (decode_json (jsonstr, &json, 0)); 2091 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2092 XPUSHs (jsonstr);
1903} 2093}
1904 2094
1905

Diff Legend

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