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.46 by root, Mon Jun 25 22:11:39 2007 UTC vs.
Revision 1.66 by root, Sun Nov 25 19:02:42 2007 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#include "assert.h" 5#include <assert.h>
6#include "string.h" 6#include <string.h>
7#include "stdlib.h" 7#include <stdlib.h>
8#include "stdio.h" 8#include <stdio.h>
9#include <float.h>
9 10
10#if defined(__BORLANDC__) || defined(_MSC_VER) 11#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h 12# define snprintf _snprintf // C compilers have this in stdio.h
12#endif 13#endif
13 14
25#define F_SPACE_BEFORE 0x00000020UL 26#define F_SPACE_BEFORE 0x00000020UL
26#define F_SPACE_AFTER 0x00000040UL 27#define F_SPACE_AFTER 0x00000040UL
27#define F_ALLOW_NONREF 0x00000100UL 28#define F_ALLOW_NONREF 0x00000100UL
28#define F_SHRINK 0x00000200UL 29#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL 30#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL // NYI 31#define F_CONV_BLESSED 0x00000800UL
32#define F_RELAXED 0x00001000UL
33
31#define F_MAXDEPTH 0xf8000000UL 34#define F_MAXDEPTH 0xf8000000UL
32#define S_MAXDEPTH 27 35#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL 36#define F_MAXSIZE 0x01f00000UL
34#define S_MAXSIZE 20 37#define S_MAXSIZE 20
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
35 39
36#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 40#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
37#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE )) 41#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38 42
39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 43#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
56#endif 60#endif
57 61
58#define expect_false(expr) expect ((expr) != 0, 0) 62#define expect_false(expr) expect ((expr) != 0, 0)
59#define expect_true(expr) expect ((expr) != 0, 1) 63#define expect_true(expr) expect ((expr) != 0, 1)
60 64
65#ifdef USE_ITHREADS
66# define JSON_SLOW 1
67# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
68#else
69# define JSON_SLOW 0
70# define JSON_STASH json_stash
71#endif
72
61static HV *json_stash, *json_boolean_stash; // JSON::XS:: 73static HV *json_stash, *json_boolean_stash; // JSON::XS::
62static SV *json_true, *json_false; 74static SV *json_true, *json_false;
63 75
76typedef struct {
77 U32 flags;
78 SV *cb_object;
79 HV *cb_sk_object;
80} JSON;
81
64///////////////////////////////////////////////////////////////////////////// 82/////////////////////////////////////////////////////////////////////////////
65// utility functions 83// utility functions
66 84
67static UV * 85inline void
68SvJSON (SV *sv)
69{
70 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
71 croak ("object is not of type JSON::XS");
72
73 return &SvUVX (SvRV (sv));
74}
75
76static void
77shrink (SV *sv) 86shrink (SV *sv)
78{ 87{
79 sv_utf8_downgrade (sv, 1); 88 sv_utf8_downgrade (sv, 1);
80 if (SvLEN (sv) > SvCUR (sv) + 1) 89 if (SvLEN (sv) > SvCUR (sv) + 1)
81 { 90 {
116typedef struct 125typedef struct
117{ 126{
118 char *cur; // SvPVX (sv) + current output position 127 char *cur; // SvPVX (sv) + current output position
119 char *end; // SvEND (sv) 128 char *end; // SvEND (sv)
120 SV *sv; // result scalar 129 SV *sv; // result scalar
121 U32 flags; // F_* 130 JSON json;
122 U32 indent; // indentation level 131 U32 indent; // indentation level
123 U32 maxdepth; // max. indentation/recursion level 132 U32 maxdepth; // max. indentation/recursion level
124} enc_t; 133} enc_t;
125 134
126inline void 135inline void
200 } 209 }
201 210
202 if (uch > 0x10FFFFUL) 211 if (uch > 0x10FFFFUL)
203 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 212 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
204 213
205 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF)) 214 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
206 { 215 {
207 if (uch > 0xFFFFUL) 216 if (uch > 0xFFFFUL)
208 { 217 {
209 need (enc, len += 11); 218 need (enc, len += 11);
210 sprintf (enc->cur, "\\u%04x\\u%04x", 219 sprintf (enc->cur, "\\u%04x\\u%04x",
224 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 233 *enc->cur++ = hexdigit [(uch >> 0) & 15];
225 } 234 }
226 235
227 str += clen; 236 str += clen;
228 } 237 }
229 else if (enc->flags & F_LATIN1) 238 else if (enc->json.flags & F_LATIN1)
230 { 239 {
231 *enc->cur++ = uch; 240 *enc->cur++ = uch;
232 str += clen; 241 str += clen;
233 } 242 }
234 else if (is_utf8) 243 else if (is_utf8)
255} 264}
256 265
257inline void 266inline void
258encode_indent (enc_t *enc) 267encode_indent (enc_t *enc)
259{ 268{
260 if (enc->flags & F_INDENT) 269 if (enc->json.flags & F_INDENT)
261 { 270 {
262 int spaces = enc->indent * INDENT_STEP; 271 int spaces = enc->indent * INDENT_STEP;
263 272
264 need (enc, spaces); 273 need (enc, spaces);
265 memset (enc->cur, ' ', spaces); 274 memset (enc->cur, ' ', spaces);
275} 284}
276 285
277inline void 286inline void
278encode_nl (enc_t *enc) 287encode_nl (enc_t *enc)
279{ 288{
280 if (enc->flags & F_INDENT) 289 if (enc->json.flags & F_INDENT)
281 { 290 {
282 need (enc, 1); 291 need (enc, 1);
283 encode_ch (enc, '\n'); 292 encode_ch (enc, '\n');
284 } 293 }
285} 294}
287inline void 296inline void
288encode_comma (enc_t *enc) 297encode_comma (enc_t *enc)
289{ 298{
290 encode_ch (enc, ','); 299 encode_ch (enc, ',');
291 300
292 if (enc->flags & F_INDENT) 301 if (enc->json.flags & F_INDENT)
293 encode_nl (enc); 302 encode_nl (enc);
294 else if (enc->flags & F_SPACE_AFTER) 303 else if (enc->json.flags & F_SPACE_AFTER)
295 encode_space (enc); 304 encode_space (enc);
296} 305}
297 306
298static void encode_sv (enc_t *enc, SV *sv); 307static void encode_sv (enc_t *enc, SV *sv);
299 308
303 int i, len = av_len (av); 312 int i, len = av_len (av);
304 313
305 if (enc->indent >= enc->maxdepth) 314 if (enc->indent >= enc->maxdepth)
306 croak ("data structure too deep (hit recursion limit)"); 315 croak ("data structure too deep (hit recursion limit)");
307 316
308 encode_ch (enc, '['); encode_nl (enc); 317 encode_ch (enc, '[');
309 ++enc->indent; 318
319 if (len >= 0)
320 {
321 encode_nl (enc); ++enc->indent;
310 322
311 for (i = 0; i <= len; ++i) 323 for (i = 0; i <= len; ++i)
312 { 324 {
325 SV **svp = av_fetch (av, i, 0);
326
313 encode_indent (enc); 327 encode_indent (enc);
314 encode_sv (enc, *av_fetch (av, i, 0));
315 328
329 if (svp)
330 encode_sv (enc, *svp);
331 else
332 encode_str (enc, "null", 4, 0);
333
316 if (i < len) 334 if (i < len)
317 encode_comma (enc); 335 encode_comma (enc);
318 } 336 }
319 337
338 encode_nl (enc); --enc->indent; encode_indent (enc);
339 }
340
320 encode_nl (enc); 341 encode_ch (enc, ']');
321
322 --enc->indent;
323 encode_indent (enc); encode_ch (enc, ']');
324} 342}
325 343
326static void 344static void
327encode_he (enc_t *enc, HE *he) 345encode_hk (enc_t *enc, HE *he)
328{ 346{
329 encode_ch (enc, '"'); 347 encode_ch (enc, '"');
330 348
331 if (HeKLEN (he) == HEf_SVKEY) 349 if (HeKLEN (he) == HEf_SVKEY)
332 { 350 {
342 else 360 else
343 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 361 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
344 362
345 encode_ch (enc, '"'); 363 encode_ch (enc, '"');
346 364
347 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 365 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
348 encode_ch (enc, ':'); 366 encode_ch (enc, ':');
349 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 367 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
350 encode_sv (enc, HeVAL (he));
351} 368}
352 369
353// compare hash entries, used when all keys are bytestrings 370// compare hash entries, used when all keys are bytestrings
354static int 371static int
355he_cmp_fast (const void *a_, const void *b_) 372he_cmp_fast (const void *a_, const void *b_)
360 HE *b = *(HE **)b_; 377 HE *b = *(HE **)b_;
361 378
362 STRLEN la = HeKLEN (a); 379 STRLEN la = HeKLEN (a);
363 STRLEN lb = HeKLEN (b); 380 STRLEN lb = HeKLEN (b);
364 381
365 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 382 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
366 cmp = la - lb; 383 cmp = lb - la;
367 384
368 return cmp; 385 return cmp;
369} 386}
370 387
371// compare hash entries, used when some keys are sv's or utf-x 388// compare hash entries, used when some keys are sv's or utf-x
372static int 389static int
373he_cmp_slow (const void *a, const void *b) 390he_cmp_slow (const void *a, const void *b)
374{ 391{
375 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 392 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
376} 393}
377 394
378static void 395static void
379encode_hv (enc_t *enc, HV *hv) 396encode_hv (enc_t *enc, HV *hv)
380{ 397{
398 HE *he;
381 int count, i; 399 int count;
382 400
383 if (enc->indent >= enc->maxdepth) 401 if (enc->indent >= enc->maxdepth)
384 croak ("data structure too deep (hit recursion limit)"); 402 croak ("data structure too deep (hit recursion limit)");
385 403
386 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 404 encode_ch (enc, '{');
387 405
388 if ((count = hv_iterinit (hv)))
389 {
390 // for canonical output we have to sort by keys first 406 // for canonical output we have to sort by keys first
391 // actually, this is mostly due to the stupid so-called 407 // actually, this is mostly due to the stupid so-called
392 // security workaround added somewhere in 5.8.x. 408 // security workaround added somewhere in 5.8.x.
393 // that randomises hash orderings 409 // that randomises hash orderings
394 if (enc->flags & F_CANONICAL) 410 if (enc->json.flags & F_CANONICAL)
411 {
412 int count = hv_iterinit (hv);
413
414 if (SvMAGICAL (hv))
395 { 415 {
416 // need to count by iterating. could improve by dynamically building the vector below
417 // but I don't care for the speed of this special case.
418 // note also that we will run into undefined behaviour when the two iterations
419 // do not result in the same count, something I might care for in some later release.
420
421 count = 0;
422 while (hv_iternext (hv))
423 ++count;
424
425 hv_iterinit (hv);
426 }
427
428 if (count)
429 {
396 int fast = 1; 430 int i, fast = 1;
397 HE *he;
398#if defined(__BORLANDC__) || defined(_MSC_VER) 431#if defined(__BORLANDC__) || defined(_MSC_VER)
399 HE **hes = _alloca (count * sizeof (HE)); 432 HE **hes = _alloca (count * sizeof (HE));
400#else 433#else
401 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 434 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
402#endif 435#endif
429 462
430 FREETMPS; 463 FREETMPS;
431 LEAVE; 464 LEAVE;
432 } 465 }
433 466
434 for (i = 0; i < count; ++i) 467 encode_nl (enc); ++enc->indent;
468
469 while (count--)
435 { 470 {
436 encode_indent (enc); 471 encode_indent (enc);
472 he = hes [count];
437 encode_he (enc, hes [i]); 473 encode_hk (enc, he);
474 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
438 475
439 if (i < count - 1) 476 if (count)
440 encode_comma (enc); 477 encode_comma (enc);
441 } 478 }
442 479
443 encode_nl (enc); 480 encode_nl (enc); --enc->indent; encode_indent (enc);
444 } 481 }
482 }
445 else 483 else
484 {
485 if (hv_iterinit (hv) || SvMAGICAL (hv))
486 if ((he = hv_iternext (hv)))
446 { 487 {
447 HE *he = hv_iternext (hv); 488 encode_nl (enc); ++enc->indent;
448 489
449 for (;;) 490 for (;;)
450 { 491 {
451 encode_indent (enc); 492 encode_indent (enc);
452 encode_he (enc, he); 493 encode_hk (enc, he);
494 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
453 495
454 if (!(he = hv_iternext (hv))) 496 if (!(he = hv_iternext (hv)))
455 break; 497 break;
456 498
457 encode_comma (enc); 499 encode_comma (enc);
458 } 500 }
459 501
460 encode_nl (enc); 502 encode_nl (enc); --enc->indent; encode_indent (enc);
461 } 503 }
462 } 504 }
463 505
464 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 506 encode_ch (enc, '}');
465} 507}
466 508
467// encode objects, arrays and special \0=false and \1=true values. 509// encode objects, arrays and special \0=false and \1=true values.
468static void 510static void
469encode_rv (enc_t *enc, SV *sv) 511encode_rv (enc_t *enc, SV *sv)
473 SvGETMAGIC (sv); 515 SvGETMAGIC (sv);
474 svt = SvTYPE (sv); 516 svt = SvTYPE (sv);
475 517
476 if (expect_false (SvOBJECT (sv))) 518 if (expect_false (SvOBJECT (sv)))
477 { 519 {
520 HV *stash = !JSON_SLOW || json_boolean_stash
521 ? json_boolean_stash
522 : gv_stashpv ("JSON::XS::Boolean", 1);
523
478 if (SvSTASH (sv) == json_boolean_stash) 524 if (SvSTASH (sv) == stash)
479 { 525 {
480 if (SvIV (sv) == 0) 526 if (SvIV (sv))
527 encode_str (enc, "true", 4, 0);
528 else
481 encode_str (enc, "false", 5, 0); 529 encode_str (enc, "false", 5, 0);
482 else
483 encode_str (enc, "true", 4, 0);
484 } 530 }
485 else 531 else
486 { 532 {
487#if 0 533#if 0
488 if (0 && sv_derived_from (rv, "JSON::Literal")) 534 if (0 && sv_derived_from (rv, "JSON::Literal"))
489 { 535 {
490 // not yet 536 // not yet
491 } 537 }
492#endif 538#endif
493 if (enc->flags & F_CONV_BLESSED) 539 if (enc->json.flags & F_CONV_BLESSED)
494 { 540 {
495 // we re-bless the reference to get overload and other niceties right 541 // we re-bless the reference to get overload and other niceties right
496 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 542 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
497 543
498 if (to_json) 544 if (to_json)
499 { 545 {
500 dSP; 546 dSP;
501 ENTER; 547
502 SAVETMPS;
503 PUSHMARK (SP); 548 ENTER; SAVETMPS; PUSHMARK (SP);
504 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 549 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
505 550
506 // calling with G_SCALAR ensures that we always get a 1 reutrn value 551 // calling with G_SCALAR ensures that we always get a 1 return value
507 // check anyways.
508 PUTBACK; 552 PUTBACK;
509 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 553 call_sv ((SV *)GvCV (to_json), G_SCALAR);
510 SPAGAIN; 554 SPAGAIN;
511 555
556 // catch this surprisingly common error
557 if (SvROK (TOPs) && SvRV (TOPs) == sv)
558 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
559
560 sv = POPs;
561 PUTBACK;
562
512 encode_sv (enc, POPs); 563 encode_sv (enc, sv);
513 564
514 FREETMPS; 565 FREETMPS; LEAVE;
515 LEAVE;
516 } 566 }
517 else if (enc->flags & F_ALLOW_BLESSED) 567 else if (enc->json.flags & F_ALLOW_BLESSED)
518 encode_str (enc, "null", 4, 0); 568 encode_str (enc, "null", 4, 0);
519 else 569 else
520 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it", 570 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
521 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 571 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
522 } 572 }
523 else if (enc->flags & F_ALLOW_BLESSED) 573 else if (enc->json.flags & F_ALLOW_BLESSED)
524 encode_str (enc, "null", 4, 0); 574 encode_str (enc, "null", 4, 0);
525 else 575 else
526 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 576 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
527 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 577 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
528 } 578 }
531 encode_hv (enc, (HV *)sv); 581 encode_hv (enc, (HV *)sv);
532 else if (svt == SVt_PVAV) 582 else if (svt == SVt_PVAV)
533 encode_av (enc, (AV *)sv); 583 encode_av (enc, (AV *)sv);
534 else if (svt < SVt_PVAV) 584 else if (svt < SVt_PVAV)
535 { 585 {
536 if (SvNIOK (sv) && SvIV (sv) == 0) 586 STRLEN len = 0;
587 char *pv = svt ? SvPV (sv, len) : 0;
588
589 if (len == 1 && *pv == '1')
590 encode_str (enc, "true", 4, 0);
591 else if (len == 1 && *pv == '0')
537 encode_str (enc, "false", 5, 0); 592 encode_str (enc, "false", 5, 0);
538 else if (SvNIOK (sv) && SvIV (sv) == 1)
539 encode_str (enc, "true", 4, 0);
540 else 593 else
541 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 594 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
542 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 595 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
543 } 596 }
544 else 597 else
614 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 667 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
615 SvPV_nolen (sv), SvFLAGS (sv)); 668 SvPV_nolen (sv), SvFLAGS (sv));
616} 669}
617 670
618static SV * 671static SV *
619encode_json (SV *scalar, U32 flags) 672encode_json (SV *scalar, JSON *json)
620{ 673{
621 enc_t enc; 674 enc_t enc;
622 675
623 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 676 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
624 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 677 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
625 678
626 enc.flags = flags; 679 enc.json = *json;
627 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 680 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
628 enc.cur = SvPVX (enc.sv); 681 enc.cur = SvPVX (enc.sv);
629 enc.end = SvEND (enc.sv); 682 enc.end = SvEND (enc.sv);
630 enc.indent = 0; 683 enc.indent = 0;
631 enc.maxdepth = DEC_DEPTH (flags); 684 enc.maxdepth = DEC_DEPTH (enc.json.flags);
632 685
633 SvPOK_only (enc.sv); 686 SvPOK_only (enc.sv);
634 encode_sv (&enc, scalar); 687 encode_sv (&enc, scalar);
635 688
636 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 689 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
637 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 690 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
638 691
639 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 692 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
640 SvUTF8_on (enc.sv); 693 SvUTF8_on (enc.sv);
641 694
642 if (enc.flags & F_SHRINK) 695 if (enc.json.flags & F_SHRINK)
643 shrink (enc.sv); 696 shrink (enc.sv);
644 697
645 return enc.sv; 698 return enc.sv;
646} 699}
647 700
652typedef struct 705typedef struct
653{ 706{
654 char *cur; // current parser pointer 707 char *cur; // current parser pointer
655 char *end; // end of input string 708 char *end; // end of input string
656 const char *err; // parse error, if != 0 709 const char *err; // parse error, if != 0
657 U32 flags; // F_* 710 JSON json;
658 U32 depth; // recursion depth 711 U32 depth; // recursion depth
659 U32 maxdepth; // recursion depth limit 712 U32 maxdepth; // recursion depth limit
660} dec_t; 713} dec_t;
661 714
662inline void 715inline void
716decode_comment (dec_t *dec)
717{
718 // only '#'-style comments allowed a.t.m.
719
720 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
721 ++dec->cur;
722}
723
724inline void
663decode_ws (dec_t *dec) 725decode_ws (dec_t *dec)
664{ 726{
665 for (;;) 727 for (;;)
666 { 728 {
667 char ch = *dec->cur; 729 char ch = *dec->cur;
668 730
669 if (ch > 0x20 731 if (ch > 0x20)
732 {
733 if (expect_false (ch == '#'))
734 {
735 if (dec->json.flags & F_RELAXED)
736 decode_comment (dec);
737 else
738 break;
739 }
740 else
741 break;
742 }
670 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 743 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
671 break; 744 break; // parse error, but let higher level handle it, gives better error messages
672 745
673 ++dec->cur; 746 ++dec->cur;
674 } 747 }
675} 748}
676 749
925 is_nv = 1; 998 is_nv = 1;
926 } 999 }
927 1000
928 if (!is_nv) 1001 if (!is_nv)
929 { 1002 {
1003 int len = dec->cur - start;
1004
930 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 1005 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
931 if (*start == '-') 1006 if (*start == '-')
932 switch (dec->cur - start) 1007 switch (len)
933 { 1008 {
934 case 2: return newSViv (-( start [1] - '0' * 1)); 1009 case 2: return newSViv (-( start [1] - '0' * 1));
935 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1010 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
936 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1011 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
937 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1012 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
938 } 1013 }
939 else 1014 else
940 switch (dec->cur - start) 1015 switch (len)
941 { 1016 {
942 case 1: return newSViv ( start [0] - '0' * 1); 1017 case 1: return newSViv ( start [0] - '0' * 1);
943 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1018 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
944 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1019 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
945 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1020 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
946 } 1021 }
947 1022
948 { 1023 {
949 UV uv; 1024 UV uv;
950 int numtype = grok_number (start, dec->cur - start, &uv); 1025 int numtype = grok_number (start, len, &uv);
951 if (numtype & IS_NUMBER_IN_UV) 1026 if (numtype & IS_NUMBER_IN_UV)
952 if (numtype & IS_NUMBER_NEG) 1027 if (numtype & IS_NUMBER_NEG)
953 { 1028 {
954 if (uv < (UV)IV_MIN) 1029 if (uv < (UV)IV_MIN)
955 return newSViv (-(IV)uv); 1030 return newSViv (-(IV)uv);
956 } 1031 }
957 else 1032 else
958 return newSVuv (uv); 1033 return newSVuv (uv);
959
960 // here would likely be the place for bigint support
961 } 1034 }
962 }
963 1035
964 // if we ever support bigint or bigfloat, this is the place for bigfloat 1036 len -= *start == '-' ? 1 : 0;
1037
1038 // does not fit into IV or UV, try NV
1039 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
1040 #if defined (LDBL_DIG)
1041 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1042 #endif
1043 )
1044 // fits into NV without loss of precision
1045 return newSVnv (Atof (start));
1046
1047 // everything else fails, convert it to a string
1048 return newSVpvn (start, dec->cur - start);
1049 }
1050
1051 // loss of precision here
965 return newSVnv (Atof (start)); 1052 return newSVnv (Atof (start));
966 1053
967fail: 1054fail:
968 return 0; 1055 return 0;
969} 1056}
999 1086
1000 if (*dec->cur != ',') 1087 if (*dec->cur != ',')
1001 ERR (", or ] expected while parsing array"); 1088 ERR (", or ] expected while parsing array");
1002 1089
1003 ++dec->cur; 1090 ++dec->cur;
1091
1092 decode_ws (dec);
1093
1094 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1095 {
1096 ++dec->cur;
1097 break;
1098 }
1004 } 1099 }
1005 1100
1006 DEC_DEC_DEPTH; 1101 DEC_DEC_DEPTH;
1007 return newRV_noinc ((SV *)av); 1102 return newRV_noinc ((SV *)av);
1008 1103
1013} 1108}
1014 1109
1015static SV * 1110static SV *
1016decode_hv (dec_t *dec) 1111decode_hv (dec_t *dec)
1017{ 1112{
1113 SV *sv;
1018 HV *hv = newHV (); 1114 HV *hv = newHV ();
1019 1115
1020 DEC_INC_DEPTH; 1116 DEC_INC_DEPTH;
1021 decode_ws (dec); 1117 decode_ws (dec);
1022 1118
1023 if (*dec->cur == '}') 1119 if (*dec->cur == '}')
1024 ++dec->cur; 1120 ++dec->cur;
1025 else 1121 else
1026 for (;;) 1122 for (;;)
1027 { 1123 {
1028 decode_ws (dec); EXPECT_CH ('"'); 1124 EXPECT_CH ('"');
1029 1125
1030 // heuristic: assume that 1126 // heuristic: assume that
1031 // a) decode_str + hv_store_ent are abysmally slow 1127 // a) decode_str + hv_store_ent are abysmally slow.
1032 // b) most hash keys are short, simple ascii text 1128 // b) most hash keys are short, simple ascii text.
1033 // so try to "fast-match" such strings to avoid 1129 // => try to "fast-match" such strings to avoid
1034 // the overhead of hv_store_ent. 1130 // the overhead of decode_str + hv_store_ent.
1035 { 1131 {
1036 SV *value; 1132 SV *value;
1037 char *p = dec->cur; 1133 char *p = dec->cur;
1038 char *e = p + 24; // only try up to 24 bytes 1134 char *e = p + 24; // only try up to 24 bytes
1039 1135
1040 for (;;) 1136 for (;;)
1041 { 1137 {
1138 // the >= 0x80 is true on most architectures
1042 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1139 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1043 { 1140 {
1044 // slow path, back up and use decode_str 1141 // slow path, back up and use decode_str
1045 SV *key = decode_str (dec); 1142 SV *key = decode_str (dec);
1046 if (!key) 1143 if (!key)
1047 goto fail; 1144 goto fail;
1048 1145
1049 decode_ws (dec); EXPECT_CH (':'); 1146 decode_ws (dec); EXPECT_CH (':');
1050 1147
1148 decode_ws (dec);
1051 value = decode_sv (dec); 1149 value = decode_sv (dec);
1052 if (!value) 1150 if (!value)
1053 { 1151 {
1054 SvREFCNT_dec (key); 1152 SvREFCNT_dec (key);
1055 goto fail; 1153 goto fail;
1067 int len = p - key; 1165 int len = p - key;
1068 dec->cur = p + 1; 1166 dec->cur = p + 1;
1069 1167
1070 decode_ws (dec); EXPECT_CH (':'); 1168 decode_ws (dec); EXPECT_CH (':');
1071 1169
1170 decode_ws (dec);
1072 value = decode_sv (dec); 1171 value = decode_sv (dec);
1073 if (!value) 1172 if (!value)
1074 goto fail; 1173 goto fail;
1075 1174
1076 hv_store (hv, key, len, value, 0); 1175 hv_store (hv, key, len, value, 0);
1092 1191
1093 if (*dec->cur != ',') 1192 if (*dec->cur != ',')
1094 ERR (", or } expected while parsing object/hash"); 1193 ERR (", or } expected while parsing object/hash");
1095 1194
1096 ++dec->cur; 1195 ++dec->cur;
1196
1197 decode_ws (dec);
1198
1199 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1200 {
1201 ++dec->cur;
1202 break;
1203 }
1097 } 1204 }
1098 1205
1099 DEC_DEC_DEPTH; 1206 DEC_DEC_DEPTH;
1100 return newRV_noinc ((SV *)hv); 1207 sv = newRV_noinc ((SV *)hv);
1208
1209 // check filter callbacks
1210 if (dec->json.flags & F_HOOK)
1211 {
1212 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1213 {
1214 HE *cb, *he;
1215
1216 hv_iterinit (hv);
1217 he = hv_iternext (hv);
1218 hv_iterinit (hv);
1219
1220 // the next line creates a mortal sv each time its called.
1221 // might want to optimise this for common cases.
1222 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1223
1224 if (cb)
1225 {
1226 dSP;
1227 int count;
1228
1229 ENTER; SAVETMPS; PUSHMARK (SP);
1230 XPUSHs (HeVAL (he));
1231
1232 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1233
1234 if (count == 1)
1235 {
1236 sv = newSVsv (POPs);
1237 FREETMPS; LEAVE;
1238 return sv;
1239 }
1240
1241 FREETMPS; LEAVE;
1242 }
1243 }
1244
1245 if (dec->json.cb_object)
1246 {
1247 dSP;
1248 int count;
1249
1250 ENTER; SAVETMPS; PUSHMARK (SP);
1251 XPUSHs (sv_2mortal (sv));
1252
1253 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1254
1255 if (count == 1)
1256 {
1257 sv = newSVsv (POPs);
1258 FREETMPS; LEAVE;
1259 return sv;
1260 }
1261
1262 SvREFCNT_inc (sv);
1263 FREETMPS; LEAVE;
1264 }
1265 }
1266
1267 return sv;
1101 1268
1102fail: 1269fail:
1103 SvREFCNT_dec (hv); 1270 SvREFCNT_dec (hv);
1104 DEC_DEC_DEPTH; 1271 DEC_DEC_DEPTH;
1105 return 0; 1272 return 0;
1106} 1273}
1107 1274
1108static SV * 1275static SV *
1109decode_sv (dec_t *dec) 1276decode_sv (dec_t *dec)
1110{ 1277{
1111 decode_ws (dec);
1112
1113 // the beauty of JSON: you need exactly one character lookahead 1278 // the beauty of JSON: you need exactly one character lookahead
1114 // to parse anything. 1279 // to parse anything.
1115 switch (*dec->cur) 1280 switch (*dec->cur)
1116 { 1281 {
1117 case '"': ++dec->cur; return decode_str (dec); 1282 case '"': ++dec->cur; return decode_str (dec);
1125 1290
1126 case 't': 1291 case 't':
1127 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1292 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1128 { 1293 {
1129 dec->cur += 4; 1294 dec->cur += 4;
1295#if JSON_SLOW
1296 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
1297#endif
1130 return SvREFCNT_inc (json_true); 1298 return SvREFCNT_inc (json_true);
1131 } 1299 }
1132 else 1300 else
1133 ERR ("'true' expected"); 1301 ERR ("'true' expected");
1134 1302
1136 1304
1137 case 'f': 1305 case 'f':
1138 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1306 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1139 { 1307 {
1140 dec->cur += 5; 1308 dec->cur += 5;
1309#if JSON_SLOW
1310 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1311#endif
1141 return SvREFCNT_inc (json_false); 1312 return SvREFCNT_inc (json_false);
1142 } 1313 }
1143 else 1314 else
1144 ERR ("'false' expected"); 1315 ERR ("'false' expected");
1145 1316
1164fail: 1335fail:
1165 return 0; 1336 return 0;
1166} 1337}
1167 1338
1168static SV * 1339static SV *
1169decode_json (SV *string, U32 flags, UV *offset_return) 1340decode_json (SV *string, JSON *json, UV *offset_return)
1170{ 1341{
1171 dec_t dec; 1342 dec_t dec;
1172 UV offset; 1343 UV offset;
1173 SV *sv; 1344 SV *sv;
1174 1345
1175 SvGETMAGIC (string); 1346 SvGETMAGIC (string);
1176 SvUPGRADE (string, SVt_PV); 1347 SvUPGRADE (string, SVt_PV);
1177 1348
1178 if (flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (flags)) 1349 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1179 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1350 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1180 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (flags)); 1351 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1181 1352
1182 if (flags & F_UTF8) 1353 if (json->flags & F_UTF8)
1183 sv_utf8_downgrade (string, 0); 1354 sv_utf8_downgrade (string, 0);
1184 else 1355 else
1185 sv_utf8_upgrade (string); 1356 sv_utf8_upgrade (string);
1186 1357
1187 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1358 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1188 1359
1189 dec.flags = flags; 1360 dec.json = *json;
1190 dec.cur = SvPVX (string); 1361 dec.cur = SvPVX (string);
1191 dec.end = SvEND (string); 1362 dec.end = SvEND (string);
1192 dec.err = 0; 1363 dec.err = 0;
1193 dec.depth = 0; 1364 dec.depth = 0;
1194 dec.maxdepth = DEC_DEPTH (dec.flags); 1365 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1366
1367 if (dec.json.cb_object || dec.json.cb_sk_object)
1368 dec.json.flags |= F_HOOK;
1195 1369
1196 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1370 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1371
1372 decode_ws (&dec);
1197 sv = decode_sv (&dec); 1373 sv = decode_sv (&dec);
1198 1374
1199 if (!(offset_return || !sv)) 1375 if (!(offset_return || !sv))
1200 { 1376 {
1201 // check for trailing garbage 1377 // check for trailing garbage
1209 } 1385 }
1210 } 1386 }
1211 1387
1212 if (offset_return || !sv) 1388 if (offset_return || !sv)
1213 { 1389 {
1214 offset = dec.flags & F_UTF8 1390 offset = dec.json.flags & F_UTF8
1215 ? dec.cur - SvPVX (string) 1391 ? dec.cur - SvPVX (string)
1216 : utf8_distance (dec.cur, SvPVX (string)); 1392 : utf8_distance (dec.cur, SvPVX (string));
1217 1393
1218 if (offset_return) 1394 if (offset_return)
1219 *offset_return = offset; 1395 *offset_return = offset;
1238 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1414 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1239 } 1415 }
1240 1416
1241 sv = sv_2mortal (sv); 1417 sv = sv_2mortal (sv);
1242 1418
1243 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1419 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1244 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1420 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1245 1421
1246 return sv; 1422 return sv;
1247} 1423}
1248 1424
1269 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1445 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1270} 1446}
1271 1447
1272PROTOTYPES: DISABLE 1448PROTOTYPES: DISABLE
1273 1449
1274SV *new (char *dummy) 1450void CLONE (...)
1275 CODE: 1451 CODE:
1276 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1452 json_stash = 0;
1277 OUTPUT: 1453 json_boolean_stash = 0;
1278 RETVAL
1279 1454
1455void new (char *klass)
1456 PPCODE:
1457{
1458 SV *pv = NEWSV (0, sizeof (JSON));
1459 SvPOK_only (pv);
1460 Zero (SvPVX (pv), 1, JSON);
1461 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1462 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1463}
1464
1280SV *ascii (SV *self, int enable = 1) 1465void ascii (JSON *self, int enable = 1)
1281 ALIAS: 1466 ALIAS:
1282 ascii = F_ASCII 1467 ascii = F_ASCII
1283 latin1 = F_LATIN1 1468 latin1 = F_LATIN1
1284 utf8 = F_UTF8 1469 utf8 = F_UTF8
1285 indent = F_INDENT 1470 indent = F_INDENT
1289 pretty = F_PRETTY 1474 pretty = F_PRETTY
1290 allow_nonref = F_ALLOW_NONREF 1475 allow_nonref = F_ALLOW_NONREF
1291 shrink = F_SHRINK 1476 shrink = F_SHRINK
1292 allow_blessed = F_ALLOW_BLESSED 1477 allow_blessed = F_ALLOW_BLESSED
1293 convert_blessed = F_CONV_BLESSED 1478 convert_blessed = F_CONV_BLESSED
1479 relaxed = F_RELAXED
1480 PPCODE:
1481{
1482 if (enable)
1483 self->flags |= ix;
1484 else
1485 self->flags &= ~ix;
1486
1487 XPUSHs (ST (0));
1488}
1489
1490void get_ascii (JSON *self)
1491 ALIAS:
1492 get_ascii = F_ASCII
1493 get_latin1 = F_LATIN1
1494 get_utf8 = F_UTF8
1495 get_indent = F_INDENT
1496 get_canonical = F_CANONICAL
1497 get_space_before = F_SPACE_BEFORE
1498 get_space_after = F_SPACE_AFTER
1499 get_pretty = F_PRETTY
1500 get_allow_nonref = F_ALLOW_NONREF
1501 get_shrink = F_SHRINK
1502 get_allow_blessed = F_ALLOW_BLESSED
1503 get_convert_blessed = F_CONV_BLESSED
1504 get_relaxed = F_RELAXED
1505 PPCODE:
1506 XPUSHs (boolSV (self->flags & ix));
1507
1508void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1509 PPCODE:
1510{
1511 UV log2 = 0;
1512
1513 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1514
1515 while ((1UL << log2) < max_depth)
1516 ++log2;
1517
1518 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1519
1520 XPUSHs (ST (0));
1521}
1522
1523int get_max_depth (JSON *self)
1294 CODE: 1524 CODE:
1295{ 1525 RETVAL = DEC_DEPTH (self->flags);
1296 UV *uv = SvJSON (self);
1297 if (enable)
1298 *uv |= ix;
1299 else
1300 *uv &= ~ix;
1301
1302 RETVAL = newSVsv (self);
1303}
1304 OUTPUT: 1526 OUTPUT:
1305 RETVAL 1527 RETVAL
1306 1528
1307SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1529void max_size (JSON *self, UV max_size = 0)
1530 PPCODE:
1531{
1532 UV log2 = 0;
1533
1534 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1535 if (max_size == 1) max_size = 2;
1536
1537 while ((1UL << log2) < max_size)
1538 ++log2;
1539
1540 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1541
1542 XPUSHs (ST (0));
1543}
1544
1545int get_max_size (JSON *self)
1308 CODE: 1546 CODE:
1309{ 1547 RETVAL = DEC_SIZE (self->flags);
1310 UV *uv = SvJSON (self);
1311 UV log2 = 0;
1312
1313 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1314
1315 while ((1UL << log2) < max_depth)
1316 ++log2;
1317
1318 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1319
1320 RETVAL = newSVsv (self);
1321}
1322 OUTPUT: 1548 OUTPUT:
1323 RETVAL 1549 RETVAL
1324 1550
1325SV *max_size (SV *self, UV max_size = 0) 1551void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1326 CODE:
1327{
1328 UV *uv = SvJSON (self);
1329 UV log2 = 0;
1330
1331 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1332 if (max_size == 1) max_size = 2;
1333
1334 while ((1UL << log2) < max_size)
1335 ++log2;
1336
1337 *uv = *uv & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1338
1339 RETVAL = newSVsv (self);
1340}
1341 OUTPUT:
1342 RETVAL
1343
1344void encode (SV *self, SV *scalar)
1345 PPCODE: 1552 PPCODE:
1346 XPUSHs (encode_json (scalar, *SvJSON (self))); 1553{
1554 SvREFCNT_dec (self->cb_object);
1555 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1347 1556
1348void decode (SV *self, SV *jsonstr) 1557 XPUSHs (ST (0));
1558}
1559
1560void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1349 PPCODE: 1561 PPCODE:
1562{
1563 if (!self->cb_sk_object)
1564 self->cb_sk_object = newHV ();
1565
1566 if (SvOK (cb))
1567 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1568 else
1569 {
1570 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1571
1572 if (!HvKEYS (self->cb_sk_object))
1573 {
1574 SvREFCNT_dec (self->cb_sk_object);
1575 self->cb_sk_object = 0;
1576 }
1577 }
1578
1579 XPUSHs (ST (0));
1580}
1581
1582void encode (JSON *self, SV *scalar)
1583 PPCODE:
1584 XPUSHs (encode_json (scalar, self));
1585
1586void decode (JSON *self, SV *jsonstr)
1587 PPCODE:
1350 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0)); 1588 XPUSHs (decode_json (jsonstr, self, 0));
1351 1589
1352void decode_prefix (SV *self, SV *jsonstr) 1590void decode_prefix (JSON *self, SV *jsonstr)
1353 PPCODE: 1591 PPCODE:
1354{ 1592{
1355 UV offset; 1593 UV offset;
1356 EXTEND (SP, 2); 1594 EXTEND (SP, 2);
1357 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset)); 1595 PUSHs (decode_json (jsonstr, self, &offset));
1358 PUSHs (sv_2mortal (newSVuv (offset))); 1596 PUSHs (sv_2mortal (newSVuv (offset)));
1359} 1597}
1360 1598
1599void DESTROY (JSON *self)
1600 CODE:
1601 SvREFCNT_dec (self->cb_sk_object);
1602 SvREFCNT_dec (self->cb_object);
1603
1361PROTOTYPES: ENABLE 1604PROTOTYPES: ENABLE
1362 1605
1363void to_json (SV *scalar) 1606void to_json (SV *scalar)
1364 ALIAS:
1365 objToJson = 0
1366 PPCODE: 1607 PPCODE:
1608{
1609 JSON json = { F_DEFAULT | F_UTF8 };
1367 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1610 XPUSHs (encode_json (scalar, &json));
1611}
1368 1612
1369void from_json (SV *jsonstr) 1613void from_json (SV *jsonstr)
1370 ALIAS:
1371 jsonToObj = 0
1372 PPCODE: 1614 PPCODE:
1615{
1616 JSON json = { F_DEFAULT | F_UTF8 };
1373 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0)); 1617 XPUSHs (decode_json (jsonstr, &json, 0));
1618}
1374 1619

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines