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

Diff Legend

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