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

Diff Legend

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