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

Diff Legend

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