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.40 by root, Tue Jun 12 01:27:02 2007 UTC vs.
Revision 1.68 by root, Thu Nov 29 08:37:11 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
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
14#define F_ASCII 0x00000001UL 21#define F_ASCII 0x00000001UL
15#define F_LATIN1 0x00000002UL 22#define F_LATIN1 0x00000002UL
16#define F_UTF8 0x00000004UL 23#define F_UTF8 0x00000004UL
17#define F_INDENT 0x00000008UL 24#define F_INDENT 0x00000008UL
18#define F_CANONICAL 0x00000010UL 25#define F_CANONICAL 0x00000010UL
19#define F_SPACE_BEFORE 0x00000020UL 26#define F_SPACE_BEFORE 0x00000020UL
20#define F_SPACE_AFTER 0x00000040UL 27#define F_SPACE_AFTER 0x00000040UL
21#define F_ALLOW_NONREF 0x00000100UL 28#define F_ALLOW_NONREF 0x00000100UL
22#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
23#define F_MAXDEPTH 0xf8000000UL 34#define F_MAXDEPTH 0xf8000000UL
24#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
25 39
26#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 40#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
27 41#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
28// F_SELFCONVERT? <=> to_json/toJson
29// F_BLESSED? <=> { $__class__$ => }
30 42
31#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 43#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
32#define F_DEFAULT (9UL << S_MAXDEPTH) 44#define F_DEFAULT (9UL << S_MAXDEPTH)
33 45
34#define INIT_SIZE 32 // initial scalar size to be allocated 46#define INIT_SIZE 32 // initial scalar size to be allocated
48#endif 60#endif
49 61
50#define expect_false(expr) expect ((expr) != 0, 0) 62#define expect_false(expr) expect ((expr) != 0, 0)
51#define expect_true(expr) expect ((expr) != 0, 1) 63#define expect_true(expr) expect ((expr) != 0, 1)
52 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
53static 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;
54 81
55///////////////////////////////////////////////////////////////////////////// 82/////////////////////////////////////////////////////////////////////////////
56// utility functions 83// utility functions
57 84
58static UV * 85inline void
59SvJSON (SV *sv)
60{
61 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
62 croak ("object is not of type JSON::XS");
63
64 return &SvUVX (SvRV (sv));
65}
66
67static void
68shrink (SV *sv) 86shrink (SV *sv)
69{ 87{
70 sv_utf8_downgrade (sv, 1); 88 sv_utf8_downgrade (sv, 1);
71 if (SvLEN (sv) > SvCUR (sv) + 1) 89 if (SvLEN (sv) > SvCUR (sv) + 1)
72 { 90 {
107typedef struct 125typedef struct
108{ 126{
109 char *cur; // SvPVX (sv) + current output position 127 char *cur; // SvPVX (sv) + current output position
110 char *end; // SvEND (sv) 128 char *end; // SvEND (sv)
111 SV *sv; // result scalar 129 SV *sv; // result scalar
112 U32 flags; // F_* 130 JSON json;
113 U32 indent; // indentation level 131 U32 indent; // indentation level
114 U32 maxdepth; // max. indentation/recursion level 132 U32 maxdepth; // max. indentation/recursion level
115} enc_t; 133} enc_t;
116 134
117inline void 135inline void
191 } 209 }
192 210
193 if (uch > 0x10FFFFUL) 211 if (uch > 0x10FFFFUL)
194 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);
195 213
196 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))
197 { 215 {
198 if (uch > 0xFFFFUL) 216 if (uch > 0xFFFFUL)
199 { 217 {
200 need (enc, len += 11); 218 need (enc, len += 11);
201 sprintf (enc->cur, "\\u%04x\\u%04x", 219 sprintf (enc->cur, "\\u%04x\\u%04x",
215 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 233 *enc->cur++ = hexdigit [(uch >> 0) & 15];
216 } 234 }
217 235
218 str += clen; 236 str += clen;
219 } 237 }
220 else if (enc->flags & F_LATIN1) 238 else if (enc->json.flags & F_LATIN1)
221 { 239 {
222 *enc->cur++ = uch; 240 *enc->cur++ = uch;
223 str += clen; 241 str += clen;
224 } 242 }
225 else if (is_utf8) 243 else if (is_utf8)
246} 264}
247 265
248inline void 266inline void
249encode_indent (enc_t *enc) 267encode_indent (enc_t *enc)
250{ 268{
251 if (enc->flags & F_INDENT) 269 if (enc->json.flags & F_INDENT)
252 { 270 {
253 int spaces = enc->indent * INDENT_STEP; 271 int spaces = enc->indent * INDENT_STEP;
254 272
255 need (enc, spaces); 273 need (enc, spaces);
256 memset (enc->cur, ' ', spaces); 274 memset (enc->cur, ' ', spaces);
266} 284}
267 285
268inline void 286inline void
269encode_nl (enc_t *enc) 287encode_nl (enc_t *enc)
270{ 288{
271 if (enc->flags & F_INDENT) 289 if (enc->json.flags & F_INDENT)
272 { 290 {
273 need (enc, 1); 291 need (enc, 1);
274 encode_ch (enc, '\n'); 292 encode_ch (enc, '\n');
275 } 293 }
276} 294}
278inline void 296inline void
279encode_comma (enc_t *enc) 297encode_comma (enc_t *enc)
280{ 298{
281 encode_ch (enc, ','); 299 encode_ch (enc, ',');
282 300
283 if (enc->flags & F_INDENT) 301 if (enc->json.flags & F_INDENT)
284 encode_nl (enc); 302 encode_nl (enc);
285 else if (enc->flags & F_SPACE_AFTER) 303 else if (enc->json.flags & F_SPACE_AFTER)
286 encode_space (enc); 304 encode_space (enc);
287} 305}
288 306
289static void encode_sv (enc_t *enc, SV *sv); 307static void encode_sv (enc_t *enc, SV *sv);
290 308
294 int i, len = av_len (av); 312 int i, len = av_len (av);
295 313
296 if (enc->indent >= enc->maxdepth) 314 if (enc->indent >= enc->maxdepth)
297 croak ("data structure too deep (hit recursion limit)"); 315 croak ("data structure too deep (hit recursion limit)");
298 316
299 encode_ch (enc, '['); encode_nl (enc); 317 encode_ch (enc, '[');
300 ++enc->indent; 318
319 if (len >= 0)
320 {
321 encode_nl (enc); ++enc->indent;
301 322
302 for (i = 0; i <= len; ++i) 323 for (i = 0; i <= len; ++i)
303 { 324 {
325 SV **svp = av_fetch (av, i, 0);
326
304 encode_indent (enc); 327 encode_indent (enc);
305 encode_sv (enc, *av_fetch (av, i, 0));
306 328
329 if (svp)
330 encode_sv (enc, *svp);
331 else
332 encode_str (enc, "null", 4, 0);
333
307 if (i < len) 334 if (i < len)
308 encode_comma (enc); 335 encode_comma (enc);
309 } 336 }
310 337
338 encode_nl (enc); --enc->indent; encode_indent (enc);
339 }
340
311 encode_nl (enc); 341 encode_ch (enc, ']');
312
313 --enc->indent;
314 encode_indent (enc); encode_ch (enc, ']');
315} 342}
316 343
317static void 344static void
318encode_he (enc_t *enc, HE *he) 345encode_hk (enc_t *enc, HE *he)
319{ 346{
320 encode_ch (enc, '"'); 347 encode_ch (enc, '"');
321 348
322 if (HeKLEN (he) == HEf_SVKEY) 349 if (HeKLEN (he) == HEf_SVKEY)
323 { 350 {
333 else 360 else
334 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 361 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
335 362
336 encode_ch (enc, '"'); 363 encode_ch (enc, '"');
337 364
338 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 365 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
339 encode_ch (enc, ':'); 366 encode_ch (enc, ':');
340 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 367 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
341 encode_sv (enc, HeVAL (he));
342} 368}
343 369
344// compare hash entries, used when all keys are bytestrings 370// compare hash entries, used when all keys are bytestrings
345static int 371static int
346he_cmp_fast (const void *a_, const void *b_) 372he_cmp_fast (const void *a_, const void *b_)
351 HE *b = *(HE **)b_; 377 HE *b = *(HE **)b_;
352 378
353 STRLEN la = HeKLEN (a); 379 STRLEN la = HeKLEN (a);
354 STRLEN lb = HeKLEN (b); 380 STRLEN lb = HeKLEN (b);
355 381
356 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 382 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
357 cmp = la - lb; 383 cmp = lb - la;
358 384
359 return cmp; 385 return cmp;
360} 386}
361 387
362// 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
363static int 389static int
364he_cmp_slow (const void *a, const void *b) 390he_cmp_slow (const void *a, const void *b)
365{ 391{
366 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 392 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
367} 393}
368 394
369static void 395static void
370encode_hv (enc_t *enc, HV *hv) 396encode_hv (enc_t *enc, HV *hv)
371{ 397{
398 HE *he;
372 int count, i; 399 int count;
373 400
374 if (enc->indent >= enc->maxdepth) 401 if (enc->indent >= enc->maxdepth)
375 croak ("data structure too deep (hit recursion limit)"); 402 croak ("data structure too deep (hit recursion limit)");
376 403
377 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 404 encode_ch (enc, '{');
378 405
379 if ((count = hv_iterinit (hv)))
380 {
381 // for canonical output we have to sort by keys first 406 // for canonical output we have to sort by keys first
382 // actually, this is mostly due to the stupid so-called 407 // actually, this is mostly due to the stupid so-called
383 // security workaround added somewhere in 5.8.x. 408 // security workaround added somewhere in 5.8.x.
384 // that randomises hash orderings 409 // that randomises hash orderings
385 if (enc->flags & F_CANONICAL) 410 if (enc->json.flags & F_CANONICAL)
411 {
412 int count = hv_iterinit (hv);
413
414 if (SvMAGICAL (hv))
386 { 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 {
387 int fast = 1; 430 int i, fast = 1;
388 HE *he;
389#if defined(__BORLANDC__) || defined(_MSC_VER) 431#if defined(__BORLANDC__) || defined(_MSC_VER)
390 HE **hes = _alloca (count * sizeof (HE)); 432 HE **hes = _alloca (count * sizeof (HE));
391#else 433#else
392 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
393#endif 435#endif
420 462
421 FREETMPS; 463 FREETMPS;
422 LEAVE; 464 LEAVE;
423 } 465 }
424 466
425 for (i = 0; i < count; ++i) 467 encode_nl (enc); ++enc->indent;
468
469 while (count--)
426 { 470 {
427 encode_indent (enc); 471 encode_indent (enc);
472 he = hes [count];
428 encode_he (enc, hes [i]); 473 encode_hk (enc, he);
474 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
429 475
430 if (i < count - 1) 476 if (count)
431 encode_comma (enc); 477 encode_comma (enc);
432 } 478 }
433 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 {
434 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);
435 } 530 }
436 else 531 else
437 { 532 {
438 HE *he = hv_iternext (hv); 533#if 0
439 534 if (0 && sv_derived_from (rv, "JSON::Literal"))
440 for (;;)
441 { 535 {
442 encode_indent (enc); 536 // not yet
443 encode_he (enc, he);
444
445 if (!(he = hv_iternext (hv)))
446 break;
447
448 encode_comma (enc);
449 } 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);
450 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
451 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))));
452 } 578 }
453 } 579 }
454
455 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
456}
457
458// encode objects, arrays and special \0=false and \1=true values.
459static void
460encode_rv (enc_t *enc, SV *sv)
461{
462 svtype svt;
463
464 SvGETMAGIC (sv);
465 svt = SvTYPE (sv);
466
467 if (svt == SVt_PVHV) 580 else if (svt == SVt_PVHV)
468 encode_hv (enc, (HV *)sv); 581 encode_hv (enc, (HV *)sv);
469 else if (svt == SVt_PVAV) 582 else if (svt == SVt_PVAV)
470 encode_av (enc, (AV *)sv); 583 encode_av (enc, (AV *)sv);
471 else if (svt < SVt_PVAV) 584 else if (svt < SVt_PVAV)
472 { 585 {
473 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')
474 encode_str (enc, "false", 5, 0); 592 encode_str (enc, "false", 5, 0);
475 else if (SvNIOK (sv) && SvIV (sv) == 1)
476 encode_str (enc, "true", 4, 0);
477 else 593 else
478 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",
479 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 595 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
480 } 596 }
481 else 597 else
551 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",
552 SvPV_nolen (sv), SvFLAGS (sv)); 668 SvPV_nolen (sv), SvFLAGS (sv));
553} 669}
554 670
555static SV * 671static SV *
556encode_json (SV *scalar, U32 flags) 672encode_json (SV *scalar, JSON *json)
557{ 673{
558 enc_t enc; 674 enc_t enc;
559 675
560 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 676 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
561 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)");
562 678
563 enc.flags = flags; 679 enc.json = *json;
564 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 680 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
565 enc.cur = SvPVX (enc.sv); 681 enc.cur = SvPVX (enc.sv);
566 enc.end = SvEND (enc.sv); 682 enc.end = SvEND (enc.sv);
567 enc.indent = 0; 683 enc.indent = 0;
568 enc.maxdepth = DEC_DEPTH (flags); 684 enc.maxdepth = DEC_DEPTH (enc.json.flags);
569 685
570 SvPOK_only (enc.sv); 686 SvPOK_only (enc.sv);
571 encode_sv (&enc, scalar); 687 encode_sv (&enc, scalar);
572 688
573 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 689 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
574 *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
575 691
576 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 692 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
577 SvUTF8_on (enc.sv); 693 SvUTF8_on (enc.sv);
578 694
579 if (enc.flags & F_SHRINK) 695 if (enc.json.flags & F_SHRINK)
580 shrink (enc.sv); 696 shrink (enc.sv);
581 697
582 return enc.sv; 698 return enc.sv;
583} 699}
584 700
589typedef struct 705typedef struct
590{ 706{
591 char *cur; // current parser pointer 707 char *cur; // current parser pointer
592 char *end; // end of input string 708 char *end; // end of input string
593 const char *err; // parse error, if != 0 709 const char *err; // parse error, if != 0
594 U32 flags; // F_* 710 JSON json;
595 U32 depth; // recursion depth 711 U32 depth; // recursion depth
596 U32 maxdepth; // recursion depth limit 712 U32 maxdepth; // recursion depth limit
597} dec_t; 713} dec_t;
598 714
599inline 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
600decode_ws (dec_t *dec) 725decode_ws (dec_t *dec)
601{ 726{
602 for (;;) 727 for (;;)
603 { 728 {
604 char ch = *dec->cur; 729 char ch = *dec->cur;
605 730
606 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 }
607 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 743 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
608 break; 744 break; // parse error, but let higher level handle it, gives better error messages
609 745
610 ++dec->cur; 746 ++dec->cur;
611 } 747 }
612} 748}
613 749
862 is_nv = 1; 998 is_nv = 1;
863 } 999 }
864 1000
865 if (!is_nv) 1001 if (!is_nv)
866 { 1002 {
1003 int len = dec->cur - start;
1004
867 // 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
868 if (*start == '-') 1006 if (*start == '-')
869 switch (dec->cur - start) 1007 switch (len)
870 { 1008 {
871 case 2: return newSViv (-( start [1] - '0' * 1)); 1009 case 2: return newSViv (-( start [1] - '0' * 1));
872 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1010 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
873 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));
874 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));
875 } 1013 }
876 else 1014 else
877 switch (dec->cur - start) 1015 switch (len)
878 { 1016 {
879 case 1: return newSViv ( start [0] - '0' * 1); 1017 case 1: return newSViv ( start [0] - '0' * 1);
880 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1018 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
881 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);
882 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);
883 } 1021 }
884 1022
885 { 1023 {
886 UV uv; 1024 UV uv;
887 int numtype = grok_number (start, dec->cur - start, &uv); 1025 int numtype = grok_number (start, len, &uv);
888 if (numtype & IS_NUMBER_IN_UV) 1026 if (numtype & IS_NUMBER_IN_UV)
889 if (numtype & IS_NUMBER_NEG) 1027 if (numtype & IS_NUMBER_NEG)
890 { 1028 {
891 if (uv < (UV)IV_MIN) 1029 if (uv < (UV)IV_MIN)
892 return newSViv (-(IV)uv); 1030 return newSViv (-(IV)uv);
893 } 1031 }
894 else 1032 else
895 return newSVuv (uv); 1033 return newSVuv (uv);
896
897 // here would likely be the place for bigint support
898 } 1034 }
899 }
900 1035
901 // 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
902 return newSVnv (Atof (start)); 1052 return newSVnv (Atof (start));
903 1053
904fail: 1054fail:
905 return 0; 1055 return 0;
906} 1056}
936 1086
937 if (*dec->cur != ',') 1087 if (*dec->cur != ',')
938 ERR (", or ] expected while parsing array"); 1088 ERR (", or ] expected while parsing array");
939 1089
940 ++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 }
941 } 1099 }
942 1100
943 DEC_DEC_DEPTH; 1101 DEC_DEC_DEPTH;
944 return newRV_noinc ((SV *)av); 1102 return newRV_noinc ((SV *)av);
945 1103
950} 1108}
951 1109
952static SV * 1110static SV *
953decode_hv (dec_t *dec) 1111decode_hv (dec_t *dec)
954{ 1112{
1113 SV *sv;
955 HV *hv = newHV (); 1114 HV *hv = newHV ();
956 1115
957 DEC_INC_DEPTH; 1116 DEC_INC_DEPTH;
958 decode_ws (dec); 1117 decode_ws (dec);
959 1118
960 if (*dec->cur == '}') 1119 if (*dec->cur == '}')
961 ++dec->cur; 1120 ++dec->cur;
962 else 1121 else
963 for (;;) 1122 for (;;)
964 { 1123 {
1124 EXPECT_CH ('"');
1125
1126 // heuristic: assume that
1127 // a) decode_str + hv_store_ent are abysmally slow.
1128 // b) most hash keys are short, simple ascii text.
1129 // => try to "fast-match" such strings to avoid
1130 // the overhead of decode_str + hv_store_ent.
1131 {
965 SV *key, *value; 1132 SV *value;
1133 char *p = dec->cur;
1134 char *e = p + 24; // only try up to 24 bytes
966 1135
967 decode_ws (dec); EXPECT_CH ('"'); 1136 for (;;)
968
969 key = decode_str (dec);
970 if (!key)
971 goto fail;
972
973 decode_ws (dec); EXPECT_CH (':');
974
975 value = decode_sv (dec);
976 if (!value)
977 { 1137 {
1138 // the >= 0x80 is true on most architectures
1139 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1140 {
1141 // slow path, back up and use decode_str
1142 SV *key = decode_str (dec);
1143 if (!key)
1144 goto fail;
1145
1146 decode_ws (dec); EXPECT_CH (':');
1147
1148 decode_ws (dec);
1149 value = decode_sv (dec);
1150 if (!value)
1151 {
1152 SvREFCNT_dec (key);
1153 goto fail;
1154 }
1155
1156 hv_store_ent (hv, key, value, 0);
978 SvREFCNT_dec (key); 1157 SvREFCNT_dec (key);
1158
1159 break;
1160 }
1161 else if (*p == '"')
1162 {
1163 // fast path, got a simple key
1164 char *key = dec->cur;
1165 int len = p - key;
1166 dec->cur = p + 1;
1167
1168 decode_ws (dec); EXPECT_CH (':');
1169
1170 decode_ws (dec);
1171 value = decode_sv (dec);
1172 if (!value)
979 goto fail; 1173 goto fail;
1174
1175 hv_store (hv, key, len, value, 0);
1176
1177 break;
1178 }
1179
1180 ++p;
980 } 1181 }
981 1182 }
982 hv_store_ent (hv, key, value, 0);
983 SvREFCNT_dec (key);
984 1183
985 decode_ws (dec); 1184 decode_ws (dec);
986 1185
987 if (*dec->cur == '}') 1186 if (*dec->cur == '}')
988 { 1187 {
992 1191
993 if (*dec->cur != ',') 1192 if (*dec->cur != ',')
994 ERR (", or } expected while parsing object/hash"); 1193 ERR (", or } expected while parsing object/hash");
995 1194
996 ++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 }
997 } 1204 }
998 1205
999 DEC_DEC_DEPTH; 1206 DEC_DEC_DEPTH;
1000 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;
1001 1268
1002fail: 1269fail:
1003 SvREFCNT_dec (hv); 1270 SvREFCNT_dec (hv);
1004 DEC_DEC_DEPTH; 1271 DEC_DEC_DEPTH;
1005 return 0; 1272 return 0;
1006} 1273}
1007 1274
1008static SV * 1275static SV *
1009decode_sv (dec_t *dec) 1276decode_sv (dec_t *dec)
1010{ 1277{
1011 decode_ws (dec);
1012
1013 // the beauty of JSON: you need exactly one character lookahead 1278 // the beauty of JSON: you need exactly one character lookahead
1014 // to parse anything. 1279 // to parse anything.
1015 switch (*dec->cur) 1280 switch (*dec->cur)
1016 { 1281 {
1017 case '"': ++dec->cur; return decode_str (dec); 1282 case '"': ++dec->cur; return decode_str (dec);
1025 1290
1026 case 't': 1291 case 't':
1027 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1292 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1028 { 1293 {
1029 dec->cur += 4; 1294 dec->cur += 4;
1030 return newSViv (1); 1295#if JSON_SLOW
1296 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
1297#endif
1298 return SvREFCNT_inc (json_true);
1031 } 1299 }
1032 else 1300 else
1033 ERR ("'true' expected"); 1301 ERR ("'true' expected");
1034 1302
1035 break; 1303 break;
1036 1304
1037 case 'f': 1305 case 'f':
1038 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1306 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1039 { 1307 {
1040 dec->cur += 5; 1308 dec->cur += 5;
1041 return newSViv (0); 1309#if JSON_SLOW
1310 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1311#endif
1312 return SvREFCNT_inc (json_false);
1042 } 1313 }
1043 else 1314 else
1044 ERR ("'false' expected"); 1315 ERR ("'false' expected");
1045 1316
1046 break; 1317 break;
1064fail: 1335fail:
1065 return 0; 1336 return 0;
1066} 1337}
1067 1338
1068static SV * 1339static SV *
1069decode_json (SV *string, U32 flags, UV *offset_return) 1340decode_json (SV *string, JSON *json, UV *offset_return)
1070{ 1341{
1071 dec_t dec; 1342 dec_t dec;
1072 UV offset; 1343 UV offset;
1073 SV *sv; 1344 SV *sv;
1074 1345
1075 SvGETMAGIC (string); 1346 SvGETMAGIC (string);
1076 SvUPGRADE (string, SVt_PV); 1347 SvUPGRADE (string, SVt_PV);
1077 1348
1349 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1350 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1351 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1352
1078 if (flags & F_UTF8) 1353 if (json->flags & F_UTF8)
1079 sv_utf8_downgrade (string, 0); 1354 sv_utf8_downgrade (string, 0);
1080 else 1355 else
1081 sv_utf8_upgrade (string); 1356 sv_utf8_upgrade (string);
1082 1357
1083 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1358 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1084 1359
1085 dec.flags = flags; 1360 dec.json = *json;
1086 dec.cur = SvPVX (string); 1361 dec.cur = SvPVX (string);
1087 dec.end = SvEND (string); 1362 dec.end = SvEND (string);
1088 dec.err = 0; 1363 dec.err = 0;
1089 dec.depth = 0; 1364 dec.depth = 0;
1090 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;
1091 1369
1092 *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);
1093 sv = decode_sv (&dec); 1373 sv = decode_sv (&dec);
1094 1374
1095 if (!(offset_return || !sv)) 1375 if (!(offset_return || !sv))
1096 { 1376 {
1097 // check for trailing garbage 1377 // check for trailing garbage
1105 } 1385 }
1106 } 1386 }
1107 1387
1108 if (offset_return || !sv) 1388 if (offset_return || !sv)
1109 { 1389 {
1110 offset = dec.flags & F_UTF8 1390 offset = dec.json.flags & F_UTF8
1111 ? dec.cur - SvPVX (string) 1391 ? dec.cur - SvPVX (string)
1112 : utf8_distance (dec.cur, SvPVX (string)); 1392 : utf8_distance (dec.cur, SvPVX (string));
1113 1393
1114 if (offset_return) 1394 if (offset_return)
1115 *offset_return = offset; 1395 *offset_return = offset;
1134 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1414 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1135 } 1415 }
1136 1416
1137 sv = sv_2mortal (sv); 1417 sv = sv_2mortal (sv);
1138 1418
1139 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1419 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1140 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)");
1141 1421
1142 return sv; 1422 return sv;
1143} 1423}
1144 1424
1156 i >= '0' && i <= '9' ? i - '0' 1436 i >= '0' && i <= '9' ? i - '0'
1157 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1437 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1158 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1438 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1159 : -1; 1439 : -1;
1160 1440
1161 json_stash = gv_stashpv ("JSON::XS", 1); 1441 json_stash = gv_stashpv ("JSON::XS" , 1);
1442 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1443
1444 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1445 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1162} 1446}
1163 1447
1164PROTOTYPES: DISABLE 1448PROTOTYPES: DISABLE
1165 1449
1166SV *new (char *dummy) 1450void CLONE (...)
1167 CODE: 1451 CODE:
1168 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1452 json_stash = 0;
1453 json_boolean_stash = 0;
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 (
1463 newRV_noinc (pv),
1464 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1465 )));
1466}
1467
1468void ascii (JSON *self, int enable = 1)
1469 ALIAS:
1470 ascii = F_ASCII
1471 latin1 = F_LATIN1
1472 utf8 = F_UTF8
1473 indent = F_INDENT
1474 canonical = F_CANONICAL
1475 space_before = F_SPACE_BEFORE
1476 space_after = F_SPACE_AFTER
1477 pretty = F_PRETTY
1478 allow_nonref = F_ALLOW_NONREF
1479 shrink = F_SHRINK
1480 allow_blessed = F_ALLOW_BLESSED
1481 convert_blessed = F_CONV_BLESSED
1482 relaxed = F_RELAXED
1483 PPCODE:
1484{
1485 if (enable)
1486 self->flags |= ix;
1487 else
1488 self->flags &= ~ix;
1489
1490 XPUSHs (ST (0));
1491}
1492
1493void get_ascii (JSON *self)
1494 ALIAS:
1495 get_ascii = F_ASCII
1496 get_latin1 = F_LATIN1
1497 get_utf8 = F_UTF8
1498 get_indent = F_INDENT
1499 get_canonical = F_CANONICAL
1500 get_space_before = F_SPACE_BEFORE
1501 get_space_after = F_SPACE_AFTER
1502 get_allow_nonref = F_ALLOW_NONREF
1503 get_shrink = F_SHRINK
1504 get_allow_blessed = F_ALLOW_BLESSED
1505 get_convert_blessed = F_CONV_BLESSED
1506 get_relaxed = F_RELAXED
1507 PPCODE:
1508 XPUSHs (boolSV (self->flags & ix));
1509
1510void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1511 PPCODE:
1512{
1513 UV log2 = 0;
1514
1515 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1516
1517 while ((1UL << log2) < max_depth)
1518 ++log2;
1519
1520 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1521
1522 XPUSHs (ST (0));
1523}
1524
1525U32 get_max_depth (JSON *self)
1526 CODE:
1527 RETVAL = DEC_DEPTH (self->flags);
1169 OUTPUT: 1528 OUTPUT:
1170 RETVAL 1529 RETVAL
1171 1530
1172SV *ascii (SV *self, int enable = 1) 1531void max_size (JSON *self, UV max_size = 0)
1173 ALIAS: 1532 PPCODE:
1174 ascii = F_ASCII 1533{
1175 latin1 = F_LATIN1 1534 UV log2 = 0;
1176 utf8 = F_UTF8 1535
1177 indent = F_INDENT 1536 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1178 canonical = F_CANONICAL 1537 if (max_size == 1) max_size = 2;
1179 space_before = F_SPACE_BEFORE 1538
1180 space_after = F_SPACE_AFTER 1539 while ((1UL << log2) < max_size)
1181 pretty = F_PRETTY 1540 ++log2;
1182 allow_nonref = F_ALLOW_NONREF 1541
1183 shrink = F_SHRINK 1542 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1543
1544 XPUSHs (ST (0));
1545}
1546
1547int get_max_size (JSON *self)
1184 CODE: 1548 CODE:
1185{ 1549 RETVAL = DEC_SIZE (self->flags);
1186 UV *uv = SvJSON (self);
1187 if (enable)
1188 *uv |= ix;
1189 else
1190 *uv &= ~ix;
1191
1192 RETVAL = newSVsv (self);
1193}
1194 OUTPUT: 1550 OUTPUT:
1195 RETVAL 1551 RETVAL
1196 1552
1197SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1553void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1198 CODE:
1199{
1200 UV *uv = SvJSON (self);
1201 UV log2 = 0;
1202
1203 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1204
1205 while ((1UL << log2) < max_depth)
1206 ++log2;
1207
1208 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1209
1210 RETVAL = newSVsv (self);
1211}
1212 OUTPUT:
1213 RETVAL
1214
1215void encode (SV *self, SV *scalar)
1216 PPCODE: 1554 PPCODE:
1217 XPUSHs (encode_json (scalar, *SvJSON (self))); 1555{
1556 SvREFCNT_dec (self->cb_object);
1557 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1218 1558
1219void decode (SV *self, SV *jsonstr) 1559 XPUSHs (ST (0));
1560}
1561
1562void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1220 PPCODE: 1563 PPCODE:
1564{
1565 if (!self->cb_sk_object)
1566 self->cb_sk_object = newHV ();
1567
1568 if (SvOK (cb))
1569 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1570 else
1571 {
1572 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1573
1574 if (!HvKEYS (self->cb_sk_object))
1575 {
1576 SvREFCNT_dec (self->cb_sk_object);
1577 self->cb_sk_object = 0;
1578 }
1579 }
1580
1581 XPUSHs (ST (0));
1582}
1583
1584void encode (JSON *self, SV *scalar)
1585 PPCODE:
1586 XPUSHs (encode_json (scalar, self));
1587
1588void decode (JSON *self, SV *jsonstr)
1589 PPCODE:
1221 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0)); 1590 XPUSHs (decode_json (jsonstr, self, 0));
1222 1591
1223void decode_prefix (SV *self, SV *jsonstr) 1592void decode_prefix (JSON *self, SV *jsonstr)
1224 PPCODE: 1593 PPCODE:
1225{ 1594{
1226 UV offset; 1595 UV offset;
1227 EXTEND (SP, 2); 1596 EXTEND (SP, 2);
1228 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset)); 1597 PUSHs (decode_json (jsonstr, self, &offset));
1229 PUSHs (sv_2mortal (newSVuv (offset))); 1598 PUSHs (sv_2mortal (newSVuv (offset)));
1230} 1599}
1231 1600
1601void DESTROY (JSON *self)
1602 CODE:
1603 SvREFCNT_dec (self->cb_sk_object);
1604 SvREFCNT_dec (self->cb_object);
1605
1232PROTOTYPES: ENABLE 1606PROTOTYPES: ENABLE
1233 1607
1234void to_json (SV *scalar) 1608void to_json (SV *scalar)
1235 ALIAS:
1236 objToJson = 0
1237 PPCODE: 1609 PPCODE:
1610{
1611 JSON json = { F_DEFAULT | F_UTF8 };
1238 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1612 XPUSHs (encode_json (scalar, &json));
1613}
1239 1614
1240void from_json (SV *jsonstr) 1615void from_json (SV *jsonstr)
1241 ALIAS:
1242 jsonToObj = 0
1243 PPCODE: 1616 PPCODE:
1617{
1618 JSON json = { F_DEFAULT | F_UTF8 };
1244 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0)); 1619 XPUSHs (decode_json (jsonstr, &json, 0));
1620}
1245 1621

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines