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.41 by root, Sat Jun 23 22:53:16 2007 UTC vs.
Revision 1.70 by root, Wed Mar 19 00:44:54 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" 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
14// some old perls do not have this, try to make it work, no 15// some old perls do not have this, try to make it work, no
15// guarentees, though. 16// guarentees, though. if it breaks, you get to keep the pieces.
16#ifndef UTF8_MAXBYTES 17#ifndef UTF8_MAXBYTES
17# define UTF8_MAXBYTES 13 18# define UTF8_MAXBYTES 13
18#endif 19#endif
19 20
20#define F_ASCII 0x00000001UL 21#define F_ASCII 0x00000001UL
21#define F_LATIN1 0x00000002UL 22#define F_LATIN1 0x00000002UL
22#define F_UTF8 0x00000004UL 23#define F_UTF8 0x00000004UL
23#define F_INDENT 0x00000008UL 24#define F_INDENT 0x00000008UL
24#define F_CANONICAL 0x00000010UL 25#define F_CANONICAL 0x00000010UL
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
30#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL
32#define F_RELAXED 0x00001000UL
33
29#define F_MAXDEPTH 0xf8000000UL 34#define F_MAXDEPTH 0xf8000000UL
30#define S_MAXDEPTH 27 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
31 39
32#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 40#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
33 41#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
34// F_SELFCONVERT? <=> to_json/toJson
35// F_BLESSED? <=> { $__class__$ => }
36 42
37#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 43#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
38#define F_DEFAULT (9UL << S_MAXDEPTH) 44#define F_DEFAULT (9UL << S_MAXDEPTH)
39 45
40#define INIT_SIZE 32 // initial scalar size to be allocated 46#define INIT_SIZE 32 // initial scalar size to be allocated
54#endif 60#endif
55 61
56#define expect_false(expr) expect ((expr) != 0, 0) 62#define expect_false(expr) expect ((expr) != 0, 0)
57#define expect_true(expr) expect ((expr) != 0, 1) 63#define expect_true(expr) expect ((expr) != 0, 1)
58 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
59static HV *json_stash; // JSON::XS:: 73static HV *json_stash, *json_boolean_stash; // JSON::XS::
74static SV *json_true, *json_false;
75
76typedef struct {
77 U32 flags;
78 SV *cb_object;
79 HV *cb_sk_object;
80} JSON;
60 81
61///////////////////////////////////////////////////////////////////////////// 82/////////////////////////////////////////////////////////////////////////////
62// utility functions 83// utility functions
63 84
64static UV * 85inline void
65SvJSON (SV *sv)
66{
67 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
68 croak ("object is not of type JSON::XS");
69
70 return &SvUVX (SvRV (sv));
71}
72
73static void
74shrink (SV *sv) 86shrink (SV *sv)
75{ 87{
76 sv_utf8_downgrade (sv, 1); 88 sv_utf8_downgrade (sv, 1);
77 if (SvLEN (sv) > SvCUR (sv) + 1) 89 if (SvLEN (sv) > SvCUR (sv) + 1)
78 { 90 {
113typedef struct 125typedef struct
114{ 126{
115 char *cur; // SvPVX (sv) + current output position 127 char *cur; // SvPVX (sv) + current output position
116 char *end; // SvEND (sv) 128 char *end; // SvEND (sv)
117 SV *sv; // result scalar 129 SV *sv; // result scalar
118 U32 flags; // F_* 130 JSON json;
119 U32 indent; // indentation level 131 U32 indent; // indentation level
120 U32 maxdepth; // max. indentation/recursion level 132 U32 maxdepth; // max. indentation/recursion level
121} enc_t; 133} enc_t;
122 134
123inline void 135inline void
197 } 209 }
198 210
199 if (uch > 0x10FFFFUL) 211 if (uch > 0x10FFFFUL)
200 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);
201 213
202 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))
203 { 215 {
204 if (uch > 0xFFFFUL) 216 if (uch > 0xFFFFUL)
205 { 217 {
206 need (enc, len += 11); 218 need (enc, len += 11);
207 sprintf (enc->cur, "\\u%04x\\u%04x", 219 sprintf (enc->cur, "\\u%04x\\u%04x",
221 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 233 *enc->cur++ = hexdigit [(uch >> 0) & 15];
222 } 234 }
223 235
224 str += clen; 236 str += clen;
225 } 237 }
226 else if (enc->flags & F_LATIN1) 238 else if (enc->json.flags & F_LATIN1)
227 { 239 {
228 *enc->cur++ = uch; 240 *enc->cur++ = uch;
229 str += clen; 241 str += clen;
230 } 242 }
231 else if (is_utf8) 243 else if (is_utf8)
252} 264}
253 265
254inline void 266inline void
255encode_indent (enc_t *enc) 267encode_indent (enc_t *enc)
256{ 268{
257 if (enc->flags & F_INDENT) 269 if (enc->json.flags & F_INDENT)
258 { 270 {
259 int spaces = enc->indent * INDENT_STEP; 271 int spaces = enc->indent * INDENT_STEP;
260 272
261 need (enc, spaces); 273 need (enc, spaces);
262 memset (enc->cur, ' ', spaces); 274 memset (enc->cur, ' ', spaces);
272} 284}
273 285
274inline void 286inline void
275encode_nl (enc_t *enc) 287encode_nl (enc_t *enc)
276{ 288{
277 if (enc->flags & F_INDENT) 289 if (enc->json.flags & F_INDENT)
278 { 290 {
279 need (enc, 1); 291 need (enc, 1);
280 encode_ch (enc, '\n'); 292 encode_ch (enc, '\n');
281 } 293 }
282} 294}
284inline void 296inline void
285encode_comma (enc_t *enc) 297encode_comma (enc_t *enc)
286{ 298{
287 encode_ch (enc, ','); 299 encode_ch (enc, ',');
288 300
289 if (enc->flags & F_INDENT) 301 if (enc->json.flags & F_INDENT)
290 encode_nl (enc); 302 encode_nl (enc);
291 else if (enc->flags & F_SPACE_AFTER) 303 else if (enc->json.flags & F_SPACE_AFTER)
292 encode_space (enc); 304 encode_space (enc);
293} 305}
294 306
295static void encode_sv (enc_t *enc, SV *sv); 307static void encode_sv (enc_t *enc, SV *sv);
296 308
300 int i, len = av_len (av); 312 int i, len = av_len (av);
301 313
302 if (enc->indent >= enc->maxdepth) 314 if (enc->indent >= enc->maxdepth)
303 croak ("data structure too deep (hit recursion limit)"); 315 croak ("data structure too deep (hit recursion limit)");
304 316
305 encode_ch (enc, '['); encode_nl (enc); 317 encode_ch (enc, '[');
306 ++enc->indent; 318
319 if (len >= 0)
320 {
321 encode_nl (enc); ++enc->indent;
307 322
308 for (i = 0; i <= len; ++i) 323 for (i = 0; i <= len; ++i)
309 { 324 {
325 SV **svp = av_fetch (av, i, 0);
326
310 encode_indent (enc); 327 encode_indent (enc);
311 encode_sv (enc, *av_fetch (av, i, 0));
312 328
329 if (svp)
330 encode_sv (enc, *svp);
331 else
332 encode_str (enc, "null", 4, 0);
333
313 if (i < len) 334 if (i < len)
314 encode_comma (enc); 335 encode_comma (enc);
315 } 336 }
316 337
338 encode_nl (enc); --enc->indent; encode_indent (enc);
339 }
340
317 encode_nl (enc); 341 encode_ch (enc, ']');
318
319 --enc->indent;
320 encode_indent (enc); encode_ch (enc, ']');
321} 342}
322 343
323static void 344static void
324encode_he (enc_t *enc, HE *he) 345encode_hk (enc_t *enc, HE *he)
325{ 346{
326 encode_ch (enc, '"'); 347 encode_ch (enc, '"');
327 348
328 if (HeKLEN (he) == HEf_SVKEY) 349 if (HeKLEN (he) == HEf_SVKEY)
329 { 350 {
339 else 360 else
340 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 361 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
341 362
342 encode_ch (enc, '"'); 363 encode_ch (enc, '"');
343 364
344 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 365 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
345 encode_ch (enc, ':'); 366 encode_ch (enc, ':');
346 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 367 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
347 encode_sv (enc, HeVAL (he));
348} 368}
349 369
350// compare hash entries, used when all keys are bytestrings 370// compare hash entries, used when all keys are bytestrings
351static int 371static int
352he_cmp_fast (const void *a_, const void *b_) 372he_cmp_fast (const void *a_, const void *b_)
357 HE *b = *(HE **)b_; 377 HE *b = *(HE **)b_;
358 378
359 STRLEN la = HeKLEN (a); 379 STRLEN la = HeKLEN (a);
360 STRLEN lb = HeKLEN (b); 380 STRLEN lb = HeKLEN (b);
361 381
362 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 382 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
363 cmp = la - lb; 383 cmp = lb - la;
364 384
365 return cmp; 385 return cmp;
366} 386}
367 387
368// 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
369static int 389static int
370he_cmp_slow (const void *a, const void *b) 390he_cmp_slow (const void *a, const void *b)
371{ 391{
372 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 392 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
373} 393}
374 394
375static void 395static void
376encode_hv (enc_t *enc, HV *hv) 396encode_hv (enc_t *enc, HV *hv)
377{ 397{
398 HE *he;
378 int count, i; 399 int count;
379 400
380 if (enc->indent >= enc->maxdepth) 401 if (enc->indent >= enc->maxdepth)
381 croak ("data structure too deep (hit recursion limit)"); 402 croak ("data structure too deep (hit recursion limit)");
382 403
383 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 404 encode_ch (enc, '{');
384 405
385 if ((count = hv_iterinit (hv)))
386 {
387 // for canonical output we have to sort by keys first 406 // for canonical output we have to sort by keys first
388 // actually, this is mostly due to the stupid so-called 407 // actually, this is mostly due to the stupid so-called
389 // security workaround added somewhere in 5.8.x. 408 // security workaround added somewhere in 5.8.x.
390 // that randomises hash orderings 409 // that randomises hash orderings
391 if (enc->flags & F_CANONICAL) 410 if (enc->json.flags & F_CANONICAL)
411 {
412 int count = hv_iterinit (hv);
413
414 if (SvMAGICAL (hv))
392 { 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 {
393 int fast = 1; 430 int i, fast = 1;
394 HE *he;
395#if defined(__BORLANDC__) || defined(_MSC_VER) 431#if defined(__BORLANDC__) || defined(_MSC_VER)
396 HE **hes = _alloca (count * sizeof (HE)); 432 HE **hes = _alloca (count * sizeof (HE));
397#else 433#else
398 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
399#endif 435#endif
426 462
427 FREETMPS; 463 FREETMPS;
428 LEAVE; 464 LEAVE;
429 } 465 }
430 466
431 for (i = 0; i < count; ++i) 467 encode_nl (enc); ++enc->indent;
468
469 while (count--)
432 { 470 {
433 encode_indent (enc); 471 encode_indent (enc);
472 he = hes [count];
434 encode_he (enc, hes [i]); 473 encode_hk (enc, he);
474 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
435 475
436 if (i < count - 1) 476 if (count)
437 encode_comma (enc); 477 encode_comma (enc);
438 } 478 }
439 479
480 encode_nl (enc); --enc->indent; encode_indent (enc);
481 }
482 }
483 else
484 {
485 if (hv_iterinit (hv) || SvMAGICAL (hv))
486 if ((he = hv_iternext (hv)))
487 {
488 encode_nl (enc); ++enc->indent;
489
490 for (;;)
491 {
440 encode_nl (enc); 492 encode_indent (enc);
493 encode_hk (enc, he);
494 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
495
496 if (!(he = hv_iternext (hv)))
497 break;
498
499 encode_comma (enc);
500 }
501
502 encode_nl (enc); --enc->indent; encode_indent (enc);
503 }
504 }
505
506 encode_ch (enc, '}');
507}
508
509// encode objects, arrays and special \0=false and \1=true values.
510static void
511encode_rv (enc_t *enc, SV *sv)
512{
513 svtype svt;
514
515 SvGETMAGIC (sv);
516 svt = SvTYPE (sv);
517
518 if (expect_false (SvOBJECT (sv)))
519 {
520 HV *stash = !JSON_SLOW || json_boolean_stash
521 ? json_boolean_stash
522 : gv_stashpv ("JSON::XS::Boolean", 1);
523
524 if (SvSTASH (sv) == stash)
525 {
526 if (SvIV (sv))
527 encode_str (enc, "true", 4, 0);
528 else
529 encode_str (enc, "false", 5, 0);
441 } 530 }
442 else 531 else
443 { 532 {
444 HE *he = hv_iternext (hv); 533#if 0
445 534 if (0 && sv_derived_from (rv, "JSON::Literal"))
446 for (;;)
447 { 535 {
448 encode_indent (enc); 536 // not yet
449 encode_he (enc, he);
450
451 if (!(he = hv_iternext (hv)))
452 break;
453
454 encode_comma (enc);
455 } 537 }
538#endif
539 if (enc->json.flags & F_CONV_BLESSED)
540 {
541 // we re-bless the reference to get overload and other niceties right
542 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
456 543
544 if (to_json)
545 {
546 dSP;
547
548 ENTER; SAVETMPS; PUSHMARK (SP);
549 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
550
551 // calling with G_SCALAR ensures that we always get a 1 return value
552 PUTBACK;
553 call_sv ((SV *)GvCV (to_json), G_SCALAR);
554 SPAGAIN;
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
457 encode_nl (enc); 563 encode_sv (enc, sv);
564
565 FREETMPS; LEAVE;
566 }
567 else if (enc->json.flags & F_ALLOW_BLESSED)
568 encode_str (enc, "null", 4, 0);
569 else
570 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
571 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
572 }
573 else if (enc->json.flags & F_ALLOW_BLESSED)
574 encode_str (enc, "null", 4, 0);
575 else
576 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
577 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
458 } 578 }
459 } 579 }
460
461 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
462}
463
464// encode objects, arrays and special \0=false and \1=true values.
465static void
466encode_rv (enc_t *enc, SV *sv)
467{
468 svtype svt;
469
470 SvGETMAGIC (sv);
471 svt = SvTYPE (sv);
472
473 if (svt == SVt_PVHV) 580 else if (svt == SVt_PVHV)
474 encode_hv (enc, (HV *)sv); 581 encode_hv (enc, (HV *)sv);
475 else if (svt == SVt_PVAV) 582 else if (svt == SVt_PVAV)
476 encode_av (enc, (AV *)sv); 583 encode_av (enc, (AV *)sv);
477 else if (svt < SVt_PVAV) 584 else if (svt < SVt_PVAV)
478 { 585 {
479 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')
480 encode_str (enc, "false", 5, 0); 592 encode_str (enc, "false", 5, 0);
481 else if (SvNIOK (sv) && SvIV (sv) == 1)
482 encode_str (enc, "true", 4, 0);
483 else 593 else
484 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",
485 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 595 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
486 } 596 }
487 else 597 else
557 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",
558 SvPV_nolen (sv), SvFLAGS (sv)); 668 SvPV_nolen (sv), SvFLAGS (sv));
559} 669}
560 670
561static SV * 671static SV *
562encode_json (SV *scalar, U32 flags) 672encode_json (SV *scalar, JSON *json)
563{ 673{
564 enc_t enc; 674 enc_t enc;
565 675
566 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 676 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
567 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)");
568 678
569 enc.flags = flags; 679 enc.json = *json;
570 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 680 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
571 enc.cur = SvPVX (enc.sv); 681 enc.cur = SvPVX (enc.sv);
572 enc.end = SvEND (enc.sv); 682 enc.end = SvEND (enc.sv);
573 enc.indent = 0; 683 enc.indent = 0;
574 enc.maxdepth = DEC_DEPTH (flags); 684 enc.maxdepth = DEC_DEPTH (enc.json.flags);
575 685
576 SvPOK_only (enc.sv); 686 SvPOK_only (enc.sv);
577 encode_sv (&enc, scalar); 687 encode_sv (&enc, scalar);
578 688
579 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 689 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
580 *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
581 691
582 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 692 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
583 SvUTF8_on (enc.sv); 693 SvUTF8_on (enc.sv);
584 694
585 if (enc.flags & F_SHRINK) 695 if (enc.json.flags & F_SHRINK)
586 shrink (enc.sv); 696 shrink (enc.sv);
587 697
588 return enc.sv; 698 return enc.sv;
589} 699}
590 700
595typedef struct 705typedef struct
596{ 706{
597 char *cur; // current parser pointer 707 char *cur; // current parser pointer
598 char *end; // end of input string 708 char *end; // end of input string
599 const char *err; // parse error, if != 0 709 const char *err; // parse error, if != 0
600 U32 flags; // F_* 710 JSON json;
601 U32 depth; // recursion depth 711 U32 depth; // recursion depth
602 U32 maxdepth; // recursion depth limit 712 U32 maxdepth; // recursion depth limit
603} dec_t; 713} dec_t;
604 714
605inline 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
606decode_ws (dec_t *dec) 725decode_ws (dec_t *dec)
607{ 726{
608 for (;;) 727 for (;;)
609 { 728 {
610 char ch = *dec->cur; 729 char ch = *dec->cur;
611 730
612 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 }
613 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 743 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
614 break; 744 break; // parse error, but let higher level handle it, gives better error messages
615 745
616 ++dec->cur; 746 ++dec->cur;
617 } 747 }
618} 748}
619 749
868 is_nv = 1; 998 is_nv = 1;
869 } 999 }
870 1000
871 if (!is_nv) 1001 if (!is_nv)
872 { 1002 {
1003 int len = dec->cur - start;
1004
873 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 1005 // special case the rather common 1..5-digit-int case
874 if (*start == '-') 1006 if (*start == '-')
875 switch (dec->cur - start) 1007 switch (len)
876 { 1008 {
877 case 2: return newSViv (-( start [1] - '0' * 1)); 1009 case 2: return newSViv (-( start [1] - '0' * 1));
878 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1010 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
879 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));
880 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));
1013 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
881 } 1014 }
882 else 1015 else
883 switch (dec->cur - start) 1016 switch (len)
884 { 1017 {
885 case 1: return newSViv ( start [0] - '0' * 1); 1018 case 1: return newSViv ( start [0] - '0' * 1);
886 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1019 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
887 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1020 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
888 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1021 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1022 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
889 } 1023 }
890 1024
891 { 1025 {
892 UV uv; 1026 UV uv;
893 int numtype = grok_number (start, dec->cur - start, &uv); 1027 int numtype = grok_number (start, len, &uv);
894 if (numtype & IS_NUMBER_IN_UV) 1028 if (numtype & IS_NUMBER_IN_UV)
895 if (numtype & IS_NUMBER_NEG) 1029 if (numtype & IS_NUMBER_NEG)
896 { 1030 {
897 if (uv < (UV)IV_MIN) 1031 if (uv < (UV)IV_MIN)
898 return newSViv (-(IV)uv); 1032 return newSViv (-(IV)uv);
899 } 1033 }
900 else 1034 else
901 return newSVuv (uv); 1035 return newSVuv (uv);
902
903 // here would likely be the place for bigint support
904 } 1036 }
905 }
906 1037
907 // if we ever support bigint or bigfloat, this is the place for bigfloat 1038 len -= *start == '-' ? 1 : 0;
1039
1040 // does not fit into IV or UV, try NV
1041 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
1042 #if defined (LDBL_DIG)
1043 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1044 #endif
1045 )
1046 // fits into NV without loss of precision
1047 return newSVnv (Atof (start));
1048
1049 // everything else fails, convert it to a string
1050 return newSVpvn (start, dec->cur - start);
1051 }
1052
1053 // loss of precision here
908 return newSVnv (Atof (start)); 1054 return newSVnv (Atof (start));
909 1055
910fail: 1056fail:
911 return 0; 1057 return 0;
912} 1058}
942 1088
943 if (*dec->cur != ',') 1089 if (*dec->cur != ',')
944 ERR (", or ] expected while parsing array"); 1090 ERR (", or ] expected while parsing array");
945 1091
946 ++dec->cur; 1092 ++dec->cur;
1093
1094 decode_ws (dec);
1095
1096 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1097 {
1098 ++dec->cur;
1099 break;
1100 }
947 } 1101 }
948 1102
949 DEC_DEC_DEPTH; 1103 DEC_DEC_DEPTH;
950 return newRV_noinc ((SV *)av); 1104 return newRV_noinc ((SV *)av);
951 1105
956} 1110}
957 1111
958static SV * 1112static SV *
959decode_hv (dec_t *dec) 1113decode_hv (dec_t *dec)
960{ 1114{
1115 SV *sv;
961 HV *hv = newHV (); 1116 HV *hv = newHV ();
962 1117
963 DEC_INC_DEPTH; 1118 DEC_INC_DEPTH;
964 decode_ws (dec); 1119 decode_ws (dec);
965 1120
966 if (*dec->cur == '}') 1121 if (*dec->cur == '}')
967 ++dec->cur; 1122 ++dec->cur;
968 else 1123 else
969 for (;;) 1124 for (;;)
970 { 1125 {
1126 EXPECT_CH ('"');
1127
1128 // heuristic: assume that
1129 // a) decode_str + hv_store_ent are abysmally slow.
1130 // b) most hash keys are short, simple ascii text.
1131 // => try to "fast-match" such strings to avoid
1132 // the overhead of decode_str + hv_store_ent.
1133 {
971 SV *key, *value; 1134 SV *value;
1135 char *p = dec->cur;
1136 char *e = p + 24; // only try up to 24 bytes
972 1137
973 decode_ws (dec); EXPECT_CH ('"'); 1138 for (;;)
974
975 key = decode_str (dec);
976 if (!key)
977 goto fail;
978
979 decode_ws (dec); EXPECT_CH (':');
980
981 value = decode_sv (dec);
982 if (!value)
983 { 1139 {
1140 // the >= 0x80 is true on most architectures
1141 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1142 {
1143 // slow path, back up and use decode_str
1144 SV *key = decode_str (dec);
1145 if (!key)
1146 goto fail;
1147
1148 decode_ws (dec); EXPECT_CH (':');
1149
1150 decode_ws (dec);
1151 value = decode_sv (dec);
1152 if (!value)
1153 {
1154 SvREFCNT_dec (key);
1155 goto fail;
1156 }
1157
1158 hv_store_ent (hv, key, value, 0);
984 SvREFCNT_dec (key); 1159 SvREFCNT_dec (key);
1160
1161 break;
1162 }
1163 else if (*p == '"')
1164 {
1165 // fast path, got a simple key
1166 char *key = dec->cur;
1167 int len = p - key;
1168 dec->cur = p + 1;
1169
1170 decode_ws (dec); EXPECT_CH (':');
1171
1172 decode_ws (dec);
1173 value = decode_sv (dec);
1174 if (!value)
985 goto fail; 1175 goto fail;
1176
1177 hv_store (hv, key, len, value, 0);
1178
1179 break;
1180 }
1181
1182 ++p;
986 } 1183 }
987 1184 }
988 hv_store_ent (hv, key, value, 0);
989 SvREFCNT_dec (key);
990 1185
991 decode_ws (dec); 1186 decode_ws (dec);
992 1187
993 if (*dec->cur == '}') 1188 if (*dec->cur == '}')
994 { 1189 {
998 1193
999 if (*dec->cur != ',') 1194 if (*dec->cur != ',')
1000 ERR (", or } expected while parsing object/hash"); 1195 ERR (", or } expected while parsing object/hash");
1001 1196
1002 ++dec->cur; 1197 ++dec->cur;
1198
1199 decode_ws (dec);
1200
1201 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1202 {
1203 ++dec->cur;
1204 break;
1205 }
1003 } 1206 }
1004 1207
1005 DEC_DEC_DEPTH; 1208 DEC_DEC_DEPTH;
1006 return newRV_noinc ((SV *)hv); 1209 sv = newRV_noinc ((SV *)hv);
1210
1211 // check filter callbacks
1212 if (dec->json.flags & F_HOOK)
1213 {
1214 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1215 {
1216 HE *cb, *he;
1217
1218 hv_iterinit (hv);
1219 he = hv_iternext (hv);
1220 hv_iterinit (hv);
1221
1222 // the next line creates a mortal sv each time its called.
1223 // might want to optimise this for common cases.
1224 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1225
1226 if (cb)
1227 {
1228 dSP;
1229 int count;
1230
1231 ENTER; SAVETMPS; PUSHMARK (SP);
1232 XPUSHs (HeVAL (he));
1233
1234 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1235
1236 if (count == 1)
1237 {
1238 sv = newSVsv (POPs);
1239 FREETMPS; LEAVE;
1240 return sv;
1241 }
1242
1243 FREETMPS; LEAVE;
1244 }
1245 }
1246
1247 if (dec->json.cb_object)
1248 {
1249 dSP;
1250 int count;
1251
1252 ENTER; SAVETMPS; PUSHMARK (SP);
1253 XPUSHs (sv_2mortal (sv));
1254
1255 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1256
1257 if (count == 1)
1258 {
1259 sv = newSVsv (POPs);
1260 FREETMPS; LEAVE;
1261 return sv;
1262 }
1263
1264 SvREFCNT_inc (sv);
1265 FREETMPS; LEAVE;
1266 }
1267 }
1268
1269 return sv;
1007 1270
1008fail: 1271fail:
1009 SvREFCNT_dec (hv); 1272 SvREFCNT_dec (hv);
1010 DEC_DEC_DEPTH; 1273 DEC_DEC_DEPTH;
1011 return 0; 1274 return 0;
1012} 1275}
1013 1276
1014static SV * 1277static SV *
1015decode_sv (dec_t *dec) 1278decode_sv (dec_t *dec)
1016{ 1279{
1017 decode_ws (dec);
1018
1019 // the beauty of JSON: you need exactly one character lookahead 1280 // the beauty of JSON: you need exactly one character lookahead
1020 // to parse anything. 1281 // to parse anything.
1021 switch (*dec->cur) 1282 switch (*dec->cur)
1022 { 1283 {
1023 case '"': ++dec->cur; return decode_str (dec); 1284 case '"': ++dec->cur; return decode_str (dec);
1031 1292
1032 case 't': 1293 case 't':
1033 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1294 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1034 { 1295 {
1035 dec->cur += 4; 1296 dec->cur += 4;
1036 return newSViv (1); 1297#if JSON_SLOW
1298 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
1299#endif
1300 return SvREFCNT_inc (json_true);
1037 } 1301 }
1038 else 1302 else
1039 ERR ("'true' expected"); 1303 ERR ("'true' expected");
1040 1304
1041 break; 1305 break;
1042 1306
1043 case 'f': 1307 case 'f':
1044 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1308 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1045 { 1309 {
1046 dec->cur += 5; 1310 dec->cur += 5;
1047 return newSViv (0); 1311#if JSON_SLOW
1312 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1313#endif
1314 return SvREFCNT_inc (json_false);
1048 } 1315 }
1049 else 1316 else
1050 ERR ("'false' expected"); 1317 ERR ("'false' expected");
1051 1318
1052 break; 1319 break;
1070fail: 1337fail:
1071 return 0; 1338 return 0;
1072} 1339}
1073 1340
1074static SV * 1341static SV *
1075decode_json (SV *string, U32 flags, UV *offset_return) 1342decode_json (SV *string, JSON *json, UV *offset_return)
1076{ 1343{
1077 dec_t dec; 1344 dec_t dec;
1078 UV offset; 1345 UV offset;
1079 SV *sv; 1346 SV *sv;
1080 1347
1081 SvGETMAGIC (string); 1348 SvGETMAGIC (string);
1082 SvUPGRADE (string, SVt_PV); 1349 SvUPGRADE (string, SVt_PV);
1083 1350
1351 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1352 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1353 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1354
1084 if (flags & F_UTF8) 1355 if (json->flags & F_UTF8)
1085 sv_utf8_downgrade (string, 0); 1356 sv_utf8_downgrade (string, 0);
1086 else 1357 else
1087 sv_utf8_upgrade (string); 1358 sv_utf8_upgrade (string);
1088 1359
1089 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1360 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1090 1361
1091 dec.flags = flags; 1362 dec.json = *json;
1092 dec.cur = SvPVX (string); 1363 dec.cur = SvPVX (string);
1093 dec.end = SvEND (string); 1364 dec.end = SvEND (string);
1094 dec.err = 0; 1365 dec.err = 0;
1095 dec.depth = 0; 1366 dec.depth = 0;
1096 dec.maxdepth = DEC_DEPTH (dec.flags); 1367 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1368
1369 if (dec.json.cb_object || dec.json.cb_sk_object)
1370 dec.json.flags |= F_HOOK;
1097 1371
1098 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1372 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1373
1374 decode_ws (&dec);
1099 sv = decode_sv (&dec); 1375 sv = decode_sv (&dec);
1100 1376
1101 if (!(offset_return || !sv)) 1377 if (!(offset_return || !sv))
1102 { 1378 {
1103 // check for trailing garbage 1379 // check for trailing garbage
1111 } 1387 }
1112 } 1388 }
1113 1389
1114 if (offset_return || !sv) 1390 if (offset_return || !sv)
1115 { 1391 {
1116 offset = dec.flags & F_UTF8 1392 offset = dec.json.flags & F_UTF8
1117 ? dec.cur - SvPVX (string) 1393 ? dec.cur - SvPVX (string)
1118 : utf8_distance (dec.cur, SvPVX (string)); 1394 : utf8_distance (dec.cur, SvPVX (string));
1119 1395
1120 if (offset_return) 1396 if (offset_return)
1121 *offset_return = offset; 1397 *offset_return = offset;
1140 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1416 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1141 } 1417 }
1142 1418
1143 sv = sv_2mortal (sv); 1419 sv = sv_2mortal (sv);
1144 1420
1145 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1421 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1146 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1422 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1147 1423
1148 return sv; 1424 return sv;
1149} 1425}
1150 1426
1162 i >= '0' && i <= '9' ? i - '0' 1438 i >= '0' && i <= '9' ? i - '0'
1163 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1439 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1164 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1440 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1165 : -1; 1441 : -1;
1166 1442
1167 json_stash = gv_stashpv ("JSON::XS", 1); 1443 json_stash = gv_stashpv ("JSON::XS" , 1);
1444 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1445
1446 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1447 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1168} 1448}
1169 1449
1170PROTOTYPES: DISABLE 1450PROTOTYPES: DISABLE
1171 1451
1172SV *new (char *dummy) 1452void CLONE (...)
1173 CODE: 1453 CODE:
1174 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1454 json_stash = 0;
1455 json_boolean_stash = 0;
1456
1457void new (char *klass)
1458 PPCODE:
1459{
1460 SV *pv = NEWSV (0, sizeof (JSON));
1461 SvPOK_only (pv);
1462 Zero (SvPVX (pv), 1, JSON);
1463 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1464 XPUSHs (sv_2mortal (sv_bless (
1465 newRV_noinc (pv),
1466 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1467 )));
1468}
1469
1470void ascii (JSON *self, int enable = 1)
1471 ALIAS:
1472 ascii = F_ASCII
1473 latin1 = F_LATIN1
1474 utf8 = F_UTF8
1475 indent = F_INDENT
1476 canonical = F_CANONICAL
1477 space_before = F_SPACE_BEFORE
1478 space_after = F_SPACE_AFTER
1479 pretty = F_PRETTY
1480 allow_nonref = F_ALLOW_NONREF
1481 shrink = F_SHRINK
1482 allow_blessed = F_ALLOW_BLESSED
1483 convert_blessed = F_CONV_BLESSED
1484 relaxed = F_RELAXED
1485 PPCODE:
1486{
1487 if (enable)
1488 self->flags |= ix;
1489 else
1490 self->flags &= ~ix;
1491
1492 XPUSHs (ST (0));
1493}
1494
1495void get_ascii (JSON *self)
1496 ALIAS:
1497 get_ascii = F_ASCII
1498 get_latin1 = F_LATIN1
1499 get_utf8 = F_UTF8
1500 get_indent = F_INDENT
1501 get_canonical = F_CANONICAL
1502 get_space_before = F_SPACE_BEFORE
1503 get_space_after = F_SPACE_AFTER
1504 get_allow_nonref = F_ALLOW_NONREF
1505 get_shrink = F_SHRINK
1506 get_allow_blessed = F_ALLOW_BLESSED
1507 get_convert_blessed = F_CONV_BLESSED
1508 get_relaxed = F_RELAXED
1509 PPCODE:
1510 XPUSHs (boolSV (self->flags & ix));
1511
1512void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1513 PPCODE:
1514{
1515 UV log2 = 0;
1516
1517 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1518
1519 while ((1UL << log2) < max_depth)
1520 ++log2;
1521
1522 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1523
1524 XPUSHs (ST (0));
1525}
1526
1527U32 get_max_depth (JSON *self)
1528 CODE:
1529 RETVAL = DEC_DEPTH (self->flags);
1175 OUTPUT: 1530 OUTPUT:
1176 RETVAL 1531 RETVAL
1177 1532
1178SV *ascii (SV *self, int enable = 1) 1533void max_size (JSON *self, UV max_size = 0)
1179 ALIAS: 1534 PPCODE:
1180 ascii = F_ASCII 1535{
1181 latin1 = F_LATIN1 1536 UV log2 = 0;
1182 utf8 = F_UTF8 1537
1183 indent = F_INDENT 1538 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1184 canonical = F_CANONICAL 1539 if (max_size == 1) max_size = 2;
1185 space_before = F_SPACE_BEFORE 1540
1186 space_after = F_SPACE_AFTER 1541 while ((1UL << log2) < max_size)
1187 pretty = F_PRETTY 1542 ++log2;
1188 allow_nonref = F_ALLOW_NONREF 1543
1189 shrink = F_SHRINK 1544 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1545
1546 XPUSHs (ST (0));
1547}
1548
1549int get_max_size (JSON *self)
1190 CODE: 1550 CODE:
1191{ 1551 RETVAL = DEC_SIZE (self->flags);
1192 UV *uv = SvJSON (self);
1193 if (enable)
1194 *uv |= ix;
1195 else
1196 *uv &= ~ix;
1197
1198 RETVAL = newSVsv (self);
1199}
1200 OUTPUT: 1552 OUTPUT:
1201 RETVAL 1553 RETVAL
1202 1554
1203SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1555void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1204 CODE:
1205{
1206 UV *uv = SvJSON (self);
1207 UV log2 = 0;
1208
1209 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1210
1211 while ((1UL << log2) < max_depth)
1212 ++log2;
1213
1214 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1215
1216 RETVAL = newSVsv (self);
1217}
1218 OUTPUT:
1219 RETVAL
1220
1221void encode (SV *self, SV *scalar)
1222 PPCODE: 1556 PPCODE:
1223 XPUSHs (encode_json (scalar, *SvJSON (self))); 1557{
1558 SvREFCNT_dec (self->cb_object);
1559 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1224 1560
1225void decode (SV *self, SV *jsonstr) 1561 XPUSHs (ST (0));
1562}
1563
1564void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1226 PPCODE: 1565 PPCODE:
1566{
1567 if (!self->cb_sk_object)
1568 self->cb_sk_object = newHV ();
1569
1570 if (SvOK (cb))
1571 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1572 else
1573 {
1574 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1575
1576 if (!HvKEYS (self->cb_sk_object))
1577 {
1578 SvREFCNT_dec (self->cb_sk_object);
1579 self->cb_sk_object = 0;
1580 }
1581 }
1582
1583 XPUSHs (ST (0));
1584}
1585
1586void encode (JSON *self, SV *scalar)
1587 PPCODE:
1588 XPUSHs (encode_json (scalar, self));
1589
1590void decode (JSON *self, SV *jsonstr)
1591 PPCODE:
1227 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0)); 1592 XPUSHs (decode_json (jsonstr, self, 0));
1228 1593
1229void decode_prefix (SV *self, SV *jsonstr) 1594void decode_prefix (JSON *self, SV *jsonstr)
1230 PPCODE: 1595 PPCODE:
1231{ 1596{
1232 UV offset; 1597 UV offset;
1233 EXTEND (SP, 2); 1598 EXTEND (SP, 2);
1234 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset)); 1599 PUSHs (decode_json (jsonstr, self, &offset));
1235 PUSHs (sv_2mortal (newSVuv (offset))); 1600 PUSHs (sv_2mortal (newSVuv (offset)));
1236} 1601}
1237 1602
1603void DESTROY (JSON *self)
1604 CODE:
1605 SvREFCNT_dec (self->cb_sk_object);
1606 SvREFCNT_dec (self->cb_object);
1607
1238PROTOTYPES: ENABLE 1608PROTOTYPES: ENABLE
1239 1609
1240void to_json (SV *scalar) 1610void encode_json (SV *scalar)
1241 ALIAS:
1242 objToJson = 0
1243 PPCODE: 1611 PPCODE:
1612{
1613 JSON json = { F_DEFAULT | F_UTF8 };
1244 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1614 XPUSHs (encode_json (scalar, &json));
1615}
1245 1616
1246void from_json (SV *jsonstr) 1617void decode_json (SV *jsonstr)
1247 ALIAS:
1248 jsonToObj = 0
1249 PPCODE: 1618 PPCODE:
1619{
1620 JSON json = { F_DEFAULT | F_UTF8 };
1250 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0)); 1621 XPUSHs (decode_json (jsonstr, &json, 0));
1622}
1251 1623

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines