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.29 by root, Wed May 9 15:34:04 2007 UTC vs.
Revision 1.61 by root, Sun Aug 26 21:56:47 2007 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#include "assert.h" 5#include <assert.h>
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 <float.h>
9 10
10#if defined(__BORLANDC__) || defined(_MSC_VER) 11#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h 12# define snprintf _snprintf // C compilers have this in stdio.h
12#endif 13#endif
13 14
15// some old perls do not have this, try to make it work, no
16// guarentees, though. if it breaks, you get to keep the pieces.
17#ifndef UTF8_MAXBYTES
18# define UTF8_MAXBYTES 13
19#endif
20
14#define F_ASCII 0x00000001UL 21#define F_ASCII 0x00000001UL
22#define F_LATIN1 0x00000002UL
15#define F_UTF8 0x00000002UL 23#define F_UTF8 0x00000004UL
16#define F_INDENT 0x00000004UL 24#define F_INDENT 0x00000008UL
17#define F_CANONICAL 0x00000008UL 25#define F_CANONICAL 0x00000010UL
18#define F_SPACE_BEFORE 0x00000010UL 26#define F_SPACE_BEFORE 0x00000020UL
19#define F_SPACE_AFTER 0x00000020UL 27#define F_SPACE_AFTER 0x00000040UL
20#define F_ALLOW_NONREF 0x00000080UL 28#define F_ALLOW_NONREF 0x00000100UL
21#define F_SHRINK 0x00000100UL 29#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL
22#define F_MAXDEPTH 0xf8000000UL 32#define F_MAXDEPTH 0xf8000000UL
23#define S_MAXDEPTH 27 33#define S_MAXDEPTH 27
34#define F_MAXSIZE 0x01f00000UL
35#define S_MAXSIZE 20
36#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
24 37
25#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 38#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
26 39#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
27// F_SELFCONVERT? <=> to_json/toJson
28// F_BLESSED? <=> { $__class__$ => }
29 40
30#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
31#define F_DEFAULT (9UL << S_MAXDEPTH) 42#define F_DEFAULT (9UL << S_MAXDEPTH)
32 43
33#define INIT_SIZE 32 // initial scalar size to be allocated 44#define INIT_SIZE 32 // initial scalar size to be allocated
34#define INDENT_STEP 3 // spaces per indentation level 45#define INDENT_STEP 3 // spaces per indentation level
35 46
36#define SHORT_STRING_LEN 512 // special-case strings of up to this size 47#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
37 48
38#define SB do { 49#define SB do {
39#define SE } while (0) 50#define SE } while (0)
40 51
52#if __GNUC__ >= 3
53# define expect(expr,value) __builtin_expect ((expr),(value))
54# define inline inline
55#else
56# define expect(expr,value) (expr)
57# define inline static
58#endif
59
60#define expect_false(expr) expect ((expr) != 0, 0)
61#define expect_true(expr) expect ((expr) != 0, 1)
62
63#ifdef USE_ITHREADS
64# define JSON_SLOW 1
65# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
66#else
67# define JSON_SLOW 0
68# define JSON_STASH json_stash
69#endif
70
41static HV *json_stash; // JSON::XS:: 71static HV *json_stash, *json_boolean_stash; // JSON::XS::
72static SV *json_true, *json_false;
73
74typedef struct {
75 U32 flags;
76 SV *cb_object;
77 HV *cb_sk_object;
78} JSON;
42 79
43///////////////////////////////////////////////////////////////////////////// 80/////////////////////////////////////////////////////////////////////////////
44// utility functions 81// utility functions
45 82
46static UV * 83inline void
47SvJSON (SV *sv)
48{
49 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
50 croak ("object is not of type JSON::XS");
51
52 return &SvUVX (SvRV (sv));
53}
54
55static void
56shrink (SV *sv) 84shrink (SV *sv)
57{ 85{
58 sv_utf8_downgrade (sv, 1); 86 sv_utf8_downgrade (sv, 1);
59 if (SvLEN (sv) > SvCUR (sv) + 1) 87 if (SvLEN (sv) > SvCUR (sv) + 1)
60 { 88 {
… …
69// decode an utf-8 character and return it, or (UV)-1 in 97// decode an utf-8 character and return it, or (UV)-1 in
70// case of an error. 98// case of an error.
71// we special-case "safe" characters from U+80 .. U+7FF, 99// we special-case "safe" characters from U+80 .. U+7FF,
72// but use the very good perl function to parse anything else. 100// but use the very good perl function to parse anything else.
73// note that we never call this function for a ascii codepoints 101// note that we never call this function for a ascii codepoints
74static UV 102inline UV
75decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 103decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
76{ 104{
77 if (s[0] > 0xdf || s[0] < 0xc2) 105 if (expect_false (s[0] > 0xdf || s[0] < 0xc2))
78 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 106 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
79 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 107 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
80 { 108 {
81 *clen = 2; 109 *clen = 2;
82 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 110 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
… …
95typedef struct 123typedef struct
96{ 124{
97 char *cur; // SvPVX (sv) + current output position 125 char *cur; // SvPVX (sv) + current output position
98 char *end; // SvEND (sv) 126 char *end; // SvEND (sv)
99 SV *sv; // result scalar 127 SV *sv; // result scalar
100 U32 flags; // F_* 128 JSON json;
101 U32 indent; // indentation level 129 U32 indent; // indentation level
102 U32 maxdepth; // max. indentation/recursion level 130 U32 maxdepth; // max. indentation/recursion level
103} enc_t; 131} enc_t;
104 132
105static void 133inline void
106need (enc_t *enc, STRLEN len) 134need (enc_t *enc, STRLEN len)
107{ 135{
108 if (enc->cur + len >= enc->end) 136 if (expect_false (enc->cur + len >= enc->end))
109 { 137 {
110 STRLEN cur = enc->cur - SvPVX (enc->sv); 138 STRLEN cur = enc->cur - SvPVX (enc->sv);
111 SvGROW (enc->sv, cur + len + 1); 139 SvGROW (enc->sv, cur + len + 1);
112 enc->cur = SvPVX (enc->sv) + cur; 140 enc->cur = SvPVX (enc->sv) + cur;
113 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 141 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
114 } 142 }
115} 143}
116 144
117static void 145inline void
118encode_ch (enc_t *enc, char ch) 146encode_ch (enc_t *enc, char ch)
119{ 147{
120 need (enc, 1); 148 need (enc, 1);
121 *enc->cur++ = ch; 149 *enc->cur++ = ch;
122} 150}
… …
130 158
131 while (str < end) 159 while (str < end)
132 { 160 {
133 unsigned char ch = *(unsigned char *)str; 161 unsigned char ch = *(unsigned char *)str;
134 162
135 if (ch >= 0x20 && ch < 0x80) // most common case 163 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
136 { 164 {
137 if (ch == '"') // but with slow exceptions 165 if (expect_false (ch == '"')) // but with slow exceptions
138 { 166 {
139 need (enc, len += 1); 167 need (enc, len += 1);
140 *enc->cur++ = '\\'; 168 *enc->cur++ = '\\';
141 *enc->cur++ = '"'; 169 *enc->cur++ = '"';
142 } 170 }
143 else if (ch == '\\') 171 else if (expect_false (ch == '\\'))
144 { 172 {
145 need (enc, len += 1); 173 need (enc, len += 1);
146 *enc->cur++ = '\\'; 174 *enc->cur++ = '\\';
147 *enc->cur++ = '\\'; 175 *enc->cur++ = '\\';
148 } 176 }
… …
166 STRLEN clen; 194 STRLEN clen;
167 UV uch; 195 UV uch;
168 196
169 if (is_utf8) 197 if (is_utf8)
170 { 198 {
171 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
172 uch = decode_utf8 (str, end - str, &clen); 199 uch = decode_utf8 (str, end - str, &clen);
173 if (clen == (STRLEN)-1) 200 if (clen == (STRLEN)-1)
174 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str); 201 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
175 } 202 }
176 else 203 else
… …
180 } 207 }
181 208
182 if (uch > 0x10FFFFUL) 209 if (uch > 0x10FFFFUL)
183 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 210 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
184 211
185 if (uch < 0x80 || enc->flags & F_ASCII) 212 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
186 { 213 {
187 if (uch > 0xFFFFUL) 214 if (uch > 0xFFFFUL)
188 { 215 {
189 need (enc, len += 11); 216 need (enc, len += 11);
190 sprintf (enc->cur, "\\u%04x\\u%04x", 217 sprintf (enc->cur, "\\u%04x\\u%04x",
… …
204 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 231 *enc->cur++ = hexdigit [(uch >> 0) & 15];
205 } 232 }
206 233
207 str += clen; 234 str += clen;
208 } 235 }
236 else if (enc->json.flags & F_LATIN1)
237 {
238 *enc->cur++ = uch;
239 str += clen;
240 }
209 else if (is_utf8) 241 else if (is_utf8)
210 { 242 {
211 need (enc, len += clen); 243 need (enc, len += clen);
212 do 244 do
213 { 245 {
… …
227 259
228 --len; 260 --len;
229 } 261 }
230} 262}
231 263
232static void 264inline void
233encode_indent (enc_t *enc) 265encode_indent (enc_t *enc)
234{ 266{
235 if (enc->flags & F_INDENT) 267 if (enc->json.flags & F_INDENT)
236 { 268 {
237 int spaces = enc->indent * INDENT_STEP; 269 int spaces = enc->indent * INDENT_STEP;
238 270
239 need (enc, spaces); 271 need (enc, spaces);
240 memset (enc->cur, ' ', spaces); 272 memset (enc->cur, ' ', spaces);
241 enc->cur += spaces; 273 enc->cur += spaces;
242 } 274 }
243} 275}
244 276
245static void 277inline void
246encode_space (enc_t *enc) 278encode_space (enc_t *enc)
247{ 279{
248 need (enc, 1); 280 need (enc, 1);
249 encode_ch (enc, ' '); 281 encode_ch (enc, ' ');
250} 282}
251 283
252static void 284inline void
253encode_nl (enc_t *enc) 285encode_nl (enc_t *enc)
254{ 286{
255 if (enc->flags & F_INDENT) 287 if (enc->json.flags & F_INDENT)
256 { 288 {
257 need (enc, 1); 289 need (enc, 1);
258 encode_ch (enc, '\n'); 290 encode_ch (enc, '\n');
259 } 291 }
260} 292}
261 293
262static void 294inline void
263encode_comma (enc_t *enc) 295encode_comma (enc_t *enc)
264{ 296{
265 encode_ch (enc, ','); 297 encode_ch (enc, ',');
266 298
267 if (enc->flags & F_INDENT) 299 if (enc->json.flags & F_INDENT)
268 encode_nl (enc); 300 encode_nl (enc);
269 else if (enc->flags & F_SPACE_AFTER) 301 else if (enc->json.flags & F_SPACE_AFTER)
270 encode_space (enc); 302 encode_space (enc);
271} 303}
272 304
273static void encode_sv (enc_t *enc, SV *sv); 305static void encode_sv (enc_t *enc, SV *sv);
274 306
… …
283 encode_ch (enc, '['); encode_nl (enc); 315 encode_ch (enc, '['); encode_nl (enc);
284 ++enc->indent; 316 ++enc->indent;
285 317
286 for (i = 0; i <= len; ++i) 318 for (i = 0; i <= len; ++i)
287 { 319 {
320 SV **svp = av_fetch (av, i, 0);
321
288 encode_indent (enc); 322 encode_indent (enc);
289 encode_sv (enc, *av_fetch (av, i, 0)); 323
324 if (svp)
325 encode_sv (enc, *svp);
326 else
327 encode_str (enc, "null", 4, 0);
290 328
291 if (i < len) 329 if (i < len)
292 encode_comma (enc); 330 encode_comma (enc);
293 } 331 }
294 332
… …
297 --enc->indent; 335 --enc->indent;
298 encode_indent (enc); encode_ch (enc, ']'); 336 encode_indent (enc); encode_ch (enc, ']');
299} 337}
300 338
301static void 339static void
302encode_he (enc_t *enc, HE *he) 340encode_hk (enc_t *enc, HE *he)
303{ 341{
304 encode_ch (enc, '"'); 342 encode_ch (enc, '"');
305 343
306 if (HeKLEN (he) == HEf_SVKEY) 344 if (HeKLEN (he) == HEf_SVKEY)
307 { 345 {
… …
317 else 355 else
318 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 356 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
319 357
320 encode_ch (enc, '"'); 358 encode_ch (enc, '"');
321 359
322 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 360 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
323 encode_ch (enc, ':'); 361 encode_ch (enc, ':');
324 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 362 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
325 encode_sv (enc, HeVAL (he));
326} 363}
327 364
328// compare hash entries, used when all keys are bytestrings 365// compare hash entries, used when all keys are bytestrings
329static int 366static int
330he_cmp_fast (const void *a_, const void *b_) 367he_cmp_fast (const void *a_, const void *b_)
… …
335 HE *b = *(HE **)b_; 372 HE *b = *(HE **)b_;
336 373
337 STRLEN la = HeKLEN (a); 374 STRLEN la = HeKLEN (a);
338 STRLEN lb = HeKLEN (b); 375 STRLEN lb = HeKLEN (b);
339 376
340 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 377 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
341 cmp = la - lb; 378 cmp = lb - la;
342 379
343 return cmp; 380 return cmp;
344} 381}
345 382
346// compare hash entries, used when some keys are sv's or utf-x 383// compare hash entries, used when some keys are sv's or utf-x
347static int 384static int
348he_cmp_slow (const void *a, const void *b) 385he_cmp_slow (const void *a, const void *b)
349{ 386{
350 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 387 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
351} 388}
352 389
353static void 390static void
354encode_hv (enc_t *enc, HV *hv) 391encode_hv (enc_t *enc, HV *hv)
355{ 392{
393 HE *he;
356 int count, i; 394 int count;
357 395
358 if (enc->indent >= enc->maxdepth) 396 if (enc->indent >= enc->maxdepth)
359 croak ("data structure too deep (hit recursion limit)"); 397 croak ("data structure too deep (hit recursion limit)");
360 398
361 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 399 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
362 400
363 if ((count = hv_iterinit (hv)))
364 {
365 // for canonical output we have to sort by keys first 401 // for canonical output we have to sort by keys first
366 // actually, this is mostly due to the stupid so-called 402 // actually, this is mostly due to the stupid so-called
367 // security workaround added somewhere in 5.8.x. 403 // security workaround added somewhere in 5.8.x.
368 // that randomises hash orderings 404 // that randomises hash orderings
369 if (enc->flags & F_CANONICAL) 405 if (enc->json.flags & F_CANONICAL)
406 {
407 int count = hv_iterinit (hv);
408
409 if (SvMAGICAL (hv))
370 { 410 {
411 // need to count by iterating. could improve by dynamically building the vector below
412 // but I don't care for the speed of this special case.
413 // note also that we will run into undefined behaviour when the two iterations
414 // do not result in the same count, something I might care for in some later release.
415
416 count = 0;
417 while (hv_iternext (hv))
418 ++count;
419
420 hv_iterinit (hv);
421 }
422
423 if (count)
424 {
425 int i, fast = 1;
426#if defined(__BORLANDC__) || defined(_MSC_VER)
427 HE **hes = _alloca (count * sizeof (HE));
428#else
371 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode 429 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
372 int fast = 1; 430#endif
373 431
374 i = 0; 432 i = 0;
375 while ((he = hv_iternext (hv))) 433 while ((he = hv_iternext (hv)))
376 { 434 {
377 hes [i++] = he; 435 hes [i++] = he;
… …
399 457
400 FREETMPS; 458 FREETMPS;
401 LEAVE; 459 LEAVE;
402 } 460 }
403 461
404 for (i = 0; i < count; ++i) 462 while (count--)
405 { 463 {
406 encode_indent (enc); 464 encode_indent (enc);
465 he = hes [count];
407 encode_he (enc, hes [i]); 466 encode_hk (enc, he);
467 encode_sv (enc, SvMAGICAL (hv) ? hv_iterval (hv, he) : HeVAL (he));
408 468
409 if (i < count - 1) 469 if (count)
410 encode_comma (enc); 470 encode_comma (enc);
411 } 471 }
412 472 }
473 }
474 else
475 {
476 if (hv_iterinit (hv) || SvMAGICAL (hv))
477 if ((he = hv_iternext (hv)))
478 for (;;)
479 {
413 encode_nl (enc); 480 encode_indent (enc);
481 encode_hk (enc, he);
482 encode_sv (enc, SvMAGICAL (hv) ? hv_iterval (hv, he) : HeVAL (he));
483
484 if (!(he = hv_iternext (hv)))
485 break;
486
487 encode_comma (enc);
488 }
489 }
490
491 encode_nl (enc);
492
493 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
494}
495
496// encode objects, arrays and special \0=false and \1=true values.
497static void
498encode_rv (enc_t *enc, SV *sv)
499{
500 svtype svt;
501
502 SvGETMAGIC (sv);
503 svt = SvTYPE (sv);
504
505 if (expect_false (SvOBJECT (sv)))
506 {
507 HV *stash = !JSON_SLOW || json_boolean_stash
508 ? json_boolean_stash
509 : gv_stashpv ("JSON::XS::Boolean", 1);
510
511 if (SvSTASH (sv) == stash)
512 {
513 if (SvIV (sv))
514 encode_str (enc, "true", 4, 0);
515 else
516 encode_str (enc, "false", 5, 0);
414 } 517 }
415 else 518 else
416 { 519 {
417 HE *he = hv_iternext (hv); 520#if 0
418 521 if (0 && sv_derived_from (rv, "JSON::Literal"))
419 for (;;)
420 {
421 encode_indent (enc);
422 encode_he (enc, he);
423
424 if (!(he = hv_iternext (hv)))
425 break;
426
427 encode_comma (enc);
428 } 522 {
523 // not yet
524 }
525#endif
526 if (enc->json.flags & F_CONV_BLESSED)
527 {
528 // we re-bless the reference to get overload and other niceties right
529 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
429 530
531 if (to_json)
532 {
533 dSP;
534
535 ENTER; SAVETMPS; PUSHMARK (SP);
536 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
537
538 // calling with G_SCALAR ensures that we always get a 1 return value
539 PUTBACK;
540 call_sv ((SV *)GvCV (to_json), G_SCALAR);
541 SPAGAIN;
542
543 // catch this surprisingly common error
544 if (SvROK (TOPs) && SvRV (TOPs) == sv)
545 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
546
547 sv = POPs;
548 PUTBACK;
549
430 encode_nl (enc); 550 encode_sv (enc, sv);
551
552 FREETMPS; LEAVE;
553 }
554 else if (enc->json.flags & F_ALLOW_BLESSED)
555 encode_str (enc, "null", 4, 0);
556 else
557 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
558 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
559 }
560 else if (enc->json.flags & F_ALLOW_BLESSED)
561 encode_str (enc, "null", 4, 0);
562 else
563 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
564 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
431 } 565 }
432 } 566 }
433
434 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
435}
436
437// encode objects, arrays and special \0=false and \1=true values.
438static void
439encode_rv (enc_t *enc, SV *sv)
440{
441 svtype svt;
442
443 SvGETMAGIC (sv);
444 svt = SvTYPE (sv);
445
446 if (svt == SVt_PVHV) 567 else if (svt == SVt_PVHV)
447 encode_hv (enc, (HV *)sv); 568 encode_hv (enc, (HV *)sv);
448 else if (svt == SVt_PVAV) 569 else if (svt == SVt_PVAV)
449 encode_av (enc, (AV *)sv); 570 encode_av (enc, (AV *)sv);
450 else if (svt < SVt_PVAV) 571 else if (svt < SVt_PVAV)
451 { 572 {
452 if (SvNIOK (sv) && SvIV (sv) == 0) 573 STRLEN len = 0;
574 char *pv = svt ? SvPV (sv, len) : 0;
575
576 if (len == 1 && *pv == '1')
577 encode_str (enc, "true", 4, 0);
578 else if (len == 1 && *pv == '0')
453 encode_str (enc, "false", 5, 0); 579 encode_str (enc, "false", 5, 0);
454 else if (SvNIOK (sv) && SvIV (sv) == 1)
455 encode_str (enc, "true", 4, 0);
456 else 580 else
457 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 581 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
458 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 582 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
459 } 583 }
460 else 584 else
… …
475 encode_str (enc, str, len, SvUTF8 (sv)); 599 encode_str (enc, str, len, SvUTF8 (sv));
476 encode_ch (enc, '"'); 600 encode_ch (enc, '"');
477 } 601 }
478 else if (SvNOKp (sv)) 602 else if (SvNOKp (sv))
479 { 603 {
604 // trust that perl will do the right thing w.r.t. JSON syntax.
480 need (enc, NV_DIG + 32); 605 need (enc, NV_DIG + 32);
481 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 606 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
482 enc->cur += strlen (enc->cur); 607 enc->cur += strlen (enc->cur);
483 } 608 }
484 else if (SvIOKp (sv)) 609 else if (SvIOKp (sv))
485 { 610 {
486 need (enc, 64); 611 // we assume we can always read an IV as a UV
612 if (SvUV (sv) & ~(UV)0x7fff)
613 {
614 // large integer, use the (rather slow) snprintf way.
615 need (enc, sizeof (UV) * 3);
487 enc->cur += 616 enc->cur +=
488 SvIsUV(sv) 617 SvIsUV(sv)
489 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 618 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
490 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 619 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
620 }
621 else
622 {
623 // optimise the "small number case"
624 // code will likely be branchless and use only a single multiplication
625 I32 i = SvIV (sv);
626 U32 u;
627 char digit, nz = 0;
628
629 need (enc, 6);
630
631 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
632 u = i < 0 ? -i : i;
633
634 // convert to 4.28 fixed-point representation
635 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
636
637 // now output digit by digit, each time masking out the integer part
638 // and multiplying by 5 while moving the decimal point one to the right,
639 // resulting in a net multiplication by 10.
640 // we always write the digit to memory but conditionally increment
641 // the pointer, to ease the usage of conditional move instructions.
642 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
643 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
644 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
645 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
646 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
647 }
491 } 648 }
492 else if (SvROK (sv)) 649 else if (SvROK (sv))
493 encode_rv (enc, SvRV (sv)); 650 encode_rv (enc, SvRV (sv));
494 else if (!SvOK (sv)) 651 else if (!SvOK (sv))
495 encode_str (enc, "null", 4, 0); 652 encode_str (enc, "null", 4, 0);
… …
497 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 654 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
498 SvPV_nolen (sv), SvFLAGS (sv)); 655 SvPV_nolen (sv), SvFLAGS (sv));
499} 656}
500 657
501static SV * 658static SV *
502encode_json (SV *scalar, U32 flags) 659encode_json (SV *scalar, JSON *json)
503{ 660{
504 enc_t enc; 661 enc_t enc;
505 662
506 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 663 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
507 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 664 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
508 665
509 enc.flags = flags; 666 enc.json = *json;
510 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 667 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
511 enc.cur = SvPVX (enc.sv); 668 enc.cur = SvPVX (enc.sv);
512 enc.end = SvEND (enc.sv); 669 enc.end = SvEND (enc.sv);
513 enc.indent = 0; 670 enc.indent = 0;
514 enc.maxdepth = DEC_DEPTH (flags); 671 enc.maxdepth = DEC_DEPTH (enc.json.flags);
515 672
516 SvPOK_only (enc.sv); 673 SvPOK_only (enc.sv);
517 encode_sv (&enc, scalar); 674 encode_sv (&enc, scalar);
518 675
519 if (!(flags & (F_ASCII | F_UTF8)))
520 SvUTF8_on (enc.sv);
521
522 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 676 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
523 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 677 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
524 678
679 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
680 SvUTF8_on (enc.sv);
681
525 if (enc.flags & F_SHRINK) 682 if (enc.json.flags & F_SHRINK)
526 shrink (enc.sv); 683 shrink (enc.sv);
527 684
528 return enc.sv; 685 return enc.sv;
529} 686}
530 687
… …
535typedef struct 692typedef struct
536{ 693{
537 char *cur; // current parser pointer 694 char *cur; // current parser pointer
538 char *end; // end of input string 695 char *end; // end of input string
539 const char *err; // parse error, if != 0 696 const char *err; // parse error, if != 0
540 U32 flags; // F_* 697 JSON json;
541 U32 depth; // recursion depth 698 U32 depth; // recursion depth
542 U32 maxdepth; // recursion depth limit 699 U32 maxdepth; // recursion depth limit
543} dec_t; 700} dec_t;
544 701
545static void 702inline void
546decode_ws (dec_t *dec) 703decode_ws (dec_t *dec)
547{ 704{
548 for (;;) 705 for (;;)
549 { 706 {
550 char ch = *dec->cur; 707 char ch = *dec->cur;
… …
576decode_4hex (dec_t *dec) 733decode_4hex (dec_t *dec)
577{ 734{
578 signed char d1, d2, d3, d4; 735 signed char d1, d2, d3, d4;
579 unsigned char *cur = (unsigned char *)dec->cur; 736 unsigned char *cur = (unsigned char *)dec->cur;
580 737
581 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected"); 738 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
582 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected"); 739 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
583 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected"); 740 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
584 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected"); 741 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
585 742
586 dec->cur += 4; 743 dec->cur += 4;
587 744
588 return ((UV)d1) << 12 745 return ((UV)d1) << 12
589 | ((UV)d2) << 8 746 | ((UV)d2) << 8
… …
597static SV * 754static SV *
598decode_str (dec_t *dec) 755decode_str (dec_t *dec)
599{ 756{
600 SV *sv = 0; 757 SV *sv = 0;
601 int utf8 = 0; 758 int utf8 = 0;
759 char *dec_cur = dec->cur;
602 760
603 do 761 do
604 { 762 {
605 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES]; 763 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
606 char *cur = buf; 764 char *cur = buf;
607 765
608 do 766 do
609 { 767 {
610 unsigned char ch = *(unsigned char *)dec->cur++; 768 unsigned char ch = *(unsigned char *)dec_cur++;
611 769
612 if (ch == '"') 770 if (expect_false (ch == '"'))
613 { 771 {
614 --dec->cur; 772 --dec_cur;
615 break; 773 break;
616 } 774 }
617 else if (ch == '\\') 775 else if (expect_false (ch == '\\'))
618 { 776 {
619 switch (*dec->cur) 777 switch (*dec_cur)
620 { 778 {
621 case '\\': 779 case '\\':
622 case '/': 780 case '/':
623 case '"': *cur++ = *dec->cur++; break; 781 case '"': *cur++ = *dec_cur++; break;
624 782
625 case 'b': ++dec->cur; *cur++ = '\010'; break; 783 case 'b': ++dec_cur; *cur++ = '\010'; break;
626 case 't': ++dec->cur; *cur++ = '\011'; break; 784 case 't': ++dec_cur; *cur++ = '\011'; break;
627 case 'n': ++dec->cur; *cur++ = '\012'; break; 785 case 'n': ++dec_cur; *cur++ = '\012'; break;
628 case 'f': ++dec->cur; *cur++ = '\014'; break; 786 case 'f': ++dec_cur; *cur++ = '\014'; break;
629 case 'r': ++dec->cur; *cur++ = '\015'; break; 787 case 'r': ++dec_cur; *cur++ = '\015'; break;
630 788
631 case 'u': 789 case 'u':
632 { 790 {
633 UV lo, hi; 791 UV lo, hi;
634 ++dec->cur; 792 ++dec_cur;
635 793
794 dec->cur = dec_cur;
636 hi = decode_4hex (dec); 795 hi = decode_4hex (dec);
796 dec_cur = dec->cur;
637 if (hi == (UV)-1) 797 if (hi == (UV)-1)
638 goto fail; 798 goto fail;
639 799
640 // possibly a surrogate pair 800 // possibly a surrogate pair
641 if (hi >= 0xd800) 801 if (hi >= 0xd800)
642 if (hi < 0xdc00) 802 if (hi < 0xdc00)
643 { 803 {
644 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 804 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
645 ERR ("missing low surrogate character in surrogate pair"); 805 ERR ("missing low surrogate character in surrogate pair");
646 806
647 dec->cur += 2; 807 dec_cur += 2;
648 808
809 dec->cur = dec_cur;
649 lo = decode_4hex (dec); 810 lo = decode_4hex (dec);
811 dec_cur = dec->cur;
650 if (lo == (UV)-1) 812 if (lo == (UV)-1)
651 goto fail; 813 goto fail;
652 814
653 if (lo < 0xdc00 || lo >= 0xe000) 815 if (lo < 0xdc00 || lo >= 0xe000)
654 ERR ("surrogate pair expected"); 816 ERR ("surrogate pair expected");
… …
668 *cur++ = hi; 830 *cur++ = hi;
669 } 831 }
670 break; 832 break;
671 833
672 default: 834 default:
673 --dec->cur; 835 --dec_cur;
674 ERR ("illegal backslash escape sequence in string"); 836 ERR ("illegal backslash escape sequence in string");
675 } 837 }
676 } 838 }
677 else if (ch >= 0x20 && ch <= 0x7f) 839 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
678 *cur++ = ch; 840 *cur++ = ch;
679 else if (ch >= 0x80) 841 else if (ch >= 0x80)
680 { 842 {
681 STRLEN clen; 843 STRLEN clen;
682 UV uch; 844 UV uch;
683 845
684 --dec->cur; 846 --dec_cur;
685 847
686 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 848 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
687 if (clen == (STRLEN)-1) 849 if (clen == (STRLEN)-1)
688 ERR ("malformed UTF-8 character in JSON string"); 850 ERR ("malformed UTF-8 character in JSON string");
689 851
690 do 852 do
691 *cur++ = *dec->cur++; 853 *cur++ = *dec_cur++;
692 while (--clen); 854 while (--clen);
693 855
694 utf8 = 1; 856 utf8 = 1;
695 } 857 }
696 else 858 else
697 { 859 {
698 --dec->cur; 860 --dec_cur;
699 861
700 if (!ch) 862 if (!ch)
701 ERR ("unexpected end of string while parsing JSON string"); 863 ERR ("unexpected end of string while parsing JSON string");
702 else 864 else
703 ERR ("invalid character encountered while parsing JSON string"); 865 ERR ("invalid character encountered while parsing JSON string");
… …
716 } 878 }
717 else 879 else
718 sv = newSVpvn (buf, len); 880 sv = newSVpvn (buf, len);
719 } 881 }
720 } 882 }
721 while (*dec->cur != '"'); 883 while (*dec_cur != '"');
722 884
723 ++dec->cur; 885 ++dec_cur;
724 886
725 if (sv) 887 if (sv)
726 { 888 {
727 SvPOK_only (sv); 889 SvPOK_only (sv);
728 *SvEND (sv) = 0; 890 *SvEND (sv) = 0;
… …
731 SvUTF8_on (sv); 893 SvUTF8_on (sv);
732 } 894 }
733 else 895 else
734 sv = newSVpvn ("", 0); 896 sv = newSVpvn ("", 0);
735 897
898 dec->cur = dec_cur;
736 return sv; 899 return sv;
737 900
738fail: 901fail:
902 dec->cur = dec_cur;
739 return 0; 903 return 0;
740} 904}
741 905
742static SV * 906static SV *
743decode_num (dec_t *dec) 907decode_num (dec_t *dec)
… …
801 is_nv = 1; 965 is_nv = 1;
802 } 966 }
803 967
804 if (!is_nv) 968 if (!is_nv)
805 { 969 {
806 UV uv; 970 int len = dec->cur - start;
807 int numtype = grok_number (start, dec->cur - start, &uv); 971
808 if (numtype & IS_NUMBER_IN_UV) 972 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
809 if (numtype & IS_NUMBER_NEG) 973 if (*start == '-')
974 switch (len)
810 { 975 {
811 if (uv < (UV)IV_MIN) 976 case 2: return newSViv (-( start [1] - '0' * 1));
812 return newSViv (-(IV)uv); 977 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
978 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
979 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
813 } 980 }
981 else
982 switch (len)
983 {
984 case 1: return newSViv ( start [0] - '0' * 1);
985 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
986 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
987 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
988 }
989
990 {
991 UV uv;
992 int numtype = grok_number (start, len, &uv);
993 if (numtype & IS_NUMBER_IN_UV)
994 if (numtype & IS_NUMBER_NEG)
995 {
996 if (uv < (UV)IV_MIN)
997 return newSViv (-(IV)uv);
998 }
814 else 999 else
815 return newSVuv (uv); 1000 return newSVuv (uv);
816 } 1001 }
817 1002
1003 len -= *start == '-' ? 1 : 0;
1004
1005 // does not fit into IV or UV, try NV
1006 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
1007 #if defined (LDBL_DIG)
1008 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1009 #endif
1010 )
1011 // fits into NV without loss of precision
1012 return newSVnv (Atof (start));
1013
1014 // everything else fails, convert it to a string
1015 return newSVpvn (start, dec->cur - start);
1016 }
1017
1018 // loss of precision here
818 return newSVnv (Atof (start)); 1019 return newSVnv (Atof (start));
819 1020
820fail: 1021fail:
821 return 0; 1022 return 0;
822} 1023}
… …
866} 1067}
867 1068
868static SV * 1069static SV *
869decode_hv (dec_t *dec) 1070decode_hv (dec_t *dec)
870{ 1071{
1072 SV *sv;
871 HV *hv = newHV (); 1073 HV *hv = newHV ();
872 1074
873 DEC_INC_DEPTH; 1075 DEC_INC_DEPTH;
874 decode_ws (dec); 1076 decode_ws (dec);
875 1077
876 if (*dec->cur == '}') 1078 if (*dec->cur == '}')
877 ++dec->cur; 1079 ++dec->cur;
878 else 1080 else
879 for (;;) 1081 for (;;)
880 { 1082 {
881 SV *key, *value;
882
883 decode_ws (dec); EXPECT_CH ('"'); 1083 decode_ws (dec); EXPECT_CH ('"');
884 1084
885 key = decode_str (dec); 1085 // heuristic: assume that
886 if (!key) 1086 // a) decode_str + hv_store_ent are abysmally slow.
887 goto fail; 1087 // b) most hash keys are short, simple ascii text.
1088 // => try to "fast-match" such strings to avoid
1089 // the overhead of decode_str + hv_store_ent.
1090 {
1091 SV *value;
1092 char *p = dec->cur;
1093 char *e = p + 24; // only try up to 24 bytes
888 1094
889 decode_ws (dec); EXPECT_CH (':'); 1095 for (;;)
890
891 value = decode_sv (dec);
892 if (!value)
893 { 1096 {
1097 // the >= 0x80 is true on most architectures
1098 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1099 {
1100 // slow path, back up and use decode_str
1101 SV *key = decode_str (dec);
1102 if (!key)
1103 goto fail;
1104
1105 decode_ws (dec); EXPECT_CH (':');
1106
1107 value = decode_sv (dec);
1108 if (!value)
1109 {
1110 SvREFCNT_dec (key);
1111 goto fail;
1112 }
1113
1114 hv_store_ent (hv, key, value, 0);
894 SvREFCNT_dec (key); 1115 SvREFCNT_dec (key);
1116
1117 break;
1118 }
1119 else if (*p == '"')
1120 {
1121 // fast path, got a simple key
1122 char *key = dec->cur;
1123 int len = p - key;
1124 dec->cur = p + 1;
1125
1126 decode_ws (dec); EXPECT_CH (':');
1127
1128 value = decode_sv (dec);
1129 if (!value)
895 goto fail; 1130 goto fail;
1131
1132 hv_store (hv, key, len, value, 0);
1133
1134 break;
1135 }
1136
1137 ++p;
896 } 1138 }
897 1139 }
898 hv_store_ent (hv, key, value, 0);
899 SvREFCNT_dec (key);
900 1140
901 decode_ws (dec); 1141 decode_ws (dec);
902 1142
903 if (*dec->cur == '}') 1143 if (*dec->cur == '}')
904 { 1144 {
… …
911 1151
912 ++dec->cur; 1152 ++dec->cur;
913 } 1153 }
914 1154
915 DEC_DEC_DEPTH; 1155 DEC_DEC_DEPTH;
916 return newRV_noinc ((SV *)hv); 1156 sv = newRV_noinc ((SV *)hv);
1157
1158 // check filter callbacks
1159 if (dec->json.flags & F_HOOK)
1160 {
1161 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1162 {
1163 HE *cb, *he;
1164
1165 hv_iterinit (hv);
1166 he = hv_iternext (hv);
1167 hv_iterinit (hv);
1168
1169 // the next line creates a mortal sv each time its called.
1170 // might want to optimise this for common cases.
1171 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1172
1173 if (cb)
1174 {
1175 dSP;
1176 int count;
1177
1178 ENTER; SAVETMPS; PUSHMARK (SP);
1179 XPUSHs (HeVAL (he));
1180
1181 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1182
1183 if (count == 1)
1184 {
1185 sv = newSVsv (POPs);
1186 FREETMPS; LEAVE;
1187 return sv;
1188 }
1189
1190 FREETMPS; LEAVE;
1191 }
1192 }
1193
1194 if (dec->json.cb_object)
1195 {
1196 dSP;
1197 int count;
1198
1199 ENTER; SAVETMPS; PUSHMARK (SP);
1200 XPUSHs (sv_2mortal (sv));
1201
1202 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1203
1204 if (count == 1)
1205 {
1206 sv = newSVsv (POPs);
1207 FREETMPS; LEAVE;
1208 return sv;
1209 }
1210
1211 SvREFCNT_inc (sv);
1212 FREETMPS; LEAVE;
1213 }
1214 }
1215
1216 return sv;
917 1217
918fail: 1218fail:
919 SvREFCNT_dec (hv); 1219 SvREFCNT_dec (hv);
920 DEC_DEC_DEPTH; 1220 DEC_DEC_DEPTH;
921 return 0; 1221 return 0;
… …
923 1223
924static SV * 1224static SV *
925decode_sv (dec_t *dec) 1225decode_sv (dec_t *dec)
926{ 1226{
927 decode_ws (dec); 1227 decode_ws (dec);
1228
1229 // the beauty of JSON: you need exactly one character lookahead
1230 // to parse anything.
928 switch (*dec->cur) 1231 switch (*dec->cur)
929 { 1232 {
930 case '"': ++dec->cur; return decode_str (dec); 1233 case '"': ++dec->cur; return decode_str (dec);
931 case '[': ++dec->cur; return decode_av (dec); 1234 case '[': ++dec->cur; return decode_av (dec);
932 case '{': ++dec->cur; return decode_hv (dec); 1235 case '{': ++dec->cur; return decode_hv (dec);
… …
938 1241
939 case 't': 1242 case 't':
940 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1243 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
941 { 1244 {
942 dec->cur += 4; 1245 dec->cur += 4;
943 return newSViv (1); 1246#if JSON_SLOW
1247 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
1248#endif
1249 return SvREFCNT_inc (json_true);
944 } 1250 }
945 else 1251 else
946 ERR ("'true' expected"); 1252 ERR ("'true' expected");
947 1253
948 break; 1254 break;
949 1255
950 case 'f': 1256 case 'f':
951 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1257 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
952 { 1258 {
953 dec->cur += 5; 1259 dec->cur += 5;
954 return newSViv (0); 1260#if JSON_SLOW
1261 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1262#endif
1263 return SvREFCNT_inc (json_false);
955 } 1264 }
956 else 1265 else
957 ERR ("'false' expected"); 1266 ERR ("'false' expected");
958 1267
959 break; 1268 break;
… …
977fail: 1286fail:
978 return 0; 1287 return 0;
979} 1288}
980 1289
981static SV * 1290static SV *
982decode_json (SV *string, U32 flags) 1291decode_json (SV *string, JSON *json, UV *offset_return)
983{ 1292{
984 dec_t dec; 1293 dec_t dec;
1294 UV offset;
985 SV *sv; 1295 SV *sv;
986 1296
987 SvGETMAGIC (string); 1297 SvGETMAGIC (string);
988 SvUPGRADE (string, SVt_PV); 1298 SvUPGRADE (string, SVt_PV);
989 1299
1300 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1301 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1302 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1303
990 if (flags & F_UTF8) 1304 if (json->flags & F_UTF8)
991 sv_utf8_downgrade (string, 0); 1305 sv_utf8_downgrade (string, 0);
992 else 1306 else
993 sv_utf8_upgrade (string); 1307 sv_utf8_upgrade (string);
994 1308
995 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1309 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
996 1310
997 dec.flags = flags; 1311 dec.json = *json;
998 dec.cur = SvPVX (string); 1312 dec.cur = SvPVX (string);
999 dec.end = SvEND (string); 1313 dec.end = SvEND (string);
1000 dec.err = 0; 1314 dec.err = 0;
1001 dec.depth = 0; 1315 dec.depth = 0;
1002 dec.maxdepth = DEC_DEPTH (dec.flags); 1316 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1003 1317
1318 if (dec.json.cb_object || dec.json.cb_sk_object)
1319 dec.json.flags |= F_HOOK;
1320
1004 *dec.end = 0; // this should basically be a nop, too, but make sure its there 1321 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1005 sv = decode_sv (&dec); 1322 sv = decode_sv (&dec);
1006 1323
1324 if (!(offset_return || !sv))
1325 {
1326 // check for trailing garbage
1327 decode_ws (&dec);
1328
1329 if (*dec.cur)
1330 {
1331 dec.err = "garbage after JSON object";
1332 SvREFCNT_dec (sv);
1333 sv = 0;
1334 }
1335 }
1336
1337 if (offset_return || !sv)
1338 {
1339 offset = dec.json.flags & F_UTF8
1340 ? dec.cur - SvPVX (string)
1341 : utf8_distance (dec.cur, SvPVX (string));
1342
1343 if (offset_return)
1344 *offset_return = offset;
1345 }
1346
1007 if (!sv) 1347 if (!sv)
1008 { 1348 {
1009 IV offset = dec.flags & F_UTF8
1010 ? dec.cur - SvPVX (string)
1011 : utf8_distance (dec.cur, SvPVX (string));
1012 SV *uni = sv_newmortal (); 1349 SV *uni = sv_newmortal ();
1013 1350
1014 // horrible hack to silence warning inside pv_uni_display 1351 // horrible hack to silence warning inside pv_uni_display
1015 COP cop = *PL_curcop; 1352 COP cop = *PL_curcop;
1016 cop.cop_warnings = pWARN_NONE; 1353 cop.cop_warnings = pWARN_NONE;
… …
1026 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1363 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1027 } 1364 }
1028 1365
1029 sv = sv_2mortal (sv); 1366 sv = sv_2mortal (sv);
1030 1367
1031 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1368 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1032 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1369 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1033 1370
1034 return sv; 1371 return sv;
1035} 1372}
1036 1373
… …
1040MODULE = JSON::XS PACKAGE = JSON::XS 1377MODULE = JSON::XS PACKAGE = JSON::XS
1041 1378
1042BOOT: 1379BOOT:
1043{ 1380{
1044 int i; 1381 int i;
1045
1046 memset (decode_hexdigit, 0xff, 256);
1047 1382
1048 for (i = 0; i < 256; ++i) 1383 for (i = 0; i < 256; ++i)
1049 decode_hexdigit [i] = 1384 decode_hexdigit [i] =
1050 i >= '0' && i <= '9' ? i - '0' 1385 i >= '0' && i <= '9' ? i - '0'
1051 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1386 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1052 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1387 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1053 : -1; 1388 : -1;
1054 1389
1055 json_stash = gv_stashpv ("JSON::XS", 1); 1390 json_stash = gv_stashpv ("JSON::XS" , 1);
1391 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1392
1393 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1394 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1056} 1395}
1057 1396
1058PROTOTYPES: DISABLE 1397PROTOTYPES: DISABLE
1059 1398
1060SV *new (char *dummy) 1399void CLONE (...)
1061 CODE: 1400 CODE:
1062 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1401 json_stash = 0;
1063 OUTPUT: 1402 json_boolean_stash = 0;
1064 RETVAL
1065 1403
1404void new (char *klass)
1405 PPCODE:
1406{
1407 SV *pv = NEWSV (0, sizeof (JSON));
1408 SvPOK_only (pv);
1409 Zero (SvPVX (pv), 1, JSON);
1410 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1411 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1412}
1413
1066SV *ascii (SV *self, int enable = 1) 1414void ascii (JSON *self, int enable = 1)
1067 ALIAS: 1415 ALIAS:
1068 ascii = F_ASCII 1416 ascii = F_ASCII
1417 latin1 = F_LATIN1
1069 utf8 = F_UTF8 1418 utf8 = F_UTF8
1070 indent = F_INDENT 1419 indent = F_INDENT
1071 canonical = F_CANONICAL 1420 canonical = F_CANONICAL
1072 space_before = F_SPACE_BEFORE 1421 space_before = F_SPACE_BEFORE
1073 space_after = F_SPACE_AFTER 1422 space_after = F_SPACE_AFTER
1074 pretty = F_PRETTY 1423 pretty = F_PRETTY
1075 allow_nonref = F_ALLOW_NONREF 1424 allow_nonref = F_ALLOW_NONREF
1076 shrink = F_SHRINK 1425 shrink = F_SHRINK
1426 allow_blessed = F_ALLOW_BLESSED
1427 convert_blessed = F_CONV_BLESSED
1077 CODE: 1428 PPCODE:
1078{ 1429{
1079 UV *uv = SvJSON (self);
1080 if (enable) 1430 if (enable)
1081 *uv |= ix; 1431 self->flags |= ix;
1082 else 1432 else
1083 *uv &= ~ix; 1433 self->flags &= ~ix;
1084 1434
1085 RETVAL = newSVsv (self); 1435 XPUSHs (ST (0));
1086} 1436}
1087 OUTPUT:
1088 RETVAL
1089 1437
1090SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1438void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1091 CODE: 1439 PPCODE:
1092{ 1440{
1093 UV *uv = SvJSON (self);
1094 UV log2 = 0; 1441 UV log2 = 0;
1095 1442
1096 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1443 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1097 1444
1098 while ((1UL << log2) < max_depth) 1445 while ((1UL << log2) < max_depth)
1099 ++log2; 1446 ++log2;
1100 1447
1101 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1448 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1102 1449
1103 RETVAL = newSVsv (self); 1450 XPUSHs (ST (0));
1104} 1451}
1105 OUTPUT:
1106 RETVAL
1107 1452
1108void encode (SV *self, SV *scalar) 1453void max_size (JSON *self, UV max_size = 0)
1109 PPCODE: 1454 PPCODE:
1110 XPUSHs (encode_json (scalar, *SvJSON (self))); 1455{
1456 UV log2 = 0;
1111 1457
1112void decode (SV *self, SV *jsonstr) 1458 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1459 if (max_size == 1) max_size = 2;
1460
1461 while ((1UL << log2) < max_size)
1462 ++log2;
1463
1464 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1465
1466 XPUSHs (ST (0));
1467}
1468
1469void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1113 PPCODE: 1470 PPCODE:
1471{
1472 SvREFCNT_dec (self->cb_object);
1473 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1474
1475 XPUSHs (ST (0));
1476}
1477
1478void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1479 PPCODE:
1480{
1481 if (!self->cb_sk_object)
1482 self->cb_sk_object = newHV ();
1483
1484 if (SvOK (cb))
1485 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1486 else
1487 {
1488 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1489
1490 if (!HvKEYS (self->cb_sk_object))
1491 {
1492 SvREFCNT_dec (self->cb_sk_object);
1493 self->cb_sk_object = 0;
1494 }
1495 }
1496
1497 XPUSHs (ST (0));
1498}
1499
1500void encode (JSON *self, SV *scalar)
1501 PPCODE:
1502 XPUSHs (encode_json (scalar, self));
1503
1504void decode (JSON *self, SV *jsonstr)
1505 PPCODE:
1114 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1506 XPUSHs (decode_json (jsonstr, self, 0));
1507
1508void decode_prefix (JSON *self, SV *jsonstr)
1509 PPCODE:
1510{
1511 UV offset;
1512 EXTEND (SP, 2);
1513 PUSHs (decode_json (jsonstr, self, &offset));
1514 PUSHs (sv_2mortal (newSVuv (offset)));
1515}
1516
1517void DESTROY (JSON *self)
1518 CODE:
1519 SvREFCNT_dec (self->cb_sk_object);
1520 SvREFCNT_dec (self->cb_object);
1115 1521
1116PROTOTYPES: ENABLE 1522PROTOTYPES: ENABLE
1117 1523
1118void to_json (SV *scalar) 1524void to_json (SV *scalar)
1119 ALIAS:
1120 objToJson = 0
1121 PPCODE: 1525 PPCODE:
1526{
1527 JSON json = { F_DEFAULT | F_UTF8 };
1122 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1528 XPUSHs (encode_json (scalar, &json));
1529}
1123 1530
1124void from_json (SV *jsonstr) 1531void from_json (SV *jsonstr)
1125 ALIAS:
1126 jsonToObj = 0
1127 PPCODE: 1532 PPCODE:
1533{
1534 JSON json = { F_DEFAULT | F_UTF8 };
1128 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8)); 1535 XPUSHs (decode_json (jsonstr, &json, 0));
1536}
1129 1537

Diff Legend

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