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.5 by root, Thu Mar 22 23:24:18 2007 UTC vs.
Revision 1.32 by root, Wed May 9 16:41:12 2007 UTC

… …
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 9
10#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h
12#endif
13
9#define F_ASCII 0x00000001 14#define F_ASCII 0x00000001UL
15#define F_LATIN1 0x00000002UL
10#define F_UTF8 0x00000002 16#define F_UTF8 0x00000004UL
11#define F_INDENT 0x00000004 17#define F_INDENT 0x00000008UL
12#define F_CANONICAL 0x00000008 18#define F_CANONICAL 0x00000010UL
13#define F_SPACE_BEFORE 0x00000010 19#define F_SPACE_BEFORE 0x00000020UL
14#define F_SPACE_AFTER 0x00000020 20#define F_SPACE_AFTER 0x00000040UL
15#define F_JSON_RPC 0x00000040
16#define F_ALLOW_NONREF 0x00000080 21#define F_ALLOW_NONREF 0x00000100UL
22#define F_SHRINK 0x00000200UL
23#define F_MAXDEPTH 0xf8000000UL
24#define S_MAXDEPTH 27
25
26#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
27
28// F_SELFCONVERT? <=> to_json/toJson
29// F_BLESSED? <=> { $__class__$ => }
17 30
18#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 31#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
19#define F_DEFAULT 0 32#define F_DEFAULT (9UL << S_MAXDEPTH)
20 33
21#define INIT_SIZE 32 // initial scalar size to be allocated 34#define INIT_SIZE 32 // initial scalar size to be allocated
35#define INDENT_STEP 3 // spaces per indentation level
36
37#define SHORT_STRING_LEN 512 // special-case strings of up to this size
22 38
23#define SB do { 39#define SB do {
24#define SE } while (0) 40#define SE } while (0)
25 41
26static HV *json_stash; 42static HV *json_stash; // JSON::XS::
43
44/////////////////////////////////////////////////////////////////////////////
45// utility functions
46
47static UV *
48SvJSON (SV *sv)
49{
50 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
51 croak ("object is not of type JSON::XS");
52
53 return &SvUVX (SvRV (sv));
54}
55
56static void
57shrink (SV *sv)
58{
59 sv_utf8_downgrade (sv, 1);
60 if (SvLEN (sv) > SvCUR (sv) + 1)
61 {
62#ifdef SvPV_shrink_to_cur
63 SvPV_shrink_to_cur (sv);
64#elif defined (SvPV_renew)
65 SvPV_renew (sv, SvCUR (sv) + 1);
66#endif
67 }
68}
69
70// decode an utf-8 character and return it, or (UV)-1 in
71// case of an error.
72// we special-case "safe" characters from U+80 .. U+7FF,
73// but use the very good perl function to parse anything else.
74// note that we never call this function for a ascii codepoints
75static UV
76decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
77{
78 if (s[0] > 0xdf || s[0] < 0xc2)
79 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
80 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
81 {
82 *clen = 2;
83 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
84 }
85 else
86 {
87 *clen = (STRLEN)-1;
88 return (UV)-1;
89 }
90}
91
92/////////////////////////////////////////////////////////////////////////////
93// encoder
27 94
28// structure used for encoding JSON 95// structure used for encoding JSON
29typedef struct 96typedef struct
30{ 97{
31 char *cur; 98 char *cur; // SvPVX (sv) + current output position
32 STRLEN len; // SvLEN (sv)
33 char *end; // SvEND (sv) 99 char *end; // SvEND (sv)
34 SV *sv; 100 SV *sv; // result scalar
35 UV flags; 101 U32 flags; // F_*
36 int max_recurse; 102 U32 indent; // indentation level
37 int indent; 103 U32 maxdepth; // max. indentation/recursion level
38} enc_t; 104} enc_t;
39
40// structure used for decoding JSON
41typedef struct
42{
43 char *cur;
44 char *end;
45 const char *err;
46 UV flags;
47} dec_t;
48
49static UV *
50SvJSON (SV *sv)
51{
52 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
53 croak ("object is not of type JSON::XS");
54
55 return &SvUVX (SvRV (sv));
56}
57
58/////////////////////////////////////////////////////////////////////////////
59 105
60static void 106static void
61need (enc_t *enc, STRLEN len) 107need (enc_t *enc, STRLEN len)
62{ 108{
63 if (enc->cur + len >= enc->end) 109 if (enc->cur + len >= enc->end)
64 { 110 {
65 STRLEN cur = enc->cur - SvPVX (enc->sv); 111 STRLEN cur = enc->cur - SvPVX (enc->sv);
66 SvGROW (enc->sv, cur + len + 1); 112 SvGROW (enc->sv, cur + len + 1);
67 enc->cur = SvPVX (enc->sv) + cur; 113 enc->cur = SvPVX (enc->sv) + cur;
68 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv); 114 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
69 } 115 }
70} 116}
71 117
72static void 118static void
73encode_ch (enc_t *enc, char ch) 119encode_ch (enc_t *enc, char ch)
… …
85 131
86 while (str < end) 132 while (str < end)
87 { 133 {
88 unsigned char ch = *(unsigned char *)str; 134 unsigned char ch = *(unsigned char *)str;
89 135
90 if (ch == '"') 136 if (ch >= 0x20 && ch < 0x80) // most common case
91 { 137 {
138 if (ch == '"') // but with slow exceptions
139 {
92 need (enc, len += 1); 140 need (enc, len += 1);
93 *enc->cur++ = '\\'; 141 *enc->cur++ = '\\';
94 *enc->cur++ = '"'; 142 *enc->cur++ = '"';
95 ++str;
96 } 143 }
97 else if (ch == '\\') 144 else if (ch == '\\')
98 { 145 {
99 need (enc, len += 1); 146 need (enc, len += 1);
100 *enc->cur++ = '\\'; 147 *enc->cur++ = '\\';
101 *enc->cur++ = '\\'; 148 *enc->cur++ = '\\';
102 ++str;
103 } 149 }
104 else if (ch >= 0x20 && ch < 0x80) // most common case 150 else
105 {
106 *enc->cur++ = ch; 151 *enc->cur++ = ch;
107 ++str; 152
108 }
109 else if (ch == '\015')
110 {
111 need (enc, len += 1);
112 *enc->cur++ = '\\';
113 *enc->cur++ = 'r';
114 ++str;
115 }
116 else if (ch == '\012')
117 {
118 need (enc, len += 1);
119 *enc->cur++ = '\\';
120 *enc->cur++ = 'n';
121 ++str; 153 ++str;
122 } 154 }
123 else 155 else
124 { 156 {
125 STRLEN clen; 157 switch (ch)
126 UV uch;
127
128 if (is_utf8)
129 { 158 {
130 uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY); 159 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
131 if (clen == (STRLEN)-1) 160 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
132 croak ("malformed UTF-8 character in string, cannot convert to JSON"); 161 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
133 } 162 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
134 else 163 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
135 {
136 uch = ch;
137 clen = 1;
138 }
139 164
140 if (uch < 0x80 || enc->flags & F_ASCII) 165 default:
141 {
142 if (uch > 0xFFFFUL)
143 { 166 {
167 STRLEN clen;
168 UV uch;
169
170 if (is_utf8)
171 {
172 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
173 uch = decode_utf8 (str, end - str, &clen);
174 if (clen == (STRLEN)-1)
175 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
176 }
177 else
178 {
179 uch = ch;
180 clen = 1;
181 }
182
183 if (uch > 0x10FFFFUL)
184 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
185
186 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF))
187 {
188 if (uch > 0xFFFFUL)
189 {
144 need (enc, len += 11); 190 need (enc, len += 11);
145 sprintf (enc->cur, "\\u%04x\\u%04x", 191 sprintf (enc->cur, "\\u%04x\\u%04x",
146 (uch - 0x10000) / 0x400 + 0xD800, 192 (int)((uch - 0x10000) / 0x400 + 0xD800),
147 (uch - 0x10000) % 0x400 + 0xDC00); 193 (int)((uch - 0x10000) % 0x400 + 0xDC00));
148 enc->cur += 12; 194 enc->cur += 12;
195 }
196 else
197 {
198 static char hexdigit [16] = "0123456789abcdef";
199 need (enc, len += 5);
200 *enc->cur++ = '\\';
201 *enc->cur++ = 'u';
202 *enc->cur++ = hexdigit [ uch >> 12 ];
203 *enc->cur++ = hexdigit [(uch >> 8) & 15];
204 *enc->cur++ = hexdigit [(uch >> 4) & 15];
205 *enc->cur++ = hexdigit [(uch >> 0) & 15];
206 }
207
208 str += clen;
209 }
210 else if (enc->flags & F_LATIN1)
211 {
212 *enc->cur++ = uch;
213 str += clen;
214 }
215 else if (is_utf8)
216 {
217 need (enc, len += clen);
218 do
219 {
220 *enc->cur++ = *str++;
221 }
222 while (--clen);
223 }
224 else
225 {
226 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
227 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
228 ++str;
229 }
149 } 230 }
150 else
151 {
152 static char hexdigit [16] = "0123456789abcdef";
153 need (enc, len += 5);
154 *enc->cur++ = '\\';
155 *enc->cur++ = 'u';
156 *enc->cur++ = hexdigit [ uch >> 12 ];
157 *enc->cur++ = hexdigit [(uch >> 8) & 15];
158 *enc->cur++ = hexdigit [(uch >> 4) & 15];
159 *enc->cur++ = hexdigit [(uch >> 0) & 15];
160 }
161
162 str += clen;
163 }
164 else if (is_utf8)
165 {
166 need (enc, len += clen);
167 do
168 {
169 *enc->cur++ = *str++;
170 }
171 while (--clen);
172 }
173 else
174 {
175 need (enc, 10); // never more than 11 bytes needed
176 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
177 ++str;
178 } 231 }
179 } 232 }
180 233
181 --len; 234 --len;
182 } 235 }
183} 236}
184 237
185#define INDENT SB \ 238static void
239encode_indent (enc_t *enc)
240{
186 if (enc->flags & F_INDENT) \ 241 if (enc->flags & F_INDENT)
187 { \ 242 {
188 int i_; \ 243 int spaces = enc->indent * INDENT_STEP;
189 need (enc, enc->indent); \
190 for (i_ = enc->indent * 3; i_--; )\
191 encode_ch (enc, ' '); \
192 } \
193 SE
194 244
195#define SPACE SB need (enc, 1); encode_ch (enc, ' '); SE 245 need (enc, spaces);
196#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE 246 memset (enc->cur, ' ', spaces);
197#define COMMA SB \ 247 enc->cur += spaces;
248 }
249}
250
251static void
252encode_space (enc_t *enc)
253{
254 need (enc, 1);
198 encode_ch (enc, ','); \ 255 encode_ch (enc, ' ');
256}
257
258static void
259encode_nl (enc_t *enc)
260{
199 if (enc->flags & F_INDENT) \ 261 if (enc->flags & F_INDENT)
200 NL; \ 262 {
263 need (enc, 1);
264 encode_ch (enc, '\n');
265 }
266}
267
268static void
269encode_comma (enc_t *enc)
270{
271 encode_ch (enc, ',');
272
273 if (enc->flags & F_INDENT)
274 encode_nl (enc);
201 else if (enc->flags & F_SPACE_AFTER) \ 275 else if (enc->flags & F_SPACE_AFTER)
202 SPACE; \ 276 encode_space (enc);
203 SE 277}
204 278
205static void encode_sv (enc_t *enc, SV *sv); 279static void encode_sv (enc_t *enc, SV *sv);
206 280
207static void 281static void
208encode_av (enc_t *enc, AV *av) 282encode_av (enc_t *enc, AV *av)
209{ 283{
210 int i, len = av_len (av); 284 int i, len = av_len (av);
211 285
212 encode_ch (enc, '['); NL; 286 if (enc->indent >= enc->maxdepth)
287 croak ("data structure too deep (hit recursion limit)");
288
289 encode_ch (enc, '['); encode_nl (enc);
213 ++enc->indent; 290 ++enc->indent;
214 291
215 for (i = 0; i <= len; ++i) 292 for (i = 0; i <= len; ++i)
216 { 293 {
217 INDENT; 294 encode_indent (enc);
218 encode_sv (enc, *av_fetch (av, i, 0)); 295 encode_sv (enc, *av_fetch (av, i, 0));
219 296
220 if (i < len) 297 if (i < len)
221 COMMA; 298 encode_comma (enc);
222 } 299 }
223 300
224 NL; 301 encode_nl (enc);
225 302
226 --enc->indent; 303 --enc->indent;
227 INDENT; encode_ch (enc, ']'); 304 encode_indent (enc); encode_ch (enc, ']');
228} 305}
229 306
230static void 307static void
231encode_he (enc_t *enc, HE *he) 308encode_he (enc_t *enc, HE *he)
232{ 309{
… …
246 else 323 else
247 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 324 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
248 325
249 encode_ch (enc, '"'); 326 encode_ch (enc, '"');
250 327
251 if (enc->flags & F_SPACE_BEFORE) SPACE; 328 if (enc->flags & F_SPACE_BEFORE) encode_space (enc);
252 encode_ch (enc, ':'); 329 encode_ch (enc, ':');
253 if (enc->flags & F_SPACE_AFTER ) SPACE; 330 if (enc->flags & F_SPACE_AFTER ) encode_space (enc);
254 encode_sv (enc, HeVAL (he)); 331 encode_sv (enc, HeVAL (he));
255} 332}
256 333
257// compare hash entries, used when all keys are bytestrings 334// compare hash entries, used when all keys are bytestrings
258static int 335static int
… …
264 HE *b = *(HE **)b_; 341 HE *b = *(HE **)b_;
265 342
266 STRLEN la = HeKLEN (a); 343 STRLEN la = HeKLEN (a);
267 STRLEN lb = HeKLEN (b); 344 STRLEN lb = HeKLEN (b);
268 345
269 if (!(cmp == memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 346 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))
270 cmp = la < lb ? -1 : la == lb ? 0 : 1; 347 cmp = la - lb;
271 348
272 return cmp; 349 return cmp;
273} 350}
274 351
275// compare hash entries, used when some keys are sv's or utf-x 352// compare hash entries, used when some keys are sv's or utf-x
… …
282static void 359static void
283encode_hv (enc_t *enc, HV *hv) 360encode_hv (enc_t *enc, HV *hv)
284{ 361{
285 int count, i; 362 int count, i;
286 363
364 if (enc->indent >= enc->maxdepth)
365 croak ("data structure too deep (hit recursion limit)");
366
287 encode_ch (enc, '{'); NL; ++enc->indent; 367 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
288 368
289 if ((count = hv_iterinit (hv))) 369 if ((count = hv_iterinit (hv)))
290 { 370 {
291 // for canonical output we have to sort by keys first 371 // for canonical output we have to sort by keys first
292 // actually, this is mostly due to the stupid so-called 372 // actually, this is mostly due to the stupid so-called
293 // security workaround added somewhere in 5.8.x. 373 // security workaround added somewhere in 5.8.x.
294 // that randomises hash orderings 374 // that randomises hash orderings
295 if (enc->flags & F_CANONICAL) 375 if (enc->flags & F_CANONICAL)
296 { 376 {
297 HE *he, *hes [count]; 377 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
298 int fast = 1; 378 int fast = 1;
299 379
300 i = 0; 380 i = 0;
301 while ((he = hv_iternext (hv))) 381 while ((he = hv_iternext (hv)))
302 { 382 {
… …
309 389
310 if (fast) 390 if (fast)
311 qsort (hes, count, sizeof (HE *), he_cmp_fast); 391 qsort (hes, count, sizeof (HE *), he_cmp_fast);
312 else 392 else
313 { 393 {
314 // hack to disable "use bytes" 394 // hack to forcefully disable "use bytes"
315 COP *oldcop = PL_curcop, cop; 395 COP cop = *PL_curcop;
316 cop.op_private = 0; 396 cop.op_private = 0;
397
398 ENTER;
399 SAVETMPS;
400
401 SAVEVPTR (PL_curcop);
317 PL_curcop = &cop; 402 PL_curcop = &cop;
318 403
319 SAVETMPS;
320 qsort (hes, count, sizeof (HE *), he_cmp_slow); 404 qsort (hes, count, sizeof (HE *), he_cmp_slow);
405
321 FREETMPS; 406 FREETMPS;
322 407 LEAVE;
323 PL_curcop = oldcop;
324 } 408 }
325 409
326 for (i = 0; i < count; ++i) 410 for (i = 0; i < count; ++i)
327 { 411 {
328 INDENT; 412 encode_indent (enc);
329 encode_he (enc, hes [i]); 413 encode_he (enc, hes [i]);
330 414
331 if (i < count - 1) 415 if (i < count - 1)
332 COMMA; 416 encode_comma (enc);
333 } 417 }
334 418
335 NL; 419 encode_nl (enc);
336 } 420 }
337 else 421 else
338 { 422 {
339 SV *sv;
340 HE *he = hv_iternext (hv); 423 HE *he = hv_iternext (hv);
341 424
342 for (;;) 425 for (;;)
343 { 426 {
344 INDENT; 427 encode_indent (enc);
345 encode_he (enc, he); 428 encode_he (enc, he);
346 429
347 if (!(he = hv_iternext (hv))) 430 if (!(he = hv_iternext (hv)))
348 break; 431 break;
349 432
350 COMMA; 433 encode_comma (enc);
351 } 434 }
352 435
353 NL; 436 encode_nl (enc);
354 } 437 }
355 } 438 }
356 439
357 --enc->indent; INDENT; encode_ch (enc, '}'); 440 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
441}
442
443// encode objects, arrays and special \0=false and \1=true values.
444static void
445encode_rv (enc_t *enc, SV *sv)
446{
447 svtype svt;
448
449 SvGETMAGIC (sv);
450 svt = SvTYPE (sv);
451
452 if (svt == SVt_PVHV)
453 encode_hv (enc, (HV *)sv);
454 else if (svt == SVt_PVAV)
455 encode_av (enc, (AV *)sv);
456 else if (svt < SVt_PVAV)
457 {
458 if (SvNIOK (sv) && SvIV (sv) == 0)
459 encode_str (enc, "false", 5, 0);
460 else if (SvNIOK (sv) && SvIV (sv) == 1)
461 encode_str (enc, "true", 4, 0);
462 else
463 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
464 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
465 }
466 else
467 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
468 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
358} 469}
359 470
360static void 471static void
361encode_sv (enc_t *enc, SV *sv) 472encode_sv (enc_t *enc, SV *sv)
362{ 473{
… …
383 SvIsUV(sv) 494 SvIsUV(sv)
384 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 495 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))
385 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 496 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));
386 } 497 }
387 else if (SvROK (sv)) 498 else if (SvROK (sv))
388 { 499 encode_rv (enc, SvRV (sv));
389 if (!--enc->max_recurse)
390 croak ("data structure too deep (hit recursion limit)");
391
392 sv = SvRV (sv);
393
394 switch (SvTYPE (sv))
395 {
396 case SVt_PVAV: encode_av (enc, (AV *)sv); break;
397 case SVt_PVHV: encode_hv (enc, (HV *)sv); break;
398
399 default:
400 croak ("JSON can only represent references to arrays or hashes");
401 }
402 }
403 else if (!SvOK (sv)) 500 else if (!SvOK (sv))
404 encode_str (enc, "null", 4, 0); 501 encode_str (enc, "null", 4, 0);
405 else 502 else
406 croak ("encountered perl type that JSON cannot handle"); 503 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
504 SvPV_nolen (sv), SvFLAGS (sv));
407} 505}
408 506
409static SV * 507static SV *
410encode_json (SV *scalar, UV flags) 508encode_json (SV *scalar, U32 flags)
411{ 509{
510 enc_t enc;
511
412 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 512 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
413 croak ("hash- or arraref required (not a simple scalar, use allow_nonref to allow this)"); 513 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
414 514
415 enc_t enc;
416 enc.flags = flags; 515 enc.flags = flags;
417 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 516 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
418 enc.cur = SvPVX (enc.sv); 517 enc.cur = SvPVX (enc.sv);
419 enc.end = SvEND (enc.sv); 518 enc.end = SvEND (enc.sv);
420 enc.max_recurse = 0;
421 enc.indent = 0; 519 enc.indent = 0;
520 enc.maxdepth = DEC_DEPTH (flags);
422 521
423 SvPOK_only (enc.sv); 522 SvPOK_only (enc.sv);
424 encode_sv (&enc, scalar); 523 encode_sv (&enc, scalar);
425 524
525 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
526 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
527
426 if (!(flags & (F_ASCII | F_UTF8))) 528 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8)))
427 SvUTF8_on (enc.sv); 529 SvUTF8_on (enc.sv);
428 530
429 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 531 if (enc.flags & F_SHRINK)
532 shrink (enc.sv);
533
430 return enc.sv; 534 return enc.sv;
431} 535}
432 536
433///////////////////////////////////////////////////////////////////////////// 537/////////////////////////////////////////////////////////////////////////////
538// decoder
434 539
435#define WS \ 540// structure used for decoding JSON
541typedef struct
542{
543 char *cur; // current parser pointer
544 char *end; // end of input string
545 const char *err; // parse error, if != 0
546 U32 flags; // F_*
547 U32 depth; // recursion depth
548 U32 maxdepth; // recursion depth limit
549} dec_t;
550
551static void
552decode_ws (dec_t *dec)
553{
436 for (;;) \ 554 for (;;)
437 { \ 555 {
438 char ch = *dec->cur; \ 556 char ch = *dec->cur;
557
439 if (ch > 0x20 \ 558 if (ch > 0x20
440 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) \ 559 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))
441 break; \ 560 break;
561
442 ++dec->cur; \ 562 ++dec->cur;
443 } 563 }
564}
444 565
445#define ERR(reason) SB dec->err = reason; goto fail; SE 566#define ERR(reason) SB dec->err = reason; goto fail; SE
567
446#define EXPECT_CH(ch) SB \ 568#define EXPECT_CH(ch) SB \
447 if (*dec->cur != ch) \ 569 if (*dec->cur != ch) \
448 ERR (# ch " expected"); \ 570 ERR (# ch " expected"); \
449 ++dec->cur; \ 571 ++dec->cur; \
450 SE 572 SE
451 573
574#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")
575#define DEC_DEC_DEPTH --dec->depth
576
452static SV *decode_sv (dec_t *dec); 577static SV *decode_sv (dec_t *dec);
453 578
454static signed char decode_hexdigit[256]; 579static signed char decode_hexdigit[256];
455 580
456static UV 581static UV
457decode_4hex (dec_t *dec) 582decode_4hex (dec_t *dec)
458{ 583{
459 signed char d1, d2, d3, d4; 584 signed char d1, d2, d3, d4;
585 unsigned char *cur = (unsigned char *)dec->cur;
460 586
461 d1 = decode_hexdigit [((unsigned char *)dec->cur) [0]];
462 if (d1 < 0) ERR ("four hexadecimal digits expected"); 587 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected");
463 d2 = decode_hexdigit [((unsigned char *)dec->cur) [1]];
464 if (d2 < 0) ERR ("four hexadecimal digits expected"); 588 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected");
465 d3 = decode_hexdigit [((unsigned char *)dec->cur) [2]];
466 if (d3 < 0) ERR ("four hexadecimal digits expected"); 589 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected");
467 d4 = decode_hexdigit [((unsigned char *)dec->cur) [3]];
468 if (d4 < 0) ERR ("four hexadecimal digits expected"); 590 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected");
469 591
470 dec->cur += 4; 592 dec->cur += 4;
471 593
472 return ((UV)d1) << 12 594 return ((UV)d1) << 12
473 | ((UV)d2) << 8 595 | ((UV)d2) << 8
… …
476 598
477fail: 599fail:
478 return (UV)-1; 600 return (UV)-1;
479} 601}
480 602
481#define APPEND_GROW(n) SB \
482 if (cur + (n) >= end) \
483 { \
484 STRLEN ofs = cur - SvPVX (sv); \
485 SvGROW (sv, ofs + (n) + 1); \
486 cur = SvPVX (sv) + ofs; \
487 end = SvEND (sv); \
488 } \
489 SE
490
491#define APPEND_CH(ch) SB \
492 APPEND_GROW (1); \
493 *cur++ = (ch); \
494 SE
495
496static SV * 603static SV *
497decode_str (dec_t *dec) 604decode_str (dec_t *dec)
498{ 605{
499 SV *sv = NEWSV (0,2); 606 SV *sv = 0;
500 int utf8 = 0; 607 int utf8 = 0;
501 char *cur = SvPVX (sv);
502 char *end = SvEND (sv);
503 608
504 for (;;) 609 do
505 { 610 {
506 unsigned char ch = *(unsigned char *)dec->cur; 611 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
612 char *cur = buf;
507 613
508 if (ch == '"') 614 do
509 break;
510 else if (ch == '\\')
511 { 615 {
512 switch (*++dec->cur) 616 unsigned char ch = *(unsigned char *)dec->cur++;
617
618 if (ch == '"')
513 { 619 {
514 case '\\': 620 --dec->cur;
515 case '/': 621 break;
516 case '"': APPEND_CH (*dec->cur++); break; 622 }
517 623 else if (ch == '\\')
518 case 'b': APPEND_CH ('\010'); ++dec->cur; break; 624 {
519 case 't': APPEND_CH ('\011'); ++dec->cur; break; 625 switch (*dec->cur)
520 case 'n': APPEND_CH ('\012'); ++dec->cur; break;
521 case 'f': APPEND_CH ('\014'); ++dec->cur; break;
522 case 'r': APPEND_CH ('\015'); ++dec->cur; break;
523
524 case 'u':
525 { 626 {
526 UV lo, hi; 627 case '\\':
527 ++dec->cur; 628 case '/':
629 case '"': *cur++ = *dec->cur++; break;
528 630
529 hi = decode_4hex (dec); 631 case 'b': ++dec->cur; *cur++ = '\010'; break;
530 if (hi == (UV)-1) 632 case 't': ++dec->cur; *cur++ = '\011'; break;
531 goto fail; 633 case 'n': ++dec->cur; *cur++ = '\012'; break;
634 case 'f': ++dec->cur; *cur++ = '\014'; break;
635 case 'r': ++dec->cur; *cur++ = '\015'; break;
532 636
533 // possibly a surrogate pair 637 case 'u':
534 if (hi >= 0xd800 && hi < 0xdc00)
535 { 638 {
536 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 639 UV lo, hi;
537 ERR ("missing low surrogate character in surrogate pair");
538
539 dec->cur += 2; 640 ++dec->cur;
540 641
541 lo = decode_4hex (dec); 642 hi = decode_4hex (dec);
542 if (lo == (UV)-1) 643 if (hi == (UV)-1)
543 goto fail; 644 goto fail;
544 645
646 // possibly a surrogate pair
647 if (hi >= 0xd800)
648 if (hi < 0xdc00)
649 {
650 if (dec->cur [0] != '\\' || dec->cur [1] != 'u')
651 ERR ("missing low surrogate character in surrogate pair");
652
653 dec->cur += 2;
654
655 lo = decode_4hex (dec);
656 if (lo == (UV)-1)
657 goto fail;
658
545 if (lo < 0xdc00 || lo >= 0xe000) 659 if (lo < 0xdc00 || lo >= 0xe000)
546 ERR ("surrogate pair expected"); 660 ERR ("surrogate pair expected");
547 661
548 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000; 662 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000;
663 }
664 else if (hi < 0xe000)
665 ERR ("missing high surrogate character in surrogate pair");
666
667 if (hi >= 0x80)
668 {
669 utf8 = 1;
670
671 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
672 }
673 else
674 *cur++ = hi;
549 } 675 }
550 else if (hi >= 0xdc00 && hi < 0xe000)
551 ERR ("missing high surrogate character in surrogate pair");
552
553 if (hi >= 0x80)
554 { 676 break;
555 utf8 = 1;
556 677
557 APPEND_GROW (4); // at most 4 bytes for 21 bits
558 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
559 }
560 else 678 default:
561 APPEND_CH (hi); 679 --dec->cur;
680 ERR ("illegal backslash escape sequence in string");
562 } 681 }
563 break; 682 }
683 else if (ch >= 0x20 && ch <= 0x7f)
684 *cur++ = ch;
685 else if (ch >= 0x80)
686 {
687 STRLEN clen;
688 UV uch;
564 689
565 default:
566 --dec->cur; 690 --dec->cur;
567 ERR ("illegal backslash escape sequence in string"); 691
692 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);
693 if (clen == (STRLEN)-1)
694 ERR ("malformed UTF-8 character in JSON string");
695
696 do
697 *cur++ = *dec->cur++;
698 while (--clen);
699
700 utf8 = 1;
701 }
702 else
703 {
704 --dec->cur;
705
706 if (!ch)
707 ERR ("unexpected end of string while parsing JSON string");
708 else
709 ERR ("invalid character encountered while parsing JSON string");
568 } 710 }
569 } 711 }
570 else if (ch >= 0x20 && ch <= 0x7f) 712 while (cur < buf + SHORT_STRING_LEN);
571 APPEND_CH (*dec->cur++); 713
572 else if (ch >= 0x80)
573 { 714 {
574 STRLEN clen; 715 STRLEN len = cur - buf;
575 UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY);
576 if (clen == (STRLEN)-1)
577 ERR ("malformed UTF-8 character in string, cannot convert to JSON");
578 716
579 APPEND_GROW (clen); 717 if (sv)
580 do
581 { 718 {
582 *cur++ = *dec->cur++; 719 SvGROW (sv, SvCUR (sv) + len + 1);
720 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
721 SvCUR_set (sv, SvCUR (sv) + len);
583 } 722 }
584 while (--clen);
585
586 utf8 = 1;
587 }
588 else if (dec->cur == dec->end)
589 ERR ("unexpected end of string while parsing json string");
590 else 723 else
591 ERR ("invalid character encountered"); 724 sv = newSVpvn (buf, len);
592 } 725 }
726 }
727 while (*dec->cur != '"');
593 728
594 ++dec->cur; 729 ++dec->cur;
595 730
596 SvCUR_set (sv, cur - SvPVX (sv)); 731 if (sv)
597 732 {
598 SvPOK_only (sv); 733 SvPOK_only (sv);
599 *SvEND (sv) = 0; 734 *SvEND (sv) = 0;
600 735
601 if (utf8) 736 if (utf8)
602 SvUTF8_on (sv); 737 SvUTF8_on (sv);
738 }
739 else
740 sv = newSVpvn ("", 0);
603 741
604 return sv; 742 return sv;
605 743
606fail: 744fail:
607 SvREFCNT_dec (sv);
608 return 0; 745 return 0;
609} 746}
610 747
611static SV * 748static SV *
612decode_num (dec_t *dec) 749decode_num (dec_t *dec)
… …
693static SV * 830static SV *
694decode_av (dec_t *dec) 831decode_av (dec_t *dec)
695{ 832{
696 AV *av = newAV (); 833 AV *av = newAV ();
697 834
698 WS; 835 DEC_INC_DEPTH;
836 decode_ws (dec);
837
699 if (*dec->cur == ']') 838 if (*dec->cur == ']')
700 ++dec->cur; 839 ++dec->cur;
701 else 840 else
702 for (;;) 841 for (;;)
703 { 842 {
… …
707 if (!value) 846 if (!value)
708 goto fail; 847 goto fail;
709 848
710 av_push (av, value); 849 av_push (av, value);
711 850
712 WS; 851 decode_ws (dec);
713 852
714 if (*dec->cur == ']') 853 if (*dec->cur == ']')
715 { 854 {
716 ++dec->cur; 855 ++dec->cur;
717 break; 856 break;
… …
721 ERR (", or ] expected while parsing array"); 860 ERR (", or ] expected while parsing array");
722 861
723 ++dec->cur; 862 ++dec->cur;
724 } 863 }
725 864
865 DEC_DEC_DEPTH;
726 return newRV_noinc ((SV *)av); 866 return newRV_noinc ((SV *)av);
727 867
728fail: 868fail:
729 SvREFCNT_dec (av); 869 SvREFCNT_dec (av);
870 DEC_DEC_DEPTH;
730 return 0; 871 return 0;
731} 872}
732 873
733static SV * 874static SV *
734decode_hv (dec_t *dec) 875decode_hv (dec_t *dec)
735{ 876{
736 HV *hv = newHV (); 877 HV *hv = newHV ();
737 878
738 WS; 879 DEC_INC_DEPTH;
880 decode_ws (dec);
881
739 if (*dec->cur == '}') 882 if (*dec->cur == '}')
740 ++dec->cur; 883 ++dec->cur;
741 else 884 else
742 for (;;) 885 for (;;)
743 { 886 {
744 SV *key, *value; 887 SV *key, *value;
745 888
746 WS; EXPECT_CH ('"'); 889 decode_ws (dec); EXPECT_CH ('"');
747 890
748 key = decode_str (dec); 891 key = decode_str (dec);
749 if (!key) 892 if (!key)
750 goto fail; 893 goto fail;
751 894
752 WS; EXPECT_CH (':'); 895 decode_ws (dec); EXPECT_CH (':');
753 896
754 value = decode_sv (dec); 897 value = decode_sv (dec);
755 if (!value) 898 if (!value)
756 { 899 {
757 SvREFCNT_dec (key); 900 SvREFCNT_dec (key);
758 goto fail; 901 goto fail;
759 } 902 }
760 903
761 //TODO: optimise
762 hv_store_ent (hv, key, value, 0); 904 hv_store_ent (hv, key, value, 0);
905 SvREFCNT_dec (key);
763 906
764 WS; 907 decode_ws (dec);
765 908
766 if (*dec->cur == '}') 909 if (*dec->cur == '}')
767 { 910 {
768 ++dec->cur; 911 ++dec->cur;
769 break; 912 break;
… …
773 ERR (", or } expected while parsing object/hash"); 916 ERR (", or } expected while parsing object/hash");
774 917
775 ++dec->cur; 918 ++dec->cur;
776 } 919 }
777 920
921 DEC_DEC_DEPTH;
778 return newRV_noinc ((SV *)hv); 922 return newRV_noinc ((SV *)hv);
779 923
780fail: 924fail:
781 SvREFCNT_dec (hv); 925 SvREFCNT_dec (hv);
926 DEC_DEC_DEPTH;
782 return 0; 927 return 0;
783} 928}
784 929
785static SV * 930static SV *
786decode_sv (dec_t *dec) 931decode_sv (dec_t *dec)
787{ 932{
788 WS; 933 decode_ws (dec);
789 switch (*dec->cur) 934 switch (*dec->cur)
790 { 935 {
791 case '"': ++dec->cur; return decode_str (dec); 936 case '"': ++dec->cur; return decode_str (dec);
792 case '[': ++dec->cur; return decode_av (dec); 937 case '[': ++dec->cur; return decode_av (dec);
793 case '{': ++dec->cur; return decode_hv (dec); 938 case '{': ++dec->cur; return decode_hv (dec);
… …
829 ERR ("'null' expected"); 974 ERR ("'null' expected");
830 975
831 break; 976 break;
832 977
833 default: 978 default:
834 ERR ("malformed json string"); 979 ERR ("malformed JSON string, neither array, object, number, string or atom");
835 break; 980 break;
836 } 981 }
837 982
838fail: 983fail:
839 return 0; 984 return 0;
840} 985}
841 986
842static SV * 987static SV *
843decode_json (SV *string, UV flags) 988decode_json (SV *string, U32 flags, UV *offset_return)
844{ 989{
990 dec_t dec;
991 UV offset;
845 SV *sv; 992 SV *sv;
993
994 SvGETMAGIC (string);
995 SvUPGRADE (string, SVt_PV);
846 996
847 if (flags & F_UTF8) 997 if (flags & F_UTF8)
848 sv_utf8_downgrade (string, 0); 998 sv_utf8_downgrade (string, 0);
849 else 999 else
850 sv_utf8_upgrade (string); 1000 sv_utf8_upgrade (string);
851 1001
852 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1002 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
853 1003
854 dec_t dec;
855 dec.flags = flags; 1004 dec.flags = flags;
856 dec.cur = SvPVX (string); 1005 dec.cur = SvPVX (string);
857 dec.end = SvEND (string); 1006 dec.end = SvEND (string);
858 dec.err = 0; 1007 dec.err = 0;
1008 dec.depth = 0;
1009 dec.maxdepth = DEC_DEPTH (dec.flags);
859 1010
1011 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
860 sv = decode_sv (&dec); 1012 sv = decode_sv (&dec);
861 1013
1014 if (!(offset_return || !sv))
1015 {
1016 // check for trailing garbage
1017 decode_ws (&dec);
1018
1019 if (*dec.cur)
1020 {
1021 dec.err = "garbage after JSON object";
1022 SvREFCNT_dec (sv);
1023 sv = 0;
1024 }
1025 }
1026
1027 if (offset_return || !sv)
1028 {
1029 offset = dec.flags & F_UTF8
1030 ? dec.cur - SvPVX (string)
1031 : utf8_distance (dec.cur, SvPVX (string));
1032
1033 if (offset_return)
1034 *offset_return = offset;
1035 }
1036
862 if (!sv) 1037 if (!sv)
863 { 1038 {
864 IV offset = utf8_distance (dec.cur, SvPVX (string));
865 SV *uni = sv_newmortal (); 1039 SV *uni = sv_newmortal ();
1040
866 // horrible hack to silence warning inside pv_uni_display 1041 // horrible hack to silence warning inside pv_uni_display
867 COP cop; 1042 COP cop = *PL_curcop;
868 memset (&cop, 0, sizeof (cop));
869 cop.cop_warnings = pWARN_NONE; 1043 cop.cop_warnings = pWARN_NONE;
1044 ENTER;
870 SAVEVPTR (PL_curcop); 1045 SAVEVPTR (PL_curcop);
871 PL_curcop = &cop; 1046 PL_curcop = &cop;
872
873 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1047 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1048 LEAVE;
1049
874 croak ("%s, at character offset %d (%s)", 1050 croak ("%s, at character offset %d [\"%s\"]",
875 dec.err, 1051 dec.err,
876 (int)offset, 1052 (int)offset,
877 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1053 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
878 } 1054 }
879 1055
880 sv = sv_2mortal (sv); 1056 sv = sv_2mortal (sv);
881 1057
882 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1058 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))
883 croak ("JSON object or array expected (but number, string, true, false or null found, use allow_nonref to allow this)"); 1059 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
884 1060
885 return sv; 1061 return sv;
886} 1062}
887 1063
1064/////////////////////////////////////////////////////////////////////////////
1065// XS interface functions
1066
888MODULE = JSON::XS PACKAGE = JSON::XS 1067MODULE = JSON::XS PACKAGE = JSON::XS
889 1068
890BOOT: 1069BOOT:
891{ 1070{
892 int i; 1071 int i;
893 1072
894 memset (decode_hexdigit, 0xff, 256); 1073 memset (decode_hexdigit, 0xff, 256);
1074
895 for (i = 10; i--; ) 1075 for (i = 0; i < 256; ++i)
896 decode_hexdigit ['0' + i] = i; 1076 decode_hexdigit [i] =
897 1077 i >= '0' && i <= '9' ? i - '0'
898 for (i = 7; i--; ) 1078 : i >= 'a' && i <= 'f' ? i - 'a' + 10
899 { 1079 : i >= 'A' && i <= 'F' ? i - 'A' + 10
900 decode_hexdigit ['a' + i] = 10 + i; 1080 : -1;
901 decode_hexdigit ['A' + i] = 10 + i;
902 }
903 1081
904 json_stash = gv_stashpv ("JSON::XS", 1); 1082 json_stash = gv_stashpv ("JSON::XS", 1);
905} 1083}
906 1084
907PROTOTYPES: DISABLE 1085PROTOTYPES: DISABLE
… …
910 CODE: 1088 CODE:
911 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1089 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);
912 OUTPUT: 1090 OUTPUT:
913 RETVAL 1091 RETVAL
914 1092
915SV *ascii (SV *self, int enable) 1093SV *ascii (SV *self, int enable = 1)
916 ALIAS: 1094 ALIAS:
917 ascii = F_ASCII 1095 ascii = F_ASCII
1096 latin1 = F_LATIN1
918 utf8 = F_UTF8 1097 utf8 = F_UTF8
919 indent = F_INDENT 1098 indent = F_INDENT
920 canonical = F_CANONICAL 1099 canonical = F_CANONICAL
921 space_before = F_SPACE_BEFORE 1100 space_before = F_SPACE_BEFORE
922 space_after = F_SPACE_AFTER 1101 space_after = F_SPACE_AFTER
923 json_rpc = F_JSON_RPC
924 pretty = F_PRETTY 1102 pretty = F_PRETTY
925 allow_nonref = F_ALLOW_NONREF 1103 allow_nonref = F_ALLOW_NONREF
1104 shrink = F_SHRINK
926 CODE: 1105 CODE:
927{ 1106{
928 UV *uv = SvJSON (self); 1107 UV *uv = SvJSON (self);
929 if (enable) 1108 if (enable)
930 *uv |= ix; 1109 *uv |= ix;
… …
934 RETVAL = newSVsv (self); 1113 RETVAL = newSVsv (self);
935} 1114}
936 OUTPUT: 1115 OUTPUT:
937 RETVAL 1116 RETVAL
938 1117
1118SV *max_depth (SV *self, UV max_depth = 0x80000000UL)
1119 CODE:
1120{
1121 UV *uv = SvJSON (self);
1122 UV log2 = 0;
1123
1124 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1125
1126 while ((1UL << log2) < max_depth)
1127 ++log2;
1128
1129 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1130
1131 RETVAL = newSVsv (self);
1132}
1133 OUTPUT:
1134 RETVAL
1135
939void encode (SV *self, SV *scalar) 1136void encode (SV *self, SV *scalar)
940 PPCODE: 1137 PPCODE:
941 XPUSHs (encode_json (scalar, *SvJSON (self))); 1138 XPUSHs (encode_json (scalar, *SvJSON (self)));
942 1139
943void decode (SV *self, SV *jsonstr) 1140void decode (SV *self, SV *jsonstr)
944 PPCODE: 1141 PPCODE:
945 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1142 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));
1143
1144void decode_prefix (SV *self, SV *jsonstr)
1145 PPCODE:
1146{
1147 UV offset;
1148 EXTEND (SP, 2);
1149 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));
1150 PUSHs (sv_2mortal (newSVuv (offset)));
1151}
946 1152
947PROTOTYPES: ENABLE 1153PROTOTYPES: ENABLE
948 1154
949void to_json (SV *scalar) 1155void to_json (SV *scalar)
1156 ALIAS:
1157 objToJson = 0
950 PPCODE: 1158 PPCODE:
951 XPUSHs (encode_json (scalar, F_UTF8)); 1159 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8));
952 1160
953void from_json (SV *jsonstr) 1161void from_json (SV *jsonstr)
1162 ALIAS:
1163 jsonToObj = 0
954 PPCODE: 1164 PPCODE:
955 XPUSHs (decode_json (jsonstr, F_UTF8)); 1165 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0));
956 1166

Diff Legend

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