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.51 by root, Mon Jul 2 00:48:18 2007 UTC

… …
25#define F_SPACE_BEFORE 0x00000020UL 25#define F_SPACE_BEFORE 0x00000020UL
26#define F_SPACE_AFTER 0x00000040UL 26#define F_SPACE_AFTER 0x00000040UL
27#define F_ALLOW_NONREF 0x00000100UL 27#define F_ALLOW_NONREF 0x00000100UL
28#define F_SHRINK 0x00000200UL 28#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL 29#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL // NYI 30#define F_CONV_BLESSED 0x00000800UL
31#define F_MAXDEPTH 0xf8000000UL 31#define F_MAXDEPTH 0xf8000000UL
32#define S_MAXDEPTH 27 32#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL 33#define F_MAXSIZE 0x01f00000UL
34#define S_MAXSIZE 20 34#define S_MAXSIZE 20
35#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
35 36
36#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 37#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
37#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE )) 38#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38 39
39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
… …
59#define expect_true(expr) expect ((expr) != 0, 1) 60#define expect_true(expr) expect ((expr) != 0, 1)
60 61
61static HV *json_stash, *json_boolean_stash; // JSON::XS:: 62static HV *json_stash, *json_boolean_stash; // JSON::XS::
62static SV *json_true, *json_false; 63static SV *json_true, *json_false;
63 64
65typedef struct {
66 U32 flags;
67 SV *cb_object, *cb_sk_object;
68} JSON;
69
64///////////////////////////////////////////////////////////////////////////// 70/////////////////////////////////////////////////////////////////////////////
65// utility functions 71// utility functions
66 72
67static UV * 73inline 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) 74shrink (SV *sv)
78{ 75{
79 sv_utf8_downgrade (sv, 1); 76 sv_utf8_downgrade (sv, 1);
80 if (SvLEN (sv) > SvCUR (sv) + 1) 77 if (SvLEN (sv) > SvCUR (sv) + 1)
81 { 78 {
… …
116typedef struct 113typedef struct
117{ 114{
118 char *cur; // SvPVX (sv) + current output position 115 char *cur; // SvPVX (sv) + current output position
119 char *end; // SvEND (sv) 116 char *end; // SvEND (sv)
120 SV *sv; // result scalar 117 SV *sv; // result scalar
121 U32 flags; // F_* 118 JSON json;
122 U32 indent; // indentation level 119 U32 indent; // indentation level
123 U32 maxdepth; // max. indentation/recursion level 120 U32 maxdepth; // max. indentation/recursion level
124} enc_t; 121} enc_t;
125 122
126inline void 123inline void
… …
200 } 197 }
201 198
202 if (uch > 0x10FFFFUL) 199 if (uch > 0x10FFFFUL)
203 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 200 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
204 201
205 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF)) 202 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
206 { 203 {
207 if (uch > 0xFFFFUL) 204 if (uch > 0xFFFFUL)
208 { 205 {
209 need (enc, len += 11); 206 need (enc, len += 11);
210 sprintf (enc->cur, "\\u%04x\\u%04x", 207 sprintf (enc->cur, "\\u%04x\\u%04x",
… …
224 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 221 *enc->cur++ = hexdigit [(uch >> 0) & 15];
225 } 222 }
226 223
227 str += clen; 224 str += clen;
228 } 225 }
229 else if (enc->flags & F_LATIN1) 226 else if (enc->json.flags & F_LATIN1)
230 { 227 {
231 *enc->cur++ = uch; 228 *enc->cur++ = uch;
232 str += clen; 229 str += clen;
233 } 230 }
234 else if (is_utf8) 231 else if (is_utf8)
… …
255} 252}
256 253
257inline void 254inline void
258encode_indent (enc_t *enc) 255encode_indent (enc_t *enc)
259{ 256{
260 if (enc->flags & F_INDENT) 257 if (enc->json.flags & F_INDENT)
261 { 258 {
262 int spaces = enc->indent * INDENT_STEP; 259 int spaces = enc->indent * INDENT_STEP;
263 260
264 need (enc, spaces); 261 need (enc, spaces);
265 memset (enc->cur, ' ', spaces); 262 memset (enc->cur, ' ', spaces);
… …
275} 272}
276 273
277inline void 274inline void
278encode_nl (enc_t *enc) 275encode_nl (enc_t *enc)
279{ 276{
280 if (enc->flags & F_INDENT) 277 if (enc->json.flags & F_INDENT)
281 { 278 {
282 need (enc, 1); 279 need (enc, 1);
283 encode_ch (enc, '\n'); 280 encode_ch (enc, '\n');
284 } 281 }
285} 282}
… …
287inline void 284inline void
288encode_comma (enc_t *enc) 285encode_comma (enc_t *enc)
289{ 286{
290 encode_ch (enc, ','); 287 encode_ch (enc, ',');
291 288
292 if (enc->flags & F_INDENT) 289 if (enc->json.flags & F_INDENT)
293 encode_nl (enc); 290 encode_nl (enc);
294 else if (enc->flags & F_SPACE_AFTER) 291 else if (enc->json.flags & F_SPACE_AFTER)
295 encode_space (enc); 292 encode_space (enc);
296} 293}
297 294
298static void encode_sv (enc_t *enc, SV *sv); 295static void encode_sv (enc_t *enc, SV *sv);
299 296
… …
342 else 339 else
343 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 340 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
344 341
345 encode_ch (enc, '"'); 342 encode_ch (enc, '"');
346 343
347 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 344 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
348 encode_ch (enc, ':'); 345 encode_ch (enc, ':');
349 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 346 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
350 encode_sv (enc, HeVAL (he)); 347 encode_sv (enc, HeVAL (he));
351} 348}
352 349
353// compare hash entries, used when all keys are bytestrings 350// compare hash entries, used when all keys are bytestrings
354static int 351static int
… …
389 { 386 {
390 // for canonical output we have to sort by keys first 387 // for canonical output we have to sort by keys first
391 // actually, this is mostly due to the stupid so-called 388 // actually, this is mostly due to the stupid so-called
392 // security workaround added somewhere in 5.8.x. 389 // security workaround added somewhere in 5.8.x.
393 // that randomises hash orderings 390 // that randomises hash orderings
394 if (enc->flags & F_CANONICAL) 391 if (enc->json.flags & F_CANONICAL)
395 { 392 {
396 int fast = 1; 393 int fast = 1;
397 HE *he; 394 HE *he;
398#if defined(__BORLANDC__) || defined(_MSC_VER) 395#if defined(__BORLANDC__) || defined(_MSC_VER)
399 HE **hes = _alloca (count * sizeof (HE)); 396 HE **hes = _alloca (count * sizeof (HE));
… …
475 472
476 if (expect_false (SvOBJECT (sv))) 473 if (expect_false (SvOBJECT (sv)))
477 { 474 {
478 if (SvSTASH (sv) == json_boolean_stash) 475 if (SvSTASH (sv) == json_boolean_stash)
479 { 476 {
480 if (SvIV (sv) == 0) 477 if (SvIV (sv))
478 encode_str (enc, "true", 4, 0);
479 else
481 encode_str (enc, "false", 5, 0); 480 encode_str (enc, "false", 5, 0);
482 else
483 encode_str (enc, "true", 4, 0);
484 } 481 }
485 else 482 else
486 { 483 {
487#if 0 484#if 0
488 if (0 && sv_derived_from (rv, "JSON::Literal")) 485 if (0 && sv_derived_from (rv, "JSON::Literal"))
489 { 486 {
490 // not yet 487 // not yet
491 } 488 }
492#endif 489#endif
493 if (enc->flags & F_CONV_BLESSED) 490 if (enc->json.flags & F_CONV_BLESSED)
494 { 491 {
495 // we re-bless the reference to get overload and other niceties right 492 // we re-bless the reference to get overload and other niceties right
496 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 493 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
497 494
498 if (to_json) 495 if (to_json)
499 { 496 {
500 dSP; 497 dSP; ENTER; SAVETMPS; PUSHMARK (SP);
501 ENTER;
502 SAVETMPS;
503 PUSHMARK (SP);
504 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 498 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
505 499
506 // calling with G_SCALAR ensures that we always get a 1 reutrn value 500 // calling with G_SCALAR ensures that we always get a 1 reutrn value
507 // check anyways. 501 // check anyways.
508 PUTBACK; 502 PUTBACK;
509 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 503 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
510 SPAGAIN; 504 SPAGAIN;
511 505
512 encode_sv (enc, POPs); 506 encode_sv (enc, POPs);
513 507
514 FREETMPS; 508 FREETMPS; LEAVE;
515 LEAVE;
516 } 509 }
517 else if (enc->flags & F_ALLOW_BLESSED) 510 else if (enc->json.flags & F_ALLOW_BLESSED)
518 encode_str (enc, "null", 4, 0); 511 encode_str (enc, "null", 4, 0);
519 else 512 else
520 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it", 513 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
521 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 514 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
522 } 515 }
523 else if (enc->flags & F_ALLOW_BLESSED) 516 else if (enc->json.flags & F_ALLOW_BLESSED)
524 encode_str (enc, "null", 4, 0); 517 encode_str (enc, "null", 4, 0);
525 else 518 else
526 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 519 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
527 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 520 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
528 } 521 }
… …
531 encode_hv (enc, (HV *)sv); 524 encode_hv (enc, (HV *)sv);
532 else if (svt == SVt_PVAV) 525 else if (svt == SVt_PVAV)
533 encode_av (enc, (AV *)sv); 526 encode_av (enc, (AV *)sv);
534 else if (svt < SVt_PVAV) 527 else if (svt < SVt_PVAV)
535 { 528 {
536 if (SvNIOK (sv) && SvIV (sv) == 0) 529 STRLEN len = 0;
530 char *pv = svt ? SvPV (sv, len) : 0;
531
532 if (len == 1 && *pv == '1')
533 encode_str (enc, "true", 4, 0);
534 else if (len == 1 && *pv == '0')
537 encode_str (enc, "false", 5, 0); 535 encode_str (enc, "false", 5, 0);
538 else if (SvNIOK (sv) && SvIV (sv) == 1)
539 encode_str (enc, "true", 4, 0);
540 else 536 else
541 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 537 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
542 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 538 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
543 } 539 }
544 else 540 else
… …
614 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 610 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
615 SvPV_nolen (sv), SvFLAGS (sv)); 611 SvPV_nolen (sv), SvFLAGS (sv));
616} 612}
617 613
618static SV * 614static SV *
619encode_json (SV *scalar, U32 flags) 615encode_json (SV *scalar, JSON *json)
620{ 616{
621 enc_t enc; 617 enc_t enc;
622 618
623 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 619 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
624 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 620 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
625 621
626 enc.flags = flags; 622 enc.json = *json;
627 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 623 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
628 enc.cur = SvPVX (enc.sv); 624 enc.cur = SvPVX (enc.sv);
629 enc.end = SvEND (enc.sv); 625 enc.end = SvEND (enc.sv);
630 enc.indent = 0; 626 enc.indent = 0;
631 enc.maxdepth = DEC_DEPTH (flags); 627 enc.maxdepth = DEC_DEPTH (enc.json.flags);
632 628
633 SvPOK_only (enc.sv); 629 SvPOK_only (enc.sv);
634 encode_sv (&enc, scalar); 630 encode_sv (&enc, scalar);
635 631
636 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 632 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
637 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 633 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
638 634
639 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 635 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
640 SvUTF8_on (enc.sv); 636 SvUTF8_on (enc.sv);
641 637
642 if (enc.flags & F_SHRINK) 638 if (enc.json.flags & F_SHRINK)
643 shrink (enc.sv); 639 shrink (enc.sv);
644 640
645 return enc.sv; 641 return enc.sv;
646} 642}
647 643
… …
652typedef struct 648typedef struct
653{ 649{
654 char *cur; // current parser pointer 650 char *cur; // current parser pointer
655 char *end; // end of input string 651 char *end; // end of input string
656 const char *err; // parse error, if != 0 652 const char *err; // parse error, if != 0
657 U32 flags; // F_* 653 JSON json;
658 U32 depth; // recursion depth 654 U32 depth; // recursion depth
659 U32 maxdepth; // recursion depth limit 655 U32 maxdepth; // recursion depth limit
660} dec_t; 656} dec_t;
661 657
662inline void 658inline void
… …
1013} 1009}
1014 1010
1015static SV * 1011static SV *
1016decode_hv (dec_t *dec) 1012decode_hv (dec_t *dec)
1017{ 1013{
1014 SV *sv;
1018 HV *hv = newHV (); 1015 HV *hv = newHV ();
1019 1016
1020 DEC_INC_DEPTH; 1017 DEC_INC_DEPTH;
1021 decode_ws (dec); 1018 decode_ws (dec);
1022 1019
… …
1026 for (;;) 1023 for (;;)
1027 { 1024 {
1028 decode_ws (dec); EXPECT_CH ('"'); 1025 decode_ws (dec); EXPECT_CH ('"');
1029 1026
1030 // heuristic: assume that 1027 // heuristic: assume that
1031 // a) decode_str + hv_store_ent are abysmally slow 1028 // a) decode_str + hv_store_ent are abysmally slow.
1032 // b) most hash keys are short, simple ascii text 1029 // b) most hash keys are short, simple ascii text.
1033 // so try to "fast-match" such strings to avoid 1030 // => try to "fast-match" such strings to avoid
1034 // the overhead of hv_store_ent. 1031 // the overhead of decode_str + hv_store_ent.
1035 { 1032 {
1036 SV *value; 1033 SV *value;
1037 char *p = dec->cur; 1034 char *p = dec->cur;
1038 char *e = p + 24; // only try up to 24 bytes 1035 char *e = p + 24; // only try up to 24 bytes
1039 1036
1040 for (;;) 1037 for (;;)
1041 { 1038 {
1039 // the >= 0x80 is true on most architectures
1042 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1040 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1043 { 1041 {
1044 // slow path, back up and use decode_str 1042 // slow path, back up and use decode_str
1045 SV *key = decode_str (dec); 1043 SV *key = decode_str (dec);
1046 if (!key) 1044 if (!key)
… …
1095 1093
1096 ++dec->cur; 1094 ++dec->cur;
1097 } 1095 }
1098 1096
1099 DEC_DEC_DEPTH; 1097 DEC_DEC_DEPTH;
1100 return newRV_noinc ((SV *)hv); 1098 sv = newRV_noinc ((SV *)hv);
1099
1100 // check filter callbacks
1101 if (dec->json.flags & F_HOOK)
1102 {
1103 ENTER; SAVETMPS;
1104
1105 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1106 {
1107 int count;
1108
1109 dSP; PUSHMARK (SP);
1110 XPUSHs (sv_2mortal (sv));
1111
1112 PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN;
1113
1114 if (count == 1)
1115 {
1116 sv = newSVsv (POPs);
1117 goto filter_ok;
1118 }
1119
1120 SvREFCNT_inc (sv);
1121 }
1122
1123 if (dec->json.cb_object)
1124 {
1125 int count;
1126
1127 dSP; ENTER; SAVETMPS; PUSHMARK (SP);
1128 XPUSHs (sv_2mortal (sv));
1129
1130 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1131
1132 if (count == 1)
1133 {
1134 sv = newSVsv (POPs);
1135 goto filter_ok;
1136 }
1137
1138 SvREFCNT_inc (sv);
1139 }
1140
1141filter_ok:
1142 FREETMPS; LEAVE;
1143 }
1144
1145 return sv;
1101 1146
1102fail: 1147fail:
1103 SvREFCNT_dec (hv); 1148 SvREFCNT_dec (hv);
1104 DEC_DEC_DEPTH; 1149 DEC_DEC_DEPTH;
1105 return 0; 1150 return 0;
… …
1164fail: 1209fail:
1165 return 0; 1210 return 0;
1166} 1211}
1167 1212
1168static SV * 1213static SV *
1169decode_json (SV *string, U32 flags, UV *offset_return) 1214decode_json (SV *string, JSON *json, UV *offset_return)
1170{ 1215{
1171 dec_t dec; 1216 dec_t dec;
1172 UV offset; 1217 UV offset;
1173 SV *sv; 1218 SV *sv;
1174 1219
1175 SvGETMAGIC (string); 1220 SvGETMAGIC (string);
1176 SvUPGRADE (string, SVt_PV); 1221 SvUPGRADE (string, SVt_PV);
1177 1222
1178 if (flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (flags)) 1223 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", 1224 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)); 1225 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1181 1226
1182 if (flags & F_UTF8) 1227 if (json->flags & F_UTF8)
1183 sv_utf8_downgrade (string, 0); 1228 sv_utf8_downgrade (string, 0);
1184 else 1229 else
1185 sv_utf8_upgrade (string); 1230 sv_utf8_upgrade (string);
1186 1231
1187 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1232 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1188 1233
1189 dec.flags = flags; 1234 dec.json = *json;
1190 dec.cur = SvPVX (string); 1235 dec.cur = SvPVX (string);
1191 dec.end = SvEND (string); 1236 dec.end = SvEND (string);
1192 dec.err = 0; 1237 dec.err = 0;
1193 dec.depth = 0; 1238 dec.depth = 0;
1194 dec.maxdepth = DEC_DEPTH (dec.flags); 1239 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1240
1241 if (dec.json.cb_object || dec.json.cb_sk_object)
1242 dec.json.flags |= F_HOOK;
1195 1243
1196 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1244 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1197 sv = decode_sv (&dec); 1245 sv = decode_sv (&dec);
1198 1246
1199 if (!(offset_return || !sv)) 1247 if (!(offset_return || !sv))
… …
1209 } 1257 }
1210 } 1258 }
1211 1259
1212 if (offset_return || !sv) 1260 if (offset_return || !sv)
1213 { 1261 {
1214 offset = dec.flags & F_UTF8 1262 offset = dec.json.flags & F_UTF8
1215 ? dec.cur - SvPVX (string) 1263 ? dec.cur - SvPVX (string)
1216 : utf8_distance (dec.cur, SvPVX (string)); 1264 : utf8_distance (dec.cur, SvPVX (string));
1217 1265
1218 if (offset_return) 1266 if (offset_return)
1219 *offset_return = offset; 1267 *offset_return = offset;
… …
1238 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1286 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1239 } 1287 }
1240 1288
1241 sv = sv_2mortal (sv); 1289 sv = sv_2mortal (sv);
1242 1290
1243 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1291 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)"); 1292 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1245 1293
1246 return sv; 1294 return sv;
1247} 1295}
1248 1296
… …
1269 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1317 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1270} 1318}
1271 1319
1272PROTOTYPES: DISABLE 1320PROTOTYPES: DISABLE
1273 1321
1274SV *new (char *dummy) 1322void new (char *klass)
1275 CODE: 1323 PPCODE:
1276 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1324{
1277 OUTPUT: 1325 SV *pv = NEWSV (0, sizeof (JSON));
1278 RETVAL 1326 SvPOK_only (pv);
1327 Zero (SvPVX (pv), 1, JSON);
1328 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1329 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
1330}
1279 1331
1280SV *ascii (SV *self, int enable = 1) 1332void ascii (JSON *self, int enable = 1)
1281 ALIAS: 1333 ALIAS:
1282 ascii = F_ASCII 1334 ascii = F_ASCII
1283 latin1 = F_LATIN1 1335 latin1 = F_LATIN1
1284 utf8 = F_UTF8 1336 utf8 = F_UTF8
1285 indent = F_INDENT 1337 indent = F_INDENT
… …
1289 pretty = F_PRETTY 1341 pretty = F_PRETTY
1290 allow_nonref = F_ALLOW_NONREF 1342 allow_nonref = F_ALLOW_NONREF
1291 shrink = F_SHRINK 1343 shrink = F_SHRINK
1292 allow_blessed = F_ALLOW_BLESSED 1344 allow_blessed = F_ALLOW_BLESSED
1293 convert_blessed = F_CONV_BLESSED 1345 convert_blessed = F_CONV_BLESSED
1294 CODE: 1346 PPCODE:
1295{ 1347{
1296 UV *uv = SvJSON (self);
1297 if (enable) 1348 if (enable)
1298 *uv |= ix; 1349 self->flags |= ix;
1299 else 1350 else
1300 *uv &= ~ix; 1351 self->flags &= ~ix;
1301 1352
1302 RETVAL = newSVsv (self); 1353 XPUSHs (ST (0));
1303} 1354}
1304 OUTPUT:
1305 RETVAL
1306 1355
1307SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1356void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1308 CODE: 1357 PPCODE:
1309{ 1358{
1310 UV *uv = SvJSON (self);
1311 UV log2 = 0; 1359 UV log2 = 0;
1312 1360
1313 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1361 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1314 1362
1315 while ((1UL << log2) < max_depth) 1363 while ((1UL << log2) < max_depth)
1316 ++log2; 1364 ++log2;
1317 1365
1318 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1366 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1319 1367
1320 RETVAL = newSVsv (self); 1368 XPUSHs (ST (0));
1321} 1369}
1322 OUTPUT:
1323 RETVAL
1324 1370
1325SV *max_size (SV *self, UV max_size = 0) 1371void max_size (JSON *self, UV max_size = 0)
1326 CODE: 1372 PPCODE:
1327{ 1373{
1328 UV *uv = SvJSON (self);
1329 UV log2 = 0; 1374 UV log2 = 0;
1330 1375
1331 if (max_size > 0x80000000UL) max_size = 0x80000000UL; 1376 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1332 if (max_size == 1) max_size = 2; 1377 if (max_size == 1) max_size = 2;
1333 1378
1334 while ((1UL << log2) < max_size) 1379 while ((1UL << log2) < max_size)
1335 ++log2; 1380 ++log2;
1336 1381
1337 *uv = *uv & ~F_MAXSIZE | (log2 << S_MAXSIZE); 1382 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1338 1383
1339 RETVAL = newSVsv (self); 1384 XPUSHs (ST (0));
1340} 1385}
1341 OUTPUT:
1342 RETVAL
1343 1386
1344void encode (SV *self, SV *scalar) 1387void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1388 ALIAS:
1389 filter_json_single_key_object = 1
1345 PPCODE: 1390 PPCODE:
1346 XPUSHs (encode_json (scalar, *SvJSON (self))); 1391{
1392 SV **svp;
1347 1393
1394 if (!SvOK (cb))
1395 cb = 0;
1396 else
1397 cb = newSVsv (cb);
1398
1399 switch (ix)
1400 {
1401 case 0: svp = &self->cb_object ; break;
1402 case 1: svp = &self->cb_sk_object; break;
1403 }
1404
1405 if (*svp)
1406 SvREFCNT_dec (*svp);
1407
1408 *svp = cb;
1409
1410 XPUSHs (ST (0));
1411}
1412
1348void decode (SV *self, SV *jsonstr) 1413void encode (JSON *self, SV *scalar)
1349 PPCODE: 1414 PPCODE:
1415 XPUSHs (encode_json (scalar, self));
1416
1417void decode (JSON *self, SV *jsonstr)
1418 PPCODE:
1350 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0)); 1419 XPUSHs (decode_json (jsonstr, self, 0));
1351 1420
1352void decode_prefix (SV *self, SV *jsonstr) 1421void decode_prefix (JSON *self, SV *jsonstr)
1353 PPCODE: 1422 PPCODE:
1354{ 1423{
1355 UV offset; 1424 UV offset;
1356 EXTEND (SP, 2); 1425 EXTEND (SP, 2);
1357 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset)); 1426 PUSHs (decode_json (jsonstr, self, &offset));
1358 PUSHs (sv_2mortal (newSVuv (offset))); 1427 PUSHs (sv_2mortal (newSVuv (offset)));
1359} 1428}
1360 1429
1361PROTOTYPES: ENABLE 1430PROTOTYPES: ENABLE
1362 1431
1363void to_json (SV *scalar) 1432void to_json (SV *scalar)
1364 ALIAS:
1365 objToJson = 0
1366 PPCODE: 1433 PPCODE:
1434{
1435 JSON json = { F_DEFAULT | F_UTF8 };
1367 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1436 XPUSHs (encode_json (scalar, &json));
1437}
1368 1438
1369void from_json (SV *jsonstr) 1439void from_json (SV *jsonstr)
1370 ALIAS:
1371 jsonToObj = 0
1372 PPCODE: 1440 PPCODE:
1441{
1442 JSON json = { F_DEFAULT | F_UTF8 };
1373 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0)); 1443 XPUSHs (decode_json (jsonstr, &json, 0));
1444}
1374 1445

Diff Legend

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