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

Diff Legend

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