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.55 by root, Mon Jul 23 22:57:40 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
… …
305 encode_ch (enc, '['); encode_nl (enc); 306 encode_ch (enc, '['); encode_nl (enc);
306 ++enc->indent; 307 ++enc->indent;
307 308
308 for (i = 0; i <= len; ++i) 309 for (i = 0; i <= len; ++i)
309 { 310 {
311 SV **svp = av_fetch (av, i, 0);
312
310 encode_indent (enc); 313 encode_indent (enc);
311 encode_sv (enc, *av_fetch (av, i, 0)); 314
315 if (svp)
316 encode_sv (enc, *svp);
317 else
318 encode_str (enc, "null", 4, 0);
312 319
313 if (i < len) 320 if (i < len)
314 encode_comma (enc); 321 encode_comma (enc);
315 } 322 }
316 323
… …
472 479
473 if (expect_false (SvOBJECT (sv))) 480 if (expect_false (SvOBJECT (sv)))
474 { 481 {
475 if (SvSTASH (sv) == json_boolean_stash) 482 if (SvSTASH (sv) == json_boolean_stash)
476 { 483 {
477 if (SvIV (sv) == 0) 484 if (SvIV (sv))
485 encode_str (enc, "true", 4, 0);
486 else
478 encode_str (enc, "false", 5, 0); 487 encode_str (enc, "false", 5, 0);
479 else
480 encode_str (enc, "true", 4, 0);
481 } 488 }
482 else 489 else
483 { 490 {
484#if 0 491#if 0
485 if (0 && sv_derived_from (rv, "JSON::Literal")) 492 if (0 && sv_derived_from (rv, "JSON::Literal"))
… …
488 } 495 }
489#endif 496#endif
490 if (enc->json.flags & F_CONV_BLESSED) 497 if (enc->json.flags & F_CONV_BLESSED)
491 { 498 {
492 // we re-bless the reference to get overload and other niceties right 499 // we re-bless the reference to get overload and other niceties right
493 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 500 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
494 501
495 if (to_json) 502 if (to_json)
496 { 503 {
504 int count;
505 dSP;
506
497 dSP; ENTER; SAVETMPS; PUSHMARK (SP); 507 ENTER; SAVETMPS; PUSHMARK (SP);
498 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 508 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
499 509
500 // calling with G_SCALAR ensures that we always get a 1 reutrn value 510 // calling with G_SCALAR ensures that we always get a 1 return value
501 // check anyways.
502 PUTBACK; 511 PUTBACK;
503 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 512 call_sv ((SV *)GvCV (to_json), G_SCALAR);
504 SPAGAIN; 513 SPAGAIN;
505 514
515 // catch this surprisingly common error
516 if (SvROK (TOPs) && SvRV (TOPs) == sv)
517 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
518
519 sv = POPs;
520 PUTBACK;
521
506 encode_sv (enc, POPs); 522 encode_sv (enc, sv);
507 523
508 FREETMPS; LEAVE; 524 FREETMPS; LEAVE;
509 } 525 }
510 else if (enc->json.flags & F_ALLOW_BLESSED) 526 else if (enc->json.flags & F_ALLOW_BLESSED)
511 encode_str (enc, "null", 4, 0); 527 encode_str (enc, "null", 4, 0);
… …
524 encode_hv (enc, (HV *)sv); 540 encode_hv (enc, (HV *)sv);
525 else if (svt == SVt_PVAV) 541 else if (svt == SVt_PVAV)
526 encode_av (enc, (AV *)sv); 542 encode_av (enc, (AV *)sv);
527 else if (svt < SVt_PVAV) 543 else if (svt < SVt_PVAV)
528 { 544 {
529 if (SvNIOK (sv) && SvIV (sv) == 0) 545 STRLEN len = 0;
546 char *pv = svt ? SvPV (sv, len) : 0;
547
548 if (len == 1 && *pv == '1')
549 encode_str (enc, "true", 4, 0);
550 else if (len == 1 && *pv == '0')
530 encode_str (enc, "false", 5, 0); 551 encode_str (enc, "false", 5, 0);
531 else if (SvNIOK (sv) && SvIV (sv) == 1)
532 encode_str (enc, "true", 4, 0);
533 else 552 else
534 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 553 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
535 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 554 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
536 } 555 }
537 else 556 else
… …
1095 sv = newRV_noinc ((SV *)hv); 1114 sv = newRV_noinc ((SV *)hv);
1096 1115
1097 // check filter callbacks 1116 // check filter callbacks
1098 if (dec->json.flags & F_HOOK) 1117 if (dec->json.flags & F_HOOK)
1099 { 1118 {
1100 ENTER; SAVETMPS; 1119 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1101
1102 if (HvKEYS (hv) == 1 && dec->json.cb_sk_object)
1103 { 1120 {
1121 HE *cb, *he;
1122
1123 hv_iterinit (hv);
1124 he = hv_iternext (hv);
1125 hv_iterinit (hv);
1126
1127 // the next line creates a mortal sv each time its called.
1128 // might want to optimise this for common cases.
1129 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1130
1131 if (cb)
1132 {
1133 dSP;
1104 int count; 1134 int count;
1105 1135
1106 dSP; PUSHMARK (SP); 1136 ENTER; SAVETMPS; PUSHMARK (SP);
1107 XPUSHs (sv_2mortal (sv)); 1137 XPUSHs (HeVAL (he));
1108 1138
1109 PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN; 1139 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1110 1140
1111 if (count == 1) 1141 if (count == 1)
1142 {
1112 sv = newSVsv (POPs); 1143 sv = newSVsv (POPs);
1113 else 1144 FREETMPS; LEAVE;
1114 SvREFCNT_inc (sv); 1145 return sv;
1146 }
1147
1148 FREETMPS; LEAVE;
1149 }
1115 } 1150 }
1116 1151
1117 if (dec->json.cb_object) 1152 if (dec->json.cb_object)
1118 { 1153 {
1154 dSP;
1119 int count; 1155 int count;
1120 1156
1121 dSP; ENTER; SAVETMPS; PUSHMARK (SP); 1157 ENTER; SAVETMPS; PUSHMARK (SP);
1122 XPUSHs (sv_2mortal (sv)); 1158 XPUSHs (sv_2mortal (sv));
1123 1159
1124 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1160 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1125 1161
1126 if (count == 1) 1162 if (count == 1)
1163 {
1127 sv = newSVsv (POPs); 1164 sv = newSVsv (POPs);
1128 else 1165 FREETMPS; LEAVE;
1166 return sv;
1167 }
1168
1129 SvREFCNT_inc (sv); 1169 SvREFCNT_inc (sv);
1170 FREETMPS; LEAVE;
1130 } 1171 }
1131
1132 FREETMPS; LEAVE;
1133 } 1172 }
1134 1173
1135 return newRV_noinc ((SV *)hv); 1174 return sv;
1136 1175
1137fail: 1176fail:
1138 SvREFCNT_dec (hv); 1177 SvREFCNT_dec (hv);
1139 DEC_DEC_DEPTH; 1178 DEC_DEC_DEPTH;
1140 return 0; 1179 return 0;
… …
1372 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE); 1411 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1373 1412
1374 XPUSHs (ST (0)); 1413 XPUSHs (ST (0));
1375} 1414}
1376 1415
1377void filter_json_objects (JSON *self, SV *cb = &PL_sv_undef) 1416void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1378 ALIAS:
1379 filter_sk_json_objects = 1
1380 PPCODE: 1417 PPCODE:
1381{ 1418{
1419 SvREFCNT_dec (self->cb_object);
1420 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1421
1422 XPUSHs (ST (0));
1423}
1424
1425void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1426 PPCODE:
1427{
1428 if (!self->cb_sk_object)
1429 self->cb_sk_object = newHV ();
1430
1382 if (!SvOK (cb)) 1431 if (SvOK (cb))
1383 cb = 0; 1432 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1384 1433 else
1385 switch (ix)
1386 { 1434 {
1387 case 0: self->cb_object = cb; break; 1435 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1436
1437 if (!HvKEYS (self->cb_sk_object))
1438 {
1439 SvREFCNT_dec (self->cb_sk_object);
1388 case 1: self->cb_sk_object = cb; break; 1440 self->cb_sk_object = 0;
1441 }
1389 } 1442 }
1390 1443
1391 XPUSHs (ST (0)); 1444 XPUSHs (ST (0));
1392} 1445}
1393 1446
… …
1406 EXTEND (SP, 2); 1459 EXTEND (SP, 2);
1407 PUSHs (decode_json (jsonstr, self, &offset)); 1460 PUSHs (decode_json (jsonstr, self, &offset));
1408 PUSHs (sv_2mortal (newSVuv (offset))); 1461 PUSHs (sv_2mortal (newSVuv (offset)));
1409} 1462}
1410 1463
1464void DESTROY (JSON *self)
1465 CODE:
1466 SvREFCNT_dec (self->cb_sk_object);
1467 SvREFCNT_dec (self->cb_object);
1468
1411PROTOTYPES: ENABLE 1469PROTOTYPES: ENABLE
1412 1470
1413void to_json (SV *scalar) 1471void to_json (SV *scalar)
1414 PPCODE: 1472 PPCODE:
1415{ 1473{

Diff Legend

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