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.41 by root, Sat Jun 23 22:53:16 2007 UTC vs.
Revision 1.48 by root, Sun Jul 1 22:20:00 2007 UTC

10#if defined(__BORLANDC__) || defined(_MSC_VER) 10#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h 11# define snprintf _snprintf // C compilers have this in stdio.h
12#endif 12#endif
13 13
14// some old perls do not have this, try to make it work, no 14// some old perls do not have this, try to make it work, no
15// guarentees, though. 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::
62static SV *json_true, *json_false;
63
64typedef struct {
65 U32 flags;
66} JSON;
60 67
61///////////////////////////////////////////////////////////////////////////// 68/////////////////////////////////////////////////////////////////////////////
62// utility functions 69// utility functions
63 70
64static UV * 71inline void
65SvJSON (SV *sv)
66{
67 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
68 croak ("object is not of type JSON::XS");
69
70 return &SvUVX (SvRV (sv));
71}
72
73static void
74shrink (SV *sv) 72shrink (SV *sv)
75{ 73{
76 sv_utf8_downgrade (sv, 1); 74 sv_utf8_downgrade (sv, 1);
77 if (SvLEN (sv) > SvCUR (sv) + 1) 75 if (SvLEN (sv) > SvCUR (sv) + 1)
78 { 76 {
113typedef struct 111typedef struct
114{ 112{
115 char *cur; // SvPVX (sv) + current output position 113 char *cur; // SvPVX (sv) + current output position
116 char *end; // SvEND (sv) 114 char *end; // SvEND (sv)
117 SV *sv; // result scalar 115 SV *sv; // result scalar
118 U32 flags; // F_* 116 JSON json;
119 U32 indent; // indentation level 117 U32 indent; // indentation level
120 U32 maxdepth; // max. indentation/recursion level 118 U32 maxdepth; // max. indentation/recursion level
121} enc_t; 119} enc_t;
122 120
123inline void 121inline void
197 } 195 }
198 196
199 if (uch > 0x10FFFFUL) 197 if (uch > 0x10FFFFUL)
200 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 198 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
201 199
202 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF)) 200 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
203 { 201 {
204 if (uch > 0xFFFFUL) 202 if (uch > 0xFFFFUL)
205 { 203 {
206 need (enc, len += 11); 204 need (enc, len += 11);
207 sprintf (enc->cur, "\\u%04x\\u%04x", 205 sprintf (enc->cur, "\\u%04x\\u%04x",
221 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 219 *enc->cur++ = hexdigit [(uch >> 0) & 15];
222 } 220 }
223 221
224 str += clen; 222 str += clen;
225 } 223 }
226 else if (enc->flags & F_LATIN1) 224 else if (enc->json.flags & F_LATIN1)
227 { 225 {
228 *enc->cur++ = uch; 226 *enc->cur++ = uch;
229 str += clen; 227 str += clen;
230 } 228 }
231 else if (is_utf8) 229 else if (is_utf8)
252} 250}
253 251
254inline void 252inline void
255encode_indent (enc_t *enc) 253encode_indent (enc_t *enc)
256{ 254{
257 if (enc->flags & F_INDENT) 255 if (enc->json.flags & F_INDENT)
258 { 256 {
259 int spaces = enc->indent * INDENT_STEP; 257 int spaces = enc->indent * INDENT_STEP;
260 258
261 need (enc, spaces); 259 need (enc, spaces);
262 memset (enc->cur, ' ', spaces); 260 memset (enc->cur, ' ', spaces);
272} 270}
273 271
274inline void 272inline void
275encode_nl (enc_t *enc) 273encode_nl (enc_t *enc)
276{ 274{
277 if (enc->flags & F_INDENT) 275 if (enc->json.flags & F_INDENT)
278 { 276 {
279 need (enc, 1); 277 need (enc, 1);
280 encode_ch (enc, '\n'); 278 encode_ch (enc, '\n');
281 } 279 }
282} 280}
284inline void 282inline void
285encode_comma (enc_t *enc) 283encode_comma (enc_t *enc)
286{ 284{
287 encode_ch (enc, ','); 285 encode_ch (enc, ',');
288 286
289 if (enc->flags & F_INDENT) 287 if (enc->json.flags & F_INDENT)
290 encode_nl (enc); 288 encode_nl (enc);
291 else if (enc->flags & F_SPACE_AFTER) 289 else if (enc->json.flags & F_SPACE_AFTER)
292 encode_space (enc); 290 encode_space (enc);
293} 291}
294 292
295static void encode_sv (enc_t *enc, SV *sv); 293static void encode_sv (enc_t *enc, SV *sv);
296 294
339 else 337 else
340 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 338 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
341 339
342 encode_ch (enc, '"'); 340 encode_ch (enc, '"');
343 341
344 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 342 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
345 encode_ch (enc, ':'); 343 encode_ch (enc, ':');
346 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 344 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
347 encode_sv (enc, HeVAL (he)); 345 encode_sv (enc, HeVAL (he));
348} 346}
349 347
350// compare hash entries, used when all keys are bytestrings 348// compare hash entries, used when all keys are bytestrings
351static int 349static int
386 { 384 {
387 // for canonical output we have to sort by keys first 385 // for canonical output we have to sort by keys first
388 // actually, this is mostly due to the stupid so-called 386 // actually, this is mostly due to the stupid so-called
389 // security workaround added somewhere in 5.8.x. 387 // security workaround added somewhere in 5.8.x.
390 // that randomises hash orderings 388 // that randomises hash orderings
391 if (enc->flags & F_CANONICAL) 389 if (enc->json.flags & F_CANONICAL)
392 { 390 {
393 int fast = 1; 391 int fast = 1;
394 HE *he; 392 HE *he;
395#if defined(__BORLANDC__) || defined(_MSC_VER) 393#if defined(__BORLANDC__) || defined(_MSC_VER)
396 HE **hes = _alloca (count * sizeof (HE)); 394 HE **hes = _alloca (count * sizeof (HE));
468 svtype svt; 466 svtype svt;
469 467
470 SvGETMAGIC (sv); 468 SvGETMAGIC (sv);
471 svt = SvTYPE (sv); 469 svt = SvTYPE (sv);
472 470
471 if (expect_false (SvOBJECT (sv)))
472 {
473 if (SvSTASH (sv) == json_boolean_stash)
474 {
475 if (SvIV (sv) == 0)
476 encode_str (enc, "false", 5, 0);
477 else
478 encode_str (enc, "true", 4, 0);
479 }
480 else
481 {
482#if 0
483 if (0 && sv_derived_from (rv, "JSON::Literal"))
484 {
485 // not yet
486 }
487#endif
488 if (enc->json.flags & F_CONV_BLESSED)
489 {
490 // we re-bless the reference to get overload and other niceties right
491 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
492
493 if (to_json)
494 {
495 dSP;
496 ENTER;
497 SAVETMPS;
498 PUSHMARK (SP);
499 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
500
501 // calling with G_SCALAR ensures that we always get a 1 reutrn value
502 // check anyways.
503 PUTBACK;
504 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
505 SPAGAIN;
506
507 encode_sv (enc, POPs);
508
509 FREETMPS;
510 LEAVE;
511 }
512 else if (enc->json.flags & F_ALLOW_BLESSED)
513 encode_str (enc, "null", 4, 0);
514 else
515 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
516 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
517 }
518 else if (enc->json.flags & F_ALLOW_BLESSED)
519 encode_str (enc, "null", 4, 0);
520 else
521 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
522 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
523 }
524 }
473 if (svt == SVt_PVHV) 525 else if (svt == SVt_PVHV)
474 encode_hv (enc, (HV *)sv); 526 encode_hv (enc, (HV *)sv);
475 else if (svt == SVt_PVAV) 527 else if (svt == SVt_PVAV)
476 encode_av (enc, (AV *)sv); 528 encode_av (enc, (AV *)sv);
477 else if (svt < SVt_PVAV) 529 else if (svt < SVt_PVAV)
478 { 530 {
557 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 609 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
558 SvPV_nolen (sv), SvFLAGS (sv)); 610 SvPV_nolen (sv), SvFLAGS (sv));
559} 611}
560 612
561static SV * 613static SV *
562encode_json (SV *scalar, U32 flags) 614encode_json (SV *scalar, JSON *json)
563{ 615{
564 enc_t enc; 616 enc_t enc;
565 617
566 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 618 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
567 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 619 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
568 620
569 enc.flags = flags; 621 enc.json = *json;
570 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 622 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
571 enc.cur = SvPVX (enc.sv); 623 enc.cur = SvPVX (enc.sv);
572 enc.end = SvEND (enc.sv); 624 enc.end = SvEND (enc.sv);
573 enc.indent = 0; 625 enc.indent = 0;
574 enc.maxdepth = DEC_DEPTH (flags); 626 enc.maxdepth = DEC_DEPTH (enc.json.flags);
575 627
576 SvPOK_only (enc.sv); 628 SvPOK_only (enc.sv);
577 encode_sv (&enc, scalar); 629 encode_sv (&enc, scalar);
578 630
579 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 631 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
580 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 632 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
581 633
582 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 634 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
583 SvUTF8_on (enc.sv); 635 SvUTF8_on (enc.sv);
584 636
585 if (enc.flags & F_SHRINK) 637 if (enc.json.flags & F_SHRINK)
586 shrink (enc.sv); 638 shrink (enc.sv);
587 639
588 return enc.sv; 640 return enc.sv;
589} 641}
590 642
595typedef struct 647typedef struct
596{ 648{
597 char *cur; // current parser pointer 649 char *cur; // current parser pointer
598 char *end; // end of input string 650 char *end; // end of input string
599 const char *err; // parse error, if != 0 651 const char *err; // parse error, if != 0
600 U32 flags; // F_* 652 JSON json;
601 U32 depth; // recursion depth 653 U32 depth; // recursion depth
602 U32 maxdepth; // recursion depth limit 654 U32 maxdepth; // recursion depth limit
603} dec_t; 655} dec_t;
604 656
605inline void 657inline void
966 if (*dec->cur == '}') 1018 if (*dec->cur == '}')
967 ++dec->cur; 1019 ++dec->cur;
968 else 1020 else
969 for (;;) 1021 for (;;)
970 { 1022 {
971 SV *key, *value;
972
973 decode_ws (dec); EXPECT_CH ('"'); 1023 decode_ws (dec); EXPECT_CH ('"');
974 1024
975 key = decode_str (dec); 1025 // heuristic: assume that
976 if (!key) 1026 // a) decode_str + hv_store_ent are abysmally slow.
977 goto fail; 1027 // b) most hash keys are short, simple ascii text.
1028 // => try to "fast-match" such strings to avoid
1029 // the overhead of decode_str + hv_store_ent.
1030 {
1031 SV *value;
1032 char *p = dec->cur;
1033 char *e = p + 24; // only try up to 24 bytes
978 1034
979 decode_ws (dec); EXPECT_CH (':'); 1035 for (;;)
980
981 value = decode_sv (dec);
982 if (!value)
983 { 1036 {
1037 // the >= 0x80 is true on most architectures
1038 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1039 {
1040 // slow path, back up and use decode_str
1041 SV *key = decode_str (dec);
1042 if (!key)
1043 goto fail;
1044
1045 decode_ws (dec); EXPECT_CH (':');
1046
1047 value = decode_sv (dec);
1048 if (!value)
1049 {
1050 SvREFCNT_dec (key);
1051 goto fail;
1052 }
1053
1054 hv_store_ent (hv, key, value, 0);
984 SvREFCNT_dec (key); 1055 SvREFCNT_dec (key);
1056
1057 break;
1058 }
1059 else if (*p == '"')
1060 {
1061 // fast path, got a simple key
1062 char *key = dec->cur;
1063 int len = p - key;
1064 dec->cur = p + 1;
1065
1066 decode_ws (dec); EXPECT_CH (':');
1067
1068 value = decode_sv (dec);
1069 if (!value)
985 goto fail; 1070 goto fail;
1071
1072 hv_store (hv, key, len, value, 0);
1073
1074 break;
1075 }
1076
1077 ++p;
986 } 1078 }
987 1079 }
988 hv_store_ent (hv, key, value, 0);
989 SvREFCNT_dec (key);
990 1080
991 decode_ws (dec); 1081 decode_ws (dec);
992 1082
993 if (*dec->cur == '}') 1083 if (*dec->cur == '}')
994 { 1084 {
1031 1121
1032 case 't': 1122 case 't':
1033 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1123 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1034 { 1124 {
1035 dec->cur += 4; 1125 dec->cur += 4;
1036 return newSViv (1); 1126 return SvREFCNT_inc (json_true);
1037 } 1127 }
1038 else 1128 else
1039 ERR ("'true' expected"); 1129 ERR ("'true' expected");
1040 1130
1041 break; 1131 break;
1042 1132
1043 case 'f': 1133 case 'f':
1044 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1134 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1045 { 1135 {
1046 dec->cur += 5; 1136 dec->cur += 5;
1047 return newSViv (0); 1137 return SvREFCNT_inc (json_false);
1048 } 1138 }
1049 else 1139 else
1050 ERR ("'false' expected"); 1140 ERR ("'false' expected");
1051 1141
1052 break; 1142 break;
1070fail: 1160fail:
1071 return 0; 1161 return 0;
1072} 1162}
1073 1163
1074static SV * 1164static SV *
1075decode_json (SV *string, U32 flags, UV *offset_return) 1165decode_json (SV *string, JSON *json, UV *offset_return)
1076{ 1166{
1077 dec_t dec; 1167 dec_t dec;
1078 UV offset; 1168 UV offset;
1079 SV *sv; 1169 SV *sv;
1080 1170
1081 SvGETMAGIC (string); 1171 SvGETMAGIC (string);
1082 SvUPGRADE (string, SVt_PV); 1172 SvUPGRADE (string, SVt_PV);
1083 1173
1174 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1175 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1176 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1177
1084 if (flags & F_UTF8) 1178 if (json->flags & F_UTF8)
1085 sv_utf8_downgrade (string, 0); 1179 sv_utf8_downgrade (string, 0);
1086 else 1180 else
1087 sv_utf8_upgrade (string); 1181 sv_utf8_upgrade (string);
1088 1182
1089 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1183 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1090 1184
1091 dec.flags = flags; 1185 dec.json = *json;
1092 dec.cur = SvPVX (string); 1186 dec.cur = SvPVX (string);
1093 dec.end = SvEND (string); 1187 dec.end = SvEND (string);
1094 dec.err = 0; 1188 dec.err = 0;
1095 dec.depth = 0; 1189 dec.depth = 0;
1096 dec.maxdepth = DEC_DEPTH (dec.flags); 1190 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1097 1191
1098 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1192 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1099 sv = decode_sv (&dec); 1193 sv = decode_sv (&dec);
1100 1194
1101 if (!(offset_return || !sv)) 1195 if (!(offset_return || !sv))
1111 } 1205 }
1112 } 1206 }
1113 1207
1114 if (offset_return || !sv) 1208 if (offset_return || !sv)
1115 { 1209 {
1116 offset = dec.flags & F_UTF8 1210 offset = dec.json.flags & F_UTF8
1117 ? dec.cur - SvPVX (string) 1211 ? dec.cur - SvPVX (string)
1118 : utf8_distance (dec.cur, SvPVX (string)); 1212 : utf8_distance (dec.cur, SvPVX (string));
1119 1213
1120 if (offset_return) 1214 if (offset_return)
1121 *offset_return = offset; 1215 *offset_return = offset;
1140 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1234 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1141 } 1235 }
1142 1236
1143 sv = sv_2mortal (sv); 1237 sv = sv_2mortal (sv);
1144 1238
1145 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1239 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1146 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1240 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1147 1241
1148 return sv; 1242 return sv;
1149} 1243}
1150 1244
1162 i >= '0' && i <= '9' ? i - '0' 1256 i >= '0' && i <= '9' ? i - '0'
1163 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1257 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1164 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1258 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1165 : -1; 1259 : -1;
1166 1260
1167 json_stash = gv_stashpv ("JSON::XS", 1); 1261 json_stash = gv_stashpv ("JSON::XS" , 1);
1262 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1263
1264 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1265 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1168} 1266}
1169 1267
1170PROTOTYPES: DISABLE 1268PROTOTYPES: DISABLE
1171 1269
1172SV *new (char *dummy) 1270void new (char *klass)
1173 CODE: 1271 PPCODE:
1174 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1272{
1175 OUTPUT: 1273 SV *pv = NEWSV (0, sizeof (JSON));
1176 RETVAL 1274 SvPOK_only (pv);
1275 Zero (SvPVX (pv), 1, sizeof (JSON));
1276 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1277 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
1278}
1177 1279
1178SV *ascii (SV *self, int enable = 1) 1280void ascii (JSON *self, int enable = 1)
1179 ALIAS: 1281 ALIAS:
1180 ascii = F_ASCII 1282 ascii = F_ASCII
1181 latin1 = F_LATIN1 1283 latin1 = F_LATIN1
1182 utf8 = F_UTF8 1284 utf8 = F_UTF8
1183 indent = F_INDENT 1285 indent = F_INDENT
1184 canonical = F_CANONICAL 1286 canonical = F_CANONICAL
1185 space_before = F_SPACE_BEFORE 1287 space_before = F_SPACE_BEFORE
1186 space_after = F_SPACE_AFTER 1288 space_after = F_SPACE_AFTER
1187 pretty = F_PRETTY 1289 pretty = F_PRETTY
1188 allow_nonref = F_ALLOW_NONREF 1290 allow_nonref = F_ALLOW_NONREF
1189 shrink = F_SHRINK 1291 shrink = F_SHRINK
1292 allow_blessed = F_ALLOW_BLESSED
1293 convert_blessed = F_CONV_BLESSED
1190 CODE: 1294 PPCODE:
1191{ 1295{
1192 UV *uv = SvJSON (self);
1193 if (enable) 1296 if (enable)
1194 *uv |= ix; 1297 self->flags |= ix;
1195 else 1298 else
1196 *uv &= ~ix; 1299 self->flags &= ~ix;
1197 1300
1198 RETVAL = newSVsv (self); 1301 XPUSHs (ST (0));
1199} 1302}
1200 OUTPUT:
1201 RETVAL
1202 1303
1203SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1304void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1204 CODE: 1305 PPCODE:
1205{ 1306{
1206 UV *uv = SvJSON (self);
1207 UV log2 = 0; 1307 UV log2 = 0;
1208 1308
1209 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1309 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1210 1310
1211 while ((1UL << log2) < max_depth) 1311 while ((1UL << log2) < max_depth)
1212 ++log2; 1312 ++log2;
1213 1313
1214 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1314 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1215 1315
1216 RETVAL = newSVsv (self); 1316 XPUSHs (ST (0));
1217} 1317}
1218 OUTPUT:
1219 RETVAL
1220 1318
1221void encode (SV *self, SV *scalar) 1319void max_size (JSON *self, UV max_size = 0)
1222 PPCODE: 1320 PPCODE:
1223 XPUSHs (encode_json (scalar, *SvJSON (self))); 1321{
1322 UV log2 = 0;
1224 1323
1324 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1325 if (max_size == 1) max_size = 2;
1326
1327 while ((1UL << log2) < max_size)
1328 ++log2;
1329
1330 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1331
1332 XPUSHs (ST (0));
1333}
1334
1225void decode (SV *self, SV *jsonstr) 1335void encode (JSON *self, SV *scalar)
1226 PPCODE: 1336 PPCODE:
1337 XPUSHs (encode_json (scalar, self));
1338
1339void decode (JSON *self, SV *jsonstr)
1340 PPCODE:
1227 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0)); 1341 XPUSHs (decode_json (jsonstr, self, 0));
1228 1342
1229void decode_prefix (SV *self, SV *jsonstr) 1343void decode_prefix (JSON *self, SV *jsonstr)
1230 PPCODE: 1344 PPCODE:
1231{ 1345{
1232 UV offset; 1346 UV offset;
1233 EXTEND (SP, 2); 1347 EXTEND (SP, 2);
1234 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset)); 1348 PUSHs (decode_json (jsonstr, self, &offset));
1235 PUSHs (sv_2mortal (newSVuv (offset))); 1349 PUSHs (sv_2mortal (newSVuv (offset)));
1236} 1350}
1237 1351
1238PROTOTYPES: ENABLE 1352PROTOTYPES: ENABLE
1239 1353
1240void to_json (SV *scalar) 1354void to_json (SV *scalar)
1241 ALIAS:
1242 objToJson = 0
1243 PPCODE: 1355 PPCODE:
1356{
1357 JSON json = { F_DEFAULT | F_UTF8 };
1244 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1358 XPUSHs (encode_json (scalar, &json));
1359}
1245 1360
1246void from_json (SV *jsonstr) 1361void from_json (SV *jsonstr)
1247 ALIAS:
1248 jsonToObj = 0
1249 PPCODE: 1362 PPCODE:
1363{
1364 JSON json = { F_DEFAULT | F_UTF8 };
1250 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0)); 1365 XPUSHs (decode_json (jsonstr, &json, 0));
1366}
1251 1367

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines