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.54 by root, Tue Jul 10 16:22:31 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;
68 HV *cb_sk_object;
66} JSON; 69} JSON;
67 70
68///////////////////////////////////////////////////////////////////////////// 71/////////////////////////////////////////////////////////////////////////////
69// utility functions 72// utility functions
70 73
… …
470 473
471 if (expect_false (SvOBJECT (sv))) 474 if (expect_false (SvOBJECT (sv)))
472 { 475 {
473 if (SvSTASH (sv) == json_boolean_stash) 476 if (SvSTASH (sv) == json_boolean_stash)
474 { 477 {
475 if (SvIV (sv) == 0) 478 if (SvIV (sv))
479 encode_str (enc, "true", 4, 0);
480 else
476 encode_str (enc, "false", 5, 0); 481 encode_str (enc, "false", 5, 0);
477 else
478 encode_str (enc, "true", 4, 0);
479 } 482 }
480 else 483 else
481 { 484 {
482#if 0 485#if 0
483 if (0 && sv_derived_from (rv, "JSON::Literal")) 486 if (0 && sv_derived_from (rv, "JSON::Literal"))
… …
486 } 489 }
487#endif 490#endif
488 if (enc->json.flags & F_CONV_BLESSED) 491 if (enc->json.flags & F_CONV_BLESSED)
489 { 492 {
490 // 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
491 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 494 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
492 495
493 if (to_json) 496 if (to_json)
494 { 497 {
498 int count;
495 dSP; 499 dSP;
496 ENTER; 500
497 SAVETMPS;
498 PUSHMARK (SP); 501 ENTER; SAVETMPS; PUSHMARK (SP);
499 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 502 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
500 503
501 // calling with G_SCALAR ensures that we always get a 1 reutrn value 504 // calling with G_SCALAR ensures that we always get a 1 return value
502 // check anyways.
503 PUTBACK; 505 PUTBACK;
504 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 506 call_sv ((SV *)GvCV (to_json), G_SCALAR);
505 SPAGAIN; 507 SPAGAIN;
506 508
509 // catch this surprisingly common error
510 if (SvROK (TOPs) && SvRV (TOPs) == sv)
511 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
512
513 sv = POPs;
514 PUTBACK;
515
507 encode_sv (enc, POPs); 516 encode_sv (enc, sv);
508 517
509 FREETMPS; 518 FREETMPS; LEAVE;
510 LEAVE;
511 } 519 }
512 else if (enc->json.flags & F_ALLOW_BLESSED) 520 else if (enc->json.flags & F_ALLOW_BLESSED)
513 encode_str (enc, "null", 4, 0); 521 encode_str (enc, "null", 4, 0);
514 else 522 else
515 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it", 523 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
… …
526 encode_hv (enc, (HV *)sv); 534 encode_hv (enc, (HV *)sv);
527 else if (svt == SVt_PVAV) 535 else if (svt == SVt_PVAV)
528 encode_av (enc, (AV *)sv); 536 encode_av (enc, (AV *)sv);
529 else if (svt < SVt_PVAV) 537 else if (svt < SVt_PVAV)
530 { 538 {
531 if (SvNIOK (sv) && SvIV (sv) == 0) 539 STRLEN len = 0;
540 char *pv = svt ? SvPV (sv, len) : 0;
541
542 if (len == 1 && *pv == '1')
543 encode_str (enc, "true", 4, 0);
544 else if (len == 1 && *pv == '0')
532 encode_str (enc, "false", 5, 0); 545 encode_str (enc, "false", 5, 0);
533 else if (SvNIOK (sv) && SvIV (sv) == 1)
534 encode_str (enc, "true", 4, 0);
535 else 546 else
536 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 547 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
537 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 548 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
538 } 549 }
539 else 550 else
… …
1008} 1019}
1009 1020
1010static SV * 1021static SV *
1011decode_hv (dec_t *dec) 1022decode_hv (dec_t *dec)
1012{ 1023{
1024 SV *sv;
1013 HV *hv = newHV (); 1025 HV *hv = newHV ();
1014 1026
1015 DEC_INC_DEPTH; 1027 DEC_INC_DEPTH;
1016 decode_ws (dec); 1028 decode_ws (dec);
1017 1029
… …
1091 1103
1092 ++dec->cur; 1104 ++dec->cur;
1093 } 1105 }
1094 1106
1095 DEC_DEC_DEPTH; 1107 DEC_DEC_DEPTH;
1096 return newRV_noinc ((SV *)hv); 1108 sv = newRV_noinc ((SV *)hv);
1109
1110 // check filter callbacks
1111 if (dec->json.flags & F_HOOK)
1112 {
1113 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1114 {
1115 HE *cb, *he;
1116
1117 hv_iterinit (hv);
1118 he = hv_iternext (hv);
1119 hv_iterinit (hv);
1120
1121 // the next line creates a mortal sv each time its called.
1122 // might want to optimise this for common cases.
1123 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1124
1125 if (cb)
1126 {
1127 dSP;
1128 int count;
1129
1130 ENTER; SAVETMPS; PUSHMARK (SP);
1131 XPUSHs (HeVAL (he));
1132
1133 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1134
1135 if (count == 1)
1136 {
1137 sv = newSVsv (POPs);
1138 FREETMPS; LEAVE;
1139 return sv;
1140 }
1141
1142 FREETMPS; LEAVE;
1143 }
1144 }
1145
1146 if (dec->json.cb_object)
1147 {
1148 dSP;
1149 int count;
1150
1151 ENTER; SAVETMPS; PUSHMARK (SP);
1152 XPUSHs (sv_2mortal (sv));
1153
1154 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1155
1156 if (count == 1)
1157 {
1158 sv = newSVsv (POPs);
1159 FREETMPS; LEAVE;
1160 return sv;
1161 }
1162
1163 SvREFCNT_inc (sv);
1164 FREETMPS; LEAVE;
1165 }
1166 }
1167
1168 return sv;
1097 1169
1098fail: 1170fail:
1099 SvREFCNT_dec (hv); 1171 SvREFCNT_dec (hv);
1100 DEC_DEC_DEPTH; 1172 DEC_DEC_DEPTH;
1101 return 0; 1173 return 0;
… …
1187 dec.end = SvEND (string); 1259 dec.end = SvEND (string);
1188 dec.err = 0; 1260 dec.err = 0;
1189 dec.depth = 0; 1261 dec.depth = 0;
1190 dec.maxdepth = DEC_DEPTH (dec.json.flags); 1262 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1191 1263
1264 if (dec.json.cb_object || dec.json.cb_sk_object)
1265 dec.json.flags |= F_HOOK;
1266
1192 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1267 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1193 sv = decode_sv (&dec); 1268 sv = decode_sv (&dec);
1194 1269
1195 if (!(offset_return || !sv)) 1270 if (!(offset_return || !sv))
1196 { 1271 {
… …
1270void new (char *klass) 1345void new (char *klass)
1271 PPCODE: 1346 PPCODE:
1272{ 1347{
1273 SV *pv = NEWSV (0, sizeof (JSON)); 1348 SV *pv = NEWSV (0, sizeof (JSON));
1274 SvPOK_only (pv); 1349 SvPOK_only (pv);
1275 Zero (SvPVX (pv), 1, sizeof (JSON)); 1350 Zero (SvPVX (pv), 1, JSON);
1276 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1351 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1277 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash))); 1352 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
1278} 1353}
1279 1354
1280void ascii (JSON *self, int enable = 1) 1355void ascii (JSON *self, int enable = 1)
… …
1330 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE); 1405 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1331 1406
1332 XPUSHs (ST (0)); 1407 XPUSHs (ST (0));
1333} 1408}
1334 1409
1410void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1411 PPCODE:
1412{
1413 SvREFCNT_dec (self->cb_object);
1414 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1415
1416 XPUSHs (ST (0));
1417}
1418
1419void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1420 PPCODE:
1421{
1422 if (!self->cb_sk_object)
1423 self->cb_sk_object = newHV ();
1424
1425 if (SvOK (cb))
1426 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1427 else
1428 {
1429 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1430
1431 if (!HvKEYS (self->cb_sk_object))
1432 {
1433 SvREFCNT_dec (self->cb_sk_object);
1434 self->cb_sk_object = 0;
1435 }
1436 }
1437
1438 XPUSHs (ST (0));
1439}
1440
1335void encode (JSON *self, SV *scalar) 1441void encode (JSON *self, SV *scalar)
1336 PPCODE: 1442 PPCODE:
1337 XPUSHs (encode_json (scalar, self)); 1443 XPUSHs (encode_json (scalar, self));
1338 1444
1339void decode (JSON *self, SV *jsonstr) 1445void decode (JSON *self, SV *jsonstr)
… …
1347 EXTEND (SP, 2); 1453 EXTEND (SP, 2);
1348 PUSHs (decode_json (jsonstr, self, &offset)); 1454 PUSHs (decode_json (jsonstr, self, &offset));
1349 PUSHs (sv_2mortal (newSVuv (offset))); 1455 PUSHs (sv_2mortal (newSVuv (offset)));
1350} 1456}
1351 1457
1458void DESTROY (JSON *self)
1459 CODE:
1460 SvREFCNT_dec (self->cb_sk_object);
1461 SvREFCNT_dec (self->cb_object);
1462
1352PROTOTYPES: ENABLE 1463PROTOTYPES: ENABLE
1353 1464
1354void to_json (SV *scalar) 1465void to_json (SV *scalar)
1355 PPCODE: 1466 PPCODE:
1356{ 1467{

Diff Legend

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