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.48 by root, Sun Jul 1 22:20:00 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
… …
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
64typedef struct { 65typedef struct {
65 U32 flags; 66 U32 flags;
67 SV *cb_object, *cb_sk_object;
66} JSON; 68} JSON;
67 69
68///////////////////////////////////////////////////////////////////////////// 70/////////////////////////////////////////////////////////////////////////////
69// utility functions 71// utility functions
70 72
… …
470 472
471 if (expect_false (SvOBJECT (sv))) 473 if (expect_false (SvOBJECT (sv)))
472 { 474 {
473 if (SvSTASH (sv) == json_boolean_stash) 475 if (SvSTASH (sv) == json_boolean_stash)
474 { 476 {
475 if (SvIV (sv) == 0) 477 if (SvIV (sv))
478 encode_str (enc, "true", 4, 0);
479 else
476 encode_str (enc, "false", 5, 0); 480 encode_str (enc, "false", 5, 0);
477 else
478 encode_str (enc, "true", 4, 0);
479 } 481 }
480 else 482 else
481 { 483 {
482#if 0 484#if 0
483 if (0 && sv_derived_from (rv, "JSON::Literal")) 485 if (0 && sv_derived_from (rv, "JSON::Literal"))
… …
490 // 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
491 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 493 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
492 494
493 if (to_json) 495 if (to_json)
494 { 496 {
495 dSP; 497 dSP; ENTER; SAVETMPS; PUSHMARK (SP);
496 ENTER;
497 SAVETMPS;
498 PUSHMARK (SP);
499 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 498 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
500 499
501 // 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
502 // check anyways. 501 // check anyways.
503 PUTBACK; 502 PUTBACK;
504 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 503 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
505 SPAGAIN; 504 SPAGAIN;
506 505
507 encode_sv (enc, POPs); 506 encode_sv (enc, POPs);
508 507
509 FREETMPS; 508 FREETMPS; LEAVE;
510 LEAVE;
511 } 509 }
512 else if (enc->json.flags & F_ALLOW_BLESSED) 510 else if (enc->json.flags & F_ALLOW_BLESSED)
513 encode_str (enc, "null", 4, 0); 511 encode_str (enc, "null", 4, 0);
514 else 512 else
515 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",
… …
526 encode_hv (enc, (HV *)sv); 524 encode_hv (enc, (HV *)sv);
527 else if (svt == SVt_PVAV) 525 else if (svt == SVt_PVAV)
528 encode_av (enc, (AV *)sv); 526 encode_av (enc, (AV *)sv);
529 else if (svt < SVt_PVAV) 527 else if (svt < SVt_PVAV)
530 { 528 {
531 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')
532 encode_str (enc, "false", 5, 0); 535 encode_str (enc, "false", 5, 0);
533 else if (SvNIOK (sv) && SvIV (sv) == 1)
534 encode_str (enc, "true", 4, 0);
535 else 536 else
536 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",
537 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 538 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
538 } 539 }
539 else 540 else
… …
1008} 1009}
1009 1010
1010static SV * 1011static SV *
1011decode_hv (dec_t *dec) 1012decode_hv (dec_t *dec)
1012{ 1013{
1014 SV *sv;
1013 HV *hv = newHV (); 1015 HV *hv = newHV ();
1014 1016
1015 DEC_INC_DEPTH; 1017 DEC_INC_DEPTH;
1016 decode_ws (dec); 1018 decode_ws (dec);
1017 1019
… …
1091 1093
1092 ++dec->cur; 1094 ++dec->cur;
1093 } 1095 }
1094 1096
1095 DEC_DEC_DEPTH; 1097 DEC_DEC_DEPTH;
1096 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;
1097 1146
1098fail: 1147fail:
1099 SvREFCNT_dec (hv); 1148 SvREFCNT_dec (hv);
1100 DEC_DEC_DEPTH; 1149 DEC_DEC_DEPTH;
1101 return 0; 1150 return 0;
… …
1187 dec.end = SvEND (string); 1236 dec.end = SvEND (string);
1188 dec.err = 0; 1237 dec.err = 0;
1189 dec.depth = 0; 1238 dec.depth = 0;
1190 dec.maxdepth = DEC_DEPTH (dec.json.flags); 1239 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1191 1240
1241 if (dec.json.cb_object || dec.json.cb_sk_object)
1242 dec.json.flags |= F_HOOK;
1243
1192 *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
1193 sv = decode_sv (&dec); 1245 sv = decode_sv (&dec);
1194 1246
1195 if (!(offset_return || !sv)) 1247 if (!(offset_return || !sv))
1196 { 1248 {
… …
1270void new (char *klass) 1322void new (char *klass)
1271 PPCODE: 1323 PPCODE:
1272{ 1324{
1273 SV *pv = NEWSV (0, sizeof (JSON)); 1325 SV *pv = NEWSV (0, sizeof (JSON));
1274 SvPOK_only (pv); 1326 SvPOK_only (pv);
1275 Zero (SvPVX (pv), 1, sizeof (JSON)); 1327 Zero (SvPVX (pv), 1, JSON);
1276 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1328 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1277 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash))); 1329 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
1278} 1330}
1279 1331
1280void ascii (JSON *self, int enable = 1) 1332void ascii (JSON *self, int enable = 1)
… …
1330 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE); 1382 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1331 1383
1332 XPUSHs (ST (0)); 1384 XPUSHs (ST (0));
1333} 1385}
1334 1386
1387void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1388 ALIAS:
1389 filter_json_single_key_object = 1
1390 PPCODE:
1391{
1392 SV **svp;
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
1335void encode (JSON *self, SV *scalar) 1413void encode (JSON *self, SV *scalar)
1336 PPCODE: 1414 PPCODE:
1337 XPUSHs (encode_json (scalar, self)); 1415 XPUSHs (encode_json (scalar, self));
1338 1416
1339void decode (JSON *self, SV *jsonstr) 1417void decode (JSON *self, SV *jsonstr)

Diff Legend

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