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.31 by root, Wed May 9 16:33:53 2007 UTC vs.
Revision 1.63 by root, Mon Aug 27 01:49:01 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
… …
289 encode_ch (enc, '['); encode_nl (enc); 317 encode_ch (enc, '['); encode_nl (enc);
290 ++enc->indent; 318 ++enc->indent;
291 319
292 for (i = 0; i <= len; ++i) 320 for (i = 0; i <= len; ++i)
293 { 321 {
322 SV **svp = av_fetch (av, i, 0);
323
294 encode_indent (enc); 324 encode_indent (enc);
295 encode_sv (enc, *av_fetch (av, i, 0)); 325
326 if (svp)
327 encode_sv (enc, *svp);
328 else
329 encode_str (enc, "null", 4, 0);
296 330
297 if (i < len) 331 if (i < len)
298 encode_comma (enc); 332 encode_comma (enc);
299 } 333 }
300 334
… …
303 --enc->indent; 337 --enc->indent;
304 encode_indent (enc); encode_ch (enc, ']'); 338 encode_indent (enc); encode_ch (enc, ']');
305} 339}
306 340
307static void 341static void
308encode_he (enc_t *enc, HE *he) 342encode_hk (enc_t *enc, HE *he)
309{ 343{
310 encode_ch (enc, '"'); 344 encode_ch (enc, '"');
311 345
312 if (HeKLEN (he) == HEf_SVKEY) 346 if (HeKLEN (he) == HEf_SVKEY)
313 { 347 {
… …
323 else 357 else
324 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 358 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
325 359
326 encode_ch (enc, '"'); 360 encode_ch (enc, '"');
327 361
328 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 362 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
329 encode_ch (enc, ':'); 363 encode_ch (enc, ':');
330 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 364 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
331 encode_sv (enc, HeVAL (he));
332} 365}
333 366
334// compare hash entries, used when all keys are bytestrings 367// compare hash entries, used when all keys are bytestrings
335static int 368static int
336he_cmp_fast (const void *a_, const void *b_) 369he_cmp_fast (const void *a_, const void *b_)
… …
341 HE *b = *(HE **)b_; 374 HE *b = *(HE **)b_;
342 375
343 STRLEN la = HeKLEN (a); 376 STRLEN la = HeKLEN (a);
344 STRLEN lb = HeKLEN (b); 377 STRLEN lb = HeKLEN (b);
345 378
346 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 379 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
347 cmp = la - lb; 380 cmp = lb - la;
348 381
349 return cmp; 382 return cmp;
350} 383}
351 384
352// compare hash entries, used when some keys are sv's or utf-x 385// compare hash entries, used when some keys are sv's or utf-x
353static int 386static int
354he_cmp_slow (const void *a, const void *b) 387he_cmp_slow (const void *a, const void *b)
355{ 388{
356 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 389 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
357} 390}
358 391
359static void 392static void
360encode_hv (enc_t *enc, HV *hv) 393encode_hv (enc_t *enc, HV *hv)
361{ 394{
395 HE *he;
362 int count, i; 396 int count;
363 397
364 if (enc->indent >= enc->maxdepth) 398 if (enc->indent >= enc->maxdepth)
365 croak ("data structure too deep (hit recursion limit)"); 399 croak ("data structure too deep (hit recursion limit)");
366 400
367 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 401 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
368 402
369 if ((count = hv_iterinit (hv)))
370 {
371 // for canonical output we have to sort by keys first 403 // for canonical output we have to sort by keys first
372 // actually, this is mostly due to the stupid so-called 404 // actually, this is mostly due to the stupid so-called
373 // security workaround added somewhere in 5.8.x. 405 // security workaround added somewhere in 5.8.x.
374 // that randomises hash orderings 406 // that randomises hash orderings
375 if (enc->flags & F_CANONICAL) 407 if (enc->json.flags & F_CANONICAL)
408 {
409 int count = hv_iterinit (hv);
410
411 if (SvMAGICAL (hv))
376 { 412 {
413 // need to count by iterating. could improve by dynamically building the vector below
414 // but I don't care for the speed of this special case.
415 // note also that we will run into undefined behaviour when the two iterations
416 // do not result in the same count, something I might care for in some later release.
417
418 count = 0;
419 while (hv_iternext (hv))
420 ++count;
421
422 hv_iterinit (hv);
423 }
424
425 if (count)
426 {
427 int i, fast = 1;
428#if defined(__BORLANDC__) || defined(_MSC_VER)
429 HE **hes = _alloca (count * sizeof (HE));
430#else
377 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode 431 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
378 int fast = 1; 432#endif
379 433
380 i = 0; 434 i = 0;
381 while ((he = hv_iternext (hv))) 435 while ((he = hv_iternext (hv)))
382 { 436 {
383 hes [i++] = he; 437 hes [i++] = he;
… …
405 459
406 FREETMPS; 460 FREETMPS;
407 LEAVE; 461 LEAVE;
408 } 462 }
409 463
410 for (i = 0; i < count; ++i) 464 while (count--)
411 { 465 {
412 encode_indent (enc); 466 encode_indent (enc);
467 he = hes [count];
413 encode_he (enc, hes [i]); 468 encode_hk (enc, he);
469 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
414 470
415 if (i < count - 1) 471 if (count)
416 encode_comma (enc); 472 encode_comma (enc);
417 } 473 }
418 474 }
475 }
476 else
477 {
478 if (hv_iterinit (hv) || SvMAGICAL (hv))
479 if ((he = hv_iternext (hv)))
480 for (;;)
481 {
419 encode_nl (enc); 482 encode_indent (enc);
483 encode_hk (enc, he);
484 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
485
486 if (!(he = hv_iternext (hv)))
487 break;
488
489 encode_comma (enc);
490 }
491 }
492
493 encode_nl (enc);
494
495 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
496}
497
498// encode objects, arrays and special \0=false and \1=true values.
499static void
500encode_rv (enc_t *enc, SV *sv)
501{
502 svtype svt;
503
504 SvGETMAGIC (sv);
505 svt = SvTYPE (sv);
506
507 if (expect_false (SvOBJECT (sv)))
508 {
509 HV *stash = !JSON_SLOW || json_boolean_stash
510 ? json_boolean_stash
511 : gv_stashpv ("JSON::XS::Boolean", 1);
512
513 if (SvSTASH (sv) == stash)
514 {
515 if (SvIV (sv))
516 encode_str (enc, "true", 4, 0);
517 else
518 encode_str (enc, "false", 5, 0);
420 } 519 }
421 else 520 else
422 { 521 {
423 HE *he = hv_iternext (hv); 522#if 0
424 523 if (0 && sv_derived_from (rv, "JSON::Literal"))
425 for (;;)
426 {
427 encode_indent (enc);
428 encode_he (enc, he);
429
430 if (!(he = hv_iternext (hv)))
431 break;
432
433 encode_comma (enc);
434 } 524 {
525 // not yet
526 }
527#endif
528 if (enc->json.flags & F_CONV_BLESSED)
529 {
530 // we re-bless the reference to get overload and other niceties right
531 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
435 532
533 if (to_json)
534 {
535 dSP;
536
537 ENTER; SAVETMPS; PUSHMARK (SP);
538 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
539
540 // calling with G_SCALAR ensures that we always get a 1 return value
541 PUTBACK;
542 call_sv ((SV *)GvCV (to_json), G_SCALAR);
543 SPAGAIN;
544
545 // catch this surprisingly common error
546 if (SvROK (TOPs) && SvRV (TOPs) == sv)
547 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
548
549 sv = POPs;
550 PUTBACK;
551
436 encode_nl (enc); 552 encode_sv (enc, sv);
553
554 FREETMPS; LEAVE;
555 }
556 else if (enc->json.flags & F_ALLOW_BLESSED)
557 encode_str (enc, "null", 4, 0);
558 else
559 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
560 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
561 }
562 else if (enc->json.flags & F_ALLOW_BLESSED)
563 encode_str (enc, "null", 4, 0);
564 else
565 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
566 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
437 } 567 }
438 } 568 }
439
440 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
441}
442
443// encode objects, arrays and special \0=false and \1=true values.
444static void
445encode_rv (enc_t *enc, SV *sv)
446{
447 svtype svt;
448
449 SvGETMAGIC (sv);
450 svt = SvTYPE (sv);
451
452 if (svt == SVt_PVHV) 569 else if (svt == SVt_PVHV)
453 encode_hv (enc, (HV *)sv); 570 encode_hv (enc, (HV *)sv);
454 else if (svt == SVt_PVAV) 571 else if (svt == SVt_PVAV)
455 encode_av (enc, (AV *)sv); 572 encode_av (enc, (AV *)sv);
456 else if (svt < SVt_PVAV) 573 else if (svt < SVt_PVAV)
457 { 574 {
458 if (SvNIOK (sv) && SvIV (sv) == 0) 575 STRLEN len = 0;
576 char *pv = svt ? SvPV (sv, len) : 0;
577
578 if (len == 1 && *pv == '1')
579 encode_str (enc, "true", 4, 0);
580 else if (len == 1 && *pv == '0')
459 encode_str (enc, "false", 5, 0); 581 encode_str (enc, "false", 5, 0);
460 else if (SvNIOK (sv) && SvIV (sv) == 1)
461 encode_str (enc, "true", 4, 0);
462 else 582 else
463 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 583 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
464 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 584 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
465 } 585 }
466 else 586 else
… …
481 encode_str (enc, str, len, SvUTF8 (sv)); 601 encode_str (enc, str, len, SvUTF8 (sv));
482 encode_ch (enc, '"'); 602 encode_ch (enc, '"');
483 } 603 }
484 else if (SvNOKp (sv)) 604 else if (SvNOKp (sv))
485 { 605 {
606 // trust that perl will do the right thing w.r.t. JSON syntax.
486 need (enc, NV_DIG + 32); 607 need (enc, NV_DIG + 32);
487 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 608 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
488 enc->cur += strlen (enc->cur); 609 enc->cur += strlen (enc->cur);
489 } 610 }
490 else if (SvIOKp (sv)) 611 else if (SvIOKp (sv))
491 { 612 {
492 need (enc, 64); 613 // we assume we can always read an IV as a UV
614 if (SvUV (sv) & ~(UV)0x7fff)
615 {
616 // large integer, use the (rather slow) snprintf way.
617 need (enc, sizeof (UV) * 3);
493 enc->cur += 618 enc->cur +=
494 SvIsUV(sv) 619 SvIsUV(sv)
495 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 620 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
496 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 621 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
622 }
623 else
624 {
625 // optimise the "small number case"
626 // code will likely be branchless and use only a single multiplication
627 I32 i = SvIV (sv);
628 U32 u;
629 char digit, nz = 0;
630
631 need (enc, 6);
632
633 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
634 u = i < 0 ? -i : i;
635
636 // convert to 4.28 fixed-point representation
637 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
638
639 // now output digit by digit, each time masking out the integer part
640 // and multiplying by 5 while moving the decimal point one to the right,
641 // resulting in a net multiplication by 10.
642 // we always write the digit to memory but conditionally increment
643 // the pointer, to ease the usage of conditional move instructions.
644 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
645 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
646 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
647 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
648 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
649 }
497 } 650 }
498 else if (SvROK (sv)) 651 else if (SvROK (sv))
499 encode_rv (enc, SvRV (sv)); 652 encode_rv (enc, SvRV (sv));
500 else if (!SvOK (sv)) 653 else if (!SvOK (sv))
501 encode_str (enc, "null", 4, 0); 654 encode_str (enc, "null", 4, 0);
… …
503 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 656 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
504 SvPV_nolen (sv), SvFLAGS (sv)); 657 SvPV_nolen (sv), SvFLAGS (sv));
505} 658}
506 659
507static SV * 660static SV *
508encode_json (SV *scalar, U32 flags) 661encode_json (SV *scalar, JSON *json)
509{ 662{
510 enc_t enc; 663 enc_t enc;
511 664
512 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 665 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
513 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 666 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
514 667
515 enc.flags = flags; 668 enc.json = *json;
516 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 669 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
517 enc.cur = SvPVX (enc.sv); 670 enc.cur = SvPVX (enc.sv);
518 enc.end = SvEND (enc.sv); 671 enc.end = SvEND (enc.sv);
519 enc.indent = 0; 672 enc.indent = 0;
520 enc.maxdepth = DEC_DEPTH (flags); 673 enc.maxdepth = DEC_DEPTH (enc.json.flags);
521 674
522 SvPOK_only (enc.sv); 675 SvPOK_only (enc.sv);
523 encode_sv (&enc, scalar); 676 encode_sv (&enc, scalar);
524 677
525 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 678 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
526 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 679 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
527 680
528 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 681 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
529 SvUTF8_on (enc.sv); 682 SvUTF8_on (enc.sv);
530 683
531 if (enc.flags & F_SHRINK) 684 if (enc.json.flags & F_SHRINK)
532 shrink (enc.sv); 685 shrink (enc.sv);
533 686
534 return enc.sv; 687 return enc.sv;
535} 688}
536 689
… …
541typedef struct 694typedef struct
542{ 695{
543 char *cur; // current parser pointer 696 char *cur; // current parser pointer
544 char *end; // end of input string 697 char *end; // end of input string
545 const char *err; // parse error, if != 0 698 const char *err; // parse error, if != 0
546 U32 flags; // F_* 699 JSON json;
547 U32 depth; // recursion depth 700 U32 depth; // recursion depth
548 U32 maxdepth; // recursion depth limit 701 U32 maxdepth; // recursion depth limit
549} dec_t; 702} dec_t;
550 703
551static void 704inline void
552decode_ws (dec_t *dec) 705decode_ws (dec_t *dec)
553{ 706{
554 for (;;) 707 for (;;)
555 { 708 {
556 char ch = *dec->cur; 709 char ch = *dec->cur;
557 710
558 if (ch > 0x20 711 if (ch > 0x20
559 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 712 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))
560 break; 713 break;
714
715 if (ch == '#' && dec->json.flags & F_RELAXED)
716 ++dec->cur;
561 717
562 ++dec->cur; 718 ++dec->cur;
563 } 719 }
564} 720}
565 721
… …
582decode_4hex (dec_t *dec) 738decode_4hex (dec_t *dec)
583{ 739{
584 signed char d1, d2, d3, d4; 740 signed char d1, d2, d3, d4;
585 unsigned char *cur = (unsigned char *)dec->cur; 741 unsigned char *cur = (unsigned char *)dec->cur;
586 742
587 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected"); 743 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
588 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected"); 744 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
589 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected"); 745 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
590 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected"); 746 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
591 747
592 dec->cur += 4; 748 dec->cur += 4;
593 749
594 return ((UV)d1) << 12 750 return ((UV)d1) << 12
595 | ((UV)d2) << 8 751 | ((UV)d2) << 8
… …
603static SV * 759static SV *
604decode_str (dec_t *dec) 760decode_str (dec_t *dec)
605{ 761{
606 SV *sv = 0; 762 SV *sv = 0;
607 int utf8 = 0; 763 int utf8 = 0;
764 char *dec_cur = dec->cur;
608 765
609 do 766 do
610 { 767 {
611 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES]; 768 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
612 char *cur = buf; 769 char *cur = buf;
613 770
614 do 771 do
615 { 772 {
616 unsigned char ch = *(unsigned char *)dec->cur++; 773 unsigned char ch = *(unsigned char *)dec_cur++;
617 774
618 if (ch == '"') 775 if (expect_false (ch == '"'))
619 { 776 {
620 --dec->cur; 777 --dec_cur;
621 break; 778 break;
622 } 779 }
623 else if (ch == '\\') 780 else if (expect_false (ch == '\\'))
624 { 781 {
625 switch (*dec->cur) 782 switch (*dec_cur)
626 { 783 {
627 case '\\': 784 case '\\':
628 case '/': 785 case '/':
629 case '"': *cur++ = *dec->cur++; break; 786 case '"': *cur++ = *dec_cur++; break;
630 787
631 case 'b': ++dec->cur; *cur++ = '\010'; break; 788 case 'b': ++dec_cur; *cur++ = '\010'; break;
632 case 't': ++dec->cur; *cur++ = '\011'; break; 789 case 't': ++dec_cur; *cur++ = '\011'; break;
633 case 'n': ++dec->cur; *cur++ = '\012'; break; 790 case 'n': ++dec_cur; *cur++ = '\012'; break;
634 case 'f': ++dec->cur; *cur++ = '\014'; break; 791 case 'f': ++dec_cur; *cur++ = '\014'; break;
635 case 'r': ++dec->cur; *cur++ = '\015'; break; 792 case 'r': ++dec_cur; *cur++ = '\015'; break;
636 793
637 case 'u': 794 case 'u':
638 { 795 {
639 UV lo, hi; 796 UV lo, hi;
640 ++dec->cur; 797 ++dec_cur;
641 798
799 dec->cur = dec_cur;
642 hi = decode_4hex (dec); 800 hi = decode_4hex (dec);
801 dec_cur = dec->cur;
643 if (hi == (UV)-1) 802 if (hi == (UV)-1)
644 goto fail; 803 goto fail;
645 804
646 // possibly a surrogate pair 805 // possibly a surrogate pair
647 if (hi >= 0xd800) 806 if (hi >= 0xd800)
648 if (hi < 0xdc00) 807 if (hi < 0xdc00)
649 { 808 {
650 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 809 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
651 ERR ("missing low surrogate character in surrogate pair"); 810 ERR ("missing low surrogate character in surrogate pair");
652 811
653 dec->cur += 2; 812 dec_cur += 2;
654 813
814 dec->cur = dec_cur;
655 lo = decode_4hex (dec); 815 lo = decode_4hex (dec);
816 dec_cur = dec->cur;
656 if (lo == (UV)-1) 817 if (lo == (UV)-1)
657 goto fail; 818 goto fail;
658 819
659 if (lo < 0xdc00 || lo >= 0xe000) 820 if (lo < 0xdc00 || lo >= 0xe000)
660 ERR ("surrogate pair expected"); 821 ERR ("surrogate pair expected");
… …
674 *cur++ = hi; 835 *cur++ = hi;
675 } 836 }
676 break; 837 break;
677 838
678 default: 839 default:
679 --dec->cur; 840 --dec_cur;
680 ERR ("illegal backslash escape sequence in string"); 841 ERR ("illegal backslash escape sequence in string");
681 } 842 }
682 } 843 }
683 else if (ch >= 0x20 && ch <= 0x7f) 844 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
684 *cur++ = ch; 845 *cur++ = ch;
685 else if (ch >= 0x80) 846 else if (ch >= 0x80)
686 { 847 {
687 STRLEN clen; 848 STRLEN clen;
688 UV uch; 849 UV uch;
689 850
690 --dec->cur; 851 --dec_cur;
691 852
692 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 853 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
693 if (clen == (STRLEN)-1) 854 if (clen == (STRLEN)-1)
694 ERR ("malformed UTF-8 character in JSON string"); 855 ERR ("malformed UTF-8 character in JSON string");
695 856
696 do 857 do
697 *cur++ = *dec->cur++; 858 *cur++ = *dec_cur++;
698 while (--clen); 859 while (--clen);
699 860
700 utf8 = 1; 861 utf8 = 1;
701 } 862 }
702 else 863 else
703 { 864 {
704 --dec->cur; 865 --dec_cur;
705 866
706 if (!ch) 867 if (!ch)
707 ERR ("unexpected end of string while parsing JSON string"); 868 ERR ("unexpected end of string while parsing JSON string");
708 else 869 else
709 ERR ("invalid character encountered while parsing JSON string"); 870 ERR ("invalid character encountered while parsing JSON string");
… …
722 } 883 }
723 else 884 else
724 sv = newSVpvn (buf, len); 885 sv = newSVpvn (buf, len);
725 } 886 }
726 } 887 }
727 while (*dec->cur != '"'); 888 while (*dec_cur != '"');
728 889
729 ++dec->cur; 890 ++dec_cur;
730 891
731 if (sv) 892 if (sv)
732 { 893 {
733 SvPOK_only (sv); 894 SvPOK_only (sv);
734 *SvEND (sv) = 0; 895 *SvEND (sv) = 0;
… …
737 SvUTF8_on (sv); 898 SvUTF8_on (sv);
738 } 899 }
739 else 900 else
740 sv = newSVpvn ("", 0); 901 sv = newSVpvn ("", 0);
741 902
903 dec->cur = dec_cur;
742 return sv; 904 return sv;
743 905
744fail: 906fail:
907 dec->cur = dec_cur;
745 return 0; 908 return 0;
746} 909}
747 910
748static SV * 911static SV *
749decode_num (dec_t *dec) 912decode_num (dec_t *dec)
… …
807 is_nv = 1; 970 is_nv = 1;
808 } 971 }
809 972
810 if (!is_nv) 973 if (!is_nv)
811 { 974 {
812 UV uv; 975 int len = dec->cur - start;
813 int numtype = grok_number (start, dec->cur - start, &uv); 976
814 if (numtype & IS_NUMBER_IN_UV) 977 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
815 if (numtype & IS_NUMBER_NEG) 978 if (*start == '-')
979 switch (len)
816 { 980 {
817 if (uv < (UV)IV_MIN) 981 case 2: return newSViv (-( start [1] - '0' * 1));
818 return newSViv (-(IV)uv); 982 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
983 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
984 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
819 } 985 }
986 else
987 switch (len)
988 {
989 case 1: return newSViv ( start [0] - '0' * 1);
990 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
991 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
992 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
993 }
994
995 {
996 UV uv;
997 int numtype = grok_number (start, len, &uv);
998 if (numtype & IS_NUMBER_IN_UV)
999 if (numtype & IS_NUMBER_NEG)
1000 {
1001 if (uv < (UV)IV_MIN)
1002 return newSViv (-(IV)uv);
1003 }
820 else 1004 else
821 return newSVuv (uv); 1005 return newSVuv (uv);
822 } 1006 }
823 1007
1008 len -= *start == '-' ? 1 : 0;
1009
1010 // does not fit into IV or UV, try NV
1011 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
1012 #if defined (LDBL_DIG)
1013 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1014 #endif
1015 )
1016 // fits into NV without loss of precision
1017 return newSVnv (Atof (start));
1018
1019 // everything else fails, convert it to a string
1020 return newSVpvn (start, dec->cur - start);
1021 }
1022
1023 // loss of precision here
824 return newSVnv (Atof (start)); 1024 return newSVnv (Atof (start));
825 1025
826fail: 1026fail:
827 return 0; 1027 return 0;
828} 1028}
… …
858 1058
859 if (*dec->cur != ',') 1059 if (*dec->cur != ',')
860 ERR (", or ] expected while parsing array"); 1060 ERR (", or ] expected while parsing array");
861 1061
862 ++dec->cur; 1062 ++dec->cur;
1063
1064 decode_ws (dec);
1065
1066 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1067 {
1068 ++dec->cur;
1069 break;
1070 }
863 } 1071 }
864 1072
865 DEC_DEC_DEPTH; 1073 DEC_DEC_DEPTH;
866 return newRV_noinc ((SV *)av); 1074 return newRV_noinc ((SV *)av);
867 1075
… …
872} 1080}
873 1081
874static SV * 1082static SV *
875decode_hv (dec_t *dec) 1083decode_hv (dec_t *dec)
876{ 1084{
1085 SV *sv;
877 HV *hv = newHV (); 1086 HV *hv = newHV ();
878 1087
879 DEC_INC_DEPTH; 1088 DEC_INC_DEPTH;
880 decode_ws (dec); 1089 decode_ws (dec);
881 1090
882 if (*dec->cur == '}') 1091 if (*dec->cur == '}')
883 ++dec->cur; 1092 ++dec->cur;
884 else 1093 else
885 for (;;) 1094 for (;;)
886 { 1095 {
1096 EXPECT_CH ('"');
1097
1098 // heuristic: assume that
1099 // a) decode_str + hv_store_ent are abysmally slow.
1100 // b) most hash keys are short, simple ascii text.
1101 // => try to "fast-match" such strings to avoid
1102 // the overhead of decode_str + hv_store_ent.
1103 {
887 SV *key, *value; 1104 SV *value;
1105 char *p = dec->cur;
1106 char *e = p + 24; // only try up to 24 bytes
888 1107
889 decode_ws (dec); EXPECT_CH ('"'); 1108 for (;;)
890
891 key = decode_str (dec);
892 if (!key)
893 goto fail;
894
895 decode_ws (dec); EXPECT_CH (':');
896
897 value = decode_sv (dec);
898 if (!value)
899 { 1109 {
1110 // the >= 0x80 is true on most architectures
1111 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1112 {
1113 // slow path, back up and use decode_str
1114 SV *key = decode_str (dec);
1115 if (!key)
1116 goto fail;
1117
1118 decode_ws (dec); EXPECT_CH (':');
1119
1120 decode_ws (dec);
1121 value = decode_sv (dec);
1122 if (!value)
1123 {
1124 SvREFCNT_dec (key);
1125 goto fail;
1126 }
1127
1128 hv_store_ent (hv, key, value, 0);
900 SvREFCNT_dec (key); 1129 SvREFCNT_dec (key);
1130
1131 break;
1132 }
1133 else if (*p == '"')
1134 {
1135 // fast path, got a simple key
1136 char *key = dec->cur;
1137 int len = p - key;
1138 dec->cur = p + 1;
1139
1140 decode_ws (dec); EXPECT_CH (':');
1141
1142 decode_ws (dec);
1143 value = decode_sv (dec);
1144 if (!value)
901 goto fail; 1145 goto fail;
1146
1147 hv_store (hv, key, len, value, 0);
1148
1149 break;
1150 }
1151
1152 ++p;
902 } 1153 }
903 1154 }
904 hv_store_ent (hv, key, value, 0);
905 SvREFCNT_dec (key);
906 1155
907 decode_ws (dec); 1156 decode_ws (dec);
908 1157
909 if (*dec->cur == '}') 1158 if (*dec->cur == '}')
910 { 1159 {
… …
914 1163
915 if (*dec->cur != ',') 1164 if (*dec->cur != ',')
916 ERR (", or } expected while parsing object/hash"); 1165 ERR (", or } expected while parsing object/hash");
917 1166
918 ++dec->cur; 1167 ++dec->cur;
1168
1169 decode_ws (dec);
1170
1171 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1172 {
1173 ++dec->cur;
1174 break;
1175 }
919 } 1176 }
920 1177
921 DEC_DEC_DEPTH; 1178 DEC_DEC_DEPTH;
922 return newRV_noinc ((SV *)hv); 1179 sv = newRV_noinc ((SV *)hv);
1180
1181 // check filter callbacks
1182 if (dec->json.flags & F_HOOK)
1183 {
1184 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1185 {
1186 HE *cb, *he;
1187
1188 hv_iterinit (hv);
1189 he = hv_iternext (hv);
1190 hv_iterinit (hv);
1191
1192 // the next line creates a mortal sv each time its called.
1193 // might want to optimise this for common cases.
1194 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1195
1196 if (cb)
1197 {
1198 dSP;
1199 int count;
1200
1201 ENTER; SAVETMPS; PUSHMARK (SP);
1202 XPUSHs (HeVAL (he));
1203
1204 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1205
1206 if (count == 1)
1207 {
1208 sv = newSVsv (POPs);
1209 FREETMPS; LEAVE;
1210 return sv;
1211 }
1212
1213 FREETMPS; LEAVE;
1214 }
1215 }
1216
1217 if (dec->json.cb_object)
1218 {
1219 dSP;
1220 int count;
1221
1222 ENTER; SAVETMPS; PUSHMARK (SP);
1223 XPUSHs (sv_2mortal (sv));
1224
1225 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1226
1227 if (count == 1)
1228 {
1229 sv = newSVsv (POPs);
1230 FREETMPS; LEAVE;
1231 return sv;
1232 }
1233
1234 SvREFCNT_inc (sv);
1235 FREETMPS; LEAVE;
1236 }
1237 }
1238
1239 return sv;
923 1240
924fail: 1241fail:
925 SvREFCNT_dec (hv); 1242 SvREFCNT_dec (hv);
926 DEC_DEC_DEPTH; 1243 DEC_DEC_DEPTH;
927 return 0; 1244 return 0;
928} 1245}
929 1246
930static SV * 1247static SV *
931decode_sv (dec_t *dec) 1248decode_sv (dec_t *dec)
932{ 1249{
933 decode_ws (dec); 1250 // the beauty of JSON: you need exactly one character lookahead
1251 // to parse anything.
934 switch (*dec->cur) 1252 switch (*dec->cur)
935 { 1253 {
936 case '"': ++dec->cur; return decode_str (dec); 1254 case '"': ++dec->cur; return decode_str (dec);
937 case '[': ++dec->cur; return decode_av (dec); 1255 case '[': ++dec->cur; return decode_av (dec);
938 case '{': ++dec->cur; return decode_hv (dec); 1256 case '{': ++dec->cur; return decode_hv (dec);
… …
944 1262
945 case 't': 1263 case 't':
946 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1264 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
947 { 1265 {
948 dec->cur += 4; 1266 dec->cur += 4;
949 return newSViv (1); 1267#if JSON_SLOW
1268 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
1269#endif
1270 return SvREFCNT_inc (json_true);
950 } 1271 }
951 else 1272 else
952 ERR ("'true' expected"); 1273 ERR ("'true' expected");
953 1274
954 break; 1275 break;
955 1276
956 case 'f': 1277 case 'f':
957 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1278 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
958 { 1279 {
959 dec->cur += 5; 1280 dec->cur += 5;
960 return newSViv (0); 1281#if JSON_SLOW
1282 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1283#endif
1284 return SvREFCNT_inc (json_false);
961 } 1285 }
962 else 1286 else
963 ERR ("'false' expected"); 1287 ERR ("'false' expected");
964 1288
965 break; 1289 break;
… …
983fail: 1307fail:
984 return 0; 1308 return 0;
985} 1309}
986 1310
987static SV * 1311static SV *
988decode_json (SV *string, U32 flags, UV *offset_return) 1312decode_json (SV *string, JSON *json, UV *offset_return)
989{ 1313{
990 dec_t dec; 1314 dec_t dec;
991 UV offset; 1315 UV offset;
992 SV *sv; 1316 SV *sv;
993 1317
994 SvGETMAGIC (string); 1318 SvGETMAGIC (string);
995 SvUPGRADE (string, SVt_PV); 1319 SvUPGRADE (string, SVt_PV);
996 1320
1321 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1322 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1323 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1324
997 if (flags & F_UTF8) 1325 if (json->flags & F_UTF8)
998 sv_utf8_downgrade (string, 0); 1326 sv_utf8_downgrade (string, 0);
999 else 1327 else
1000 sv_utf8_upgrade (string); 1328 sv_utf8_upgrade (string);
1001 1329
1002 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1330 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1003 1331
1004 dec.flags = flags; 1332 dec.json = *json;
1005 dec.cur = SvPVX (string); 1333 dec.cur = SvPVX (string);
1006 dec.end = SvEND (string); 1334 dec.end = SvEND (string);
1007 dec.err = 0; 1335 dec.err = 0;
1008 dec.depth = 0; 1336 dec.depth = 0;
1009 dec.maxdepth = DEC_DEPTH (dec.flags); 1337 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1338
1339 if (dec.json.cb_object || dec.json.cb_sk_object)
1340 dec.json.flags |= F_HOOK;
1010 1341
1011 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1342 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1343
1344 decode_ws (&dec);
1012 sv = decode_sv (&dec); 1345 sv = decode_sv (&dec);
1013 1346
1014 if (offset_return || !sv) 1347 if (!(offset_return || !sv))
1015 {
1016 offset = dec.flags & F_UTF8
1017 ? dec.cur - SvPVX (string)
1018 : utf8_distance (dec.cur, SvPVX (string));
1019
1020 if (offset_return)
1021 *offset_return = offset;
1022 }
1023 else
1024 { 1348 {
1025 // check for trailing garbage 1349 // check for trailing garbage
1026 decode_ws (&dec); 1350 decode_ws (&dec);
1027 1351
1028 if (*dec.cur) 1352 if (*dec.cur)
1029 { 1353 {
1030 dec.err = "garbage after JSON object"; 1354 dec.err = "garbage after JSON object";
1031 SvREFCNT_dec (sv); 1355 SvREFCNT_dec (sv);
1032 sv = 0; 1356 sv = 0;
1033 } 1357 }
1358 }
1359
1360 if (offset_return || !sv)
1361 {
1362 offset = dec.json.flags & F_UTF8
1363 ? dec.cur - SvPVX (string)
1364 : utf8_distance (dec.cur, SvPVX (string));
1365
1366 if (offset_return)
1367 *offset_return = offset;
1034 } 1368 }
1035 1369
1036 if (!sv) 1370 if (!sv)
1037 { 1371 {
1038 SV *uni = sv_newmortal (); 1372 SV *uni = sv_newmortal ();
… …
1052 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1386 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1053 } 1387 }
1054 1388
1055 sv = sv_2mortal (sv); 1389 sv = sv_2mortal (sv);
1056 1390
1057 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1391 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1058 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1392 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1059 1393
1060 return sv; 1394 return sv;
1061} 1395}
1062 1396
… …
1066MODULE = JSON::XS PACKAGE = JSON::XS 1400MODULE = JSON::XS PACKAGE = JSON::XS
1067 1401
1068BOOT: 1402BOOT:
1069{ 1403{
1070 int i; 1404 int i;
1071
1072 memset (decode_hexdigit, 0xff, 256);
1073 1405
1074 for (i = 0; i < 256; ++i) 1406 for (i = 0; i < 256; ++i)
1075 decode_hexdigit [i] = 1407 decode_hexdigit [i] =
1076 i >= '0' && i <= '9' ? i - '0' 1408 i >= '0' && i <= '9' ? i - '0'
1077 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1409 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1078 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1410 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1079 : -1; 1411 : -1;
1080 1412
1081 json_stash = gv_stashpv ("JSON::XS", 1); 1413 json_stash = gv_stashpv ("JSON::XS" , 1);
1414 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1415
1416 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1417 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1082} 1418}
1083 1419
1084PROTOTYPES: DISABLE 1420PROTOTYPES: DISABLE
1085 1421
1086SV *new (char *dummy) 1422void CLONE (...)
1087 CODE: 1423 CODE:
1088 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1424 json_stash = 0;
1089 OUTPUT: 1425 json_boolean_stash = 0;
1090 RETVAL
1091 1426
1427void new (char *klass)
1428 PPCODE:
1429{
1430 SV *pv = NEWSV (0, sizeof (JSON));
1431 SvPOK_only (pv);
1432 Zero (SvPVX (pv), 1, JSON);
1433 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1434 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1435}
1436
1092SV *ascii (SV *self, int enable = 1) 1437void ascii (JSON *self, int enable = 1)
1093 ALIAS: 1438 ALIAS:
1094 ascii = F_ASCII 1439 ascii = F_ASCII
1095 latin1 = F_LATIN1 1440 latin1 = F_LATIN1
1096 utf8 = F_UTF8 1441 utf8 = F_UTF8
1097 indent = F_INDENT 1442 indent = F_INDENT
1098 canonical = F_CANONICAL 1443 canonical = F_CANONICAL
1099 space_before = F_SPACE_BEFORE 1444 space_before = F_SPACE_BEFORE
1100 space_after = F_SPACE_AFTER 1445 space_after = F_SPACE_AFTER
1101 pretty = F_PRETTY 1446 pretty = F_PRETTY
1102 allow_nonref = F_ALLOW_NONREF 1447 allow_nonref = F_ALLOW_NONREF
1103 shrink = F_SHRINK 1448 shrink = F_SHRINK
1449 allow_blessed = F_ALLOW_BLESSED
1450 convert_blessed = F_CONV_BLESSED
1451 relaxed = F_RELAXED
1104 CODE: 1452 PPCODE:
1105{ 1453{
1106 UV *uv = SvJSON (self);
1107 if (enable) 1454 if (enable)
1108 *uv |= ix; 1455 self->flags |= ix;
1109 else 1456 else
1110 *uv &= ~ix; 1457 self->flags &= ~ix;
1111 1458
1112 RETVAL = newSVsv (self); 1459 XPUSHs (ST (0));
1113} 1460}
1114 OUTPUT:
1115 RETVAL
1116 1461
1117SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1462void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1118 CODE: 1463 PPCODE:
1119{ 1464{
1120 UV *uv = SvJSON (self);
1121 UV log2 = 0; 1465 UV log2 = 0;
1122 1466
1123 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1467 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1124 1468
1125 while ((1UL << log2) < max_depth) 1469 while ((1UL << log2) < max_depth)
1126 ++log2; 1470 ++log2;
1127 1471
1128 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1472 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1129 1473
1130 RETVAL = newSVsv (self); 1474 XPUSHs (ST (0));
1131} 1475}
1132 OUTPUT:
1133 RETVAL
1134 1476
1135void encode (SV *self, SV *scalar) 1477void max_size (JSON *self, UV max_size = 0)
1136 PPCODE: 1478 PPCODE:
1137 XPUSHs (encode_json (scalar, *SvJSON (self))); 1479{
1480 UV log2 = 0;
1138 1481
1139void decode (SV *self, SV *jsonstr) 1482 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1483 if (max_size == 1) max_size = 2;
1484
1485 while ((1UL << log2) < max_size)
1486 ++log2;
1487
1488 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1489
1490 XPUSHs (ST (0));
1491}
1492
1493void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1140 PPCODE: 1494 PPCODE:
1495{
1496 SvREFCNT_dec (self->cb_object);
1497 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1498
1499 XPUSHs (ST (0));
1500}
1501
1502void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1503 PPCODE:
1504{
1505 if (!self->cb_sk_object)
1506 self->cb_sk_object = newHV ();
1507
1508 if (SvOK (cb))
1509 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1510 else
1511 {
1512 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1513
1514 if (!HvKEYS (self->cb_sk_object))
1515 {
1516 SvREFCNT_dec (self->cb_sk_object);
1517 self->cb_sk_object = 0;
1518 }
1519 }
1520
1521 XPUSHs (ST (0));
1522}
1523
1524void encode (JSON *self, SV *scalar)
1525 PPCODE:
1526 XPUSHs (encode_json (scalar, self));
1527
1528void decode (JSON *self, SV *jsonstr)
1529 PPCODE:
1141 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0)); 1530 XPUSHs (decode_json (jsonstr, self, 0));
1142 1531
1143void decode_prefix (SV *self, SV *jsonstr) 1532void decode_prefix (JSON *self, SV *jsonstr)
1144 PPCODE: 1533 PPCODE:
1145{ 1534{
1146 UV offset; 1535 UV offset;
1147 EXTEND (SP, 2); 1536 EXTEND (SP, 2);
1148 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset)); 1537 PUSHs (decode_json (jsonstr, self, &offset));
1149 PUSHs (sv_2mortal (newSVuv (offset))); 1538 PUSHs (sv_2mortal (newSVuv (offset)));
1150} 1539}
1151 1540
1541void DESTROY (JSON *self)
1542 CODE:
1543 SvREFCNT_dec (self->cb_sk_object);
1544 SvREFCNT_dec (self->cb_object);
1545
1152PROTOTYPES: ENABLE 1546PROTOTYPES: ENABLE
1153 1547
1154void to_json (SV *scalar) 1548void to_json (SV *scalar)
1155 ALIAS:
1156 objToJson = 0
1157 PPCODE: 1549 PPCODE:
1550{
1551 JSON json = { F_DEFAULT | F_UTF8 };
1158 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1552 XPUSHs (encode_json (scalar, &json));
1553}
1159 1554
1160void from_json (SV *jsonstr) 1555void from_json (SV *jsonstr)
1161 ALIAS:
1162 jsonToObj = 0
1163 PPCODE: 1556 PPCODE:
1557{
1558 JSON json = { F_DEFAULT | F_UTF8 };
1164 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0)); 1559 XPUSHs (decode_json (jsonstr, &json, 0));
1560}
1165 1561

Diff Legend

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