ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CBOR-XS/XS.xs
(Generate patch)

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.3 by root, Sat Oct 26 11:08:34 2013 UTC vs.
Revision 1.13 by root, Mon Oct 28 22:50:50 2013 UTC

… …
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11 11
12#include "ecb.h" 12#include "ecb.h"
13 13
14// known tags
15enum cbor_tag
16{
17 // inofficial extensions (pending iana registration)
18 CBOR_TAG_PERL_OBJECT = 256,
19 CBOR_TAG_GENERIC_OBJECT = 257,
20
21 // rfc7049
22 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
23 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
24 CBOR_TAG_POS_BIGNUM = 2, // byte string
25 CBOR_TAG_NEG_BIGNUM = 3, // byte string
26 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
27 CBOR_TAG_BIGFLOAT = 5, // array
28
29 CBOR_TAG_CONV_B64U = 21, // base64url, any
30 CBOR_TAG_CONV_B64 = 22, // base64, any
31 CBOR_TAG_CONV_HEX = 23, // base16, any
32 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
33
34 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
35 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
36 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
37 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
38 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
39
40 CBOR_TAG_MAGIC = 55799 // self-describe cbor
41};
42
14#define F_SHRINK 0x00000200UL 43#define F_SHRINK 0x00000200UL
15#define F_ALLOW_UNKNOWN 0x00002000UL 44#define F_ALLOW_UNKNOWN 0x00002000UL
16 45
17#define INIT_SIZE 32 // initial scalar size to be allocated 46#define INIT_SIZE 32 // initial scalar size to be allocated
18 47
19#define SB do { 48#define SB do {
20#define SE } while (0) 49#define SE } while (0)
21
22#if __GNUC__ >= 3
23# define expect(expr,value) __builtin_expect ((expr), (value))
24# define INLINE static inline
25#else
26# define expect(expr,value) (expr)
27# define INLINE static
28#endif
29
30#define expect_false(expr) expect ((expr) != 0, 0)
31#define expect_true(expr) expect ((expr) != 0, 1)
32 50
33#define IN_RANGE_INC(type,val,beg,end) \ 51#define IN_RANGE_INC(type,val,beg,end) \
34 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 52 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
35 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 53 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
36 54
… …
42#else 60#else
43# define CBOR_SLOW 0 61# define CBOR_SLOW 0
44# define CBOR_STASH cbor_stash 62# define CBOR_STASH cbor_stash
45#endif 63#endif
46 64
47static HV *cbor_stash, *cbor_boolean_stash; // CBOR::XS:: 65static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
48static SV *cbor_true, *cbor_false; 66static SV *types_true, *types_false, *types_error, *sv_cbor;
49 67
50typedef struct { 68typedef struct {
51 U32 flags; 69 U32 flags;
52 U32 max_depth; 70 U32 max_depth;
53 STRLEN max_size; 71 STRLEN max_size;
54
55 SV *cb_object;
56 HV *cb_sk_object;
57} CBOR; 72} CBOR;
58 73
59INLINE void 74ecb_inline void
60cbor_init (CBOR *cbor) 75cbor_init (CBOR *cbor)
61{ 76{
62 Zero (cbor, 1, CBOR); 77 Zero (cbor, 1, CBOR);
63 cbor->max_depth = 512; 78 cbor->max_depth = 512;
64} 79}
65 80
66///////////////////////////////////////////////////////////////////////////// 81/////////////////////////////////////////////////////////////////////////////
67// utility functions 82// utility functions
68 83
69INLINE SV * 84ecb_inline SV *
70get_bool (const char *name) 85get_bool (const char *name)
71{ 86{
72 SV *sv = get_sv (name, 1); 87 SV *sv = get_sv (name, 1);
73 88
74 SvREADONLY_on (sv); 89 SvREADONLY_on (sv);
75 SvREADONLY_on (SvRV (sv)); 90 SvREADONLY_on (SvRV (sv));
76 91
77 return sv; 92 return sv;
78} 93}
79 94
80INLINE void 95ecb_inline void
81shrink (SV *sv) 96shrink (SV *sv)
82{ 97{
83 sv_utf8_downgrade (sv, 1); 98 sv_utf8_downgrade (sv, 1);
84 99
85 if (SvLEN (sv) > SvCUR (sv) + 1) 100 if (SvLEN (sv) > SvCUR (sv) + 1)
… …
108 SV *sv; // result scalar 123 SV *sv; // result scalar
109 CBOR cbor; 124 CBOR cbor;
110 U32 depth; // recursion level 125 U32 depth; // recursion level
111} enc_t; 126} enc_t;
112 127
113INLINE void 128ecb_inline void
114need (enc_t *enc, STRLEN len) 129need (enc_t *enc, STRLEN len)
115{ 130{
116 if (expect_false (enc->cur + len >= enc->end)) 131 if (ecb_expect_false (enc->cur + len >= enc->end))
117 { 132 {
118 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 133 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
119 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 134 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
120 enc->cur = SvPVX (enc->sv) + cur; 135 enc->cur = SvPVX (enc->sv) + cur;
121 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 136 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
122 } 137 }
123} 138}
124 139
125INLINE void 140ecb_inline void
126encode_ch (enc_t *enc, char ch) 141encode_ch (enc_t *enc, char ch)
127{ 142{
128 need (enc, 1); 143 need (enc, 1);
129 *enc->cur++ = ch; 144 *enc->cur++ = ch;
130} 145}
… …
134{ 149{
135 need (enc, 9); 150 need (enc, 9);
136 151
137 if (len < 24) 152 if (len < 24)
138 *enc->cur++ = major | len; 153 *enc->cur++ = major | len;
139 else if (len < 0x100) 154 else if (len <= 0xff)
140 { 155 {
141 *enc->cur++ = major | 24; 156 *enc->cur++ = major | 24;
142 *enc->cur++ = len; 157 *enc->cur++ = len;
143 } 158 }
144 else if (len < 0x10000) 159 else if (len <= 0xffff)
145 { 160 {
146 *enc->cur++ = major | 25; 161 *enc->cur++ = major | 25;
147 *enc->cur++ = len >> 8; 162 *enc->cur++ = len >> 8;
148 *enc->cur++ = len; 163 *enc->cur++ = len;
149 } 164 }
150 else if (len < 0x100000000) 165 else if (len <= 0xffffffff)
151 { 166 {
152 *enc->cur++ = major | 26; 167 *enc->cur++ = major | 26;
153 *enc->cur++ = len >> 24; 168 *enc->cur++ = len >> 24;
154 *enc->cur++ = len >> 16; 169 *enc->cur++ = len >> 16;
155 *enc->cur++ = len >> 8; 170 *enc->cur++ = len >> 8;
156 *enc->cur++ = len; 171 *enc->cur++ = len;
157 } 172 }
158 else if (len) 173 else
159 { 174 {
160 *enc->cur++ = major | 27; 175 *enc->cur++ = major | 27;
161 *enc->cur++ = len >> 56; 176 *enc->cur++ = len >> 56;
162 *enc->cur++ = len >> 48; 177 *enc->cur++ = len >> 48;
163 *enc->cur++ = len >> 40; 178 *enc->cur++ = len >> 40;
… …
224 if (HeKLEN (he) == HEf_SVKEY) 239 if (HeKLEN (he) == HEf_SVKEY)
225 encode_sv (enc, HeSVKEY (he)); 240 encode_sv (enc, HeSVKEY (he));
226 else 241 else
227 encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 242 encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
228 243
229 encode_sv (enc, expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 244 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
230 } 245 }
231 246
232 if (mg) 247 if (mg)
233 encode_ch (enc, 0xe0 | 31); 248 encode_ch (enc, 0xe0 | 31);
234 249
… …
242 svtype svt; 257 svtype svt;
243 258
244 SvGETMAGIC (sv); 259 SvGETMAGIC (sv);
245 svt = SvTYPE (sv); 260 svt = SvTYPE (sv);
246 261
247 if (expect_false (SvOBJECT (sv))) 262 if (ecb_expect_false (SvOBJECT (sv)))
248 { 263 {
249 HV *stash = !CBOR_SLOW || cbor_boolean_stash 264 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
250 ? cbor_boolean_stash 265 ? types_boolean_stash
266 : gv_stashpv ("Types::Serialiser::Boolean", 1);
267 HV *error_stash = !CBOR_SLOW || types_error_stash
268 ? types_error_stash
269 : gv_stashpv ("Types::Serialiser::Error", 1);
270 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
271 ? cbor_tagged_stash
251 : gv_stashpv ("CBOR::XS::Boolean", 1); 272 : gv_stashpv ("CBOR::XS::Tagged" , 1);
252 273
253 if (SvSTASH (sv) == stash) 274 HV *stash = SvSTASH (sv);
275 GV *method;
276
277 if (stash == boolean_stash)
254 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 278 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
279 else if (stash == error_stash)
280 encode_ch (enc, 0xe0 | 23);
281 else if (stash == tagged_stash)
282 {
283 if (svt != SVt_PVAV)
284 croak ("encountered CBOR::XS::Tagged object that isn't an array");
285
286 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));
287 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
288 }
289 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
290 {
291 dSP;
292
293 ENTER; SAVETMPS; PUSHMARK (SP);
294 // we re-bless the reference to get overload and other niceties right
295 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
296
297 PUTBACK;
298 // G_SCALAR ensures that return value is 1
299 call_sv ((SV *)GvCV (method), G_SCALAR);
300 SPAGAIN;
301
302 // catch this surprisingly common error
303 if (SvROK (TOPs) && SvRV (TOPs) == sv)
304 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
305
306 encode_sv (enc, POPs);
307
308 PUTBACK;
309
310 FREETMPS; LEAVE;
311 }
312 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
313 {
314 dSP;
315
316 ENTER; SAVETMPS; PUSHMARK (SP);
317 EXTEND (SP, 2);
318 // we re-bless the reference to get overload and other niceties right
319 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
320 PUSHs (sv_cbor);
321
322 PUTBACK;
323 int count = call_sv ((SV *)GvCV (method), G_ARRAY);
324 SPAGAIN;
325
326 // catch this surprisingly common error
327 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
328 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
329
330 encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT);
331 encode_uint (enc, 0x80, count + 1);
332 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
333
334 while (count)
335 encode_sv (enc, SP[1 - count--]);
336
337 PUTBACK;
338
339 FREETMPS; LEAVE;
340 }
255 else 341 else
256 {
257#if 0 //TODO
258 if (enc->cbor.flags & F_CONV_BLESSED)
259 {
260 // we re-bless the reference to get overload and other niceties right
261 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
262
263 if (to_cbor)
264 {
265 dSP;
266
267 ENTER; SAVETMPS; PUSHMARK (SP);
268 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
269
270 // calling with G_SCALAR ensures that we always get a 1 return value
271 PUTBACK;
272 call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
273 SPAGAIN;
274
275 // catch this surprisingly common error
276 if (SvROK (TOPs) && SvRV (TOPs) == sv)
277 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
278
279 sv = POPs;
280 PUTBACK;
281
282 encode_sv (enc, sv);
283
284 FREETMPS; LEAVE;
285 }
286 else if (enc->cbor.flags & F_ALLOW_BLESSED)
287 encode_str (enc, "null", 4, 0);
288 else
289 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_CBOR method available on it", 342 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
290 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
291 }
292 else if (enc->cbor.flags & F_ALLOW_BLESSED)
293 encode_str (enc, "null", 4, 0);
294 else
295 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
296 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 343 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
297#endif
298 }
299 } 344 }
300 else if (svt == SVt_PVHV) 345 else if (svt == SVt_PVHV)
301 encode_hv (enc, (HV *)sv); 346 encode_hv (enc, (HV *)sv);
302 else if (svt == SVt_PVAV) 347 else if (svt == SVt_PVAV)
303 encode_av (enc, (AV *)sv); 348 encode_av (enc, (AV *)sv);
… …
328{ 373{
329 double nv = SvNVX (sv); 374 double nv = SvNVX (sv);
330 375
331 need (enc, 9); 376 need (enc, 9);
332 377
333 if (expect_false (nv == (U32)nv)) 378 if (ecb_expect_false (nv == (U32)nv))
334 encode_uint (enc, 0x00, (U32)nv); 379 encode_uint (enc, 0x00, (U32)nv);
335 //TODO: maybe I32? 380 //TODO: maybe I32?
336 else if (expect_false (nv == (float)nv)) 381 else if (ecb_expect_false (nv == (float)nv))
337 { 382 {
338 uint32_t fp = ecb_float_to_binary32 (nv); 383 uint32_t fp = ecb_float_to_binary32 (nv);
339 384
340 *enc->cur++ = 0xe0 | 26; 385 *enc->cur++ = 0xe0 | 26;
341 386
… …
429 U32 maxdepth; // recursion depth limit 474 U32 maxdepth; // recursion depth limit
430} dec_t; 475} dec_t;
431 476
432#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 477#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
433 478
434#define WANT(len) if (expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data"); 479#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
435 480
436#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 481#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)
437#define DEC_DEC_DEPTH --dec->depth 482#define DEC_DEC_DEPTH --dec->depth
438 483
439static UV 484static UV
… …
553 598
554 SV *k = decode_sv (dec); 599 SV *k = decode_sv (dec);
555 SV *v = decode_sv (dec); 600 SV *v = decode_sv (dec);
556 601
557 hv_store_ent (hv, k, v, 0); 602 hv_store_ent (hv, k, v, 0);
603 SvREFCNT_dec (k);
558 } 604 }
559 } 605 }
560 else 606 else
561 { 607 {
562 int len = decode_uint (dec); 608 int len = decode_uint (dec);
… …
565 { 611 {
566 SV *k = decode_sv (dec); 612 SV *k = decode_sv (dec);
567 SV *v = decode_sv (dec); 613 SV *v = decode_sv (dec);
568 614
569 hv_store_ent (hv, k, v, 0); 615 hv_store_ent (hv, k, v, 0);
616 SvREFCNT_dec (k);
570 } 617 }
571 } 618 }
572 619
573 DEC_DEC_DEPTH; 620 DEC_DEC_DEPTH;
574 return newRV_noinc ((SV *)hv); 621 return newRV_noinc ((SV *)hv);
575
576#if 0
577 SV *sv;
578 HV *hv = newHV ();
579
580 DEC_INC_DEPTH;
581 decode_ws (dec);
582
583 for (;;)
584 {
585 // heuristic: assume that
586 // a) decode_str + hv_store_ent are abysmally slow.
587 // b) most hash keys are short, simple ascii text.
588 // => try to "fast-match" such strings to avoid
589 // the overhead of decode_str + hv_store_ent.
590 {
591 SV *value;
592 char *p = dec->cur;
593 char *e = p + 24; // only try up to 24 bytes
594
595 for (;;)
596 {
597 // the >= 0x80 is false on most architectures
598 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
599 {
600 // slow path, back up and use decode_str
601 SV *key = decode_str (dec);
602 if (!key)
603 goto fail;
604
605 decode_ws (dec); EXPECT_CH (':');
606
607 decode_ws (dec);
608 value = decode_sv (dec);
609 if (!value)
610 {
611 SvREFCNT_dec (key);
612 goto fail;
613 }
614
615 hv_store_ent (hv, key, value, 0);
616 SvREFCNT_dec (key);
617
618 break;
619 }
620 else if (*p == '"')
621 {
622 // fast path, got a simple key
623 char *key = dec->cur;
624 int len = p - key;
625 dec->cur = p + 1;
626
627 decode_ws (dec); EXPECT_CH (':');
628
629 decode_ws (dec);
630 value = decode_sv (dec);
631 if (!value)
632 goto fail;
633
634 hv_store (hv, key, len, value, 0);
635
636 break;
637 }
638
639 ++p;
640 }
641 }
642
643 decode_ws (dec);
644
645 if (*dec->cur == '}')
646 {
647 ++dec->cur;
648 break;
649 }
650
651 if (*dec->cur != ',')
652 ERR (", or } expected while parsing object/hash");
653
654 ++dec->cur;
655
656 decode_ws (dec);
657
658 if (*dec->cur == '}' && dec->cbor.flags & F_RELAXED)
659 {
660 ++dec->cur;
661 break;
662 }
663 }
664
665 DEC_DEC_DEPTH;
666 sv = newRV_noinc ((SV *)hv);
667
668 // check filter callbacks
669 if (dec->cbor.flags & F_HOOK)
670 {
671 if (dec->cbor.cb_sk_object && HvKEYS (hv) == 1)
672 {
673 HE *cb, *he;
674
675 hv_iterinit (hv);
676 he = hv_iternext (hv);
677 hv_iterinit (hv);
678
679 // the next line creates a mortal sv each time its called.
680 // might want to optimise this for common cases.
681 cb = hv_fetch_ent (dec->cbor.cb_sk_object, hv_iterkeysv (he), 0, 0);
682
683 if (cb)
684 {
685 dSP;
686 int count;
687
688 ENTER; SAVETMPS; PUSHMARK (SP);
689 XPUSHs (HeVAL (he));
690 sv_2mortal (sv);
691
692 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
693
694 if (count == 1)
695 {
696 sv = newSVsv (POPs);
697 FREETMPS; LEAVE;
698 return sv;
699 }
700
701 SvREFCNT_inc (sv);
702 FREETMPS; LEAVE;
703 }
704 }
705
706 if (dec->cbor.cb_object)
707 {
708 dSP;
709 int count;
710
711 ENTER; SAVETMPS; PUSHMARK (SP);
712 XPUSHs (sv_2mortal (sv));
713
714 PUTBACK; count = call_sv (dec->cbor.cb_object, G_ARRAY); SPAGAIN;
715
716 if (count == 1)
717 {
718 sv = newSVsv (POPs);
719 FREETMPS; LEAVE;
720 return sv;
721 }
722
723 SvREFCNT_inc (sv);
724 FREETMPS; LEAVE;
725 }
726 }
727
728 return sv;
729#endif
730 622
731fail: 623fail:
732 SvREFCNT_dec (hv); 624 SvREFCNT_dec (hv);
733 DEC_DEC_DEPTH; 625 DEC_DEC_DEPTH;
734 return &PL_sv_undef; 626 return &PL_sv_undef;
735} 627}
736 628
737static SV * 629static SV *
738decode_str (dec_t *dec, int utf8) 630decode_str (dec_t *dec, int utf8)
739{ 631{
740 SV *sv; 632 SV *sv = 0;
741 633
742 if ((*dec->cur & 31) == 31) 634 if ((*dec->cur & 31) == 31)
743 { 635 {
744 ++dec->cur; 636 ++dec->cur;
745 637
… …
754 { 646 {
755 ++dec->cur; 647 ++dec->cur;
756 break; 648 break;
757 } 649 }
758 650
759 SV *sv2 = decode_sv (dec);
760 sv_catsv (sv, sv2); 651 sv_catsv (sv, decode_sv (dec));
761 } 652 }
762 } 653 }
763 else 654 else
764 { 655 {
765 STRLEN len = decode_uint (dec); 656 STRLEN len = decode_uint (dec);
… …
773 SvUTF8_on (sv); 664 SvUTF8_on (sv);
774 665
775 return sv; 666 return sv;
776 667
777fail: 668fail:
669 SvREFCNT_dec (sv);
778 return &PL_sv_undef; 670 return &PL_sv_undef;
779} 671}
780 672
781static SV * 673static SV *
782decode_tagged (dec_t *dec) 674decode_tagged (dec_t *dec)
783{ 675{
784 UV tag = decode_uint (dec); 676 UV tag = decode_uint (dec);
785 SV *sv = decode_sv (dec); 677 SV *sv = decode_sv (dec);
786 678
787 if (tag == 55799) // 2.4.5 Self-Describe CBOR 679 if (tag == CBOR_TAG_MAGIC)
788 return sv; 680 return sv;
681 else if (tag == CBOR_TAG_PERL_OBJECT)
682 {
683 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
684 ERR ("corrupted CBOR data (non-array perl object)");
789 685
686 AV *av = (AV *)SvRV (sv);
687 int len = av_len (av) + 1;
688 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
689
690 if (!stash)
691 ERR ("cannot decode perl-object (package does not exist)");
692
693 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
694
695 if (!method)
696 ERR ("cannot decode perl-object (package does not have a THAW method)");
697
698 dSP;
699
700 ENTER; SAVETMPS; PUSHMARK (SP);
701 EXTEND (SP, len + 1);
702 // we re-bless the reference to get overload and other niceties right
703 PUSHs (*av_fetch (av, 0, 1));
704 PUSHs (sv_cbor);
705
706 int i;
707
708 for (i = 1; i < len; ++i)
709 PUSHs (*av_fetch (av, i, 1));
710
711 PUTBACK;
712 call_sv ((SV *)GvCV (method), G_SCALAR);
713 SPAGAIN;
714
715 SvREFCNT_dec (sv);
716 sv = SvREFCNT_inc (POPs);
717
718 PUTBACK;
719
720 FREETMPS; LEAVE;
721
722 return sv;
723 }
724 else
725 {
790 AV *av = newAV (); 726 AV *av = newAV ();
791 av_push (av, newSVuv (tag)); 727 av_push (av, newSVuv (tag));
792 av_push (av, sv); 728 av_push (av, sv);
793 return newRV_noinc ((SV *)av); 729
730 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
731 ? cbor_tagged_stash
732 : gv_stashpv ("CBOR::XS::Tagged" , 1);
733
734 return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
735 }
736
737fail:
738 SvREFCNT_dec (sv);
739 return &PL_sv_undef;
794} 740}
795 741
796static SV * 742static SV *
797decode_sv (dec_t *dec) 743decode_sv (dec_t *dec)
798{ 744{
799 WANT (1); 745 WANT (1);
800 746
801 switch (*dec->cur >> 5) 747 switch (*dec->cur >> 5)
802 { 748 {
803 case 0: // unsigned int 749 case 0: // unsigned int
804 //TODO: 64 bit values on 3 2bit perls
805 return newSVuv (decode_uint (dec)); 750 return newSVuv (decode_uint (dec));
806 case 1: // negative int 751 case 1: // negative int
807 return newSViv (-1 - (IV)decode_uint (dec)); 752 return newSViv (-1 - (IV)decode_uint (dec));
808 case 2: // octet string 753 case 2: // octet string
809 return decode_str (dec, 0); 754 return decode_str (dec, 0);
… …
818 case 7: // misc 763 case 7: // misc
819 switch (*dec->cur++ & 31) 764 switch (*dec->cur++ & 31)
820 { 765 {
821 case 20: 766 case 20:
822#if CBOR_SLOW 767#if CBOR_SLOW
823 cbor_false = get_bool ("CBOR::XS::false"); 768 types_false = get_bool ("Types::Serialiser::false");
824#endif 769#endif
825 return newSVsv (cbor_false); 770 return newSVsv (types_false);
826 case 21: 771 case 21:
827#if CBOR_SLOW 772#if CBOR_SLOW
828 cbor_true = get_bool ("CBOR::XS::true"); 773 types_true = get_bool ("Types::Serialiser::true");
829#endif 774#endif
830 return newSVsv (cbor_true); 775 return newSVsv (types_true);
831 case 22: 776 case 22:
832 return newSVsv (&PL_sv_undef); 777 return newSVsv (&PL_sv_undef);
778 case 23:
779#if CBOR_SLOW
780 types_error = get_bool ("Types::Serialiser::error");
781#endif
782 return newSVsv (types_error);
833 783
834 case 25: 784 case 25:
835 { 785 {
836 WANT (2); 786 WANT (2);
837 787
… …
873 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 823 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
874 } 824 }
875 825
876 break; 826 break;
877 } 827 }
878#if 0
879 switch (*dec->cur)
880 {
881 //case '"': ++dec->cur; return decode_str (dec);
882 case '[': ++dec->cur; return decode_av (dec);
883 case '{': ++dec->cur; return decode_hv (dec);
884
885 case '-':
886 case '0': case '1': case '2': case '3': case '4':
887 case '5': case '6': case '7': case '8': case '9':
888 //TODO return decode_num (dec);
889
890 case 't':
891 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
892 {
893 dec->cur += 4;
894#if CBOR_SLOW
895 cbor_true = get_bool ("CBOR::XS::true");
896#endif
897 return newSVsv (cbor_true);
898 }
899 else
900 ERR ("'true' expected");
901
902 break;
903
904 case 'f':
905 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
906 {
907 dec->cur += 5;
908#if CBOR_SLOW
909 cbor_false = get_bool ("CBOR::XS::false");
910#endif
911 return newSVsv (cbor_false);
912 }
913 else
914 ERR ("'false' expected");
915
916 break;
917
918 case 'n':
919 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
920 {
921 dec->cur += 4;
922 return newSVsv (&PL_sv_undef);
923 }
924 else
925 ERR ("'null' expected");
926
927 break;
928
929 default:
930 ERR ("malformed CBOR string, neither array, object, number, string or atom");
931 break;
932 }
933#endif
934 828
935fail: 829fail:
936 return &PL_sv_undef; 830 return &PL_sv_undef;
937} 831}
938 832
… …
981 dec.cur = (U8 *)SvPVX (string); 875 dec.cur = (U8 *)SvPVX (string);
982 dec.end = (U8 *)SvEND (string); 876 dec.end = (U8 *)SvEND (string);
983 dec.err = 0; 877 dec.err = 0;
984 dec.depth = 0; 878 dec.depth = 0;
985 879
986 if (dec.cbor.cb_object || dec.cbor.cb_sk_object)
987 ;//TODO dec.cbor.flags |= F_HOOK;
988
989 sv = decode_sv (&dec); 880 sv = decode_sv (&dec);
990 881
991 if (offset_return) 882 if (offset_return)
992 *offset_return = dec.cur; 883 *offset_return = dec.cur;
993 884
… …
1012MODULE = CBOR::XS PACKAGE = CBOR::XS 903MODULE = CBOR::XS PACKAGE = CBOR::XS
1013 904
1014BOOT: 905BOOT:
1015{ 906{
1016 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 907 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1017 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1); 908 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1018 909
1019 cbor_true = get_bool ("CBOR::XS::true"); 910 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1020 cbor_false = get_bool ("CBOR::XS::false"); 911 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
912
913 types_true = get_bool ("Types::Serialiser::true" );
914 types_false = get_bool ("Types::Serialiser::false");
915 types_error = get_bool ("Types::Serialiser::error");
916
917 sv_cbor = newSVpv ("CBOR", 0);
918 SvREADONLY_on (sv_cbor);
1021} 919}
1022 920
1023PROTOTYPES: DISABLE 921PROTOTYPES: DISABLE
1024 922
1025void CLONE (...) 923void CLONE (...)
1026 CODE: 924 CODE:
1027 cbor_stash = 0; 925 cbor_stash = 0;
926 cbor_tagged_stash = 0;
927 types_error_stash = 0;
1028 cbor_boolean_stash = 0; 928 types_boolean_stash = 0;
1029 929
1030void new (char *klass) 930void new (char *klass)
1031 PPCODE: 931 PPCODE:
1032{ 932{
1033 SV *pv = NEWSV (0, sizeof (CBOR)); 933 SV *pv = NEWSV (0, sizeof (CBOR));
… …
1136 EXTEND (SP, 2); 1036 EXTEND (SP, 2);
1137 PUSHs (sv); 1037 PUSHs (sv);
1138 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1038 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1139} 1039}
1140 1040
1041#if 0
1042
1141void DESTROY (CBOR *self) 1043void DESTROY (CBOR *self)
1142 CODE: 1044 CODE:
1143 SvREFCNT_dec (self->cb_sk_object); 1045 SvREFCNT_dec (self->cb_sk_object);
1144 SvREFCNT_dec (self->cb_object); 1046 SvREFCNT_dec (self->cb_object);
1145 1047
1048#endif
1049
1146PROTOTYPES: ENABLE 1050PROTOTYPES: ENABLE
1147 1051
1148void encode_cbor (SV *scalar) 1052void encode_cbor (SV *scalar)
1149 PPCODE: 1053 PPCODE:
1150{ 1054{

Diff Legend

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