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

Diff Legend

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