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

Diff Legend

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