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.57 by root, Mon Aug 13 16:05:42 2007 UTC vs.
Revision 1.64 by root, Mon Aug 27 02:03:23 2007 UTC

… …
27#define F_SPACE_AFTER 0x00000040UL 27#define F_SPACE_AFTER 0x00000040UL
28#define F_ALLOW_NONREF 0x00000100UL 28#define F_ALLOW_NONREF 0x00000100UL
29#define F_SHRINK 0x00000200UL 29#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL 30#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL 31#define F_CONV_BLESSED 0x00000800UL
32#define F_RELAXED 0x00001000UL
33
32#define F_MAXDEPTH 0xf8000000UL 34#define F_MAXDEPTH 0xf8000000UL
33#define S_MAXDEPTH 27 35#define S_MAXDEPTH 27
34#define F_MAXSIZE 0x01f00000UL 36#define F_MAXSIZE 0x01f00000UL
35#define S_MAXSIZE 20 37#define S_MAXSIZE 20
36#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
… …
60#define expect_false(expr) expect ((expr) != 0, 0) 62#define expect_false(expr) expect ((expr) != 0, 0)
61#define expect_true(expr) expect ((expr) != 0, 1) 63#define expect_true(expr) expect ((expr) != 0, 1)
62 64
63#ifdef USE_ITHREADS 65#ifdef USE_ITHREADS
64# define JSON_SLOW 1 66# define JSON_SLOW 1
67# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
65#else 68#else
66# define JSON_SLOW 1 69# define JSON_SLOW 0
70# define JSON_STASH json_stash
67#endif 71#endif
68 72
69static HV *json_stash, *json_boolean_stash; // JSON::XS:: 73static HV *json_stash, *json_boolean_stash; // JSON::XS::
70static SV *json_true, *json_false; 74static SV *json_true, *json_false;
71 75
… …
333 --enc->indent; 337 --enc->indent;
334 encode_indent (enc); encode_ch (enc, ']'); 338 encode_indent (enc); encode_ch (enc, ']');
335} 339}
336 340
337static void 341static void
338encode_he (enc_t *enc, HE *he) 342encode_hk (enc_t *enc, HE *he)
339{ 343{
340 encode_ch (enc, '"'); 344 encode_ch (enc, '"');
341 345
342 if (HeKLEN (he) == HEf_SVKEY) 346 if (HeKLEN (he) == HEf_SVKEY)
343 { 347 {
… …
356 encode_ch (enc, '"'); 360 encode_ch (enc, '"');
357 361
358 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); 362 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
359 encode_ch (enc, ':'); 363 encode_ch (enc, ':');
360 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); 364 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
361 encode_sv (enc, HeVAL (he));
362} 365}
363 366
364// compare hash entries, used when all keys are bytestrings 367// compare hash entries, used when all keys are bytestrings
365static int 368static int
366he_cmp_fast (const void *a_, const void *b_) 369he_cmp_fast (const void *a_, const void *b_)
… …
371 HE *b = *(HE **)b_; 374 HE *b = *(HE **)b_;
372 375
373 STRLEN la = HeKLEN (a); 376 STRLEN la = HeKLEN (a);
374 STRLEN lb = HeKLEN (b); 377 STRLEN lb = HeKLEN (b);
375 378
376 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 379 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
377 cmp = la - lb; 380 cmp = lb - la;
378 381
379 return cmp; 382 return cmp;
380} 383}
381 384
382// compare hash entries, used when some keys are sv's or utf-x 385// compare hash entries, used when some keys are sv's or utf-x
383static int 386static int
384he_cmp_slow (const void *a, const void *b) 387he_cmp_slow (const void *a, const void *b)
385{ 388{
386 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 389 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
387} 390}
388 391
389static void 392static void
390encode_hv (enc_t *enc, HV *hv) 393encode_hv (enc_t *enc, HV *hv)
391{ 394{
395 HE *he;
392 int count, i; 396 int count;
393 397
394 if (enc->indent >= enc->maxdepth) 398 if (enc->indent >= enc->maxdepth)
395 croak ("data structure too deep (hit recursion limit)"); 399 croak ("data structure too deep (hit recursion limit)");
396 400
397 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 401 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
398 402
399 if ((count = hv_iterinit (hv)))
400 {
401 // for canonical output we have to sort by keys first 403 // for canonical output we have to sort by keys first
402 // actually, this is mostly due to the stupid so-called 404 // actually, this is mostly due to the stupid so-called
403 // security workaround added somewhere in 5.8.x. 405 // security workaround added somewhere in 5.8.x.
404 // that randomises hash orderings 406 // that randomises hash orderings
405 if (enc->json.flags & F_CANONICAL) 407 if (enc->json.flags & F_CANONICAL)
408 {
409 int count = hv_iterinit (hv);
410
411 if (SvMAGICAL (hv))
406 { 412 {
413 // need to count by iterating. could improve by dynamically building the vector below
414 // but I don't care for the speed of this special case.
415 // note also that we will run into undefined behaviour when the two iterations
416 // do not result in the same count, something I might care for in some later release.
417
418 count = 0;
419 while (hv_iternext (hv))
420 ++count;
421
422 hv_iterinit (hv);
423 }
424
425 if (count)
426 {
407 int fast = 1; 427 int i, fast = 1;
408 HE *he;
409#if defined(__BORLANDC__) || defined(_MSC_VER) 428#if defined(__BORLANDC__) || defined(_MSC_VER)
410 HE **hes = _alloca (count * sizeof (HE)); 429 HE **hes = _alloca (count * sizeof (HE));
411#else 430#else
412 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 431 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
413#endif 432#endif
… …
440 459
441 FREETMPS; 460 FREETMPS;
442 LEAVE; 461 LEAVE;
443 } 462 }
444 463
445 for (i = 0; i < count; ++i) 464 while (count--)
446 { 465 {
447 encode_indent (enc); 466 encode_indent (enc);
467 he = hes [count];
448 encode_he (enc, hes [i]); 468 encode_hk (enc, he);
469 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
449 470
450 if (i < count - 1) 471 if (count)
451 encode_comma (enc); 472 encode_comma (enc);
452 } 473 }
453
454 encode_nl (enc);
455 } 474 }
475 }
456 else 476 else
457 { 477 {
478 if (hv_iterinit (hv) || SvMAGICAL (hv))
458 HE *he = hv_iternext (hv); 479 if ((he = hv_iternext (hv)))
459
460 for (;;) 480 for (;;)
461 { 481 {
462 encode_indent (enc); 482 encode_indent (enc);
463 encode_he (enc, he); 483 encode_hk (enc, he);
484 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
464 485
465 if (!(he = hv_iternext (hv))) 486 if (!(he = hv_iternext (hv)))
466 break; 487 break;
467 488
468 encode_comma (enc); 489 encode_comma (enc);
469 } 490 }
491 }
470 492
471 encode_nl (enc); 493 encode_nl (enc);
472 }
473 }
474 494
475 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 495 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
476} 496}
477 497
478// encode objects, arrays and special \0=false and \1=true values. 498// encode objects, arrays and special \0=false and \1=true values.
… …
510 // we re-bless the reference to get overload and other niceties right 530 // we re-bless the reference to get overload and other niceties right
511 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0); 531 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
512 532
513 if (to_json) 533 if (to_json)
514 { 534 {
515 int count;
516 dSP; 535 dSP;
517 536
518 ENTER; SAVETMPS; PUSHMARK (SP); 537 ENTER; SAVETMPS; PUSHMARK (SP);
519 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 538 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
520 539
… …
681 U32 depth; // recursion depth 700 U32 depth; // recursion depth
682 U32 maxdepth; // recursion depth limit 701 U32 maxdepth; // recursion depth limit
683} dec_t; 702} dec_t;
684 703
685inline void 704inline void
705decode_comment (dec_t *dec)
706{
707 // only '#'-style comments allowed a.t.m.
708
709 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
710 ++dec->cur;
711}
712
713inline void
686decode_ws (dec_t *dec) 714decode_ws (dec_t *dec)
687{ 715{
688 for (;;) 716 for (;;)
689 { 717 {
690 char ch = *dec->cur; 718 char ch = *dec->cur;
691 719
692 if (ch > 0x20 720 if (ch > 0x20)
721 {
722 if (expect_false (ch == '#'))
723 {
724 if (dec->json.flags & F_RELAXED)
725 decode_comment (dec);
726 else
727 break;
728 }
729 else
730 break;
731 }
693 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 732 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
694 break; 733 break; // parse error, but let higher level handle it, gives better error messages
695 734
696 ++dec->cur; 735 ++dec->cur;
697 } 736 }
698} 737}
699 738
… …
1036 1075
1037 if (*dec->cur != ',') 1076 if (*dec->cur != ',')
1038 ERR (", or ] expected while parsing array"); 1077 ERR (", or ] expected while parsing array");
1039 1078
1040 ++dec->cur; 1079 ++dec->cur;
1080
1081 decode_ws (dec);
1082
1083 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1084 {
1085 ++dec->cur;
1086 break;
1087 }
1041 } 1088 }
1042 1089
1043 DEC_DEC_DEPTH; 1090 DEC_DEC_DEPTH;
1044 return newRV_noinc ((SV *)av); 1091 return newRV_noinc ((SV *)av);
1045 1092
… …
1061 if (*dec->cur == '}') 1108 if (*dec->cur == '}')
1062 ++dec->cur; 1109 ++dec->cur;
1063 else 1110 else
1064 for (;;) 1111 for (;;)
1065 { 1112 {
1066 decode_ws (dec); EXPECT_CH ('"'); 1113 EXPECT_CH ('"');
1067 1114
1068 // heuristic: assume that 1115 // heuristic: assume that
1069 // a) decode_str + hv_store_ent are abysmally slow. 1116 // a) decode_str + hv_store_ent are abysmally slow.
1070 // b) most hash keys are short, simple ascii text. 1117 // b) most hash keys are short, simple ascii text.
1071 // => try to "fast-match" such strings to avoid 1118 // => try to "fast-match" such strings to avoid
… …
1085 if (!key) 1132 if (!key)
1086 goto fail; 1133 goto fail;
1087 1134
1088 decode_ws (dec); EXPECT_CH (':'); 1135 decode_ws (dec); EXPECT_CH (':');
1089 1136
1137 decode_ws (dec);
1090 value = decode_sv (dec); 1138 value = decode_sv (dec);
1091 if (!value) 1139 if (!value)
1092 { 1140 {
1093 SvREFCNT_dec (key); 1141 SvREFCNT_dec (key);
1094 goto fail; 1142 goto fail;
… …
1106 int len = p - key; 1154 int len = p - key;
1107 dec->cur = p + 1; 1155 dec->cur = p + 1;
1108 1156
1109 decode_ws (dec); EXPECT_CH (':'); 1157 decode_ws (dec); EXPECT_CH (':');
1110 1158
1159 decode_ws (dec);
1111 value = decode_sv (dec); 1160 value = decode_sv (dec);
1112 if (!value) 1161 if (!value)
1113 goto fail; 1162 goto fail;
1114 1163
1115 hv_store (hv, key, len, value, 0); 1164 hv_store (hv, key, len, value, 0);
… …
1131 1180
1132 if (*dec->cur != ',') 1181 if (*dec->cur != ',')
1133 ERR (", or } expected while parsing object/hash"); 1182 ERR (", or } expected while parsing object/hash");
1134 1183
1135 ++dec->cur; 1184 ++dec->cur;
1185
1186 decode_ws (dec);
1187
1188 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1189 {
1190 ++dec->cur;
1191 break;
1192 }
1136 } 1193 }
1137 1194
1138 DEC_DEC_DEPTH; 1195 DEC_DEC_DEPTH;
1139 sv = newRV_noinc ((SV *)hv); 1196 sv = newRV_noinc ((SV *)hv);
1140 1197
… …
1205} 1262}
1206 1263
1207static SV * 1264static SV *
1208decode_sv (dec_t *dec) 1265decode_sv (dec_t *dec)
1209{ 1266{
1210 decode_ws (dec);
1211
1212 // the beauty of JSON: you need exactly one character lookahead 1267 // the beauty of JSON: you need exactly one character lookahead
1213 // to parse anything. 1268 // to parse anything.
1214 switch (*dec->cur) 1269 switch (*dec->cur)
1215 { 1270 {
1216 case '"': ++dec->cur; return decode_str (dec); 1271 case '"': ++dec->cur; return decode_str (dec);
… …
1224 1279
1225 case 't': 1280 case 't':
1226 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1281 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1227 { 1282 {
1228 dec->cur += 4; 1283 dec->cur += 4;
1284#if JSON_SLOW
1285 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
1286#endif
1229 return SvREFCNT_inc (json_true); 1287 return SvREFCNT_inc (json_true);
1230 } 1288 }
1231 else 1289 else
1232 ERR ("'true' expected"); 1290 ERR ("'true' expected");
1233 1291
… …
1235 1293
1236 case 'f': 1294 case 'f':
1237 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1295 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1238 { 1296 {
1239 dec->cur += 5; 1297 dec->cur += 5;
1298#if JSON_SLOW
1299 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1300#endif
1240 return SvREFCNT_inc (json_false); 1301 return SvREFCNT_inc (json_false);
1241 } 1302 }
1242 else 1303 else
1243 ERR ("'false' expected"); 1304 ERR ("'false' expected");
1244 1305
… …
1294 1355
1295 if (dec.json.cb_object || dec.json.cb_sk_object) 1356 if (dec.json.cb_object || dec.json.cb_sk_object)
1296 dec.json.flags |= F_HOOK; 1357 dec.json.flags |= F_HOOK;
1297 1358
1298 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1359 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1360
1361 decode_ws (&dec);
1299 sv = decode_sv (&dec); 1362 sv = decode_sv (&dec);
1300 1363
1301 if (!(offset_return || !sv)) 1364 if (!(offset_return || !sv))
1302 { 1365 {
1303 // check for trailing garbage 1366 // check for trailing garbage
… …
1379 json_boolean_stash = 0; 1442 json_boolean_stash = 0;
1380 1443
1381void new (char *klass) 1444void new (char *klass)
1382 PPCODE: 1445 PPCODE:
1383{ 1446{
1384 HV *stash = !JSON_SLOW || json_stash
1385 ? json_stash
1386 : gv_stashpv ("JSON::XS", 1);
1387 SV *pv = NEWSV (0, sizeof (JSON)); 1447 SV *pv = NEWSV (0, sizeof (JSON));
1388 SvPOK_only (pv); 1448 SvPOK_only (pv);
1389 Zero (SvPVX (pv), 1, JSON); 1449 Zero (SvPVX (pv), 1, JSON);
1390 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1450 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1391 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), stash))); 1451 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1392} 1452}
1393 1453
1394void ascii (JSON *self, int enable = 1) 1454void ascii (JSON *self, int enable = 1)
1395 ALIAS: 1455 ALIAS:
1396 ascii = F_ASCII 1456 ascii = F_ASCII
… …
1403 pretty = F_PRETTY 1463 pretty = F_PRETTY
1404 allow_nonref = F_ALLOW_NONREF 1464 allow_nonref = F_ALLOW_NONREF
1405 shrink = F_SHRINK 1465 shrink = F_SHRINK
1406 allow_blessed = F_ALLOW_BLESSED 1466 allow_blessed = F_ALLOW_BLESSED
1407 convert_blessed = F_CONV_BLESSED 1467 convert_blessed = F_CONV_BLESSED
1468 relaxed = F_RELAXED
1408 PPCODE: 1469 PPCODE:
1409{ 1470{
1410 if (enable) 1471 if (enable)
1411 self->flags |= ix; 1472 self->flags |= ix;
1412 else 1473 else

Diff Legend

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