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.43 by root, Sat Jun 23 23:49:29 2007 UTC vs.
Revision 1.45 by root, Mon Jun 25 06:57:42 2007 UTC

… …
15// guarentees, though. if it breaks, you get to keep the pieces. 15// guarentees, though. if it breaks, you get to keep the pieces.
16#ifndef UTF8_MAXBYTES 16#ifndef UTF8_MAXBYTES
17# define UTF8_MAXBYTES 13 17# define UTF8_MAXBYTES 13
18#endif 18#endif
19 19
20#define F_ASCII 0x00000001UL 20#define F_ASCII 0x00000001UL
21#define F_LATIN1 0x00000002UL 21#define F_LATIN1 0x00000002UL
22#define F_UTF8 0x00000004UL 22#define F_UTF8 0x00000004UL
23#define F_INDENT 0x00000008UL 23#define F_INDENT 0x00000008UL
24#define F_CANONICAL 0x00000010UL 24#define F_CANONICAL 0x00000010UL
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
30#define F_CONV_BLESSED 0x00000800UL // NYI
29#define F_MAXDEPTH 0xf8000000UL 31#define F_MAXDEPTH 0xf8000000UL
30#define S_MAXDEPTH 27 32#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL
34#define S_MAXSIZE 20
31 35
32#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 36#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
33 37#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
34// F_SELFCONVERT? <=> to_json/toJson
35// F_BLESSED? <=> { $__class__$ => }
36 38
37#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
38#define F_DEFAULT (9UL << S_MAXDEPTH) 40#define F_DEFAULT (9UL << S_MAXDEPTH)
39 41
40#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
… …
54#endif 56#endif
55 57
56#define expect_false(expr) expect ((expr) != 0, 0) 58#define expect_false(expr) expect ((expr) != 0, 0)
57#define expect_true(expr) expect ((expr) != 0, 1) 59#define expect_true(expr) expect ((expr) != 0, 1)
58 60
59static HV *json_stash; // JSON::XS:: 61static HV *json_stash, *json_boolean_stash; // JSON::XS::
60static SV *json_true, *json_false; 62static SV *json_true, *json_false;
61 63
62///////////////////////////////////////////////////////////////////////////// 64/////////////////////////////////////////////////////////////////////////////
63// utility functions 65// utility functions
64 66
… …
469 svtype svt; 471 svtype svt;
470 472
471 SvGETMAGIC (sv); 473 SvGETMAGIC (sv);
472 svt = SvTYPE (sv); 474 svt = SvTYPE (sv);
473 475
476 if (expect_false (SvOBJECT (sv)))
477 {
478 if (SvSTASH (sv) == json_boolean_stash)
479 {
480 if (SvIV (sv) == 0)
481 encode_str (enc, "false", 5, 0);
482 else
483 encode_str (enc, "true", 4, 0);
484 }
485 else
486 {
487#if 0
488 if (0 && sv_derived_from (rv, "JSON::Literal"))
489 {
490 // not yet
491 }
492#endif
493 if (enc->flags & F_CONV_BLESSED)
494 {
495 // we re-bless the reference to get overload and other niceties right
496 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
497
498 if (to_json)
499 {
500 dSP;
501 ENTER;
502 SAVETMPS;
503 PUSHMARK (SP);
504 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
505
506 // calling with G_SCALAR ensures that we always get a 1 reutrn value
507 // check anyways.
508 PUTBACK;
509 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
510 SPAGAIN;
511
512 encode_sv (enc, POPs);
513
514 FREETMPS;
515 LEAVE;
516 }
517 else if (enc->flags & F_ALLOW_BLESSED)
518 encode_str (enc, "null", 4, 0);
519 else
520 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
521 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
522 }
523 else if (enc->flags & F_ALLOW_BLESSED)
524 encode_str (enc, "null", 4, 0);
525 else
526 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
527 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
528 }
529 }
474 if (svt == SVt_PVHV) 530 else if (svt == SVt_PVHV)
475 encode_hv (enc, (HV *)sv); 531 encode_hv (enc, (HV *)sv);
476 else if (svt == SVt_PVAV) 532 else if (svt == SVt_PVAV)
477 encode_av (enc, (AV *)sv); 533 encode_av (enc, (AV *)sv);
478 else if (svt < SVt_PVAV) 534 else if (svt < SVt_PVAV)
479 { 535 {
… …
1080 SV *sv; 1136 SV *sv;
1081 1137
1082 SvGETMAGIC (string); 1138 SvGETMAGIC (string);
1083 SvUPGRADE (string, SVt_PV); 1139 SvUPGRADE (string, SVt_PV);
1084 1140
1141 if (flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (flags))
1142 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1143 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (flags));
1144
1085 if (flags & F_UTF8) 1145 if (flags & F_UTF8)
1086 sv_utf8_downgrade (string, 0); 1146 sv_utf8_downgrade (string, 0);
1087 else 1147 else
1088 sv_utf8_upgrade (string); 1148 sv_utf8_upgrade (string);
1089 1149
… …
1163 i >= '0' && i <= '9' ? i - '0' 1223 i >= '0' && i <= '9' ? i - '0'
1164 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1224 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1165 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1225 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1166 : -1; 1226 : -1;
1167 1227
1168 json_stash = gv_stashpv ("JSON::XS", 1); 1228 json_stash = gv_stashpv ("JSON::XS" , 1);
1229 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1169 1230
1170 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1231 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1171 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1232 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1172} 1233}
1173 1234
… …
1179 OUTPUT: 1240 OUTPUT:
1180 RETVAL 1241 RETVAL
1181 1242
1182SV *ascii (SV *self, int enable = 1) 1243SV *ascii (SV *self, int enable = 1)
1183 ALIAS: 1244 ALIAS:
1184 ascii = F_ASCII 1245 ascii = F_ASCII
1185 latin1 = F_LATIN1 1246 latin1 = F_LATIN1
1186 utf8 = F_UTF8 1247 utf8 = F_UTF8
1187 indent = F_INDENT 1248 indent = F_INDENT
1188 canonical = F_CANONICAL 1249 canonical = F_CANONICAL
1189 space_before = F_SPACE_BEFORE 1250 space_before = F_SPACE_BEFORE
1190 space_after = F_SPACE_AFTER 1251 space_after = F_SPACE_AFTER
1191 pretty = F_PRETTY 1252 pretty = F_PRETTY
1192 allow_nonref = F_ALLOW_NONREF 1253 allow_nonref = F_ALLOW_NONREF
1193 shrink = F_SHRINK 1254 shrink = F_SHRINK
1255 allow_blessed = F_ALLOW_BLESSED
1256 convert_blessed = F_CONV_BLESSED
1194 CODE: 1257 CODE:
1195{ 1258{
1196 UV *uv = SvJSON (self); 1259 UV *uv = SvJSON (self);
1197 if (enable) 1260 if (enable)
1198 *uv |= ix; 1261 *uv |= ix;
… …
1220 RETVAL = newSVsv (self); 1283 RETVAL = newSVsv (self);
1221} 1284}
1222 OUTPUT: 1285 OUTPUT:
1223 RETVAL 1286 RETVAL
1224 1287
1288SV *max_size (SV *self, UV max_size = 0)
1289 CODE:
1290{
1291 UV *uv = SvJSON (self);
1292 UV log2 = 0;
1293
1294 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1295 if (max_size == 1) max_size = 2;
1296
1297 while ((1UL << log2) < max_size)
1298 ++log2;
1299
1300 *uv = *uv & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1301
1302 RETVAL = newSVsv (self);
1303}
1304 OUTPUT:
1305 RETVAL
1306
1225void encode (SV *self, SV *scalar) 1307void encode (SV *self, SV *scalar)
1226 PPCODE: 1308 PPCODE:
1227 XPUSHs (encode_json (scalar, *SvJSON (self))); 1309 XPUSHs (encode_json (scalar, *SvJSON (self)));
1228 1310
1229void decode (SV *self, SV *jsonstr) 1311void decode (SV *self, SV *jsonstr)

Diff Legend

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