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.47 by root, Sun Jul 1 14:08:03 2007 UTC vs.
Revision 1.53 by root, Tue Jul 10 15:45:34 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
… …
59#define expect_true(expr) expect ((expr) != 0, 1) 60#define expect_true(expr) expect ((expr) != 0, 1)
60 61
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 json { 65typedef struct {
65 U32 flags; 66 U32 flags;
67 SV *cb_object;
68 HV *cb_sk_object;
66} JSON__XS; 69} JSON;
67 70
68///////////////////////////////////////////////////////////////////////////// 71/////////////////////////////////////////////////////////////////////////////
69// utility functions 72// utility functions
70 73
71static UV * 74inline void
72SvJSON (SV *sv)
73{
74 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
75 croak ("object is not of type JSON::XS");
76
77 return &SvUVX (SvRV (sv));
78}
79
80static void
81shrink (SV *sv) 75shrink (SV *sv)
82{ 76{
83 sv_utf8_downgrade (sv, 1); 77 sv_utf8_downgrade (sv, 1);
84 if (SvLEN (sv) > SvCUR (sv) + 1) 78 if (SvLEN (sv) > SvCUR (sv) + 1)
85 { 79 {
… …
120typedef struct 114typedef struct
121{ 115{
122 char *cur; // SvPVX (sv) + current output position 116 char *cur; // SvPVX (sv) + current output position
123 char *end; // SvEND (sv) 117 char *end; // SvEND (sv)
124 SV *sv; // result scalar 118 SV *sv; // result scalar
125 struct json json; 119 JSON json;
126 U32 indent; // indentation level 120 U32 indent; // indentation level
127 U32 maxdepth; // max. indentation/recursion level 121 U32 maxdepth; // max. indentation/recursion level
128} enc_t; 122} enc_t;
129 123
130inline void 124inline void
… …
479 473
480 if (expect_false (SvOBJECT (sv))) 474 if (expect_false (SvOBJECT (sv)))
481 { 475 {
482 if (SvSTASH (sv) == json_boolean_stash) 476 if (SvSTASH (sv) == json_boolean_stash)
483 { 477 {
484 if (SvIV (sv) == 0) 478 if (SvIV (sv))
479 encode_str (enc, "true", 4, 0);
480 else
485 encode_str (enc, "false", 5, 0); 481 encode_str (enc, "false", 5, 0);
486 else
487 encode_str (enc, "true", 4, 0);
488 } 482 }
489 else 483 else
490 { 484 {
491#if 0 485#if 0
492 if (0 && sv_derived_from (rv, "JSON::Literal")) 486 if (0 && sv_derived_from (rv, "JSON::Literal"))
… …
495 } 489 }
496#endif 490#endif
497 if (enc->json.flags & F_CONV_BLESSED) 491 if (enc->json.flags & F_CONV_BLESSED)
498 { 492 {
499 // 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
500 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 494 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
501 495
502 if (to_json) 496 if (to_json)
503 { 497 {
504 dSP; 498 dSP;
505 ENTER; 499
506 SAVETMPS;
507 PUSHMARK (SP); 500 ENTER; SAVETMPS; PUSHMARK (SP);
508 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 501 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
509 502
510 // 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
511 // check anyways. 504 // check anyways.
512 PUTBACK; 505 PUTBACK;
513 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 506 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
514 SPAGAIN; 507 SPAGAIN;
515 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
516 encode_sv (enc, POPs); 516 encode_sv (enc, sv);
517 517
518 FREETMPS; 518 FREETMPS; LEAVE;
519 LEAVE;
520 } 519 }
521 else if (enc->json.flags & F_ALLOW_BLESSED) 520 else if (enc->json.flags & F_ALLOW_BLESSED)
522 encode_str (enc, "null", 4, 0); 521 encode_str (enc, "null", 4, 0);
523 else 522 else
524 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",
… …
535 encode_hv (enc, (HV *)sv); 534 encode_hv (enc, (HV *)sv);
536 else if (svt == SVt_PVAV) 535 else if (svt == SVt_PVAV)
537 encode_av (enc, (AV *)sv); 536 encode_av (enc, (AV *)sv);
538 else if (svt < SVt_PVAV) 537 else if (svt < SVt_PVAV)
539 { 538 {
540 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')
541 encode_str (enc, "false", 5, 0); 545 encode_str (enc, "false", 5, 0);
542 else if (SvNIOK (sv) && SvIV (sv) == 1)
543 encode_str (enc, "true", 4, 0);
544 else 546 else
545 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",
546 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 548 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
547 } 549 }
548 else 550 else
… …
618 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 620 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
619 SvPV_nolen (sv), SvFLAGS (sv)); 621 SvPV_nolen (sv), SvFLAGS (sv));
620} 622}
621 623
622static SV * 624static SV *
623encode_json (SV *scalar, struct json *json) 625encode_json (SV *scalar, JSON *json)
624{ 626{
625 enc_t enc; 627 enc_t enc;
626 628
627 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 629 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
628 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 630 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
… …
656typedef struct 658typedef struct
657{ 659{
658 char *cur; // current parser pointer 660 char *cur; // current parser pointer
659 char *end; // end of input string 661 char *end; // end of input string
660 const char *err; // parse error, if != 0 662 const char *err; // parse error, if != 0
661 struct json json; 663 JSON json;
662 U32 depth; // recursion depth 664 U32 depth; // recursion depth
663 U32 maxdepth; // recursion depth limit 665 U32 maxdepth; // recursion depth limit
664} dec_t; 666} dec_t;
665 667
666inline void 668inline void
… …
1017} 1019}
1018 1020
1019static SV * 1021static SV *
1020decode_hv (dec_t *dec) 1022decode_hv (dec_t *dec)
1021{ 1023{
1024 SV *sv;
1022 HV *hv = newHV (); 1025 HV *hv = newHV ();
1023 1026
1024 DEC_INC_DEPTH; 1027 DEC_INC_DEPTH;
1025 decode_ws (dec); 1028 decode_ws (dec);
1026 1029
… …
1100 1103
1101 ++dec->cur; 1104 ++dec->cur;
1102 } 1105 }
1103 1106
1104 DEC_DEC_DEPTH; 1107 DEC_DEC_DEPTH;
1105 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;
1106 1169
1107fail: 1170fail:
1108 SvREFCNT_dec (hv); 1171 SvREFCNT_dec (hv);
1109 DEC_DEC_DEPTH; 1172 DEC_DEC_DEPTH;
1110 return 0; 1173 return 0;
… …
1169fail: 1232fail:
1170 return 0; 1233 return 0;
1171} 1234}
1172 1235
1173static SV * 1236static SV *
1174decode_json (SV *string, struct json *json, UV *offset_return) 1237decode_json (SV *string, JSON *json, UV *offset_return)
1175{ 1238{
1176 dec_t dec; 1239 dec_t dec;
1177 UV offset; 1240 UV offset;
1178 SV *sv; 1241 SV *sv;
1179 1242
… …
1195 dec.cur = SvPVX (string); 1258 dec.cur = SvPVX (string);
1196 dec.end = SvEND (string); 1259 dec.end = SvEND (string);
1197 dec.err = 0; 1260 dec.err = 0;
1198 dec.depth = 0; 1261 dec.depth = 0;
1199 dec.maxdepth = DEC_DEPTH (dec.json.flags); 1262 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1263
1264 if (dec.json.cb_object || dec.json.cb_sk_object)
1265 dec.json.flags |= F_HOOK;
1200 1266
1201 *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
1202 sv = decode_sv (&dec); 1268 sv = decode_sv (&dec);
1203 1269
1204 if (!(offset_return || !sv)) 1270 if (!(offset_return || !sv))
… …
1274 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1340 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1275} 1341}
1276 1342
1277PROTOTYPES: DISABLE 1343PROTOTYPES: DISABLE
1278 1344
1279SV *new (char *dummy) 1345void new (char *klass)
1280 CODE: 1346 PPCODE:
1281 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1347{
1282 OUTPUT: 1348 SV *pv = NEWSV (0, sizeof (JSON));
1283 RETVAL 1349 SvPOK_only (pv);
1350 Zero (SvPVX (pv), 1, JSON);
1351 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1352 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
1353}
1284 1354
1285SV *ascii (SV *self, int enable = 1) 1355void ascii (JSON *self, int enable = 1)
1286 ALIAS: 1356 ALIAS:
1287 ascii = F_ASCII 1357 ascii = F_ASCII
1288 latin1 = F_LATIN1 1358 latin1 = F_LATIN1
1289 utf8 = F_UTF8 1359 utf8 = F_UTF8
1290 indent = F_INDENT 1360 indent = F_INDENT
… …
1294 pretty = F_PRETTY 1364 pretty = F_PRETTY
1295 allow_nonref = F_ALLOW_NONREF 1365 allow_nonref = F_ALLOW_NONREF
1296 shrink = F_SHRINK 1366 shrink = F_SHRINK
1297 allow_blessed = F_ALLOW_BLESSED 1367 allow_blessed = F_ALLOW_BLESSED
1298 convert_blessed = F_CONV_BLESSED 1368 convert_blessed = F_CONV_BLESSED
1299 CODE: 1369 PPCODE:
1300{ 1370{
1301 UV *uv = SvJSON (self);
1302 if (enable) 1371 if (enable)
1303 *uv |= ix; 1372 self->flags |= ix;
1304 else 1373 else
1305 *uv &= ~ix; 1374 self->flags &= ~ix;
1306 1375
1307 RETVAL = newSVsv (self); 1376 XPUSHs (ST (0));
1308} 1377}
1309 OUTPUT:
1310 RETVAL
1311 1378
1312SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1379void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1313 CODE: 1380 PPCODE:
1314{ 1381{
1315 UV *uv = SvJSON (self);
1316 UV log2 = 0; 1382 UV log2 = 0;
1317 1383
1318 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1384 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1319 1385
1320 while ((1UL << log2) < max_depth) 1386 while ((1UL << log2) < max_depth)
1321 ++log2; 1387 ++log2;
1322 1388
1323 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1389 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1324 1390
1325 RETVAL = newSVsv (self); 1391 XPUSHs (ST (0));
1326} 1392}
1327 OUTPUT:
1328 RETVAL
1329 1393
1330SV *max_size (SV *self, UV max_size = 0) 1394void max_size (JSON *self, UV max_size = 0)
1331 CODE: 1395 PPCODE:
1332{ 1396{
1333 UV *uv = SvJSON (self);
1334 UV log2 = 0; 1397 UV log2 = 0;
1335 1398
1336 if (max_size > 0x80000000UL) max_size = 0x80000000UL; 1399 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1337 if (max_size == 1) max_size = 2; 1400 if (max_size == 1) max_size = 2;
1338 1401
1339 while ((1UL << log2) < max_size) 1402 while ((1UL << log2) < max_size)
1340 ++log2; 1403 ++log2;
1341 1404
1342 *uv = *uv & ~F_MAXSIZE | (log2 << S_MAXSIZE); 1405 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1343 1406
1344 RETVAL = newSVsv (self); 1407 XPUSHs (ST (0));
1345} 1408}
1346 OUTPUT:
1347 RETVAL
1348 1409
1349void encode (SV *self, SV *scalar) 1410void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1350 PPCODE: 1411 PPCODE:
1351{ 1412{
1352 struct json json = { *SvJSON (self) }; 1413 SvREFCNT_dec (self->cb_object);
1353 XPUSHs (encode_json (scalar, &json)); 1414 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1354}
1355 1415
1356void decode (SV *self, SV *jsonstr) 1416 XPUSHs (ST (0));
1417}
1418
1419void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1357 PPCODE: 1420 PPCODE:
1358{ 1421{
1359 struct json json = { *SvJSON (self) }; 1422 if (!self->cb_sk_object)
1360 XPUSHs (decode_json (jsonstr, &json, 0)); 1423 self->cb_sk_object = newHV ();
1361}
1362 1424
1363void decode_prefix (SV *self, SV *jsonstr) 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
1441void encode (JSON *self, SV *scalar)
1364 PPCODE: 1442 PPCODE:
1443 XPUSHs (encode_json (scalar, self));
1444
1445void decode (JSON *self, SV *jsonstr)
1446 PPCODE:
1447 XPUSHs (decode_json (jsonstr, self, 0));
1448
1449void decode_prefix (JSON *self, SV *jsonstr)
1450 PPCODE:
1365{ 1451{
1366 UV offset; 1452 UV offset;
1367 struct json json = { *SvJSON (self) };
1368 EXTEND (SP, 2); 1453 EXTEND (SP, 2);
1369 PUSHs (decode_json (jsonstr, &json, &offset)); 1454 PUSHs (decode_json (jsonstr, self, &offset));
1370 PUSHs (sv_2mortal (newSVuv (offset))); 1455 PUSHs (sv_2mortal (newSVuv (offset)));
1371} 1456}
1457
1458void DESTROY (JSON *self)
1459 CODE:
1460 SvREFCNT_dec (self->cb_sk_object);
1461 SvREFCNT_dec (self->cb_object);
1372 1462
1373PROTOTYPES: ENABLE 1463PROTOTYPES: ENABLE
1374 1464
1375void to_json (SV *scalar) 1465void to_json (SV *scalar)
1376 PPCODE: 1466 PPCODE:
1377{ 1467{
1378 struct json json = { F_DEFAULT | F_UTF8 }; 1468 JSON json = { F_DEFAULT | F_UTF8 };
1379 XPUSHs (encode_json (scalar, &json)); 1469 XPUSHs (encode_json (scalar, &json));
1380} 1470}
1381 1471
1382void from_json (SV *jsonstr) 1472void from_json (SV *jsonstr)
1383 PPCODE: 1473 PPCODE:
1384{ 1474{
1385 struct json json = { F_DEFAULT | F_UTF8 }; 1475 JSON json = { F_DEFAULT | F_UTF8 };
1386 XPUSHs (decode_json (jsonstr, &json, 0)); 1476 XPUSHs (decode_json (jsonstr, &json, 0));
1387} 1477}
1388 1478

Diff Legend

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