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.26 by root, Fri Nov 22 09:40:13 2013 UTC vs.
Revision 1.36 by root, Sat Nov 30 17:37:45 2013 UTC

… …
19# define HvNAMELEN(hv) HvNAMELEN_get (hv) 19# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20#endif 20#endif
21#ifndef HvNAMEUTF8 21#ifndef HvNAMEUTF8
22# define HvNAMEUTF8(hv) 0 22# define HvNAMEUTF8(hv) 0
23#endif 23#endif
24#ifndef SvREFCNT_dec_NN
25# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
26#endif
27
28// known major and minor types
29enum cbor_type
30{
31 MAJOR_SHIFT = 5,
32 MINOR_MASK = 0x1f,
33
34 MAJOR_POS_INT = 0 << MAJOR_SHIFT,
35 MAJOR_NEG_INT = 1 << MAJOR_SHIFT,
36 MAJOR_BYTES = 2 << MAJOR_SHIFT,
37 MAJOR_TEXT = 3 << MAJOR_SHIFT,
38 MAJOR_ARRAY = 4 << MAJOR_SHIFT,
39 MAJOR_MAP = 5 << MAJOR_SHIFT,
40 MAJOR_TAG = 6 << MAJOR_SHIFT,
41 MAJOR_MISC = 7 << MAJOR_SHIFT,
42
43 // INT/STRING/ARRAY/MAP subtypes
44 LENGTH_EXT1 = 24,
45 LENGTH_EXT2 = 25,
46 LENGTH_EXT4 = 26,
47 LENGTH_EXT8 = 27,
48
49 // SIMPLE types (effectively MISC subtypes)
50 SIMPLE_FALSE = 20,
51 SIMPLE_TRUE = 21,
52 SIMPLE_NULL = 22,
53 SIMPLE_UNDEF = 23,
54
55 // MISC subtype (unused)
56 MISC_EXT1 = 24,
57 MISC_FLOAT16 = 25,
58 MISC_FLOAT32 = 26,
59 MISC_FLOAT64 = 27,
60
61 // BYTES/TEXT/ARRAY/MAP
62 MINOR_INDEF = 31,
63};
24 64
25// known tags 65// known tags
26enum cbor_tag 66enum cbor_tag
27{ 67{
28 // inofficial extensions (pending iana registration) 68 // extensions
69 CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
29 CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object 70 CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
30 CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object 71 CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
31 CBOR_TAG_VALUE_SHAREABLE = 26, // http://cbor.schmorp.de/value-sharing 72 CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
32 CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing 73 CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
33 CBOR_TAG_STRINGREF_NAMESPACE = 65537, // http://cbor.schmorp.de/stringref 74 CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
34 CBOR_TAG_STRINGREF = 28, // http://cbor.schmorp.de/stringref
35 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection 75 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
36 76
37 // rfc7049 77 // rfc7049
38 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8 78 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
39 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any 79 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
40 CBOR_TAG_POS_BIGNUM = 2, // byte string 80 CBOR_TAG_POS_BIGNUM = 2, // byte string
41 CBOR_TAG_NEG_BIGNUM = 3, // byte string 81 CBOR_TAG_NEG_BIGNUM = 3, // byte string
42 CBOR_TAG_DECIMAL = 4, // decimal fraction, array 82 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
43 CBOR_TAG_BIGFLOAT = 5, // array 83 CBOR_TAG_BIGFLOAT = 5, // array
44 84
45 CBOR_TAG_CONV_B64U = 21, // base64url, any 85 CBOR_TAG_CONV_B64U = 21, // base64url, any
46 CBOR_TAG_CONV_B64 = 22, // base64, any 86 CBOR_TAG_CONV_B64 = 22, // base64, any
47 CBOR_TAG_CONV_HEX = 23, // base16, any 87 CBOR_TAG_CONV_HEX = 23, // base16, any
48 CBOR_TAG_CBOR = 24, // embedded cbor, byte string 88 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
49 89
50 CBOR_TAG_URI = 32, // URI rfc3986, utf-8 90 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
51 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8 91 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
52 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8 92 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
53 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8 93 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
54 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 94 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
55 95
56 CBOR_TAG_MAGIC = 55799 // self-describe cbor 96 CBOR_TAG_MAGIC = 55799, // self-describe cbor
57}; 97};
58 98
59#define F_SHRINK 0x00000001UL 99#define F_SHRINK 0x00000001UL
60#define F_ALLOW_UNKNOWN 0x00000002UL 100#define F_ALLOW_UNKNOWN 0x00000002UL
61#define F_ALLOW_SHARING 0x00000004UL //TODO 101#define F_ALLOW_SHARING 0x00000004UL
62#define F_ALLOW_STRINGREF 0x00000008UL //TODO 102#define F_PACK_STRINGS 0x00000008UL
63 103
64#define INIT_SIZE 32 // initial scalar size to be allocated 104#define INIT_SIZE 32 // initial scalar size to be allocated
65 105
66#define SB do { 106#define SB do {
67#define SE } while (0) 107#define SE } while (0)
… …
79# define CBOR_SLOW 0 119# define CBOR_SLOW 0
80# define CBOR_STASH cbor_stash 120# define CBOR_STASH cbor_stash
81#endif 121#endif
82 122
83static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS:: 123static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
84static SV *types_true, *types_false, *types_error, *sv_cbor; 124static SV *types_true, *types_false, *types_error, *sv_cbor, *default_filter;
85 125
86typedef struct { 126typedef struct {
87 U32 flags; 127 U32 flags;
88 U32 max_depth; 128 U32 max_depth;
89 STRLEN max_size; 129 STRLEN max_size;
130 SV *filter;
90} CBOR; 131} CBOR;
91 132
92ecb_inline void 133ecb_inline void
93cbor_init (CBOR *cbor) 134cbor_init (CBOR *cbor)
94{ 135{
95 Zero (cbor, 1, CBOR); 136 Zero (cbor, 1, CBOR);
96 cbor->max_depth = 512; 137 cbor->max_depth = 512;
138}
139
140ecb_inline void
141cbor_free (CBOR *cbor)
142{
143 SvREFCNT_dec (cbor->filter);
97} 144}
98 145
99///////////////////////////////////////////////////////////////////////////// 146/////////////////////////////////////////////////////////////////////////////
100// utility functions 147// utility functions
101 148
… …
131{ 178{
132 return idx > 23 179 return idx > 23
133 ? idx > 0xffU 180 ? idx > 0xffU
134 ? idx > 0xffffU 181 ? idx > 0xffffU
135 ? idx > 0xffffffffU 182 ? idx > 0xffffffffU
183 ? 11
136 ? 7 184 : 7
137 : 6
138 : 5 185 : 5
139 : 4 186 : 4
140 : 3; 187 : 3;
141} 188}
142 189
… …
179static void 226static void
180encode_uint (enc_t *enc, int major, UV len) 227encode_uint (enc_t *enc, int major, UV len)
181{ 228{
182 need (enc, 9); 229 need (enc, 9);
183 230
184 if (len < 24) 231 if (ecb_expect_true (len < LENGTH_EXT1))
185 *enc->cur++ = major | len; 232 *enc->cur++ = major | len;
186 else if (len <= 0xff) 233 else if (ecb_expect_true (len <= 0xffU))
187 { 234 {
188 *enc->cur++ = major | 24; 235 *enc->cur++ = major | LENGTH_EXT1;
189 *enc->cur++ = len; 236 *enc->cur++ = len;
190 } 237 }
191 else if (len <= 0xffff) 238 else if (len <= 0xffffU)
192 { 239 {
193 *enc->cur++ = major | 25; 240 *enc->cur++ = major | LENGTH_EXT2;
194 *enc->cur++ = len >> 8; 241 *enc->cur++ = len >> 8;
195 *enc->cur++ = len; 242 *enc->cur++ = len;
196 } 243 }
197 else if (len <= 0xffffffff) 244 else if (len <= 0xffffffffU)
198 { 245 {
199 *enc->cur++ = major | 26; 246 *enc->cur++ = major | LENGTH_EXT4;
200 *enc->cur++ = len >> 24; 247 *enc->cur++ = len >> 24;
201 *enc->cur++ = len >> 16; 248 *enc->cur++ = len >> 16;
202 *enc->cur++ = len >> 8; 249 *enc->cur++ = len >> 8;
203 *enc->cur++ = len; 250 *enc->cur++ = len;
204 } 251 }
205 else 252 else
206 { 253 {
207 *enc->cur++ = major | 27; 254 *enc->cur++ = major | LENGTH_EXT8;
208 *enc->cur++ = len >> 56; 255 *enc->cur++ = len >> 56;
209 *enc->cur++ = len >> 48; 256 *enc->cur++ = len >> 48;
210 *enc->cur++ = len >> 40; 257 *enc->cur++ = len >> 40;
211 *enc->cur++ = len >> 32; 258 *enc->cur++ = len >> 32;
212 *enc->cur++ = len >> 24; 259 *enc->cur++ = len >> 24;
… …
217} 264}
218 265
219ecb_inline void 266ecb_inline void
220encode_tag (enc_t *enc, UV tag) 267encode_tag (enc_t *enc, UV tag)
221{ 268{
222 encode_uint (enc, 0xc0, tag); 269 encode_uint (enc, MAJOR_TAG, tag);
270}
271
272ecb_inline void
273encode_str (enc_t *enc, int utf8, char *str, STRLEN len)
274{
275 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
276 need (enc, len);
277 memcpy (enc->cur, str, len);
278 enc->cur += len;
223} 279}
224 280
225static void 281static void
226encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 282encode_strref (enc_t *enc, int utf8, char *str, STRLEN len)
227{ 283{
228 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF)) 284 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
229 { 285 {
230 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 286 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
231 287
232 if (SvOK (*svp)) 288 if (SvOK (*svp))
233 { 289 {
234 // already registered, use stringref 290 // already registered, use stringref
235 encode_tag (enc, CBOR_TAG_STRINGREF); 291 encode_tag (enc, CBOR_TAG_STRINGREF);
236 encode_uint (enc, 0x00, SvUV (*svp)); 292 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
237 return; 293 return;
238 } 294 }
239 else if (len >= minimum_string_length (enc->stringref_idx)) 295 else if (len >= minimum_string_length (enc->stringref_idx))
240 { 296 {
241 // register only 297 // register only
242 sv_setuv (*svp, enc->stringref_idx); 298 sv_setuv (*svp, enc->stringref_idx);
243 ++enc->stringref_idx; 299 ++enc->stringref_idx;
244 } 300 }
245 } 301 }
246 302
247 encode_uint (enc, utf8 ? 0x60 : 0x40, len); 303 encode_str (enc, utf8, str, len);
248 need (enc, len);
249 memcpy (enc->cur, str, len);
250 enc->cur += len;
251} 304}
252 305
253static void encode_sv (enc_t *enc, SV *sv); 306static void encode_sv (enc_t *enc, SV *sv);
254 307
255static void 308static void
… …
260 if (enc->depth >= enc->cbor.max_depth) 313 if (enc->depth >= enc->cbor.max_depth)
261 croak (ERR_NESTING_EXCEEDED); 314 croak (ERR_NESTING_EXCEEDED);
262 315
263 ++enc->depth; 316 ++enc->depth;
264 317
265 encode_uint (enc, 0x80, len + 1); 318 encode_uint (enc, MAJOR_ARRAY, len + 1);
266 319
267 for (i = 0; i <= len; ++i) 320 for (i = 0; i <= len; ++i)
268 { 321 {
269 SV **svp = av_fetch (av, i, 0); 322 SV **svp = av_fetch (av, i, 0);
270 encode_sv (enc, svp ? *svp : &PL_sv_undef); 323 encode_sv (enc, svp ? *svp : &PL_sv_undef);
… …
285 338
286 int pairs = hv_iterinit (hv); 339 int pairs = hv_iterinit (hv);
287 int mg = SvMAGICAL (hv); 340 int mg = SvMAGICAL (hv);
288 341
289 if (mg) 342 if (mg)
290 encode_ch (enc, 0xa0 | 31); 343 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
291 else 344 else
292 encode_uint (enc, 0xa0, pairs); 345 encode_uint (enc, MAJOR_MAP, pairs);
293 346
294 while ((he = hv_iternext (hv))) 347 while ((he = hv_iternext (hv)))
295 { 348 {
296 if (HeKLEN (he) == HEf_SVKEY) 349 if (HeKLEN (he) == HEf_SVKEY)
297 encode_sv (enc, HeSVKEY (he)); 350 encode_sv (enc, HeSVKEY (he));
298 else 351 else
299 encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 352 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
300 353
301 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 354 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
302 } 355 }
303 356
304 if (mg) 357 if (mg)
305 encode_ch (enc, 0xe0 | 31); 358 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
306 359
307 --enc->depth; 360 --enc->depth;
308} 361}
309 362
310// encode objects, arrays and special \0=false and \1=true values. 363// encode objects, arrays and special \0=false and \1=true values.
311static void 364static void
312encode_rv (enc_t *enc, SV *sv) 365encode_rv (enc_t *enc, SV *sv)
313{ 366{
314 SvGETMAGIC (sv); 367 SvGETMAGIC (sv);
315
316 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
317 && ecb_expect_false (SvREFCNT (sv) > 1))
318 {
319 if (!enc->shareable)
320 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
321
322 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
323
324 if (SvOK (*svp))
325 {
326 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
327 encode_uint (enc, 0x00, SvUV (*svp));
328 return;
329 }
330 else
331 {
332 sv_setuv (*svp, enc->shareable_idx);
333 ++enc->shareable_idx;
334 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
335 }
336 }
337 368
338 svtype svt = SvTYPE (sv); 369 svtype svt = SvTYPE (sv);
339 370
340 if (ecb_expect_false (SvOBJECT (sv))) 371 if (ecb_expect_false (SvOBJECT (sv)))
341 { 372 {
… …
348 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 379 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
349 ? cbor_tagged_stash 380 ? cbor_tagged_stash
350 : gv_stashpv ("CBOR::XS::Tagged" , 1); 381 : gv_stashpv ("CBOR::XS::Tagged" , 1);
351 382
352 HV *stash = SvSTASH (sv); 383 HV *stash = SvSTASH (sv);
353 GV *method;
354 384
355 if (stash == boolean_stash) 385 if (stash == boolean_stash)
356 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 386 {
387 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
388 return;
389 }
357 else if (stash == error_stash) 390 else if (stash == error_stash)
358 encode_ch (enc, 0xe0 | 23); 391 {
392 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
393 return;
394 }
359 else if (stash == tagged_stash) 395 else if (stash == tagged_stash)
360 { 396 {
361 if (svt != SVt_PVAV) 397 if (svt != SVt_PVAV)
362 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 398 croak ("encountered CBOR::XS::Tagged object that isn't an array");
363 399
364 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 400 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
365 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 401 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
402
403 return;
404 }
405 }
406
407 if (ecb_expect_false (SvREFCNT (sv) > 1)
408 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
409 {
410 if (!enc->shareable)
411 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
412
413 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
414
415 if (SvOK (*svp))
366 } 416 {
417 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
418 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
419 return;
420 }
421 else
422 {
423 sv_setuv (*svp, enc->shareable_idx);
424 ++enc->shareable_idx;
425 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
426 }
427 }
428
429 if (ecb_expect_false (SvOBJECT (sv)))
430 {
431 HV *stash = SvSTASH (sv);
432 GV *method;
433
367 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 434 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
368 { 435 {
369 dSP; 436 dSP;
370 437
371 ENTER; SAVETMPS; PUSHMARK (SP); 438 ENTER; SAVETMPS; PUSHMARK (SP);
372 // we re-bless the reference to get overload and other niceties right 439 // we re-bless the reference to get overload and other niceties right
… …
404 // catch this surprisingly common error 471 // catch this surprisingly common error
405 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 472 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
406 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 473 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
407 474
408 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 475 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
409 encode_uint (enc, 0x80, count + 1); 476 encode_uint (enc, MAJOR_ARRAY, count + 1);
410 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 477 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
411 478
412 while (count) 479 while (count)
413 encode_sv (enc, SP[1 - count--]); 480 encode_sv (enc, SP[1 - count--]);
414 481
415 PUTBACK; 482 PUTBACK;
… …
436{ 503{
437 double nv = SvNVX (sv); 504 double nv = SvNVX (sv);
438 505
439 need (enc, 9); 506 need (enc, 9);
440 507
441 if (ecb_expect_false (nv == (U32)nv)) 508 if (ecb_expect_false (nv == (NV)(U32)nv))
442 encode_uint (enc, 0x00, (U32)nv); 509 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
443 //TODO: maybe I32? 510 //TODO: maybe I32?
444 else if (ecb_expect_false (nv == (float)nv)) 511 else if (ecb_expect_false (nv == (float)nv))
445 { 512 {
446 uint32_t fp = ecb_float_to_binary32 (nv); 513 uint32_t fp = ecb_float_to_binary32 (nv);
447 514
448 *enc->cur++ = 0xe0 | 26; 515 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
449 516
450 if (!ecb_big_endian ()) 517 if (!ecb_big_endian ())
451 fp = ecb_bswap32 (fp); 518 fp = ecb_bswap32 (fp);
452 519
453 memcpy (enc->cur, &fp, 4); 520 memcpy (enc->cur, &fp, 4);
… …
455 } 522 }
456 else 523 else
457 { 524 {
458 uint64_t fp = ecb_double_to_binary64 (nv); 525 uint64_t fp = ecb_double_to_binary64 (nv);
459 526
460 *enc->cur++ = 0xe0 | 27; 527 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
461 528
462 if (!ecb_big_endian ()) 529 if (!ecb_big_endian ())
463 fp = ecb_bswap64 (fp); 530 fp = ecb_bswap64 (fp);
464 531
465 memcpy (enc->cur, &fp, 8); 532 memcpy (enc->cur, &fp, 8);
… …
474 541
475 if (SvPOKp (sv)) 542 if (SvPOKp (sv))
476 { 543 {
477 STRLEN len; 544 STRLEN len;
478 char *str = SvPV (sv, len); 545 char *str = SvPV (sv, len);
479 encode_str (enc, SvUTF8 (sv), str, len); 546 encode_strref (enc, SvUTF8 (sv), str, len);
480 } 547 }
481 else if (SvNOKp (sv)) 548 else if (SvNOKp (sv))
482 encode_nv (enc, sv); 549 encode_nv (enc, sv);
483 else if (SvIOKp (sv)) 550 else if (SvIOKp (sv))
484 { 551 {
485 if (SvIsUV (sv)) 552 if (SvIsUV (sv))
486 encode_uint (enc, 0x00, SvUVX (sv)); 553 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
487 else if (SvIVX (sv) >= 0) 554 else if (SvIVX (sv) >= 0)
488 encode_uint (enc, 0x00, SvIVX (sv)); 555 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
489 else 556 else
490 encode_uint (enc, 0x20, -(SvIVX (sv) + 1)); 557 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
491 } 558 }
492 else if (SvROK (sv)) 559 else if (SvROK (sv))
493 encode_rv (enc, SvRV (sv)); 560 encode_rv (enc, SvRV (sv));
494 else if (!SvOK (sv)) 561 else if (!SvOK (sv))
495 encode_ch (enc, 0xe0 | 22); 562 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
496 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 563 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
497 encode_ch (enc, 0xe0 | 23); 564 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
498 else 565 else
499 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data", 566 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
500 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 567 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
501} 568}
502 569
… …
510 enc.cur = SvPVX (enc.sv); 577 enc.cur = SvPVX (enc.sv);
511 enc.end = SvEND (enc.sv); 578 enc.end = SvEND (enc.sv);
512 579
513 SvPOK_only (enc.sv); 580 SvPOK_only (enc.sv);
514 581
515 if (cbor->flags & F_ALLOW_STRINGREF) 582 if (cbor->flags & F_PACK_STRINGS)
516 { 583 {
517 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE); 584 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
518 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ()); 585 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
519 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ()); 586 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
520 } 587 }
… …
542 CBOR cbor; 609 CBOR cbor;
543 U32 depth; // recursion depth 610 U32 depth; // recursion depth
544 U32 maxdepth; // recursion depth limit 611 U32 maxdepth; // recursion depth limit
545 AV *shareable; 612 AV *shareable;
546 AV *stringref; 613 AV *stringref;
614 SV *decode_tagged;
547} dec_t; 615} dec_t;
548 616
549#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 617#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
550 618
551#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 619#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
… …
554#define DEC_DEC_DEPTH --dec->depth 622#define DEC_DEC_DEPTH --dec->depth
555 623
556static UV 624static UV
557decode_uint (dec_t *dec) 625decode_uint (dec_t *dec)
558{ 626{
559 switch (*dec->cur & 31) 627 U8 m = *dec->cur & MINOR_MASK;
560 { 628 ++dec->cur;
561 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
562 case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
563 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
564 return *dec->cur++ & 31;
565 629
566 case 24: 630 if (ecb_expect_true (m < LENGTH_EXT1))
631 return m;
632 else if (ecb_expect_true (m == LENGTH_EXT1))
633 {
567 WANT (2); 634 WANT (1);
568 dec->cur += 2; 635 dec->cur += 1;
569 return dec->cur[-1]; 636 return dec->cur[-1];
570 637 }
571 case 25: 638 else if (ecb_expect_true (m == LENGTH_EXT2))
639 {
572 WANT (3); 640 WANT (2);
573 dec->cur += 3; 641 dec->cur += 2;
574 return (((UV)dec->cur[-2]) << 8) 642 return (((UV)dec->cur[-2]) << 8)
575 | ((UV)dec->cur[-1]); 643 | ((UV)dec->cur[-1]);
576 644 }
577 case 26: 645 else if (ecb_expect_true (m == LENGTH_EXT4))
646 {
578 WANT (5); 647 WANT (4);
579 dec->cur += 5; 648 dec->cur += 4;
580 return (((UV)dec->cur[-4]) << 24) 649 return (((UV)dec->cur[-4]) << 24)
581 | (((UV)dec->cur[-3]) << 16) 650 | (((UV)dec->cur[-3]) << 16)
582 | (((UV)dec->cur[-2]) << 8) 651 | (((UV)dec->cur[-2]) << 8)
583 | ((UV)dec->cur[-1]); 652 | ((UV)dec->cur[-1]);
584 653 }
585 case 27: 654 else if (ecb_expect_true (m == LENGTH_EXT8))
655 {
586 WANT (9); 656 WANT (8);
587 dec->cur += 9; 657 dec->cur += 8;
658
659 return
660#if UVSIZE < 8
661 0
662#else
588 return (((UV)dec->cur[-8]) << 56) 663 (((UV)dec->cur[-8]) << 56)
589 | (((UV)dec->cur[-7]) << 48) 664 | (((UV)dec->cur[-7]) << 48)
590 | (((UV)dec->cur[-6]) << 40) 665 | (((UV)dec->cur[-6]) << 40)
591 | (((UV)dec->cur[-5]) << 32) 666 | (((UV)dec->cur[-5]) << 32)
667#endif
592 | (((UV)dec->cur[-4]) << 24) 668 | (((UV)dec->cur[-4]) << 24)
593 | (((UV)dec->cur[-3]) << 16) 669 | (((UV)dec->cur[-3]) << 16)
594 | (((UV)dec->cur[-2]) << 8) 670 | (((UV)dec->cur[-2]) << 8)
595 | ((UV)dec->cur[-1]); 671 | ((UV)dec->cur[-1]);
596 672 }
597 default: 673 else
598 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 674 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
599 }
600 675
601fail: 676fail:
602 return 0; 677 return 0;
603} 678}
604 679
… …
609{ 684{
610 AV *av = newAV (); 685 AV *av = newAV ();
611 686
612 DEC_INC_DEPTH; 687 DEC_INC_DEPTH;
613 688
614 if ((*dec->cur & 31) == 31) 689 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
615 { 690 {
616 ++dec->cur; 691 ++dec->cur;
617 692
618 for (;;) 693 for (;;)
619 { 694 {
620 WANT (1); 695 WANT (1);
621 696
622 if (*dec->cur == (0xe0 | 31)) 697 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
623 { 698 {
624 ++dec->cur; 699 ++dec->cur;
625 break; 700 break;
626 } 701 }
627 702
… …
630 } 705 }
631 else 706 else
632 { 707 {
633 int i, len = decode_uint (dec); 708 int i, len = decode_uint (dec);
634 709
710 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
635 av_fill (av, len - 1); 711 av_fill (av, len - 1);
636 712
637 for (i = 0; i < len; ++i) 713 for (i = 0; i < len; ++i)
638 AvARRAY (av)[i] = decode_sv (dec); 714 AvARRAY (av)[i] = decode_sv (dec);
639 } 715 }
… …
652{ 728{
653 // for speed reasons, we specialcase single-string 729 // for speed reasons, we specialcase single-string
654 // byte or utf-8 strings as keys, but only when !stringref 730 // byte or utf-8 strings as keys, but only when !stringref
655 731
656 if (ecb_expect_true (!dec->stringref)) 732 if (ecb_expect_true (!dec->stringref))
657 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27) 733 if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
658 { 734 {
659 I32 len = decode_uint (dec); 735 I32 len = decode_uint (dec);
660 char *key = (char *)dec->cur; 736 char *key = (char *)dec->cur;
661 737
662 dec->cur += len; 738 dec->cur += len;
… …
666 742
667 hv_store (hv, key, len, decode_sv (dec), 0); 743 hv_store (hv, key, len, decode_sv (dec), 0);
668 744
669 return; 745 return;
670 } 746 }
671 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27) 747 else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
672 { 748 {
673 I32 len = decode_uint (dec); 749 I32 len = decode_uint (dec);
674 char *key = (char *)dec->cur; 750 char *key = (char *)dec->cur;
675 751
676 dec->cur += len; 752 dec->cur += len;
… …
695{ 771{
696 HV *hv = newHV (); 772 HV *hv = newHV ();
697 773
698 DEC_INC_DEPTH; 774 DEC_INC_DEPTH;
699 775
700 if ((*dec->cur & 31) == 31) 776 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
701 { 777 {
702 ++dec->cur; 778 ++dec->cur;
703 779
704 for (;;) 780 for (;;)
705 { 781 {
706 WANT (1); 782 WANT (1);
707 783
708 if (*dec->cur == (0xe0 | 31)) 784 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
709 { 785 {
710 ++dec->cur; 786 ++dec->cur;
711 break; 787 break;
712 } 788 }
713 789
… …
734static SV * 810static SV *
735decode_str (dec_t *dec, int utf8) 811decode_str (dec_t *dec, int utf8)
736{ 812{
737 SV *sv = 0; 813 SV *sv = 0;
738 814
739 if ((*dec->cur & 31) == 31) 815 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
740 { 816 {
817 // indefinite length strings
741 ++dec->cur; 818 ++dec->cur;
742 819
820 U8 major = *dec->cur & MAJOR_MISC;
821
743 sv = newSVpvn ("", 0); 822 sv = newSVpvn ("", 0);
744 823
745 // not very fast, and certainly not robust against illegal input
746 for (;;) 824 for (;;)
747 { 825 {
748 WANT (1); 826 WANT (1);
749 827
750 if (*dec->cur == (0xe0 | 31)) 828 if ((*dec->cur - major) > LENGTH_EXT8)
829 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
751 { 830 {
752 ++dec->cur; 831 ++dec->cur;
753 break; 832 break;
754 } 833 }
834 else
835 ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
755 836
756 sv_catsv (sv, decode_sv (dec)); 837 STRLEN len = decode_uint (dec);
838
839 WANT (len);
840 sv_catpvn (sv, dec->cur, len);
841 dec->cur += len;
757 } 842 }
758 } 843 }
759 else 844 else
760 { 845 {
761 STRLEN len = decode_uint (dec); 846 STRLEN len = decode_uint (dec);
… …
810 } 895 }
811 break; 896 break;
812 897
813 case CBOR_TAG_STRINGREF: 898 case CBOR_TAG_STRINGREF:
814 { 899 {
815 if ((*dec->cur >> 5) != 0) 900 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
816 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 901 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
817 902
818 UV idx = decode_uint (dec); 903 UV idx = decode_uint (dec);
819 904
820 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 905 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref))
… …
838 } 923 }
839 break; 924 break;
840 925
841 case CBOR_TAG_VALUE_SHAREDREF: 926 case CBOR_TAG_VALUE_SHAREDREF:
842 { 927 {
843 if ((*dec->cur >> 5) != 0) 928 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
844 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 929 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
845 930
846 UV idx = decode_uint (dec); 931 UV idx = decode_uint (dec);
847 932
848 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 933 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable))
… …
905 990
906 default: 991 default:
907 { 992 {
908 sv = decode_sv (dec); 993 sv = decode_sv (dec);
909 994
995 dSP;
996 ENTER; SAVETMPS; PUSHMARK (SP);
997 EXTEND (SP, 2);
998 PUSHs (newSVuv (tag));
999 PUSHs (sv);
1000
1001 PUTBACK;
1002 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1003 SPAGAIN;
1004
1005 if (SvTRUE (ERRSV))
1006 {
1007 FREETMPS; LEAVE;
1008 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
1009 }
1010
1011 if (count)
1012 {
1013 SvREFCNT_dec (sv);
1014 sv = SvREFCNT_inc (POPs);
1015 }
1016 else
1017 {
910 AV *av = newAV (); 1018 AV *av = newAV ();
911 av_push (av, newSVuv (tag)); 1019 av_push (av, newSVuv (tag));
912 av_push (av, sv); 1020 av_push (av, sv);
913 1021
914 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1022 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
915 ? cbor_tagged_stash 1023 ? cbor_tagged_stash
916 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1024 : gv_stashpv ("CBOR::XS::Tagged" , 1);
917
918 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash); 1025 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
1026 }
1027
1028 PUTBACK;
1029
1030 FREETMPS; LEAVE;
919 } 1031 }
920 break; 1032 break;
921 } 1033 }
922 1034
923 return sv; 1035 return sv;
… …
930static SV * 1042static SV *
931decode_sv (dec_t *dec) 1043decode_sv (dec_t *dec)
932{ 1044{
933 WANT (1); 1045 WANT (1);
934 1046
935 switch (*dec->cur >> 5) 1047 switch (*dec->cur >> MAJOR_SHIFT)
936 { 1048 {
937 case 0: // unsigned int 1049 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
938 return newSVuv (decode_uint (dec)); 1050 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
939 case 1: // negative int 1051 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
940 return newSViv (-1 - (IV)decode_uint (dec)); 1052 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
941 case 2: // octet string 1053 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
942 return decode_str (dec, 0); 1054 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
943 case 3: // utf-8 string 1055 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
944 return decode_str (dec, 1); 1056
945 case 4: // array 1057 case MAJOR_MISC >> MAJOR_SHIFT:
946 return decode_av (dec);
947 case 5: // map
948 return decode_hv (dec);
949 case 6: // tag
950 return decode_tagged (dec);
951 case 7: // misc
952 switch (*dec->cur++ & 31) 1058 switch (*dec->cur++ & MINOR_MASK)
953 { 1059 {
954 case 20: 1060 case SIMPLE_FALSE:
955#if CBOR_SLOW 1061#if CBOR_SLOW
956 types_false = get_bool ("Types::Serialiser::false"); 1062 types_false = get_bool ("Types::Serialiser::false");
957#endif 1063#endif
958 return newSVsv (types_false); 1064 return newSVsv (types_false);
959 case 21: 1065 case SIMPLE_TRUE:
960#if CBOR_SLOW 1066#if CBOR_SLOW
961 types_true = get_bool ("Types::Serialiser::true"); 1067 types_true = get_bool ("Types::Serialiser::true");
962#endif 1068#endif
963 return newSVsv (types_true); 1069 return newSVsv (types_true);
964 case 22: 1070 case SIMPLE_NULL:
965 return newSVsv (&PL_sv_undef); 1071 return newSVsv (&PL_sv_undef);
966 case 23: 1072 case SIMPLE_UNDEF:
967#if CBOR_SLOW 1073#if CBOR_SLOW
968 types_error = get_bool ("Types::Serialiser::error"); 1074 types_error = get_bool ("Types::Serialiser::error");
969#endif 1075#endif
970 return newSVsv (types_error); 1076 return newSVsv (types_error);
971 1077
972 case 25: 1078 case MISC_FLOAT16:
973 { 1079 {
974 WANT (2); 1080 WANT (2);
975 1081
976 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1082 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
977 dec->cur += 2; 1083 dec->cur += 2;
978 1084
979 return newSVnv (ecb_binary16_to_float (fp)); 1085 return newSVnv (ecb_binary16_to_float (fp));
980 } 1086 }
981 1087
982 case 26: 1088 case MISC_FLOAT32:
983 { 1089 {
984 uint32_t fp; 1090 uint32_t fp;
985 WANT (4); 1091 WANT (4);
986 memcpy (&fp, dec->cur, 4); 1092 memcpy (&fp, dec->cur, 4);
987 dec->cur += 4; 1093 dec->cur += 4;
… …
990 fp = ecb_bswap32 (fp); 1096 fp = ecb_bswap32 (fp);
991 1097
992 return newSVnv (ecb_binary32_to_float (fp)); 1098 return newSVnv (ecb_binary32_to_float (fp));
993 } 1099 }
994 1100
995 case 27: 1101 case MISC_FLOAT64:
996 { 1102 {
997 uint64_t fp; 1103 uint64_t fp;
998 WANT (8); 1104 WANT (8);
999 memcpy (&fp, dec->cur, 8); 1105 memcpy (&fp, dec->cur, 8);
1000 dec->cur += 8; 1106 dec->cur += 8;
… …
1003 fp = ecb_bswap64 (fp); 1109 fp = ecb_bswap64 (fp);
1004 1110
1005 return newSVnv (ecb_binary64_to_double (fp)); 1111 return newSVnv (ecb_binary64_to_double (fp));
1006 } 1112 }
1007 1113
1008 // 0..19 unassigned 1114 // 0..19 unassigned simple
1009 // 24 reserved + unassigned (reserved values are not encodable) 1115 // 24 reserved + unassigned (reserved values are not encodable)
1010 default: 1116 default:
1011 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1117 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
1012 } 1118 }
1013 1119
… …
1068 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1); 1174 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
1069 1175
1070 types_true = get_bool ("Types::Serialiser::true" ); 1176 types_true = get_bool ("Types::Serialiser::true" );
1071 types_false = get_bool ("Types::Serialiser::false"); 1177 types_false = get_bool ("Types::Serialiser::false");
1072 types_error = get_bool ("Types::Serialiser::error"); 1178 types_error = get_bool ("Types::Serialiser::error");
1179
1180 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1073 1181
1074 sv_cbor = newSVpv ("CBOR", 0); 1182 sv_cbor = newSVpv ("CBOR", 0);
1075 SvREADONLY_on (sv_cbor); 1183 SvREADONLY_on (sv_cbor);
1076} 1184}
1077 1185
… …
1099void shrink (CBOR *self, int enable = 1) 1207void shrink (CBOR *self, int enable = 1)
1100 ALIAS: 1208 ALIAS:
1101 shrink = F_SHRINK 1209 shrink = F_SHRINK
1102 allow_unknown = F_ALLOW_UNKNOWN 1210 allow_unknown = F_ALLOW_UNKNOWN
1103 allow_sharing = F_ALLOW_SHARING 1211 allow_sharing = F_ALLOW_SHARING
1104 allow_stringref = F_ALLOW_STRINGREF 1212 pack_strings = F_PACK_STRINGS
1105 PPCODE: 1213 PPCODE:
1106{ 1214{
1107 if (enable) 1215 if (enable)
1108 self->flags |= ix; 1216 self->flags |= ix;
1109 else 1217 else
… …
1115void get_shrink (CBOR *self) 1223void get_shrink (CBOR *self)
1116 ALIAS: 1224 ALIAS:
1117 get_shrink = F_SHRINK 1225 get_shrink = F_SHRINK
1118 get_allow_unknown = F_ALLOW_UNKNOWN 1226 get_allow_unknown = F_ALLOW_UNKNOWN
1119 get_allow_sharing = F_ALLOW_SHARING 1227 get_allow_sharing = F_ALLOW_SHARING
1120 get_allow_stringref = F_ALLOW_STRINGREF 1228 get_pack_strings = F_PACK_STRINGS
1121 PPCODE: 1229 PPCODE:
1122 XPUSHs (boolSV (self->flags & ix)); 1230 XPUSHs (boolSV (self->flags & ix));
1123 1231
1124void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1232void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1125 PPCODE: 1233 PPCODE:
… …
1138 XPUSHs (ST (0)); 1246 XPUSHs (ST (0));
1139 1247
1140int get_max_size (CBOR *self) 1248int get_max_size (CBOR *self)
1141 CODE: 1249 CODE:
1142 RETVAL = self->max_size; 1250 RETVAL = self->max_size;
1251 OUTPUT:
1252 RETVAL
1253
1254void filter (CBOR *self, SV *filter = 0)
1255 PPCODE:
1256 SvREFCNT_dec (self->filter);
1257 self->filter = filter ? newSVsv (filter) : filter;
1258 XPUSHs (ST (0));
1259
1260SV *get_filter (CBOR *self)
1261 CODE:
1262 RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1143 OUTPUT: 1263 OUTPUT:
1144 RETVAL 1264 RETVAL
1145 1265
1146void encode (CBOR *self, SV *scalar) 1266void encode (CBOR *self, SV *scalar)
1147 PPCODE: 1267 PPCODE:
… …
1162 EXTEND (SP, 2); 1282 EXTEND (SP, 2);
1163 PUSHs (sv); 1283 PUSHs (sv);
1164 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1284 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1165} 1285}
1166 1286
1287void DESTROY (CBOR *self)
1288 PPCODE:
1289 cbor_free (self);
1290
1167PROTOTYPES: ENABLE 1291PROTOTYPES: ENABLE
1168 1292
1169void encode_cbor (SV *scalar) 1293void encode_cbor (SV *scalar)
1294 ALIAS:
1295 encode_cbor = 0
1296 encode_cbor_sharing = F_ALLOW_SHARING
1170 PPCODE: 1297 PPCODE:
1171{ 1298{
1172 CBOR cbor; 1299 CBOR cbor;
1173 cbor_init (&cbor); 1300 cbor_init (&cbor);
1301 cbor.flags |= ix;
1174 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1302 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1175 XPUSHs (scalar); 1303 XPUSHs (scalar);
1176} 1304}
1177 1305
1178void decode_cbor (SV *cborstr) 1306void decode_cbor (SV *cborstr)

Diff Legend

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