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.52 by root, Mon Jul 2 02:57:11 2007 UTC vs.
Revision 1.63 by root, Mon Aug 27 01:49:01 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
… …
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 31#define F_CONV_BLESSED 0x00000800UL
32#define F_RELAXED 0x00001000UL
33
31#define F_MAXDEPTH 0xf8000000UL 34#define F_MAXDEPTH 0xf8000000UL
32#define S_MAXDEPTH 27 35#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL 36#define F_MAXSIZE 0x01f00000UL
34#define S_MAXSIZE 20 37#define S_MAXSIZE 20
35#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
… …
56# define inline static 59# define inline static
57#endif 60#endif
58 61
59#define expect_false(expr) expect ((expr) != 0, 0) 62#define expect_false(expr) expect ((expr) != 0, 0)
60#define expect_true(expr) expect ((expr) != 0, 1) 63#define expect_true(expr) expect ((expr) != 0, 1)
64
65#ifdef USE_ITHREADS
66# define JSON_SLOW 1
67# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
68#else
69# define JSON_SLOW 0
70# define JSON_STASH json_stash
71#endif
61 72
62static HV *json_stash, *json_boolean_stash; // JSON::XS:: 73static HV *json_stash, *json_boolean_stash; // JSON::XS::
63static SV *json_true, *json_false; 74static SV *json_true, *json_false;
64 75
65typedef struct { 76typedef struct {
… …
306 encode_ch (enc, '['); encode_nl (enc); 317 encode_ch (enc, '['); encode_nl (enc);
307 ++enc->indent; 318 ++enc->indent;
308 319
309 for (i = 0; i <= len; ++i) 320 for (i = 0; i <= len; ++i)
310 { 321 {
322 SV **svp = av_fetch (av, i, 0);
323
311 encode_indent (enc); 324 encode_indent (enc);
312 encode_sv (enc, *av_fetch (av, i, 0)); 325
326 if (svp)
327 encode_sv (enc, *svp);
328 else
329 encode_str (enc, "null", 4, 0);
313 330
314 if (i < len) 331 if (i < len)
315 encode_comma (enc); 332 encode_comma (enc);
316 } 333 }
317 334
… …
320 --enc->indent; 337 --enc->indent;
321 encode_indent (enc); encode_ch (enc, ']'); 338 encode_indent (enc); encode_ch (enc, ']');
322} 339}
323 340
324static void 341static void
325encode_he (enc_t *enc, HE *he) 342encode_hk (enc_t *enc, HE *he)
326{ 343{
327 encode_ch (enc, '"'); 344 encode_ch (enc, '"');
328 345
329 if (HeKLEN (he) == HEf_SVKEY) 346 if (HeKLEN (he) == HEf_SVKEY)
330 { 347 {
… …
343 encode_ch (enc, '"'); 360 encode_ch (enc, '"');
344 361
345 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); 362 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
346 encode_ch (enc, ':'); 363 encode_ch (enc, ':');
347 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); 364 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
348 encode_sv (enc, HeVAL (he));
349} 365}
350 366
351// compare hash entries, used when all keys are bytestrings 367// compare hash entries, used when all keys are bytestrings
352static int 368static int
353he_cmp_fast (const void *a_, const void *b_) 369he_cmp_fast (const void *a_, const void *b_)
… …
358 HE *b = *(HE **)b_; 374 HE *b = *(HE **)b_;
359 375
360 STRLEN la = HeKLEN (a); 376 STRLEN la = HeKLEN (a);
361 STRLEN lb = HeKLEN (b); 377 STRLEN lb = HeKLEN (b);
362 378
363 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 379 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
364 cmp = la - lb; 380 cmp = lb - la;
365 381
366 return cmp; 382 return cmp;
367} 383}
368 384
369// compare hash entries, used when some keys are sv's or utf-x 385// compare hash entries, used when some keys are sv's or utf-x
370static int 386static int
371he_cmp_slow (const void *a, const void *b) 387he_cmp_slow (const void *a, const void *b)
372{ 388{
373 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 389 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
374} 390}
375 391
376static void 392static void
377encode_hv (enc_t *enc, HV *hv) 393encode_hv (enc_t *enc, HV *hv)
378{ 394{
395 HE *he;
379 int count, i; 396 int count;
380 397
381 if (enc->indent >= enc->maxdepth) 398 if (enc->indent >= enc->maxdepth)
382 croak ("data structure too deep (hit recursion limit)"); 399 croak ("data structure too deep (hit recursion limit)");
383 400
384 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 401 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
385 402
386 if ((count = hv_iterinit (hv)))
387 {
388 // for canonical output we have to sort by keys first 403 // for canonical output we have to sort by keys first
389 // actually, this is mostly due to the stupid so-called 404 // actually, this is mostly due to the stupid so-called
390 // security workaround added somewhere in 5.8.x. 405 // security workaround added somewhere in 5.8.x.
391 // that randomises hash orderings 406 // that randomises hash orderings
392 if (enc->json.flags & F_CANONICAL) 407 if (enc->json.flags & F_CANONICAL)
408 {
409 int count = hv_iterinit (hv);
410
411 if (SvMAGICAL (hv))
393 { 412 {
413 // need to count by iterating. could improve by dynamically building the vector below
414 // but I don't care for the speed of this special case.
415 // note also that we will run into undefined behaviour when the two iterations
416 // do not result in the same count, something I might care for in some later release.
417
418 count = 0;
419 while (hv_iternext (hv))
420 ++count;
421
422 hv_iterinit (hv);
423 }
424
425 if (count)
426 {
394 int fast = 1; 427 int i, fast = 1;
395 HE *he;
396#if defined(__BORLANDC__) || defined(_MSC_VER) 428#if defined(__BORLANDC__) || defined(_MSC_VER)
397 HE **hes = _alloca (count * sizeof (HE)); 429 HE **hes = _alloca (count * sizeof (HE));
398#else 430#else
399 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 431 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
400#endif 432#endif
… …
427 459
428 FREETMPS; 460 FREETMPS;
429 LEAVE; 461 LEAVE;
430 } 462 }
431 463
432 for (i = 0; i < count; ++i) 464 while (count--)
433 { 465 {
434 encode_indent (enc); 466 encode_indent (enc);
467 he = hes [count];
435 encode_he (enc, hes [i]); 468 encode_hk (enc, he);
469 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
436 470
437 if (i < count - 1) 471 if (count)
438 encode_comma (enc); 472 encode_comma (enc);
439 } 473 }
440
441 encode_nl (enc);
442 } 474 }
475 }
443 else 476 else
444 { 477 {
478 if (hv_iterinit (hv) || SvMAGICAL (hv))
445 HE *he = hv_iternext (hv); 479 if ((he = hv_iternext (hv)))
446
447 for (;;) 480 for (;;)
448 { 481 {
449 encode_indent (enc); 482 encode_indent (enc);
450 encode_he (enc, he); 483 encode_hk (enc, he);
484 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
451 485
452 if (!(he = hv_iternext (hv))) 486 if (!(he = hv_iternext (hv)))
453 break; 487 break;
454 488
455 encode_comma (enc); 489 encode_comma (enc);
456 } 490 }
491 }
457 492
458 encode_nl (enc); 493 encode_nl (enc);
459 }
460 }
461 494
462 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 495 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
463} 496}
464 497
465// encode objects, arrays and special \0=false and \1=true values. 498// encode objects, arrays and special \0=false and \1=true values.
… …
471 SvGETMAGIC (sv); 504 SvGETMAGIC (sv);
472 svt = SvTYPE (sv); 505 svt = SvTYPE (sv);
473 506
474 if (expect_false (SvOBJECT (sv))) 507 if (expect_false (SvOBJECT (sv)))
475 { 508 {
509 HV *stash = !JSON_SLOW || json_boolean_stash
510 ? json_boolean_stash
511 : gv_stashpv ("JSON::XS::Boolean", 1);
512
476 if (SvSTASH (sv) == json_boolean_stash) 513 if (SvSTASH (sv) == stash)
477 { 514 {
478 if (SvIV (sv)) 515 if (SvIV (sv))
479 encode_str (enc, "true", 4, 0); 516 encode_str (enc, "true", 4, 0);
480 else 517 else
481 encode_str (enc, "false", 5, 0); 518 encode_str (enc, "false", 5, 0);
… …
489 } 526 }
490#endif 527#endif
491 if (enc->json.flags & F_CONV_BLESSED) 528 if (enc->json.flags & F_CONV_BLESSED)
492 { 529 {
493 // we re-bless the reference to get overload and other niceties right 530 // we re-bless the reference to get overload and other niceties right
494 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 531 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
495 532
496 if (to_json) 533 if (to_json)
497 { 534 {
535 dSP;
536
498 dSP; ENTER; SAVETMPS; PUSHMARK (SP); 537 ENTER; SAVETMPS; PUSHMARK (SP);
499 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 538 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
500 539
501 // calling with G_SCALAR ensures that we always get a 1 reutrn value 540 // calling with G_SCALAR ensures that we always get a 1 return value
502 // check anyways.
503 PUTBACK; 541 PUTBACK;
504 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 542 call_sv ((SV *)GvCV (to_json), G_SCALAR);
505 SPAGAIN; 543 SPAGAIN;
506 544
545 // catch this surprisingly common error
546 if (SvROK (TOPs) && SvRV (TOPs) == sv)
547 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
548
549 sv = POPs;
550 PUTBACK;
551
507 encode_sv (enc, POPs); 552 encode_sv (enc, sv);
508 553
509 FREETMPS; LEAVE; 554 FREETMPS; LEAVE;
510 } 555 }
511 else if (enc->json.flags & F_ALLOW_BLESSED) 556 else if (enc->json.flags & F_ALLOW_BLESSED)
512 encode_str (enc, "null", 4, 0); 557 encode_str (enc, "null", 4, 0);
… …
665 710
666 if (ch > 0x20 711 if (ch > 0x20
667 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 712 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))
668 break; 713 break;
669 714
715 if (ch == '#' && dec->json.flags & F_RELAXED)
716 ++dec->cur;
717
670 ++dec->cur; 718 ++dec->cur;
671 } 719 }
672} 720}
673 721
674#define ERR(reason) SB dec->err = reason; goto fail; SE 722#define ERR(reason) SB dec->err = reason; goto fail; SE
… …
922 is_nv = 1; 970 is_nv = 1;
923 } 971 }
924 972
925 if (!is_nv) 973 if (!is_nv)
926 { 974 {
975 int len = dec->cur - start;
976
927 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 977 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
928 if (*start == '-') 978 if (*start == '-')
929 switch (dec->cur - start) 979 switch (len)
930 { 980 {
931 case 2: return newSViv (-( start [1] - '0' * 1)); 981 case 2: return newSViv (-( start [1] - '0' * 1));
932 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 982 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
933 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 983 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
934 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 984 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
935 } 985 }
936 else 986 else
937 switch (dec->cur - start) 987 switch (len)
938 { 988 {
939 case 1: return newSViv ( start [0] - '0' * 1); 989 case 1: return newSViv ( start [0] - '0' * 1);
940 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 990 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
941 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 991 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
942 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 992 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
943 } 993 }
944 994
945 { 995 {
946 UV uv; 996 UV uv;
947 int numtype = grok_number (start, dec->cur - start, &uv); 997 int numtype = grok_number (start, len, &uv);
948 if (numtype & IS_NUMBER_IN_UV) 998 if (numtype & IS_NUMBER_IN_UV)
949 if (numtype & IS_NUMBER_NEG) 999 if (numtype & IS_NUMBER_NEG)
950 { 1000 {
951 if (uv < (UV)IV_MIN) 1001 if (uv < (UV)IV_MIN)
952 return newSViv (-(IV)uv); 1002 return newSViv (-(IV)uv);
953 } 1003 }
954 else 1004 else
955 return newSVuv (uv); 1005 return newSVuv (uv);
956
957 // here would likely be the place for bigint support
958 } 1006 }
959 }
960 1007
961 // if we ever support bigint or bigfloat, this is the place for bigfloat 1008 len -= *start == '-' ? 1 : 0;
1009
1010 // does not fit into IV or UV, try NV
1011 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
1012 #if defined (LDBL_DIG)
1013 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1014 #endif
1015 )
1016 // fits into NV without loss of precision
1017 return newSVnv (Atof (start));
1018
1019 // everything else fails, convert it to a string
1020 return newSVpvn (start, dec->cur - start);
1021 }
1022
1023 // loss of precision here
962 return newSVnv (Atof (start)); 1024 return newSVnv (Atof (start));
963 1025
964fail: 1026fail:
965 return 0; 1027 return 0;
966} 1028}
… …
996 1058
997 if (*dec->cur != ',') 1059 if (*dec->cur != ',')
998 ERR (", or ] expected while parsing array"); 1060 ERR (", or ] expected while parsing array");
999 1061
1000 ++dec->cur; 1062 ++dec->cur;
1063
1064 decode_ws (dec);
1065
1066 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1067 {
1068 ++dec->cur;
1069 break;
1070 }
1001 } 1071 }
1002 1072
1003 DEC_DEC_DEPTH; 1073 DEC_DEC_DEPTH;
1004 return newRV_noinc ((SV *)av); 1074 return newRV_noinc ((SV *)av);
1005 1075
… …
1021 if (*dec->cur == '}') 1091 if (*dec->cur == '}')
1022 ++dec->cur; 1092 ++dec->cur;
1023 else 1093 else
1024 for (;;) 1094 for (;;)
1025 { 1095 {
1026 decode_ws (dec); EXPECT_CH ('"'); 1096 EXPECT_CH ('"');
1027 1097
1028 // heuristic: assume that 1098 // heuristic: assume that
1029 // a) decode_str + hv_store_ent are abysmally slow. 1099 // a) decode_str + hv_store_ent are abysmally slow.
1030 // b) most hash keys are short, simple ascii text. 1100 // b) most hash keys are short, simple ascii text.
1031 // => try to "fast-match" such strings to avoid 1101 // => try to "fast-match" such strings to avoid
… …
1045 if (!key) 1115 if (!key)
1046 goto fail; 1116 goto fail;
1047 1117
1048 decode_ws (dec); EXPECT_CH (':'); 1118 decode_ws (dec); EXPECT_CH (':');
1049 1119
1120 decode_ws (dec);
1050 value = decode_sv (dec); 1121 value = decode_sv (dec);
1051 if (!value) 1122 if (!value)
1052 { 1123 {
1053 SvREFCNT_dec (key); 1124 SvREFCNT_dec (key);
1054 goto fail; 1125 goto fail;
… …
1066 int len = p - key; 1137 int len = p - key;
1067 dec->cur = p + 1; 1138 dec->cur = p + 1;
1068 1139
1069 decode_ws (dec); EXPECT_CH (':'); 1140 decode_ws (dec); EXPECT_CH (':');
1070 1141
1142 decode_ws (dec);
1071 value = decode_sv (dec); 1143 value = decode_sv (dec);
1072 if (!value) 1144 if (!value)
1073 goto fail; 1145 goto fail;
1074 1146
1075 hv_store (hv, key, len, value, 0); 1147 hv_store (hv, key, len, value, 0);
… …
1091 1163
1092 if (*dec->cur != ',') 1164 if (*dec->cur != ',')
1093 ERR (", or } expected while parsing object/hash"); 1165 ERR (", or } expected while parsing object/hash");
1094 1166
1095 ++dec->cur; 1167 ++dec->cur;
1168
1169 decode_ws (dec);
1170
1171 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1172 {
1173 ++dec->cur;
1174 break;
1175 }
1096 } 1176 }
1097 1177
1098 DEC_DEC_DEPTH; 1178 DEC_DEC_DEPTH;
1099 sv = newRV_noinc ((SV *)hv); 1179 sv = newRV_noinc ((SV *)hv);
1100 1180
… …
1113 // might want to optimise this for common cases. 1193 // might want to optimise this for common cases.
1114 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1194 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1115 1195
1116 if (cb) 1196 if (cb)
1117 { 1197 {
1198 dSP;
1118 int count; 1199 int count;
1119 ENTER; SAVETMPS;
1120 1200
1121 dSP; PUSHMARK (SP); 1201 ENTER; SAVETMPS; PUSHMARK (SP);
1122 XPUSHs (HeVAL (he)); 1202 XPUSHs (HeVAL (he));
1123 1203
1124 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1204 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1125 1205
1126 if (count == 1) 1206 if (count == 1)
… …
1134 } 1214 }
1135 } 1215 }
1136 1216
1137 if (dec->json.cb_object) 1217 if (dec->json.cb_object)
1138 { 1218 {
1219 dSP;
1139 int count; 1220 int count;
1140 ENTER; SAVETMPS;
1141 1221
1142 dSP; ENTER; SAVETMPS; PUSHMARK (SP); 1222 ENTER; SAVETMPS; PUSHMARK (SP);
1143 XPUSHs (sv_2mortal (sv)); 1223 XPUSHs (sv_2mortal (sv));
1144 1224
1145 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1225 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1146 1226
1147 if (count == 1) 1227 if (count == 1)
… …
1165} 1245}
1166 1246
1167static SV * 1247static SV *
1168decode_sv (dec_t *dec) 1248decode_sv (dec_t *dec)
1169{ 1249{
1170 decode_ws (dec);
1171
1172 // the beauty of JSON: you need exactly one character lookahead 1250 // the beauty of JSON: you need exactly one character lookahead
1173 // to parse anything. 1251 // to parse anything.
1174 switch (*dec->cur) 1252 switch (*dec->cur)
1175 { 1253 {
1176 case '"': ++dec->cur; return decode_str (dec); 1254 case '"': ++dec->cur; return decode_str (dec);
… …
1184 1262
1185 case 't': 1263 case 't':
1186 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1264 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1187 { 1265 {
1188 dec->cur += 4; 1266 dec->cur += 4;
1267#if JSON_SLOW
1268 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
1269#endif
1189 return SvREFCNT_inc (json_true); 1270 return SvREFCNT_inc (json_true);
1190 } 1271 }
1191 else 1272 else
1192 ERR ("'true' expected"); 1273 ERR ("'true' expected");
1193 1274
… …
1195 1276
1196 case 'f': 1277 case 'f':
1197 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1278 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1198 { 1279 {
1199 dec->cur += 5; 1280 dec->cur += 5;
1281#if JSON_SLOW
1282 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1283#endif
1200 return SvREFCNT_inc (json_false); 1284 return SvREFCNT_inc (json_false);
1201 } 1285 }
1202 else 1286 else
1203 ERR ("'false' expected"); 1287 ERR ("'false' expected");
1204 1288
… …
1254 1338
1255 if (dec.json.cb_object || dec.json.cb_sk_object) 1339 if (dec.json.cb_object || dec.json.cb_sk_object)
1256 dec.json.flags |= F_HOOK; 1340 dec.json.flags |= F_HOOK;
1257 1341
1258 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1342 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1343
1344 decode_ws (&dec);
1259 sv = decode_sv (&dec); 1345 sv = decode_sv (&dec);
1260 1346
1261 if (!(offset_return || !sv)) 1347 if (!(offset_return || !sv))
1262 { 1348 {
1263 // check for trailing garbage 1349 // check for trailing garbage
… …
1331 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1417 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1332} 1418}
1333 1419
1334PROTOTYPES: DISABLE 1420PROTOTYPES: DISABLE
1335 1421
1422void CLONE (...)
1423 CODE:
1424 json_stash = 0;
1425 json_boolean_stash = 0;
1426
1336void new (char *klass) 1427void new (char *klass)
1337 PPCODE: 1428 PPCODE:
1338{ 1429{
1339 SV *pv = NEWSV (0, sizeof (JSON)); 1430 SV *pv = NEWSV (0, sizeof (JSON));
1340 SvPOK_only (pv); 1431 SvPOK_only (pv);
1341 Zero (SvPVX (pv), 1, JSON); 1432 Zero (SvPVX (pv), 1, JSON);
1342 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1433 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1343 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash))); 1434 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1344} 1435}
1345 1436
1346void ascii (JSON *self, int enable = 1) 1437void ascii (JSON *self, int enable = 1)
1347 ALIAS: 1438 ALIAS:
1348 ascii = F_ASCII 1439 ascii = F_ASCII
… …
1355 pretty = F_PRETTY 1446 pretty = F_PRETTY
1356 allow_nonref = F_ALLOW_NONREF 1447 allow_nonref = F_ALLOW_NONREF
1357 shrink = F_SHRINK 1448 shrink = F_SHRINK
1358 allow_blessed = F_ALLOW_BLESSED 1449 allow_blessed = F_ALLOW_BLESSED
1359 convert_blessed = F_CONV_BLESSED 1450 convert_blessed = F_CONV_BLESSED
1451 relaxed = F_RELAXED
1360 PPCODE: 1452 PPCODE:
1361{ 1453{
1362 if (enable) 1454 if (enable)
1363 self->flags |= ix; 1455 self->flags |= ix;
1364 else 1456 else

Diff Legend

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