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.48 by root, Sun Jul 1 22:20:00 2007 UTC vs.
Revision 1.59 by root, Mon Aug 13 16:14:20 2007 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#include "assert.h" 5#include <assert.h>
6#include "string.h" 6#include <string.h>
7#include "stdlib.h" 7#include <stdlib.h>
8#include "stdio.h" 8#include <stdio.h>
9#include <float.h>
9 10
10#if defined(__BORLANDC__) || defined(_MSC_VER) 11#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h 12# define snprintf _snprintf // C compilers have this in stdio.h
12#endif 13#endif
13 14
… …
25#define F_SPACE_BEFORE 0x00000020UL 26#define F_SPACE_BEFORE 0x00000020UL
26#define F_SPACE_AFTER 0x00000040UL 27#define F_SPACE_AFTER 0x00000040UL
27#define F_ALLOW_NONREF 0x00000100UL 28#define F_ALLOW_NONREF 0x00000100UL
28#define F_SHRINK 0x00000200UL 29#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL 30#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL // NYI 31#define F_CONV_BLESSED 0x00000800UL
31#define F_MAXDEPTH 0xf8000000UL 32#define F_MAXDEPTH 0xf8000000UL
32#define S_MAXDEPTH 27 33#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL 34#define F_MAXSIZE 0x01f00000UL
34#define S_MAXSIZE 20 35#define S_MAXSIZE 20
36#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
35 37
36#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 38#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
37#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE )) 39#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38 40
39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
… …
56#endif 58#endif
57 59
58#define expect_false(expr) expect ((expr) != 0, 0) 60#define expect_false(expr) expect ((expr) != 0, 0)
59#define expect_true(expr) expect ((expr) != 0, 1) 61#define expect_true(expr) expect ((expr) != 0, 1)
60 62
63#ifdef USE_ITHREADS
64# define JSON_SLOW 1
65# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
66#else
67# define JSON_SLOW 0
68# define JSON_STASH json_stash
69#endif
70
61static HV *json_stash, *json_boolean_stash; // JSON::XS:: 71static HV *json_stash, *json_boolean_stash; // JSON::XS::
62static SV *json_true, *json_false; 72static SV *json_true, *json_false;
63 73
64typedef struct { 74typedef struct {
65 U32 flags; 75 U32 flags;
76 SV *cb_object;
77 HV *cb_sk_object;
66} JSON; 78} JSON;
67 79
68///////////////////////////////////////////////////////////////////////////// 80/////////////////////////////////////////////////////////////////////////////
69// utility functions 81// utility functions
70 82
… …
303 encode_ch (enc, '['); encode_nl (enc); 315 encode_ch (enc, '['); encode_nl (enc);
304 ++enc->indent; 316 ++enc->indent;
305 317
306 for (i = 0; i <= len; ++i) 318 for (i = 0; i <= len; ++i)
307 { 319 {
320 SV **svp = av_fetch (av, i, 0);
321
308 encode_indent (enc); 322 encode_indent (enc);
309 encode_sv (enc, *av_fetch (av, i, 0)); 323
324 if (svp)
325 encode_sv (enc, *svp);
326 else
327 encode_str (enc, "null", 4, 0);
310 328
311 if (i < len) 329 if (i < len)
312 encode_comma (enc); 330 encode_comma (enc);
313 } 331 }
314 332
… …
468 SvGETMAGIC (sv); 486 SvGETMAGIC (sv);
469 svt = SvTYPE (sv); 487 svt = SvTYPE (sv);
470 488
471 if (expect_false (SvOBJECT (sv))) 489 if (expect_false (SvOBJECT (sv)))
472 { 490 {
491 HV *stash = !JSON_SLOW || json_boolean_stash
492 ? json_boolean_stash
493 : gv_stashpv ("JSON::XS::Boolean", 1);
494
473 if (SvSTASH (sv) == json_boolean_stash) 495 if (SvSTASH (sv) == stash)
474 { 496 {
475 if (SvIV (sv) == 0) 497 if (SvIV (sv))
498 encode_str (enc, "true", 4, 0);
499 else
476 encode_str (enc, "false", 5, 0); 500 encode_str (enc, "false", 5, 0);
477 else
478 encode_str (enc, "true", 4, 0);
479 } 501 }
480 else 502 else
481 { 503 {
482#if 0 504#if 0
483 if (0 && sv_derived_from (rv, "JSON::Literal")) 505 if (0 && sv_derived_from (rv, "JSON::Literal"))
… …
486 } 508 }
487#endif 509#endif
488 if (enc->json.flags & F_CONV_BLESSED) 510 if (enc->json.flags & F_CONV_BLESSED)
489 { 511 {
490 // we re-bless the reference to get overload and other niceties right 512 // we re-bless the reference to get overload and other niceties right
491 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 513 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
492 514
493 if (to_json) 515 if (to_json)
494 { 516 {
495 dSP; 517 dSP;
496 ENTER; 518
497 SAVETMPS;
498 PUSHMARK (SP); 519 ENTER; SAVETMPS; PUSHMARK (SP);
499 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 520 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
500 521
501 // calling with G_SCALAR ensures that we always get a 1 reutrn value 522 // calling with G_SCALAR ensures that we always get a 1 return value
502 // check anyways.
503 PUTBACK; 523 PUTBACK;
504 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 524 call_sv ((SV *)GvCV (to_json), G_SCALAR);
505 SPAGAIN; 525 SPAGAIN;
506 526
527 // catch this surprisingly common error
528 if (SvROK (TOPs) && SvRV (TOPs) == sv)
529 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
530
531 sv = POPs;
532 PUTBACK;
533
507 encode_sv (enc, POPs); 534 encode_sv (enc, sv);
508 535
509 FREETMPS; 536 FREETMPS; LEAVE;
510 LEAVE;
511 } 537 }
512 else if (enc->json.flags & F_ALLOW_BLESSED) 538 else if (enc->json.flags & F_ALLOW_BLESSED)
513 encode_str (enc, "null", 4, 0); 539 encode_str (enc, "null", 4, 0);
514 else 540 else
515 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it", 541 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
… …
526 encode_hv (enc, (HV *)sv); 552 encode_hv (enc, (HV *)sv);
527 else if (svt == SVt_PVAV) 553 else if (svt == SVt_PVAV)
528 encode_av (enc, (AV *)sv); 554 encode_av (enc, (AV *)sv);
529 else if (svt < SVt_PVAV) 555 else if (svt < SVt_PVAV)
530 { 556 {
531 if (SvNIOK (sv) && SvIV (sv) == 0) 557 STRLEN len = 0;
558 char *pv = svt ? SvPV (sv, len) : 0;
559
560 if (len == 1 && *pv == '1')
561 encode_str (enc, "true", 4, 0);
562 else if (len == 1 && *pv == '0')
532 encode_str (enc, "false", 5, 0); 563 encode_str (enc, "false", 5, 0);
533 else if (SvNIOK (sv) && SvIV (sv) == 1)
534 encode_str (enc, "true", 4, 0);
535 else 564 else
536 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 565 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
537 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 566 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
538 } 567 }
539 else 568 else
… …
920 is_nv = 1; 949 is_nv = 1;
921 } 950 }
922 951
923 if (!is_nv) 952 if (!is_nv)
924 { 953 {
954 int len = dec->cur - start;
955
925 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 956 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
926 if (*start == '-') 957 if (*start == '-')
927 switch (dec->cur - start) 958 switch (len)
928 { 959 {
929 case 2: return newSViv (-( start [1] - '0' * 1)); 960 case 2: return newSViv (-( start [1] - '0' * 1));
930 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 961 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
931 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 962 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
932 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 963 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
933 } 964 }
934 else 965 else
935 switch (dec->cur - start) 966 switch (len)
936 { 967 {
937 case 1: return newSViv ( start [0] - '0' * 1); 968 case 1: return newSViv ( start [0] - '0' * 1);
938 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 969 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
939 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 970 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
940 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 971 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
941 } 972 }
942 973
943 { 974 {
944 UV uv; 975 UV uv;
945 int numtype = grok_number (start, dec->cur - start, &uv); 976 int numtype = grok_number (start, len, &uv);
946 if (numtype & IS_NUMBER_IN_UV) 977 if (numtype & IS_NUMBER_IN_UV)
947 if (numtype & IS_NUMBER_NEG) 978 if (numtype & IS_NUMBER_NEG)
948 { 979 {
949 if (uv < (UV)IV_MIN) 980 if (uv < (UV)IV_MIN)
950 return newSViv (-(IV)uv); 981 return newSViv (-(IV)uv);
951 } 982 }
952 else 983 else
953 return newSVuv (uv); 984 return newSVuv (uv);
954
955 // here would likely be the place for bigint support
956 } 985 }
957 }
958 986
959 // if we ever support bigint or bigfloat, this is the place for bigfloat 987 len -= *start == '-' ? 1 : 0;
988
989 // does not fit into IV or UV, try NV
990 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
991 #if defined (LDBL_DIG)
992 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
993 #endif
994 )
995 // fits into NV without loss of precision
996 return newSVnv (Atof (start));
997
998 // everything else fails, convert it to a string
999 return newSVpvn (start, dec->cur - start);
1000 }
1001
1002 // loss of precision here
960 return newSVnv (Atof (start)); 1003 return newSVnv (Atof (start));
961 1004
962fail: 1005fail:
963 return 0; 1006 return 0;
964} 1007}
… …
1008} 1051}
1009 1052
1010static SV * 1053static SV *
1011decode_hv (dec_t *dec) 1054decode_hv (dec_t *dec)
1012{ 1055{
1056 SV *sv;
1013 HV *hv = newHV (); 1057 HV *hv = newHV ();
1014 1058
1015 DEC_INC_DEPTH; 1059 DEC_INC_DEPTH;
1016 decode_ws (dec); 1060 decode_ws (dec);
1017 1061
… …
1091 1135
1092 ++dec->cur; 1136 ++dec->cur;
1093 } 1137 }
1094 1138
1095 DEC_DEC_DEPTH; 1139 DEC_DEC_DEPTH;
1096 return newRV_noinc ((SV *)hv); 1140 sv = newRV_noinc ((SV *)hv);
1141
1142 // check filter callbacks
1143 if (dec->json.flags & F_HOOK)
1144 {
1145 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1146 {
1147 HE *cb, *he;
1148
1149 hv_iterinit (hv);
1150 he = hv_iternext (hv);
1151 hv_iterinit (hv);
1152
1153 // the next line creates a mortal sv each time its called.
1154 // might want to optimise this for common cases.
1155 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1156
1157 if (cb)
1158 {
1159 dSP;
1160 int count;
1161
1162 ENTER; SAVETMPS; PUSHMARK (SP);
1163 XPUSHs (HeVAL (he));
1164
1165 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1166
1167 if (count == 1)
1168 {
1169 sv = newSVsv (POPs);
1170 FREETMPS; LEAVE;
1171 return sv;
1172 }
1173
1174 FREETMPS; LEAVE;
1175 }
1176 }
1177
1178 if (dec->json.cb_object)
1179 {
1180 dSP;
1181 int count;
1182
1183 ENTER; SAVETMPS; PUSHMARK (SP);
1184 XPUSHs (sv_2mortal (sv));
1185
1186 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1187
1188 if (count == 1)
1189 {
1190 sv = newSVsv (POPs);
1191 FREETMPS; LEAVE;
1192 return sv;
1193 }
1194
1195 SvREFCNT_inc (sv);
1196 FREETMPS; LEAVE;
1197 }
1198 }
1199
1200 return sv;
1097 1201
1098fail: 1202fail:
1099 SvREFCNT_dec (hv); 1203 SvREFCNT_dec (hv);
1100 DEC_DEC_DEPTH; 1204 DEC_DEC_DEPTH;
1101 return 0; 1205 return 0;
… …
1187 dec.end = SvEND (string); 1291 dec.end = SvEND (string);
1188 dec.err = 0; 1292 dec.err = 0;
1189 dec.depth = 0; 1293 dec.depth = 0;
1190 dec.maxdepth = DEC_DEPTH (dec.json.flags); 1294 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1191 1295
1296 if (dec.json.cb_object || dec.json.cb_sk_object)
1297 dec.json.flags |= F_HOOK;
1298
1192 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1299 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1193 sv = decode_sv (&dec); 1300 sv = decode_sv (&dec);
1194 1301
1195 if (!(offset_return || !sv)) 1302 if (!(offset_return || !sv))
1196 { 1303 {
… …
1265 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1372 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1266} 1373}
1267 1374
1268PROTOTYPES: DISABLE 1375PROTOTYPES: DISABLE
1269 1376
1377void CLONE (...)
1378 CODE:
1379 json_stash = 0;
1380 json_boolean_stash = 0;
1381
1270void new (char *klass) 1382void new (char *klass)
1271 PPCODE: 1383 PPCODE:
1272{ 1384{
1273 SV *pv = NEWSV (0, sizeof (JSON)); 1385 SV *pv = NEWSV (0, sizeof (JSON));
1274 SvPOK_only (pv); 1386 SvPOK_only (pv);
1275 Zero (SvPVX (pv), 1, sizeof (JSON)); 1387 Zero (SvPVX (pv), 1, JSON);
1276 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1388 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1277 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash))); 1389 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1278} 1390}
1279 1391
1280void ascii (JSON *self, int enable = 1) 1392void ascii (JSON *self, int enable = 1)
1281 ALIAS: 1393 ALIAS:
1282 ascii = F_ASCII 1394 ascii = F_ASCII
… …
1330 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE); 1442 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1331 1443
1332 XPUSHs (ST (0)); 1444 XPUSHs (ST (0));
1333} 1445}
1334 1446
1447void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1448 PPCODE:
1449{
1450 SvREFCNT_dec (self->cb_object);
1451 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1452
1453 XPUSHs (ST (0));
1454}
1455
1456void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1457 PPCODE:
1458{
1459 if (!self->cb_sk_object)
1460 self->cb_sk_object = newHV ();
1461
1462 if (SvOK (cb))
1463 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1464 else
1465 {
1466 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1467
1468 if (!HvKEYS (self->cb_sk_object))
1469 {
1470 SvREFCNT_dec (self->cb_sk_object);
1471 self->cb_sk_object = 0;
1472 }
1473 }
1474
1475 XPUSHs (ST (0));
1476}
1477
1335void encode (JSON *self, SV *scalar) 1478void encode (JSON *self, SV *scalar)
1336 PPCODE: 1479 PPCODE:
1337 XPUSHs (encode_json (scalar, self)); 1480 XPUSHs (encode_json (scalar, self));
1338 1481
1339void decode (JSON *self, SV *jsonstr) 1482void decode (JSON *self, SV *jsonstr)
… …
1347 EXTEND (SP, 2); 1490 EXTEND (SP, 2);
1348 PUSHs (decode_json (jsonstr, self, &offset)); 1491 PUSHs (decode_json (jsonstr, self, &offset));
1349 PUSHs (sv_2mortal (newSVuv (offset))); 1492 PUSHs (sv_2mortal (newSVuv (offset)));
1350} 1493}
1351 1494
1495void DESTROY (JSON *self)
1496 CODE:
1497 SvREFCNT_dec (self->cb_sk_object);
1498 SvREFCNT_dec (self->cb_object);
1499
1352PROTOTYPES: ENABLE 1500PROTOTYPES: ENABLE
1353 1501
1354void to_json (SV *scalar) 1502void to_json (SV *scalar)
1355 PPCODE: 1503 PPCODE:
1356{ 1504{

Diff Legend

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