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.57 by root, Mon Aug 13 16:05: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
31#define F_MAXDEPTH 0xf8000000UL 32#define F_MAXDEPTH 0xf8000000UL
32#define S_MAXDEPTH 27 33#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL 34#define F_MAXSIZE 0x01f00000UL
34#define S_MAXSIZE 20 35#define S_MAXSIZE 20
36#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
35 37
36#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 38#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
37#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE )) 39#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38 40
39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
… …
56#endif 58#endif
57 59
58#define expect_false(expr) expect ((expr) != 0, 0) 60#define expect_false(expr) expect ((expr) != 0, 0)
59#define expect_true(expr) expect ((expr) != 0, 1) 61#define expect_true(expr) expect ((expr) != 0, 1)
60 62
63#ifdef USE_ITHREADS
64# define JSON_SLOW 1
65#else
66# define JSON_SLOW 1
67#endif
68
61static HV *json_stash, *json_boolean_stash; // JSON::XS:: 69static HV *json_stash, *json_boolean_stash; // JSON::XS::
62static SV *json_true, *json_false; 70static SV *json_true, *json_false;
63 71
72typedef struct {
73 U32 flags;
74 SV *cb_object;
75 HV *cb_sk_object;
76} JSON;
77
64///////////////////////////////////////////////////////////////////////////// 78/////////////////////////////////////////////////////////////////////////////
65// utility functions 79// utility functions
66 80
67static UV * 81inline 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) 82shrink (SV *sv)
78{ 83{
79 sv_utf8_downgrade (sv, 1); 84 sv_utf8_downgrade (sv, 1);
80 if (SvLEN (sv) > SvCUR (sv) + 1) 85 if (SvLEN (sv) > SvCUR (sv) + 1)
81 { 86 {
… …
116typedef struct 121typedef struct
117{ 122{
118 char *cur; // SvPVX (sv) + current output position 123 char *cur; // SvPVX (sv) + current output position
119 char *end; // SvEND (sv) 124 char *end; // SvEND (sv)
120 SV *sv; // result scalar 125 SV *sv; // result scalar
121 U32 flags; // F_* 126 JSON json;
122 U32 indent; // indentation level 127 U32 indent; // indentation level
123 U32 maxdepth; // max. indentation/recursion level 128 U32 maxdepth; // max. indentation/recursion level
124} enc_t; 129} enc_t;
125 130
126inline void 131inline void
… …
200 } 205 }
201 206
202 if (uch > 0x10FFFFUL) 207 if (uch > 0x10FFFFUL)
203 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 208 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
204 209
205 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF)) 210 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
206 { 211 {
207 if (uch > 0xFFFFUL) 212 if (uch > 0xFFFFUL)
208 { 213 {
209 need (enc, len += 11); 214 need (enc, len += 11);
210 sprintf (enc->cur, "\\u%04x\\u%04x", 215 sprintf (enc->cur, "\\u%04x\\u%04x",
… …
224 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 229 *enc->cur++ = hexdigit [(uch >> 0) & 15];
225 } 230 }
226 231
227 str += clen; 232 str += clen;
228 } 233 }
229 else if (enc->flags & F_LATIN1) 234 else if (enc->json.flags & F_LATIN1)
230 { 235 {
231 *enc->cur++ = uch; 236 *enc->cur++ = uch;
232 str += clen; 237 str += clen;
233 } 238 }
234 else if (is_utf8) 239 else if (is_utf8)
… …
255} 260}
256 261
257inline void 262inline void
258encode_indent (enc_t *enc) 263encode_indent (enc_t *enc)
259{ 264{
260 if (enc->flags & F_INDENT) 265 if (enc->json.flags & F_INDENT)
261 { 266 {
262 int spaces = enc->indent * INDENT_STEP; 267 int spaces = enc->indent * INDENT_STEP;
263 268
264 need (enc, spaces); 269 need (enc, spaces);
265 memset (enc->cur, ' ', spaces); 270 memset (enc->cur, ' ', spaces);
… …
275} 280}
276 281
277inline void 282inline void
278encode_nl (enc_t *enc) 283encode_nl (enc_t *enc)
279{ 284{
280 if (enc->flags & F_INDENT) 285 if (enc->json.flags & F_INDENT)
281 { 286 {
282 need (enc, 1); 287 need (enc, 1);
283 encode_ch (enc, '\n'); 288 encode_ch (enc, '\n');
284 } 289 }
285} 290}
… …
287inline void 292inline void
288encode_comma (enc_t *enc) 293encode_comma (enc_t *enc)
289{ 294{
290 encode_ch (enc, ','); 295 encode_ch (enc, ',');
291 296
292 if (enc->flags & F_INDENT) 297 if (enc->json.flags & F_INDENT)
293 encode_nl (enc); 298 encode_nl (enc);
294 else if (enc->flags & F_SPACE_AFTER) 299 else if (enc->json.flags & F_SPACE_AFTER)
295 encode_space (enc); 300 encode_space (enc);
296} 301}
297 302
298static void encode_sv (enc_t *enc, SV *sv); 303static void encode_sv (enc_t *enc, SV *sv);
299 304
… …
308 encode_ch (enc, '['); encode_nl (enc); 313 encode_ch (enc, '['); encode_nl (enc);
309 ++enc->indent; 314 ++enc->indent;
310 315
311 for (i = 0; i <= len; ++i) 316 for (i = 0; i <= len; ++i)
312 { 317 {
318 SV **svp = av_fetch (av, i, 0);
319
313 encode_indent (enc); 320 encode_indent (enc);
314 encode_sv (enc, *av_fetch (av, i, 0)); 321
322 if (svp)
323 encode_sv (enc, *svp);
324 else
325 encode_str (enc, "null", 4, 0);
315 326
316 if (i < len) 327 if (i < len)
317 encode_comma (enc); 328 encode_comma (enc);
318 } 329 }
319 330
… …
342 else 353 else
343 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 354 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
344 355
345 encode_ch (enc, '"'); 356 encode_ch (enc, '"');
346 357
347 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 358 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
348 encode_ch (enc, ':'); 359 encode_ch (enc, ':');
349 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 360 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
350 encode_sv (enc, HeVAL (he)); 361 encode_sv (enc, HeVAL (he));
351} 362}
352 363
353// compare hash entries, used when all keys are bytestrings 364// compare hash entries, used when all keys are bytestrings
354static int 365static int
… …
389 { 400 {
390 // for canonical output we have to sort by keys first 401 // for canonical output we have to sort by keys first
391 // actually, this is mostly due to the stupid so-called 402 // actually, this is mostly due to the stupid so-called
392 // security workaround added somewhere in 5.8.x. 403 // security workaround added somewhere in 5.8.x.
393 // that randomises hash orderings 404 // that randomises hash orderings
394 if (enc->flags & F_CANONICAL) 405 if (enc->json.flags & F_CANONICAL)
395 { 406 {
396 int fast = 1; 407 int fast = 1;
397 HE *he; 408 HE *he;
398#if defined(__BORLANDC__) || defined(_MSC_VER) 409#if defined(__BORLANDC__) || defined(_MSC_VER)
399 HE **hes = _alloca (count * sizeof (HE)); 410 HE **hes = _alloca (count * sizeof (HE));
… …
473 SvGETMAGIC (sv); 484 SvGETMAGIC (sv);
474 svt = SvTYPE (sv); 485 svt = SvTYPE (sv);
475 486
476 if (expect_false (SvOBJECT (sv))) 487 if (expect_false (SvOBJECT (sv)))
477 { 488 {
489 HV *stash = !JSON_SLOW || json_boolean_stash
490 ? json_boolean_stash
491 : gv_stashpv ("JSON::XS::Boolean", 1);
492
478 if (SvSTASH (sv) == json_boolean_stash) 493 if (SvSTASH (sv) == stash)
479 { 494 {
480 if (SvIV (sv) == 0) 495 if (SvIV (sv))
496 encode_str (enc, "true", 4, 0);
497 else
481 encode_str (enc, "false", 5, 0); 498 encode_str (enc, "false", 5, 0);
482 else
483 encode_str (enc, "true", 4, 0);
484 } 499 }
485 else 500 else
486 { 501 {
487#if 0 502#if 0
488 if (0 && sv_derived_from (rv, "JSON::Literal")) 503 if (0 && sv_derived_from (rv, "JSON::Literal"))
489 { 504 {
490 // not yet 505 // not yet
491 } 506 }
492#endif 507#endif
493 if (enc->flags & F_CONV_BLESSED) 508 if (enc->json.flags & F_CONV_BLESSED)
494 { 509 {
495 // we re-bless the reference to get overload and other niceties right 510 // we re-bless the reference to get overload and other niceties right
496 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 511 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
497 512
498 if (to_json) 513 if (to_json)
499 { 514 {
515 int count;
500 dSP; 516 dSP;
501 ENTER; 517
502 SAVETMPS;
503 PUSHMARK (SP); 518 ENTER; SAVETMPS; PUSHMARK (SP);
504 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 519 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
505 520
506 // calling with G_SCALAR ensures that we always get a 1 reutrn value 521 // calling with G_SCALAR ensures that we always get a 1 return value
507 // check anyways.
508 PUTBACK; 522 PUTBACK;
509 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 523 call_sv ((SV *)GvCV (to_json), G_SCALAR);
510 SPAGAIN; 524 SPAGAIN;
511 525
526 // catch this surprisingly common error
527 if (SvROK (TOPs) && SvRV (TOPs) == sv)
528 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
529
530 sv = POPs;
531 PUTBACK;
532
512 encode_sv (enc, POPs); 533 encode_sv (enc, sv);
513 534
514 FREETMPS; 535 FREETMPS; LEAVE;
515 LEAVE;
516 } 536 }
517 else if (enc->flags & F_ALLOW_BLESSED) 537 else if (enc->json.flags & F_ALLOW_BLESSED)
518 encode_str (enc, "null", 4, 0); 538 encode_str (enc, "null", 4, 0);
519 else 539 else
520 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it", 540 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
521 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 541 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
522 } 542 }
523 else if (enc->flags & F_ALLOW_BLESSED) 543 else if (enc->json.flags & F_ALLOW_BLESSED)
524 encode_str (enc, "null", 4, 0); 544 encode_str (enc, "null", 4, 0);
525 else 545 else
526 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 546 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
527 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 547 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
528 } 548 }
… …
531 encode_hv (enc, (HV *)sv); 551 encode_hv (enc, (HV *)sv);
532 else if (svt == SVt_PVAV) 552 else if (svt == SVt_PVAV)
533 encode_av (enc, (AV *)sv); 553 encode_av (enc, (AV *)sv);
534 else if (svt < SVt_PVAV) 554 else if (svt < SVt_PVAV)
535 { 555 {
536 if (SvNIOK (sv) && SvIV (sv) == 0) 556 STRLEN len = 0;
557 char *pv = svt ? SvPV (sv, len) : 0;
558
559 if (len == 1 && *pv == '1')
560 encode_str (enc, "true", 4, 0);
561 else if (len == 1 && *pv == '0')
537 encode_str (enc, "false", 5, 0); 562 encode_str (enc, "false", 5, 0);
538 else if (SvNIOK (sv) && SvIV (sv) == 1)
539 encode_str (enc, "true", 4, 0);
540 else 563 else
541 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 564 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
542 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 565 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
543 } 566 }
544 else 567 else
… …
614 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 637 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
615 SvPV_nolen (sv), SvFLAGS (sv)); 638 SvPV_nolen (sv), SvFLAGS (sv));
616} 639}
617 640
618static SV * 641static SV *
619encode_json (SV *scalar, U32 flags) 642encode_json (SV *scalar, JSON *json)
620{ 643{
621 enc_t enc; 644 enc_t enc;
622 645
623 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 646 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
624 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 647 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
625 648
626 enc.flags = flags; 649 enc.json = *json;
627 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 650 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
628 enc.cur = SvPVX (enc.sv); 651 enc.cur = SvPVX (enc.sv);
629 enc.end = SvEND (enc.sv); 652 enc.end = SvEND (enc.sv);
630 enc.indent = 0; 653 enc.indent = 0;
631 enc.maxdepth = DEC_DEPTH (flags); 654 enc.maxdepth = DEC_DEPTH (enc.json.flags);
632 655
633 SvPOK_only (enc.sv); 656 SvPOK_only (enc.sv);
634 encode_sv (&enc, scalar); 657 encode_sv (&enc, scalar);
635 658
636 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 659 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
637 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 660 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
638 661
639 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 662 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
640 SvUTF8_on (enc.sv); 663 SvUTF8_on (enc.sv);
641 664
642 if (enc.flags & F_SHRINK) 665 if (enc.json.flags & F_SHRINK)
643 shrink (enc.sv); 666 shrink (enc.sv);
644 667
645 return enc.sv; 668 return enc.sv;
646} 669}
647 670
… …
652typedef struct 675typedef struct
653{ 676{
654 char *cur; // current parser pointer 677 char *cur; // current parser pointer
655 char *end; // end of input string 678 char *end; // end of input string
656 const char *err; // parse error, if != 0 679 const char *err; // parse error, if != 0
657 U32 flags; // F_* 680 JSON json;
658 U32 depth; // recursion depth 681 U32 depth; // recursion depth
659 U32 maxdepth; // recursion depth limit 682 U32 maxdepth; // recursion depth limit
660} dec_t; 683} dec_t;
661 684
662inline void 685inline void
… …
925 is_nv = 1; 948 is_nv = 1;
926 } 949 }
927 950
928 if (!is_nv) 951 if (!is_nv)
929 { 952 {
953 int len = dec->cur - start;
954
930 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 955 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
931 if (*start == '-') 956 if (*start == '-')
932 switch (dec->cur - start) 957 switch (len)
933 { 958 {
934 case 2: return newSViv (-( start [1] - '0' * 1)); 959 case 2: return newSViv (-( start [1] - '0' * 1));
935 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 960 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)); 961 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)); 962 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
938 } 963 }
939 else 964 else
940 switch (dec->cur - start) 965 switch (len)
941 { 966 {
942 case 1: return newSViv ( start [0] - '0' * 1); 967 case 1: return newSViv ( start [0] - '0' * 1);
943 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 968 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); 969 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); 970 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
946 } 971 }
947 972
948 { 973 {
949 UV uv; 974 UV uv;
950 int numtype = grok_number (start, dec->cur - start, &uv); 975 int numtype = grok_number (start, len, &uv);
951 if (numtype & IS_NUMBER_IN_UV) 976 if (numtype & IS_NUMBER_IN_UV)
952 if (numtype & IS_NUMBER_NEG) 977 if (numtype & IS_NUMBER_NEG)
953 { 978 {
954 if (uv < (UV)IV_MIN) 979 if (uv < (UV)IV_MIN)
955 return newSViv (-(IV)uv); 980 return newSViv (-(IV)uv);
956 } 981 }
957 else 982 else
958 return newSVuv (uv); 983 return newSVuv (uv);
959
960 // here would likely be the place for bigint support
961 } 984 }
962 }
963 985
964 // if we ever support bigint or bigfloat, this is the place for bigfloat 986 len -= *start == '-' ? 1 : 0;
987
988 // does not fit into IV or UV, try NV
989 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
990 #if defined (LDBL_DIG)
991 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
992 #endif
993 )
994 // fits into NV without loss of precision
995 return newSVnv (Atof (start));
996
997 // everything else fails, convert it to a string
998 return newSVpvn (start, dec->cur - start);
999 }
1000
1001 // loss of precision here
965 return newSVnv (Atof (start)); 1002 return newSVnv (Atof (start));
966 1003
967fail: 1004fail:
968 return 0; 1005 return 0;
969} 1006}
… …
1013} 1050}
1014 1051
1015static SV * 1052static SV *
1016decode_hv (dec_t *dec) 1053decode_hv (dec_t *dec)
1017{ 1054{
1055 SV *sv;
1018 HV *hv = newHV (); 1056 HV *hv = newHV ();
1019 1057
1020 DEC_INC_DEPTH; 1058 DEC_INC_DEPTH;
1021 decode_ws (dec); 1059 decode_ws (dec);
1022 1060
… …
1026 for (;;) 1064 for (;;)
1027 { 1065 {
1028 decode_ws (dec); EXPECT_CH ('"'); 1066 decode_ws (dec); EXPECT_CH ('"');
1029 1067
1030 // heuristic: assume that 1068 // heuristic: assume that
1031 // a) decode_str + hv_store_ent are abysmally slow 1069 // a) decode_str + hv_store_ent are abysmally slow.
1032 // b) most hash keys are short, simple ascii text 1070 // b) most hash keys are short, simple ascii text.
1033 // so try to "fast-match" such strings to avoid 1071 // => try to "fast-match" such strings to avoid
1034 // the overhead of hv_store_ent. 1072 // the overhead of decode_str + hv_store_ent.
1035 { 1073 {
1036 SV *value; 1074 SV *value;
1037 char *p = dec->cur; 1075 char *p = dec->cur;
1038 char *e = p + 24; // only try up to 24 bytes 1076 char *e = p + 24; // only try up to 24 bytes
1039 1077
1040 for (;;) 1078 for (;;)
1041 { 1079 {
1080 // the >= 0x80 is true on most architectures
1042 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1081 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1043 { 1082 {
1044 // slow path, back up and use decode_str 1083 // slow path, back up and use decode_str
1045 SV *key = decode_str (dec); 1084 SV *key = decode_str (dec);
1046 if (!key) 1085 if (!key)
… …
1095 1134
1096 ++dec->cur; 1135 ++dec->cur;
1097 } 1136 }
1098 1137
1099 DEC_DEC_DEPTH; 1138 DEC_DEC_DEPTH;
1100 return newRV_noinc ((SV *)hv); 1139 sv = newRV_noinc ((SV *)hv);
1140
1141 // check filter callbacks
1142 if (dec->json.flags & F_HOOK)
1143 {
1144 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1145 {
1146 HE *cb, *he;
1147
1148 hv_iterinit (hv);
1149 he = hv_iternext (hv);
1150 hv_iterinit (hv);
1151
1152 // the next line creates a mortal sv each time its called.
1153 // might want to optimise this for common cases.
1154 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1155
1156 if (cb)
1157 {
1158 dSP;
1159 int count;
1160
1161 ENTER; SAVETMPS; PUSHMARK (SP);
1162 XPUSHs (HeVAL (he));
1163
1164 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1165
1166 if (count == 1)
1167 {
1168 sv = newSVsv (POPs);
1169 FREETMPS; LEAVE;
1170 return sv;
1171 }
1172
1173 FREETMPS; LEAVE;
1174 }
1175 }
1176
1177 if (dec->json.cb_object)
1178 {
1179 dSP;
1180 int count;
1181
1182 ENTER; SAVETMPS; PUSHMARK (SP);
1183 XPUSHs (sv_2mortal (sv));
1184
1185 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1186
1187 if (count == 1)
1188 {
1189 sv = newSVsv (POPs);
1190 FREETMPS; LEAVE;
1191 return sv;
1192 }
1193
1194 SvREFCNT_inc (sv);
1195 FREETMPS; LEAVE;
1196 }
1197 }
1198
1199 return sv;
1101 1200
1102fail: 1201fail:
1103 SvREFCNT_dec (hv); 1202 SvREFCNT_dec (hv);
1104 DEC_DEC_DEPTH; 1203 DEC_DEC_DEPTH;
1105 return 0; 1204 return 0;
… …
1164fail: 1263fail:
1165 return 0; 1264 return 0;
1166} 1265}
1167 1266
1168static SV * 1267static SV *
1169decode_json (SV *string, U32 flags, UV *offset_return) 1268decode_json (SV *string, JSON *json, UV *offset_return)
1170{ 1269{
1171 dec_t dec; 1270 dec_t dec;
1172 UV offset; 1271 UV offset;
1173 SV *sv; 1272 SV *sv;
1174 1273
1175 SvGETMAGIC (string); 1274 SvGETMAGIC (string);
1176 SvUPGRADE (string, SVt_PV); 1275 SvUPGRADE (string, SVt_PV);
1177 1276
1178 if (flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (flags)) 1277 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", 1278 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)); 1279 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1181 1280
1182 if (flags & F_UTF8) 1281 if (json->flags & F_UTF8)
1183 sv_utf8_downgrade (string, 0); 1282 sv_utf8_downgrade (string, 0);
1184 else 1283 else
1185 sv_utf8_upgrade (string); 1284 sv_utf8_upgrade (string);
1186 1285
1187 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1286 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1188 1287
1189 dec.flags = flags; 1288 dec.json = *json;
1190 dec.cur = SvPVX (string); 1289 dec.cur = SvPVX (string);
1191 dec.end = SvEND (string); 1290 dec.end = SvEND (string);
1192 dec.err = 0; 1291 dec.err = 0;
1193 dec.depth = 0; 1292 dec.depth = 0;
1194 dec.maxdepth = DEC_DEPTH (dec.flags); 1293 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1294
1295 if (dec.json.cb_object || dec.json.cb_sk_object)
1296 dec.json.flags |= F_HOOK;
1195 1297
1196 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1298 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1197 sv = decode_sv (&dec); 1299 sv = decode_sv (&dec);
1198 1300
1199 if (!(offset_return || !sv)) 1301 if (!(offset_return || !sv))
… …
1209 } 1311 }
1210 } 1312 }
1211 1313
1212 if (offset_return || !sv) 1314 if (offset_return || !sv)
1213 { 1315 {
1214 offset = dec.flags & F_UTF8 1316 offset = dec.json.flags & F_UTF8
1215 ? dec.cur - SvPVX (string) 1317 ? dec.cur - SvPVX (string)
1216 : utf8_distance (dec.cur, SvPVX (string)); 1318 : utf8_distance (dec.cur, SvPVX (string));
1217 1319
1218 if (offset_return) 1320 if (offset_return)
1219 *offset_return = offset; 1321 *offset_return = offset;
… …
1238 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1340 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1239 } 1341 }
1240 1342
1241 sv = sv_2mortal (sv); 1343 sv = sv_2mortal (sv);
1242 1344
1243 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1345 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)"); 1346 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1245 1347
1246 return sv; 1348 return sv;
1247} 1349}
1248 1350
… …
1269 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1371 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1270} 1372}
1271 1373
1272PROTOTYPES: DISABLE 1374PROTOTYPES: DISABLE
1273 1375
1274SV *new (char *dummy) 1376void CLONE (...)
1275 CODE: 1377 CODE:
1276 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1378 json_stash = 0;
1277 OUTPUT: 1379 json_boolean_stash = 0;
1278 RETVAL
1279 1380
1381void new (char *klass)
1382 PPCODE:
1383{
1384 HV *stash = !JSON_SLOW || json_stash
1385 ? json_stash
1386 : gv_stashpv ("JSON::XS", 1);
1387 SV *pv = NEWSV (0, sizeof (JSON));
1388 SvPOK_only (pv);
1389 Zero (SvPVX (pv), 1, JSON);
1390 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1391 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), stash)));
1392}
1393
1280SV *ascii (SV *self, int enable = 1) 1394void ascii (JSON *self, int enable = 1)
1281 ALIAS: 1395 ALIAS:
1282 ascii = F_ASCII 1396 ascii = F_ASCII
1283 latin1 = F_LATIN1 1397 latin1 = F_LATIN1
1284 utf8 = F_UTF8 1398 utf8 = F_UTF8
1285 indent = F_INDENT 1399 indent = F_INDENT
… …
1289 pretty = F_PRETTY 1403 pretty = F_PRETTY
1290 allow_nonref = F_ALLOW_NONREF 1404 allow_nonref = F_ALLOW_NONREF
1291 shrink = F_SHRINK 1405 shrink = F_SHRINK
1292 allow_blessed = F_ALLOW_BLESSED 1406 allow_blessed = F_ALLOW_BLESSED
1293 convert_blessed = F_CONV_BLESSED 1407 convert_blessed = F_CONV_BLESSED
1294 CODE: 1408 PPCODE:
1295{ 1409{
1296 UV *uv = SvJSON (self);
1297 if (enable) 1410 if (enable)
1298 *uv |= ix; 1411 self->flags |= ix;
1299 else 1412 else
1300 *uv &= ~ix; 1413 self->flags &= ~ix;
1301 1414
1302 RETVAL = newSVsv (self); 1415 XPUSHs (ST (0));
1303} 1416}
1304 OUTPUT:
1305 RETVAL
1306 1417
1307SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1418void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1308 CODE: 1419 PPCODE:
1309{ 1420{
1310 UV *uv = SvJSON (self);
1311 UV log2 = 0; 1421 UV log2 = 0;
1312 1422
1313 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1423 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1314 1424
1315 while ((1UL << log2) < max_depth) 1425 while ((1UL << log2) < max_depth)
1316 ++log2; 1426 ++log2;
1317 1427
1318 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1428 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1319 1429
1320 RETVAL = newSVsv (self); 1430 XPUSHs (ST (0));
1321} 1431}
1322 OUTPUT:
1323 RETVAL
1324 1432
1325SV *max_size (SV *self, UV max_size = 0) 1433void max_size (JSON *self, UV max_size = 0)
1326 CODE: 1434 PPCODE:
1327{ 1435{
1328 UV *uv = SvJSON (self);
1329 UV log2 = 0; 1436 UV log2 = 0;
1330 1437
1331 if (max_size > 0x80000000UL) max_size = 0x80000000UL; 1438 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1332 if (max_size == 1) max_size = 2; 1439 if (max_size == 1) max_size = 2;
1333 1440
1334 while ((1UL << log2) < max_size) 1441 while ((1UL << log2) < max_size)
1335 ++log2; 1442 ++log2;
1336 1443
1337 *uv = *uv & ~F_MAXSIZE | (log2 << S_MAXSIZE); 1444 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1338 1445
1339 RETVAL = newSVsv (self); 1446 XPUSHs (ST (0));
1340} 1447}
1341 OUTPUT:
1342 RETVAL
1343 1448
1344void encode (SV *self, SV *scalar) 1449void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1345 PPCODE: 1450 PPCODE:
1346 XPUSHs (encode_json (scalar, *SvJSON (self))); 1451{
1452 SvREFCNT_dec (self->cb_object);
1453 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1347 1454
1348void decode (SV *self, SV *jsonstr) 1455 XPUSHs (ST (0));
1456}
1457
1458void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1349 PPCODE: 1459 PPCODE:
1460{
1461 if (!self->cb_sk_object)
1462 self->cb_sk_object = newHV ();
1463
1464 if (SvOK (cb))
1465 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1466 else
1467 {
1468 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1469
1470 if (!HvKEYS (self->cb_sk_object))
1471 {
1472 SvREFCNT_dec (self->cb_sk_object);
1473 self->cb_sk_object = 0;
1474 }
1475 }
1476
1477 XPUSHs (ST (0));
1478}
1479
1480void encode (JSON *self, SV *scalar)
1481 PPCODE:
1482 XPUSHs (encode_json (scalar, self));
1483
1484void decode (JSON *self, SV *jsonstr)
1485 PPCODE:
1350 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0)); 1486 XPUSHs (decode_json (jsonstr, self, 0));
1351 1487
1352void decode_prefix (SV *self, SV *jsonstr) 1488void decode_prefix (JSON *self, SV *jsonstr)
1353 PPCODE: 1489 PPCODE:
1354{ 1490{
1355 UV offset; 1491 UV offset;
1356 EXTEND (SP, 2); 1492 EXTEND (SP, 2);
1357 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset)); 1493 PUSHs (decode_json (jsonstr, self, &offset));
1358 PUSHs (sv_2mortal (newSVuv (offset))); 1494 PUSHs (sv_2mortal (newSVuv (offset)));
1359} 1495}
1360 1496
1497void DESTROY (JSON *self)
1498 CODE:
1499 SvREFCNT_dec (self->cb_sk_object);
1500 SvREFCNT_dec (self->cb_object);
1501
1361PROTOTYPES: ENABLE 1502PROTOTYPES: ENABLE
1362 1503
1363void to_json (SV *scalar) 1504void to_json (SV *scalar)
1364 ALIAS:
1365 objToJson = 0
1366 PPCODE: 1505 PPCODE:
1506{
1507 JSON json = { F_DEFAULT | F_UTF8 };
1367 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1508 XPUSHs (encode_json (scalar, &json));
1509}
1368 1510
1369void from_json (SV *jsonstr) 1511void from_json (SV *jsonstr)
1370 ALIAS:
1371 jsonToObj = 0
1372 PPCODE: 1512 PPCODE:
1513{
1514 JSON json = { F_DEFAULT | F_UTF8 };
1373 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0)); 1515 XPUSHs (decode_json (jsonstr, &json, 0));
1516}
1374 1517

Diff Legend

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