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.49 by root, Sun Jul 1 23:40:07 2007 UTC vs.
Revision 1.53 by root, Tue Jul 10 15:45:34 2007 UTC

… …
62static HV *json_stash, *json_boolean_stash; // JSON::XS:: 62static HV *json_stash, *json_boolean_stash; // JSON::XS::
63static SV *json_true, *json_false; 63static SV *json_true, *json_false;
64 64
65typedef struct { 65typedef struct {
66 U32 flags; 66 U32 flags;
67 SV *cb_object, *cb_sk_object; 67 SV *cb_object;
68 HV *cb_sk_object;
68} JSON; 69} JSON;
69 70
70///////////////////////////////////////////////////////////////////////////// 71/////////////////////////////////////////////////////////////////////////////
71// utility functions 72// utility functions
72 73
… …
472 473
473 if (expect_false (SvOBJECT (sv))) 474 if (expect_false (SvOBJECT (sv)))
474 { 475 {
475 if (SvSTASH (sv) == json_boolean_stash) 476 if (SvSTASH (sv) == json_boolean_stash)
476 { 477 {
477 if (SvIV (sv) == 0) 478 if (SvIV (sv))
479 encode_str (enc, "true", 4, 0);
480 else
478 encode_str (enc, "false", 5, 0); 481 encode_str (enc, "false", 5, 0);
479 else
480 encode_str (enc, "true", 4, 0);
481 } 482 }
482 else 483 else
483 { 484 {
484#if 0 485#if 0
485 if (0 && sv_derived_from (rv, "JSON::Literal")) 486 if (0 && sv_derived_from (rv, "JSON::Literal"))
… …
488 } 489 }
489#endif 490#endif
490 if (enc->json.flags & F_CONV_BLESSED) 491 if (enc->json.flags & F_CONV_BLESSED)
491 { 492 {
492 // 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
493 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 494 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
494 495
495 if (to_json) 496 if (to_json)
496 { 497 {
498 dSP;
499
497 dSP; ENTER; SAVETMPS; PUSHMARK (SP); 500 ENTER; SAVETMPS; PUSHMARK (SP);
498 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 501 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
499 502
500 // calling with G_SCALAR ensures that we always get a 1 reutrn value 503 // calling with G_SCALAR ensures that we always get a 1 return value
501 // check anyways. 504 // check anyways.
502 PUTBACK; 505 PUTBACK;
503 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 506 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
504 SPAGAIN; 507 SPAGAIN;
505 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
506 encode_sv (enc, POPs); 516 encode_sv (enc, sv);
507 517
508 FREETMPS; LEAVE; 518 FREETMPS; LEAVE;
509 } 519 }
510 else if (enc->json.flags & F_ALLOW_BLESSED) 520 else if (enc->json.flags & F_ALLOW_BLESSED)
511 encode_str (enc, "null", 4, 0); 521 encode_str (enc, "null", 4, 0);
… …
524 encode_hv (enc, (HV *)sv); 534 encode_hv (enc, (HV *)sv);
525 else if (svt == SVt_PVAV) 535 else if (svt == SVt_PVAV)
526 encode_av (enc, (AV *)sv); 536 encode_av (enc, (AV *)sv);
527 else if (svt < SVt_PVAV) 537 else if (svt < SVt_PVAV)
528 { 538 {
529 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')
530 encode_str (enc, "false", 5, 0); 545 encode_str (enc, "false", 5, 0);
531 else if (SvNIOK (sv) && SvIV (sv) == 1)
532 encode_str (enc, "true", 4, 0);
533 else 546 else
534 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",
535 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 548 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
536 } 549 }
537 else 550 else
… …
1095 sv = newRV_noinc ((SV *)hv); 1108 sv = newRV_noinc ((SV *)hv);
1096 1109
1097 // check filter callbacks 1110 // check filter callbacks
1098 if (dec->json.flags & F_HOOK) 1111 if (dec->json.flags & F_HOOK)
1099 { 1112 {
1100 ENTER; SAVETMPS; 1113 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1101
1102 if (HvKEYS (hv) == 1 && dec->json.cb_sk_object)
1103 { 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;
1104 int count; 1128 int count;
1105 1129
1106 dSP; PUSHMARK (SP); 1130 ENTER; SAVETMPS; PUSHMARK (SP);
1107 XPUSHs (sv_2mortal (sv)); 1131 XPUSHs (HeVAL (he));
1108 1132
1109 PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN; 1133 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1110 1134
1111 if (count == 1) 1135 if (count == 1)
1136 {
1112 sv = newSVsv (POPs); 1137 sv = newSVsv (POPs);
1113 else 1138 FREETMPS; LEAVE;
1114 SvREFCNT_inc (sv); 1139 return sv;
1140 }
1141
1142 FREETMPS; LEAVE;
1143 }
1115 } 1144 }
1116 1145
1117 if (dec->json.cb_object) 1146 if (dec->json.cb_object)
1118 { 1147 {
1148 dSP;
1119 int count; 1149 int count;
1120 1150
1121 dSP; ENTER; SAVETMPS; PUSHMARK (SP); 1151 ENTER; SAVETMPS; PUSHMARK (SP);
1122 XPUSHs (sv_2mortal (sv)); 1152 XPUSHs (sv_2mortal (sv));
1123 1153
1124 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1154 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1125 1155
1126 if (count == 1) 1156 if (count == 1)
1157 {
1127 sv = newSVsv (POPs); 1158 sv = newSVsv (POPs);
1128 else 1159 FREETMPS; LEAVE;
1160 return sv;
1161 }
1162
1129 SvREFCNT_inc (sv); 1163 SvREFCNT_inc (sv);
1164 FREETMPS; LEAVE;
1130 } 1165 }
1131
1132 FREETMPS; LEAVE;
1133 } 1166 }
1134 1167
1135 return newRV_noinc ((SV *)hv); 1168 return sv;
1136 1169
1137fail: 1170fail:
1138 SvREFCNT_dec (hv); 1171 SvREFCNT_dec (hv);
1139 DEC_DEC_DEPTH; 1172 DEC_DEC_DEPTH;
1140 return 0; 1173 return 0;
… …
1372 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE); 1405 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1373 1406
1374 XPUSHs (ST (0)); 1407 XPUSHs (ST (0));
1375} 1408}
1376 1409
1377void filter_json_objects (JSON *self, SV *cb = &PL_sv_undef) 1410void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1378 ALIAS:
1379 filter_sk_json_objects = 1
1380 PPCODE: 1411 PPCODE:
1381{ 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
1382 if (!SvOK (cb)) 1425 if (SvOK (cb))
1383 cb = 0; 1426 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1384 1427 else
1385 switch (ix)
1386 { 1428 {
1387 case 0: self->cb_object = cb; break; 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);
1388 case 1: self->cb_sk_object = cb; break; 1434 self->cb_sk_object = 0;
1435 }
1389 } 1436 }
1390 1437
1391 XPUSHs (ST (0)); 1438 XPUSHs (ST (0));
1392} 1439}
1393 1440
… …
1406 EXTEND (SP, 2); 1453 EXTEND (SP, 2);
1407 PUSHs (decode_json (jsonstr, self, &offset)); 1454 PUSHs (decode_json (jsonstr, self, &offset));
1408 PUSHs (sv_2mortal (newSVuv (offset))); 1455 PUSHs (sv_2mortal (newSVuv (offset)));
1409} 1456}
1410 1457
1458void DESTROY (JSON *self)
1459 CODE:
1460 SvREFCNT_dec (self->cb_sk_object);
1461 SvREFCNT_dec (self->cb_object);
1462
1411PROTOTYPES: ENABLE 1463PROTOTYPES: ENABLE
1412 1464
1413void to_json (SV *scalar) 1465void to_json (SV *scalar)
1414 PPCODE: 1466 PPCODE:
1415{ 1467{

Diff Legend

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