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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines