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.51 by root, Mon Jul 2 00:48:18 2007 UTC

… …
472 472
473 if (expect_false (SvOBJECT (sv))) 473 if (expect_false (SvOBJECT (sv)))
474 { 474 {
475 if (SvSTASH (sv) == json_boolean_stash) 475 if (SvSTASH (sv) == json_boolean_stash)
476 { 476 {
477 if (SvIV (sv) == 0) 477 if (SvIV (sv))
478 encode_str (enc, "true", 4, 0);
479 else
478 encode_str (enc, "false", 5, 0); 480 encode_str (enc, "false", 5, 0);
479 else
480 encode_str (enc, "true", 4, 0);
481 } 481 }
482 else 482 else
483 { 483 {
484#if 0 484#if 0
485 if (0 && sv_derived_from (rv, "JSON::Literal")) 485 if (0 && sv_derived_from (rv, "JSON::Literal"))
… …
524 encode_hv (enc, (HV *)sv); 524 encode_hv (enc, (HV *)sv);
525 else if (svt == SVt_PVAV) 525 else if (svt == SVt_PVAV)
526 encode_av (enc, (AV *)sv); 526 encode_av (enc, (AV *)sv);
527 else if (svt < SVt_PVAV) 527 else if (svt < SVt_PVAV)
528 { 528 {
529 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')
530 encode_str (enc, "false", 5, 0); 535 encode_str (enc, "false", 5, 0);
531 else if (SvNIOK (sv) && SvIV (sv) == 1)
532 encode_str (enc, "true", 4, 0);
533 else 536 else
534 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",
535 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 538 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
536 } 539 }
537 else 540 else
… …
1097 // check filter callbacks 1100 // check filter callbacks
1098 if (dec->json.flags & F_HOOK) 1101 if (dec->json.flags & F_HOOK)
1099 { 1102 {
1100 ENTER; SAVETMPS; 1103 ENTER; SAVETMPS;
1101 1104
1102 if (HvKEYS (hv) == 1 && dec->json.cb_sk_object) 1105 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1103 { 1106 {
1104 int count; 1107 int count;
1105 1108
1106 dSP; PUSHMARK (SP); 1109 dSP; PUSHMARK (SP);
1107 XPUSHs (sv_2mortal (sv)); 1110 XPUSHs (sv_2mortal (sv));
1108 1111
1109 PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN; 1112 PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN;
1110 1113
1111 if (count == 1) 1114 if (count == 1)
1115 {
1112 sv = newSVsv (POPs); 1116 sv = newSVsv (POPs);
1113 else 1117 goto filter_ok;
1118 }
1119
1114 SvREFCNT_inc (sv); 1120 SvREFCNT_inc (sv);
1115 } 1121 }
1116 1122
1117 if (dec->json.cb_object) 1123 if (dec->json.cb_object)
1118 { 1124 {
1119 int count; 1125 int count;
… …
1122 XPUSHs (sv_2mortal (sv)); 1128 XPUSHs (sv_2mortal (sv));
1123 1129
1124 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1130 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1125 1131
1126 if (count == 1) 1132 if (count == 1)
1133 {
1127 sv = newSVsv (POPs); 1134 sv = newSVsv (POPs);
1128 else 1135 goto filter_ok;
1136 }
1137
1129 SvREFCNT_inc (sv); 1138 SvREFCNT_inc (sv);
1130 } 1139 }
1131 1140
1141filter_ok:
1132 FREETMPS; LEAVE; 1142 FREETMPS; LEAVE;
1133 } 1143 }
1134 1144
1135 return newRV_noinc ((SV *)hv); 1145 return sv;
1136 1146
1137fail: 1147fail:
1138 SvREFCNT_dec (hv); 1148 SvREFCNT_dec (hv);
1139 DEC_DEC_DEPTH; 1149 DEC_DEC_DEPTH;
1140 return 0; 1150 return 0;
… …
1372 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE); 1382 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1373 1383
1374 XPUSHs (ST (0)); 1384 XPUSHs (ST (0));
1375} 1385}
1376 1386
1377void filter_json_objects (JSON *self, SV *cb = &PL_sv_undef) 1387void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1378 ALIAS: 1388 ALIAS:
1379 filter_sk_json_objects = 1 1389 filter_json_single_key_object = 1
1380 PPCODE: 1390 PPCODE:
1381{ 1391{
1392 SV **svp;
1393
1382 if (!SvOK (cb)) 1394 if (!SvOK (cb))
1383 cb = 0; 1395 cb = 0;
1396 else
1397 cb = newSVsv (cb);
1384 1398
1385 switch (ix) 1399 switch (ix)
1386 { 1400 {
1387 case 0: self->cb_object = cb; break; 1401 case 0: svp = &self->cb_object ; break;
1388 case 1: self->cb_sk_object = cb; break; 1402 case 1: svp = &self->cb_sk_object; break;
1389 } 1403 }
1404
1405 if (*svp)
1406 SvREFCNT_dec (*svp);
1407
1408 *svp = cb;
1390 1409
1391 XPUSHs (ST (0)); 1410 XPUSHs (ST (0));
1392} 1411}
1393 1412
1394void encode (JSON *self, SV *scalar) 1413void encode (JSON *self, SV *scalar)

Diff Legend

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