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.23 by root, Tue Apr 3 23:34:17 2007 UTC vs.
Revision 1.25 by root, Fri Apr 6 20:37:22 2007 UTC

… …
21 21
22// F_SELFCONVERT? <=> to_json/toJson 22// F_SELFCONVERT? <=> to_json/toJson
23// F_BLESSED? <=> { $__class__$ => } 23// F_BLESSED? <=> { $__class__$ => }
24 24
25#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 25#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
26#define F_DEFAULT (12UL << S_MAXDEPTH) 26#define F_DEFAULT (9UL << S_MAXDEPTH)
27 27
28#define INIT_SIZE 32 // initial scalar size to be allocated 28#define INIT_SIZE 32 // initial scalar size to be allocated
29#define INDENT_STEP 3 // spaces per indentation level 29#define INDENT_STEP 3 // spaces per indentation level
30 30
31#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character 31#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character
… …
408 408
409 encode_nl (enc); 409 encode_nl (enc);
410 } 410 }
411 else 411 else
412 { 412 {
413 SV *sv;
414 HE *he = hv_iternext (hv); 413 HE *he = hv_iternext (hv);
415 414
416 for (;;) 415 for (;;)
417 { 416 {
418 encode_indent (enc); 417 encode_indent (enc);
… …
433 432
434// encode objects, arrays and special \0=false and \1=true values. 433// encode objects, arrays and special \0=false and \1=true values.
435static void 434static void
436encode_rv (enc_t *enc, SV *sv) 435encode_rv (enc_t *enc, SV *sv)
437{ 436{
437 svtype svt;
438
438 SvGETMAGIC (sv); 439 SvGETMAGIC (sv);
439
440 svtype svt = SvTYPE (sv); 440 svt = SvTYPE (sv);
441 441
442 if (svt == SVt_PVHV) 442 if (svt == SVt_PVHV)
443 encode_hv (enc, (HV *)sv); 443 encode_hv (enc, (HV *)sv);
444 else if (svt == SVt_PVAV) 444 else if (svt == SVt_PVAV)
445 encode_av (enc, (AV *)sv); 445 encode_av (enc, (AV *)sv);
… …
495} 495}
496 496
497static SV * 497static SV *
498encode_json (SV *scalar, U32 flags) 498encode_json (SV *scalar, U32 flags)
499{ 499{
500 enc_t enc;
501
500 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 502 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
501 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 503 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
502 504
503 enc_t enc;
504 enc.flags = flags; 505 enc.flags = flags;
505 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 506 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
506 enc.cur = SvPVX (enc.sv); 507 enc.cur = SvPVX (enc.sv);
507 enc.end = SvEND (enc.sv); 508 enc.end = SvEND (enc.sv);
508 enc.indent = 0; 509 enc.indent = 0;
… …
670 } 671 }
671 else if (ch >= 0x20 && ch <= 0x7f) 672 else if (ch >= 0x20 && ch <= 0x7f)
672 *cur++ = ch; 673 *cur++ = ch;
673 else if (ch >= 0x80) 674 else if (ch >= 0x80)
674 { 675 {
676 STRLEN clen;
677 UV uch;
678
675 --dec->cur; 679 --dec->cur;
676 680
677 STRLEN clen;
678 UV uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 681 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);
679 if (clen == (STRLEN)-1) 682 if (clen == (STRLEN)-1)
680 ERR ("malformed UTF-8 character in JSON string"); 683 ERR ("malformed UTF-8 character in JSON string");
681 684
682 do 685 do
683 *cur++ = *dec->cur++; 686 *cur++ = *dec->cur++;
… …
688 else 691 else
689 { 692 {
690 --dec->cur; 693 --dec->cur;
691 694
692 if (!ch) 695 if (!ch)
693 ERR ("unexpected end of string while parsing json string"); 696 ERR ("unexpected end of string while parsing JSON string");
694 else 697 else
695 ERR ("invalid character encountered while parsing json string"); 698 ERR ("invalid character encountered while parsing JSON string");
696 } 699 }
697 } 700 }
698 while (cur < buf + SHORT_STRING_LEN); 701 while (cur < buf + SHORT_STRING_LEN);
699 702
703 {
700 STRLEN len = cur - buf; 704 STRLEN len = cur - buf;
701 705
702 if (sv) 706 if (sv)
703 { 707 {
704 SvGROW (sv, SvCUR (sv) + len + 1); 708 SvGROW (sv, SvCUR (sv) + len + 1);
705 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 709 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
706 SvCUR_set (sv, SvCUR (sv) + len); 710 SvCUR_set (sv, SvCUR (sv) + len);
707 } 711 }
708 else 712 else
709 sv = newSVpvn (buf, len); 713 sv = newSVpvn (buf, len);
714 }
710 } 715 }
711 while (*dec->cur != '"'); 716 while (*dec->cur != '"');
712 717
713 ++dec->cur; 718 ++dec->cur;
714 719
… …
958 ERR ("'null' expected"); 963 ERR ("'null' expected");
959 964
960 break; 965 break;
961 966
962 default: 967 default:
963 ERR ("malformed json string, neither array, object, number, string or atom"); 968 ERR ("malformed JSON string, neither array, object, number, string or atom");
964 break; 969 break;
965 } 970 }
966 971
967fail: 972fail:
968 return 0; 973 return 0;
969} 974}
970 975
971static SV * 976static SV *
972decode_json (SV *string, U32 flags) 977decode_json (SV *string, U32 flags)
973{ 978{
979 dec_t dec;
974 SV *sv; 980 SV *sv;
975 981
976 SvUPGRADE (string, SVt_PV); 982 SvUPGRADE (string, SVt_PV);
977 983
978 if (flags & F_UTF8) 984 if (flags & F_UTF8)
… …
980 else 986 else
981 sv_utf8_upgrade (string); 987 sv_utf8_upgrade (string);
982 988
983 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 989 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
984 990
985 dec_t dec;
986 dec.flags = flags; 991 dec.flags = flags;
987 dec.cur = SvPVX (string); 992 dec.cur = SvPVX (string);
988 dec.end = SvEND (string); 993 dec.end = SvEND (string);
989 dec.err = 0; 994 dec.err = 0;
990 dec.depth = 0; 995 dec.depth = 0;
… …
1074 RETVAL = newSVsv (self); 1079 RETVAL = newSVsv (self);
1075} 1080}
1076 OUTPUT: 1081 OUTPUT:
1077 RETVAL 1082 RETVAL
1078 1083
1079SV *max_depth (SV *self, int max_depth = 0x80000000UL) 1084SV *max_depth (SV *self, UV max_depth = 0x80000000UL)
1080 CODE: 1085 CODE:
1081{ 1086{
1082 UV *uv = SvJSON (self); 1087 UV *uv = SvJSON (self);
1083 UV log2 = 0; 1088 UV log2 = 0;
1084 1089

Diff Legend

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