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.52 by root, Mon Jul 2 02:57:11 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"))
… …
524 encode_hv (enc, (HV *)sv); 525 encode_hv (enc, (HV *)sv);
525 else if (svt == SVt_PVAV) 526 else if (svt == SVt_PVAV)
526 encode_av (enc, (AV *)sv); 527 encode_av (enc, (AV *)sv);
527 else if (svt < SVt_PVAV) 528 else if (svt < SVt_PVAV)
528 { 529 {
529 if (SvNIOK (sv) && SvIV (sv) == 0) 530 STRLEN len = 0;
531 char *pv = svt ? SvPV (sv, len) : 0;
532
533 if (len == 1 && *pv == '1')
534 encode_str (enc, "true", 4, 0);
535 else if (len == 1 && *pv == '0')
530 encode_str (enc, "false", 5, 0); 536 encode_str (enc, "false", 5, 0);
531 else if (SvNIOK (sv) && SvIV (sv) == 1)
532 encode_str (enc, "true", 4, 0);
533 else 537 else
534 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 538 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
535 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 539 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
536 } 540 }
537 else 541 else
… …
1095 sv = newRV_noinc ((SV *)hv); 1099 sv = newRV_noinc ((SV *)hv);
1096 1100
1097 // check filter callbacks 1101 // check filter callbacks
1098 if (dec->json.flags & F_HOOK) 1102 if (dec->json.flags & F_HOOK)
1099 { 1103 {
1100 ENTER; SAVETMPS; 1104 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1101
1102 if (HvKEYS (hv) == 1 && dec->json.cb_sk_object)
1103 { 1105 {
1106 HE *cb, *he;
1107
1108 hv_iterinit (hv);
1109 he = hv_iternext (hv);
1110 hv_iterinit (hv);
1111
1112 // the next line creates a mortal sv each time its called.
1113 // might want to optimise this for common cases.
1114 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1115
1116 if (cb)
1117 {
1104 int count; 1118 int count;
1119 ENTER; SAVETMPS;
1105 1120
1106 dSP; PUSHMARK (SP); 1121 dSP; PUSHMARK (SP);
1107 XPUSHs (sv_2mortal (sv)); 1122 XPUSHs (HeVAL (he));
1108 1123
1109 PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN; 1124 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1110 1125
1111 if (count == 1) 1126 if (count == 1)
1127 {
1112 sv = newSVsv (POPs); 1128 sv = newSVsv (POPs);
1113 else 1129 FREETMPS; LEAVE;
1114 SvREFCNT_inc (sv); 1130 return sv;
1131 }
1132
1133 FREETMPS; LEAVE;
1134 }
1115 } 1135 }
1116 1136
1117 if (dec->json.cb_object) 1137 if (dec->json.cb_object)
1118 { 1138 {
1119 int count; 1139 int count;
1140 ENTER; SAVETMPS;
1120 1141
1121 dSP; ENTER; SAVETMPS; PUSHMARK (SP); 1142 dSP; ENTER; SAVETMPS; PUSHMARK (SP);
1122 XPUSHs (sv_2mortal (sv)); 1143 XPUSHs (sv_2mortal (sv));
1123 1144
1124 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1145 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1125 1146
1126 if (count == 1) 1147 if (count == 1)
1148 {
1127 sv = newSVsv (POPs); 1149 sv = newSVsv (POPs);
1128 else 1150 FREETMPS; LEAVE;
1151 return sv;
1152 }
1153
1129 SvREFCNT_inc (sv); 1154 SvREFCNT_inc (sv);
1155 FREETMPS; LEAVE;
1130 } 1156 }
1131
1132 FREETMPS; LEAVE;
1133 } 1157 }
1134 1158
1135 return newRV_noinc ((SV *)hv); 1159 return sv;
1136 1160
1137fail: 1161fail:
1138 SvREFCNT_dec (hv); 1162 SvREFCNT_dec (hv);
1139 DEC_DEC_DEPTH; 1163 DEC_DEC_DEPTH;
1140 return 0; 1164 return 0;
… …
1372 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE); 1396 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1373 1397
1374 XPUSHs (ST (0)); 1398 XPUSHs (ST (0));
1375} 1399}
1376 1400
1377void filter_json_objects (JSON *self, SV *cb = &PL_sv_undef) 1401void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1378 ALIAS:
1379 filter_sk_json_objects = 1
1380 PPCODE: 1402 PPCODE:
1381{ 1403{
1404 SvREFCNT_dec (self->cb_object);
1405 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1406
1407 XPUSHs (ST (0));
1408}
1409
1410void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1411 PPCODE:
1412{
1413 if (!self->cb_sk_object)
1414 self->cb_sk_object = newHV ();
1415
1382 if (!SvOK (cb)) 1416 if (SvOK (cb))
1383 cb = 0; 1417 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1384 1418 else
1385 switch (ix)
1386 { 1419 {
1387 case 0: self->cb_object = cb; break; 1420 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1421
1422 if (!HvKEYS (self->cb_sk_object))
1423 {
1424 SvREFCNT_dec (self->cb_sk_object);
1388 case 1: self->cb_sk_object = cb; break; 1425 self->cb_sk_object = 0;
1426 }
1389 } 1427 }
1390 1428
1391 XPUSHs (ST (0)); 1429 XPUSHs (ST (0));
1392} 1430}
1393 1431
… …
1406 EXTEND (SP, 2); 1444 EXTEND (SP, 2);
1407 PUSHs (decode_json (jsonstr, self, &offset)); 1445 PUSHs (decode_json (jsonstr, self, &offset));
1408 PUSHs (sv_2mortal (newSVuv (offset))); 1446 PUSHs (sv_2mortal (newSVuv (offset)));
1409} 1447}
1410 1448
1449void DESTROY (JSON *self)
1450 CODE:
1451 SvREFCNT_dec (self->cb_sk_object);
1452 SvREFCNT_dec (self->cb_object);
1453
1411PROTOTYPES: ENABLE 1454PROTOTYPES: ENABLE
1412 1455
1413void to_json (SV *scalar) 1456void to_json (SV *scalar)
1414 PPCODE: 1457 PPCODE:
1415{ 1458{

Diff Legend

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