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.1 by root, Fri Oct 25 23:09:45 2013 UTC vs.
Revision 1.44 by root, Tue Feb 18 22:12:12 2014 UTC

7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11 11
12#define ECB_NO_THREADS 1
12#include "ecb.h" 13#include "ecb.h"
13 14
14#if defined(__BORLANDC__) || defined(_MSC_VER) 15// compatibility with perl <5.18
15# define snprintf _snprintf // C compilers have this in stdio.h 16#ifndef HvNAMELEN_get
17# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
16#endif 18#endif
19#ifndef HvNAMELEN
20# define HvNAMELEN(hv) HvNAMELEN_get (hv)
21#endif
22#ifndef HvNAMEUTF8
23# define HvNAMEUTF8(hv) 0
24#endif
25#ifndef SvREFCNT_dec_NN
26# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
27#endif
17 28
29// known major and minor types
30enum cbor_type
31{
32 MAJOR_SHIFT = 5,
33 MINOR_MASK = 0x1f,
34
35 MAJOR_POS_INT = 0 << MAJOR_SHIFT,
36 MAJOR_NEG_INT = 1 << MAJOR_SHIFT,
37 MAJOR_BYTES = 2 << MAJOR_SHIFT,
38 MAJOR_TEXT = 3 << MAJOR_SHIFT,
39 MAJOR_ARRAY = 4 << MAJOR_SHIFT,
40 MAJOR_MAP = 5 << MAJOR_SHIFT,
41 MAJOR_TAG = 6 << MAJOR_SHIFT,
42 MAJOR_MISC = 7 << MAJOR_SHIFT,
43
44 // INT/STRING/ARRAY/MAP subtypes
45 LENGTH_EXT1 = 24,
46 LENGTH_EXT2 = 25,
47 LENGTH_EXT4 = 26,
48 LENGTH_EXT8 = 27,
49
50 // SIMPLE types (effectively MISC subtypes)
51 SIMPLE_FALSE = 20,
52 SIMPLE_TRUE = 21,
53 SIMPLE_NULL = 22,
54 SIMPLE_UNDEF = 23,
55
56 // MISC subtype (unused)
57 MISC_EXT1 = 24,
58 MISC_FLOAT16 = 25,
59 MISC_FLOAT32 = 26,
60 MISC_FLOAT64 = 27,
61
62 // BYTES/TEXT/ARRAY/MAP
63 MINOR_INDEF = 31,
64};
65
66// known tags
67enum cbor_tag
68{
69 // extensions
70 CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
71 CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
72 CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
73 CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
74 CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
75 CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
76 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
77
78 // rfc7049
79 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
80 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
81 CBOR_TAG_POS_BIGNUM = 2, // byte string
82 CBOR_TAG_NEG_BIGNUM = 3, // byte string
83 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
84 CBOR_TAG_BIGFLOAT = 5, // array
85
86 CBOR_TAG_CONV_B64U = 21, // base64url, any
87 CBOR_TAG_CONV_B64 = 22, // base64, any
88 CBOR_TAG_CONV_HEX = 23, // base16, any
89 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
90
91 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
92 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
93 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
94 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
95 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
96
97 CBOR_TAG_MAGIC = 55799, // self-describe cbor
98};
99
18#define F_SHRINK 0x00000200UL 100#define F_SHRINK 0x00000001UL
19#define F_ALLOW_UNKNOWN 0x00002000UL 101#define F_ALLOW_UNKNOWN 0x00000002UL
102#define F_ALLOW_SHARING 0x00000004UL
103#define F_ALLOW_CYCLES 0x00000008UL
104#define F_PACK_STRINGS 0x00000010UL
105#define F_VALIDATE_UTF8 0x00000020UL
20 106
21#define INIT_SIZE 32 // initial scalar size to be allocated 107#define INIT_SIZE 32 // initial scalar size to be allocated
22 108
23#define SB do { 109#define SB do {
24#define SE } while (0) 110#define SE } while (0)
25
26#if __GNUC__ >= 3
27# define expect(expr,value) __builtin_expect ((expr), (value))
28# define INLINE static inline
29#else
30# define expect(expr,value) (expr)
31# define INLINE static
32#endif
33
34#define expect_false(expr) expect ((expr) != 0, 0)
35#define expect_true(expr) expect ((expr) != 0, 1)
36 111
37#define IN_RANGE_INC(type,val,beg,end) \ 112#define IN_RANGE_INC(type,val,beg,end) \
38 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 113 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
39 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 114 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
40 115
46#else 121#else
47# define CBOR_SLOW 0 122# define CBOR_SLOW 0
48# define CBOR_STASH cbor_stash 123# define CBOR_STASH cbor_stash
49#endif 124#endif
50 125
51static HV *cbor_stash, *cbor_boolean_stash; // CBOR::XS:: 126static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
52static SV *cbor_true, *cbor_false; 127static SV *types_true, *types_false, *types_error, *sv_cbor, *default_filter;
53 128
54typedef struct { 129typedef struct {
55 U32 flags; 130 U32 flags;
56 U32 max_depth; 131 U32 max_depth;
57 STRLEN max_size; 132 STRLEN max_size;
133 SV *filter;
58 134
59 SV *cb_object; 135 // for the incremental parser
60 HV *cb_sk_object; 136 STRLEN incr_pos; // the current offset into the text
137 STRLEN incr_need; // minimum bytes needed to decode
138 AV *incr_count; // for every nesting level, the number of outstanding values, or -1 for indef.
61} CBOR; 139} CBOR;
62 140
63INLINE void 141ecb_inline void
64cbor_init (CBOR *cbor) 142cbor_init (CBOR *cbor)
65{ 143{
66 Zero (cbor, 1, CBOR); 144 Zero (cbor, 1, CBOR);
67 cbor->max_depth = 512; 145 cbor->max_depth = 512;
68} 146}
69 147
148ecb_inline void
149cbor_free (CBOR *cbor)
150{
151 SvREFCNT_dec (cbor->filter);
152 SvREFCNT_dec (cbor->incr_count);
153}
154
70///////////////////////////////////////////////////////////////////////////// 155/////////////////////////////////////////////////////////////////////////////
71// utility functions 156// utility functions
72 157
73INLINE SV * 158ecb_inline SV *
74get_bool (const char *name) 159get_bool (const char *name)
75{ 160{
76 SV *sv = get_sv (name, 1); 161 SV *sv = get_sv (name, 1);
77 162
78 SvREADONLY_on (sv); 163 SvREADONLY_on (sv);
79 SvREADONLY_on (SvRV (sv)); 164 SvREADONLY_on (SvRV (sv));
80 165
81 return sv; 166 return sv;
82} 167}
83 168
84INLINE void 169ecb_inline void
85shrink (SV *sv) 170shrink (SV *sv)
86{ 171{
87 sv_utf8_downgrade (sv, 1); 172 sv_utf8_downgrade (sv, 1);
88 173
89 if (SvLEN (sv) > SvCUR (sv) + 1) 174 if (SvLEN (sv) > SvCUR (sv) + 1)
94 SvPV_renew (sv, SvCUR (sv) + 1); 179 SvPV_renew (sv, SvCUR (sv) + 1);
95#endif 180#endif
96 } 181 }
97} 182}
98 183
99///////////////////////////////////////////////////////////////////////////// 184// minimum length of a string to be registered for stringref
100// fp hell 185ecb_inline int
101 186minimum_string_length (UV idx)
102//TODO 187{
188 return idx > 23
189 ? idx > 0xffU
190 ? idx > 0xffffU
191 ? idx > 0xffffffffU
192 ? 11
193 : 7
194 : 5
195 : 4
196 : 3;
197}
103 198
104///////////////////////////////////////////////////////////////////////////// 199/////////////////////////////////////////////////////////////////////////////
105// encoder 200// encoder
106 201
107// structure used for encoding CBOR 202// structure used for encoding CBOR
110 char *cur; // SvPVX (sv) + current output position 205 char *cur; // SvPVX (sv) + current output position
111 char *end; // SvEND (sv) 206 char *end; // SvEND (sv)
112 SV *sv; // result scalar 207 SV *sv; // result scalar
113 CBOR cbor; 208 CBOR cbor;
114 U32 depth; // recursion level 209 U32 depth; // recursion level
210 HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
211 UV stringref_idx;
212 HV *shareable; // ptr => index, or 0
213 UV shareable_idx;
115} enc_t; 214} enc_t;
116 215
117INLINE void 216ecb_inline void
118need (enc_t *enc, STRLEN len) 217need (enc_t *enc, STRLEN len)
119{ 218{
120 if (expect_false (enc->cur + len >= enc->end)) 219 if (ecb_expect_false (enc->cur + len >= enc->end))
121 { 220 {
122 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 221 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
123 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 222 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
124 enc->cur = SvPVX (enc->sv) + cur; 223 enc->cur = SvPVX (enc->sv) + cur;
125 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 224 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
126 } 225 }
127} 226}
128 227
129INLINE void 228ecb_inline void
130encode_ch (enc_t *enc, char ch) 229encode_ch (enc_t *enc, char ch)
131{ 230{
132 need (enc, 1); 231 need (enc, 1);
133 *enc->cur++ = ch; 232 *enc->cur++ = ch;
134} 233}
136static void 235static void
137encode_uint (enc_t *enc, int major, UV len) 236encode_uint (enc_t *enc, int major, UV len)
138{ 237{
139 need (enc, 9); 238 need (enc, 9);
140 239
141 if (len < 24) 240 if (ecb_expect_true (len < LENGTH_EXT1))
142 *enc->cur++ = major | len; 241 *enc->cur++ = major | len;
143 else if (len < 0x100) 242 else if (ecb_expect_true (len <= 0xffU))
144 { 243 {
145 *enc->cur++ = major | 24; 244 *enc->cur++ = major | LENGTH_EXT1;
146 *enc->cur++ = len; 245 *enc->cur++ = len;
147 } 246 }
148 else if (len < 0x10000) 247 else if (len <= 0xffffU)
149 { 248 {
150 *enc->cur++ = major | 25; 249 *enc->cur++ = major | LENGTH_EXT2;
151 *enc->cur++ = len >> 8; 250 *enc->cur++ = len >> 8;
152 *enc->cur++ = len; 251 *enc->cur++ = len;
153 } 252 }
154 else if (len < 0x100000000) 253 else if (len <= 0xffffffffU)
155 { 254 {
156 *enc->cur++ = major | 26; 255 *enc->cur++ = major | LENGTH_EXT4;
157 *enc->cur++ = len >> 24; 256 *enc->cur++ = len >> 24;
158 *enc->cur++ = len >> 16; 257 *enc->cur++ = len >> 16;
159 *enc->cur++ = len >> 8; 258 *enc->cur++ = len >> 8;
160 *enc->cur++ = len; 259 *enc->cur++ = len;
161 } 260 }
162 else if (len) 261 else
163 { 262 {
164 *enc->cur++ = major | 27; 263 *enc->cur++ = major | LENGTH_EXT8;
165 *enc->cur++ = len >> 56; 264 *enc->cur++ = len >> 56;
166 *enc->cur++ = len >> 48; 265 *enc->cur++ = len >> 48;
167 *enc->cur++ = len >> 40; 266 *enc->cur++ = len >> 40;
168 *enc->cur++ = len >> 32; 267 *enc->cur++ = len >> 32;
169 *enc->cur++ = len >> 24; 268 *enc->cur++ = len >> 24;
171 *enc->cur++ = len >> 8; 270 *enc->cur++ = len >> 8;
172 *enc->cur++ = len; 271 *enc->cur++ = len;
173 } 272 }
174} 273}
175 274
176static void 275ecb_inline void
276encode_tag (enc_t *enc, UV tag)
277{
278 encode_uint (enc, MAJOR_TAG, tag);
279}
280
281ecb_inline void
177encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 282encode_str (enc_t *enc, int utf8, char *str, STRLEN len)
178{ 283{
179 encode_uint (enc, utf8 ? 0x60 : 0x40, len); 284 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
180 need (enc, len); 285 need (enc, len);
181 memcpy (enc->cur, str, len); 286 memcpy (enc->cur, str, len);
182 enc->cur += len; 287 enc->cur += len;
183} 288}
184 289
290static void
291encode_strref (enc_t *enc, int utf8, char *str, STRLEN len)
292{
293 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
294 {
295 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
296
297 if (SvOK (*svp))
298 {
299 // already registered, use stringref
300 encode_tag (enc, CBOR_TAG_STRINGREF);
301 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
302 return;
303 }
304 else if (len >= minimum_string_length (enc->stringref_idx))
305 {
306 // register only
307 sv_setuv (*svp, enc->stringref_idx);
308 ++enc->stringref_idx;
309 }
310 }
311
312 encode_str (enc, utf8, str, len);
313}
314
185static void encode_sv (enc_t *enc, SV *sv); 315static void encode_sv (enc_t *enc, SV *sv);
186 316
187static void 317static void
188encode_av (enc_t *enc, AV *av) 318encode_av (enc_t *enc, AV *av)
189{ 319{
192 if (enc->depth >= enc->cbor.max_depth) 322 if (enc->depth >= enc->cbor.max_depth)
193 croak (ERR_NESTING_EXCEEDED); 323 croak (ERR_NESTING_EXCEEDED);
194 324
195 ++enc->depth; 325 ++enc->depth;
196 326
197 encode_uint (enc, 0x80, len + 1); 327 encode_uint (enc, MAJOR_ARRAY, len + 1);
198 328
199 for (i = 0; i <= len; ++i) 329 for (i = 0; i <= len; ++i)
200 { 330 {
201 SV **svp = av_fetch (av, i, 0); 331 SV **svp = av_fetch (av, i, 0);
202 encode_sv (enc, svp ? *svp : &PL_sv_undef); 332 encode_sv (enc, svp ? *svp : &PL_sv_undef);
217 347
218 int pairs = hv_iterinit (hv); 348 int pairs = hv_iterinit (hv);
219 int mg = SvMAGICAL (hv); 349 int mg = SvMAGICAL (hv);
220 350
221 if (mg) 351 if (mg)
222 encode_ch (enc, 0xa0 | 31); 352 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
223 else 353 else
224 encode_uint (enc, 0xa0, pairs); 354 encode_uint (enc, MAJOR_MAP, pairs);
225 355
226 while ((he = hv_iternext (hv))) 356 while ((he = hv_iternext (hv)))
227 { 357 {
228 if (HeKLEN (he) == HEf_SVKEY) 358 if (HeKLEN (he) == HEf_SVKEY)
229 encode_sv (enc, HeSVKEY (he)); 359 encode_sv (enc, HeSVKEY (he));
230 else 360 else
231 encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 361 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
232 362
233 encode_sv (enc, expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 363 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
234 } 364 }
235 365
236 if (mg) 366 if (mg)
237 encode_ch (enc, 0xe0 | 31); 367 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
238 368
239 --enc->depth; 369 --enc->depth;
240} 370}
241 371
242// encode objects, arrays and special \0=false and \1=true values. 372// encode objects, arrays and special \0=false and \1=true values.
243static void 373static void
244encode_rv (enc_t *enc, SV *sv) 374encode_rv (enc_t *enc, SV *sv)
245{ 375{
246 svtype svt;
247
248 SvGETMAGIC (sv); 376 SvGETMAGIC (sv);
377
249 svt = SvTYPE (sv); 378 svtype svt = SvTYPE (sv);
250 379
251 if (expect_false (SvOBJECT (sv))) 380 if (ecb_expect_false (SvOBJECT (sv)))
252 { 381 {
253 HV *stash = !CBOR_SLOW || cbor_boolean_stash 382 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
254 ? cbor_boolean_stash 383 ? types_boolean_stash
384 : gv_stashpv ("Types::Serialiser::Boolean", 1);
385 HV *error_stash = !CBOR_SLOW || types_error_stash
386 ? types_error_stash
387 : gv_stashpv ("Types::Serialiser::Error", 1);
388 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
389 ? cbor_tagged_stash
255 : gv_stashpv ("CBOR::XS::Boolean", 1); 390 : gv_stashpv ("CBOR::XS::Tagged" , 1);
256 391
257 if (SvSTASH (sv) == stash) 392 HV *stash = SvSTASH (sv);
258 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 393
394 if (stash == boolean_stash)
395 {
396 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
397 return;
398 }
399 else if (stash == error_stash)
400 {
401 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
402 return;
403 }
404 else if (stash == tagged_stash)
405 {
406 if (svt != SVt_PVAV)
407 croak ("encountered CBOR::XS::Tagged object that isn't an array");
408
409 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
410 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
411
412 return;
413 }
414 }
415
416 if (ecb_expect_false (SvREFCNT (sv) > 1)
417 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
418 {
419 if (!enc->shareable)
420 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
421
422 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
423
424 if (SvOK (*svp))
425 {
426 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
427 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
428 return;
429 }
259 else 430 else
260 { 431 {
261#if 0 //TODO 432 sv_setuv (*svp, enc->shareable_idx);
262 if (enc->cbor.flags & F_CONV_BLESSED) 433 ++enc->shareable_idx;
434 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
435 }
436 }
437
438 if (ecb_expect_false (SvOBJECT (sv)))
439 {
440 HV *stash = SvSTASH (sv);
441 GV *method;
442
443 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
263 { 444 {
445 dSP;
446
447 ENTER; SAVETMPS; PUSHMARK (SP);
264 // we re-bless the reference to get overload and other niceties right 448 // we re-bless the reference to get overload and other niceties right
265 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
266
267 if (to_cbor)
268 {
269 dSP;
270
271 ENTER; SAVETMPS; PUSHMARK (SP);
272 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 449 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
273 450
274 // calling with G_SCALAR ensures that we always get a 1 return value
275 PUTBACK; 451 PUTBACK;
452 // G_SCALAR ensures that return value is 1
276 call_sv ((SV *)GvCV (to_cbor), G_SCALAR); 453 call_sv ((SV *)GvCV (method), G_SCALAR);
277 SPAGAIN; 454 SPAGAIN;
278 455
279 // catch this surprisingly common error 456 // catch this surprisingly common error
280 if (SvROK (TOPs) && SvRV (TOPs) == sv) 457 if (SvROK (TOPs) && SvRV (TOPs) == sv)
281 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv))); 458 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
282 459
283 sv = POPs;
284 PUTBACK;
285
286 encode_sv (enc, sv); 460 encode_sv (enc, POPs);
287 461
462 PUTBACK;
463
288 FREETMPS; LEAVE; 464 FREETMPS; LEAVE;
289 }
290 else if (enc->cbor.flags & F_ALLOW_BLESSED)
291 encode_str (enc, "null", 4, 0);
292 else
293 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_CBOR method available on it",
294 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
295 } 465 }
296 else if (enc->cbor.flags & F_ALLOW_BLESSED) 466 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
297 encode_str (enc, "null", 4, 0); 467 {
468 dSP;
469
470 ENTER; SAVETMPS; PUSHMARK (SP);
471 EXTEND (SP, 2);
472 // we re-bless the reference to get overload and other niceties right
473 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
474 PUSHs (sv_cbor);
475
476 PUTBACK;
477 int count = call_sv ((SV *)GvCV (method), G_ARRAY);
478 SPAGAIN;
479
480 // catch this surprisingly common error
481 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
482 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
483
484 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
485 encode_uint (enc, MAJOR_ARRAY, count + 1);
486 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
487
488 while (count)
489 encode_sv (enc, SP[1 - count--]);
490
491 PUTBACK;
492
493 FREETMPS; LEAVE;
494 }
298 else 495 else
299 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 496 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
300 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 497 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
301#endif
302 }
303 } 498 }
304 else if (svt == SVt_PVHV) 499 else if (svt == SVt_PVHV)
305 encode_hv (enc, (HV *)sv); 500 encode_hv (enc, (HV *)sv);
306 else if (svt == SVt_PVAV) 501 else if (svt == SVt_PVAV)
307 encode_av (enc, (AV *)sv); 502 encode_av (enc, (AV *)sv);
308 else if (svt < SVt_PVAV)
309 {
310 STRLEN len = 0;
311 char *pv = svt ? SvPV (sv, len) : 0;
312
313 if (len == 1 && *pv == '1')
314 encode_ch (enc, 0xe0 | 21);
315 else if (len == 1 && *pv == '0')
316 encode_ch (enc, 0xe0 | 20);
317 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
318 encode_ch (enc, 0xe0 | 23);
319 else
320 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
321 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
322 }
323 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
324 encode_ch (enc, 0xe0 | 23);
325 else 503 else
326 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 504 {
327 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 505 encode_tag (enc, CBOR_TAG_INDIRECTION);
506 encode_sv (enc, sv);
507 }
328} 508}
329 509
330static void 510static void
331encode_nv (enc_t *enc, SV *sv) 511encode_nv (enc_t *enc, SV *sv)
332{ 512{
333 double nv = SvNVX (sv); 513 double nv = SvNVX (sv);
334 514
335 need (enc, 9); 515 need (enc, 9);
336 516
337 if (expect_false (nv == (U32)nv)) 517 if (ecb_expect_false (nv == (NV)(U32)nv))
338 encode_uint (enc, 0x00, (U32)nv); 518 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
339 //TODO: maybe I32? 519 //TODO: maybe I32?
340 else if (expect_false (nv == (float)nv)) 520 else if (ecb_expect_false (nv == (float)nv))
341 { 521 {
342 uint32_t fp = ecb_float_to_binary32 (nv); 522 uint32_t fp = ecb_float_to_binary32 (nv);
343 523
344 *enc->cur++ = 0xe0 | 26; 524 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
345 525
346 if (!ecb_big_endian ()) 526 if (!ecb_big_endian ())
347 fp = ecb_bswap32 (fp); 527 fp = ecb_bswap32 (fp);
348 528
349 memcpy (enc->cur, &fp, 4); 529 memcpy (enc->cur, &fp, 4);
351 } 531 }
352 else 532 else
353 { 533 {
354 uint64_t fp = ecb_double_to_binary64 (nv); 534 uint64_t fp = ecb_double_to_binary64 (nv);
355 535
356 *enc->cur++ = 0xe0 | 27; 536 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
357 537
358 if (!ecb_big_endian ()) 538 if (!ecb_big_endian ())
359 fp = ecb_bswap64 (fp); 539 fp = ecb_bswap64 (fp);
360 540
361 memcpy (enc->cur, &fp, 8); 541 memcpy (enc->cur, &fp, 8);
370 550
371 if (SvPOKp (sv)) 551 if (SvPOKp (sv))
372 { 552 {
373 STRLEN len; 553 STRLEN len;
374 char *str = SvPV (sv, len); 554 char *str = SvPV (sv, len);
375 encode_str (enc, SvUTF8 (sv), str, len); 555 encode_strref (enc, SvUTF8 (sv), str, len);
376 } 556 }
377 else if (SvNOKp (sv)) 557 else if (SvNOKp (sv))
378 encode_nv (enc, sv); 558 encode_nv (enc, sv);
379 else if (SvIOKp (sv)) 559 else if (SvIOKp (sv))
380 { 560 {
381 if (SvIsUV (sv)) 561 if (SvIsUV (sv))
382 encode_uint (enc, 0x00, SvUVX (sv)); 562 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
383 else if (SvIVX (sv) >= 0) 563 else if (SvIVX (sv) >= 0)
384 encode_uint (enc, 0x00, SvIVX (sv)); 564 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
385 else 565 else
386 encode_uint (enc, 0x20, -(SvIVX (sv) + 1)); 566 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
387 } 567 }
388 else if (SvROK (sv)) 568 else if (SvROK (sv))
389 encode_rv (enc, SvRV (sv)); 569 encode_rv (enc, SvRV (sv));
390 else if (!SvOK (sv)) 570 else if (!SvOK (sv))
391 encode_ch (enc, 0xe0 | 22); 571 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
392 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 572 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
393 encode_ch (enc, 0xe0 | 23); 573 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
394 else 574 else
395 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data", 575 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
396 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 576 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
397} 577}
398 578
399static SV * 579static SV *
400encode_cbor (SV *scalar, CBOR *cbor) 580encode_cbor (SV *scalar, CBOR *cbor)
401{ 581{
402 enc_t enc; 582 enc_t enc = { };
403 583
404 enc.cbor = *cbor; 584 enc.cbor = *cbor;
405 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 585 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
406 enc.cur = SvPVX (enc.sv); 586 enc.cur = SvPVX (enc.sv);
407 enc.end = SvEND (enc.sv); 587 enc.end = SvEND (enc.sv);
408 enc.depth = 0;
409 588
410 SvPOK_only (enc.sv); 589 SvPOK_only (enc.sv);
590
591 if (cbor->flags & F_PACK_STRINGS)
592 {
593 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
594 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
595 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
596 }
597
411 encode_sv (&enc, scalar); 598 encode_sv (&enc, scalar);
412 599
413 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 600 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
414 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 601 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
415 602
429 U8 *end; // end of input string 616 U8 *end; // end of input string
430 const char *err; // parse error, if != 0 617 const char *err; // parse error, if != 0
431 CBOR cbor; 618 CBOR cbor;
432 U32 depth; // recursion depth 619 U32 depth; // recursion depth
433 U32 maxdepth; // recursion depth limit 620 U32 maxdepth; // recursion depth limit
621 AV *shareable;
622 AV *stringref;
623 SV *decode_tagged;
434} dec_t; 624} dec_t;
435 625
436#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 626#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
437 627
438#define WANT(len) if (expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data"); 628#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
439 629
440#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 630#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)
441#define DEC_DEC_DEPTH --dec->depth 631#define DEC_DEC_DEPTH --dec->depth
442 632
443static UV 633static UV
444decode_uint (dec_t *dec) 634decode_uint (dec_t *dec)
445{ 635{
446 switch (*dec->cur & 31) 636 U8 m = *dec->cur & MINOR_MASK;
447 { 637 ++dec->cur;
448 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
449 case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
450 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
451 return *dec->cur++ & 31;
452 638
453 case 24: 639 if (ecb_expect_true (m < LENGTH_EXT1))
640 return m;
641 else if (ecb_expect_true (m == LENGTH_EXT1))
642 {
454 WANT (2); 643 WANT (1);
455 dec->cur += 2; 644 dec->cur += 1;
456 return dec->cur[-1]; 645 return dec->cur[-1];
457 646 }
458 case 25: 647 else if (ecb_expect_true (m == LENGTH_EXT2))
648 {
459 WANT (3); 649 WANT (2);
460 dec->cur += 3; 650 dec->cur += 2;
461 return (((UV)dec->cur[-2]) << 8) 651 return (((UV)dec->cur[-2]) << 8)
462 | ((UV)dec->cur[-1]); 652 | ((UV)dec->cur[-1]);
463 653 }
464 case 26: 654 else if (ecb_expect_true (m == LENGTH_EXT4))
655 {
465 WANT (5); 656 WANT (4);
466 dec->cur += 5; 657 dec->cur += 4;
467 return (((UV)dec->cur[-4]) << 24) 658 return (((UV)dec->cur[-4]) << 24)
468 | (((UV)dec->cur[-3]) << 16) 659 | (((UV)dec->cur[-3]) << 16)
469 | (((UV)dec->cur[-2]) << 8) 660 | (((UV)dec->cur[-2]) << 8)
470 | ((UV)dec->cur[-1]); 661 | ((UV)dec->cur[-1]);
471 662 }
472 case 27: 663 else if (ecb_expect_true (m == LENGTH_EXT8))
664 {
473 WANT (9); 665 WANT (8);
474 dec->cur += 9; 666 dec->cur += 8;
667
668 return
669#if UVSIZE < 8
670 0
671#else
475 return (((UV)dec->cur[-8]) << 56) 672 (((UV)dec->cur[-8]) << 56)
476 | (((UV)dec->cur[-7]) << 48) 673 | (((UV)dec->cur[-7]) << 48)
477 | (((UV)dec->cur[-6]) << 40) 674 | (((UV)dec->cur[-6]) << 40)
478 | (((UV)dec->cur[-5]) << 32) 675 | (((UV)dec->cur[-5]) << 32)
676#endif
479 | (((UV)dec->cur[-4]) << 24) 677 | (((UV)dec->cur[-4]) << 24)
480 | (((UV)dec->cur[-3]) << 16) 678 | (((UV)dec->cur[-3]) << 16)
481 | (((UV)dec->cur[-2]) << 8) 679 | (((UV)dec->cur[-2]) << 8)
482 | ((UV)dec->cur[-1]); 680 | ((UV)dec->cur[-1]);
483 681 }
484 default: 682 else
485 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 683 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
486 }
487 684
488fail: 685fail:
489 return 0; 686 return 0;
490} 687}
491 688
496{ 693{
497 AV *av = newAV (); 694 AV *av = newAV ();
498 695
499 DEC_INC_DEPTH; 696 DEC_INC_DEPTH;
500 697
501 if ((*dec->cur & 31) == 31) 698 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
502 { 699 {
503 ++dec->cur; 700 ++dec->cur;
504 701
505 for (;;) 702 for (;;)
506 { 703 {
507 WANT (1); 704 WANT (1);
508 705
509 if (*dec->cur == 0xe0 | 31) 706 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
510 { 707 {
511 ++dec->cur; 708 ++dec->cur;
512 break; 709 break;
513 } 710 }
514 711
517 } 714 }
518 else 715 else
519 { 716 {
520 int i, len = decode_uint (dec); 717 int i, len = decode_uint (dec);
521 718
719 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
522 av_fill (av, len - 1); 720 av_fill (av, len - 1);
523 721
524 for (i = 0; i < len; ++i) 722 for (i = 0; i < len; ++i)
525 AvARRAY (av)[i] = decode_sv (dec); 723 AvARRAY (av)[i] = decode_sv (dec);
526 } 724 }
532 SvREFCNT_dec (av); 730 SvREFCNT_dec (av);
533 DEC_DEC_DEPTH; 731 DEC_DEC_DEPTH;
534 return &PL_sv_undef; 732 return &PL_sv_undef;
535} 733}
536 734
735static void
736decode_he (dec_t *dec, HV *hv)
737{
738 // for speed reasons, we specialcase single-string
739 // byte or utf-8 strings as keys, but only when !stringref
740
741 if (ecb_expect_true (!dec->stringref))
742 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
743 {
744 I32 len = decode_uint (dec);
745 char *key = (char *)dec->cur;
746
747 dec->cur += len;
748
749 hv_store (hv, key, len, decode_sv (dec), 0);
750
751 return;
752 }
753 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
754 {
755 I32 len = decode_uint (dec);
756 char *key = (char *)dec->cur;
757
758 dec->cur += len;
759
760 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
761 if (!is_utf8_string (key, len))
762 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
763
764 hv_store (hv, key, -len, decode_sv (dec), 0);
765
766 return;
767 }
768
769 SV *k = decode_sv (dec);
770 SV *v = decode_sv (dec);
771
772 hv_store_ent (hv, k, v, 0);
773 SvREFCNT_dec (k);
774
775fail:
776 ;
777}
778
537static SV * 779static SV *
538decode_hv (dec_t *dec) 780decode_hv (dec_t *dec)
539{ 781{
540 HV *hv = newHV (); 782 HV *hv = newHV ();
541 783
542 DEC_INC_DEPTH; 784 DEC_INC_DEPTH;
543 785
544 if ((*dec->cur & 31) == 31) 786 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
545 { 787 {
546 ++dec->cur; 788 ++dec->cur;
547 789
548 for (;;) 790 for (;;)
549 { 791 {
550 WANT (1); 792 WANT (1);
551 793
552 if (*dec->cur == 0xe0 | 31) 794 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
553 { 795 {
554 ++dec->cur; 796 ++dec->cur;
555 break; 797 break;
556 } 798 }
557 799
558 SV *k = decode_sv (dec); 800 decode_he (dec, hv);
559 SV *v = decode_sv (dec);
560
561 hv_store_ent (hv, k, v, 0);
562 } 801 }
563 } 802 }
564 else 803 else
565 { 804 {
566 int len = decode_uint (dec); 805 int pairs = decode_uint (dec);
567 806
568 while (len--) 807 while (pairs--)
569 { 808 decode_he (dec, hv);
570 SV *k = decode_sv (dec);
571 SV *v = decode_sv (dec);
572
573 hv_store_ent (hv, k, v, 0);
574 }
575 } 809 }
576 810
577 DEC_DEC_DEPTH; 811 DEC_DEC_DEPTH;
578 return newRV_noinc ((SV *)hv); 812 return newRV_noinc ((SV *)hv);
579
580#if 0
581 SV *sv;
582 HV *hv = newHV ();
583
584 DEC_INC_DEPTH;
585 decode_ws (dec);
586
587 for (;;)
588 {
589 // heuristic: assume that
590 // a) decode_str + hv_store_ent are abysmally slow.
591 // b) most hash keys are short, simple ascii text.
592 // => try to "fast-match" such strings to avoid
593 // the overhead of decode_str + hv_store_ent.
594 {
595 SV *value;
596 char *p = dec->cur;
597 char *e = p + 24; // only try up to 24 bytes
598
599 for (;;)
600 {
601 // the >= 0x80 is false on most architectures
602 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
603 {
604 // slow path, back up and use decode_str
605 SV *key = decode_str (dec);
606 if (!key)
607 goto fail;
608
609 decode_ws (dec); EXPECT_CH (':');
610
611 decode_ws (dec);
612 value = decode_sv (dec);
613 if (!value)
614 {
615 SvREFCNT_dec (key);
616 goto fail;
617 }
618
619 hv_store_ent (hv, key, value, 0);
620 SvREFCNT_dec (key);
621
622 break;
623 }
624 else if (*p == '"')
625 {
626 // fast path, got a simple key
627 char *key = dec->cur;
628 int len = p - key;
629 dec->cur = p + 1;
630
631 decode_ws (dec); EXPECT_CH (':');
632
633 decode_ws (dec);
634 value = decode_sv (dec);
635 if (!value)
636 goto fail;
637
638 hv_store (hv, key, len, value, 0);
639
640 break;
641 }
642
643 ++p;
644 }
645 }
646
647 decode_ws (dec);
648
649 if (*dec->cur == '}')
650 {
651 ++dec->cur;
652 break;
653 }
654
655 if (*dec->cur != ',')
656 ERR (", or } expected while parsing object/hash");
657
658 ++dec->cur;
659
660 decode_ws (dec);
661
662 if (*dec->cur == '}' && dec->cbor.flags & F_RELAXED)
663 {
664 ++dec->cur;
665 break;
666 }
667 }
668
669 DEC_DEC_DEPTH;
670 sv = newRV_noinc ((SV *)hv);
671
672 // check filter callbacks
673 if (dec->cbor.flags & F_HOOK)
674 {
675 if (dec->cbor.cb_sk_object && HvKEYS (hv) == 1)
676 {
677 HE *cb, *he;
678
679 hv_iterinit (hv);
680 he = hv_iternext (hv);
681 hv_iterinit (hv);
682
683 // the next line creates a mortal sv each time its called.
684 // might want to optimise this for common cases.
685 cb = hv_fetch_ent (dec->cbor.cb_sk_object, hv_iterkeysv (he), 0, 0);
686
687 if (cb)
688 {
689 dSP;
690 int count;
691
692 ENTER; SAVETMPS; PUSHMARK (SP);
693 XPUSHs (HeVAL (he));
694 sv_2mortal (sv);
695
696 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
697
698 if (count == 1)
699 {
700 sv = newSVsv (POPs);
701 FREETMPS; LEAVE;
702 return sv;
703 }
704
705 SvREFCNT_inc (sv);
706 FREETMPS; LEAVE;
707 }
708 }
709
710 if (dec->cbor.cb_object)
711 {
712 dSP;
713 int count;
714
715 ENTER; SAVETMPS; PUSHMARK (SP);
716 XPUSHs (sv_2mortal (sv));
717
718 PUTBACK; count = call_sv (dec->cbor.cb_object, G_ARRAY); SPAGAIN;
719
720 if (count == 1)
721 {
722 sv = newSVsv (POPs);
723 FREETMPS; LEAVE;
724 return sv;
725 }
726
727 SvREFCNT_inc (sv);
728 FREETMPS; LEAVE;
729 }
730 }
731
732 return sv;
733#endif
734 813
735fail: 814fail:
736 SvREFCNT_dec (hv); 815 SvREFCNT_dec (hv);
737 DEC_DEC_DEPTH; 816 DEC_DEC_DEPTH;
738 return &PL_sv_undef; 817 return &PL_sv_undef;
739} 818}
740 819
741static SV * 820static SV *
742decode_str (dec_t *dec, int utf8) 821decode_str (dec_t *dec, int utf8)
743{ 822{
744 SV *sv; 823 SV *sv = 0;
745 824
746 if ((*dec->cur & 31) == 31) 825 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
747 { 826 {
827 // indefinite length strings
748 ++dec->cur; 828 ++dec->cur;
749 829
830 U8 major = *dec->cur & MAJOR_MISC;
831
750 sv = newSVpvn ("", 0); 832 sv = newSVpvn ("", 0);
751 833
752 // not very fast, and certainly not robust against illegal input
753 for (;;) 834 for (;;)
754 { 835 {
755 WANT (1); 836 WANT (1);
756 837
757 if (*dec->cur == 0xe0 | 31) 838 if ((*dec->cur - major) > LENGTH_EXT8)
839 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
758 { 840 {
759 ++dec->cur; 841 ++dec->cur;
760 break; 842 break;
761 } 843 }
844 else
845 ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
762 846
763 SV *sv2 = decode_sv (dec); 847 STRLEN len = decode_uint (dec);
764 sv_catsv (sv, sv2); 848
849 WANT (len);
850 sv_catpvn (sv, dec->cur, len);
851 dec->cur += len;
765 } 852 }
766 } 853 }
767 else 854 else
768 { 855 {
769 STRLEN len = decode_uint (dec); 856 STRLEN len = decode_uint (dec);
770 857
771 WANT (len); 858 WANT (len);
772 sv = newSVpvn (dec->cur, len); 859 sv = newSVpvn (dec->cur, len);
773 dec->cur += len; 860 dec->cur += len;
861
862 if (ecb_expect_false (dec->stringref)
863 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
864 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
774 } 865 }
775 866
776 if (utf8) 867 if (utf8)
868 {
869 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
870 if (!is_utf8_string (SvPVX (sv), SvCUR (sv)))
871 ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
872
777 SvUTF8_on (sv); 873 SvUTF8_on (sv);
874 }
778 875
779 return sv; 876 return sv;
780 877
781fail: 878fail:
879 SvREFCNT_dec (sv);
880 return &PL_sv_undef;
881}
882
883static SV *
884decode_tagged (dec_t *dec)
885{
886 SV *sv = 0;
887 UV tag = decode_uint (dec);
888
889 WANT (1);
890
891 switch (tag)
892 {
893 case CBOR_TAG_MAGIC:
894 sv = decode_sv (dec);
895 break;
896
897 case CBOR_TAG_INDIRECTION:
898 sv = newRV_noinc (decode_sv (dec));
899 break;
900
901 case CBOR_TAG_STRINGREF_NAMESPACE:
902 {
903 ENTER; SAVETMPS;
904
905 SAVESPTR (dec->stringref);
906 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
907
908 sv = decode_sv (dec);
909
910 FREETMPS; LEAVE;
911 }
912 break;
913
914 case CBOR_TAG_STRINGREF:
915 {
916 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
917 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
918
919 UV idx = decode_uint (dec);
920
921 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref))
922 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
923
924 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
925 }
926 break;
927
928 case CBOR_TAG_VALUE_SHAREABLE:
929 {
930 if (ecb_expect_false (!dec->shareable))
931 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
932
933 if (dec->cbor.flags & F_ALLOW_CYCLES)
934 {
935 sv = newSV (0);
936 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
937
938 SV *osv = decode_sv (dec);
939 sv_setsv (sv, osv);
940 SvREFCNT_dec_NN (osv);
941 }
942 else
943 {
944 av_push (dec->shareable, &PL_sv_undef);
945 int idx = AvFILLp (dec->shareable);
946 sv = decode_sv (dec);
947 av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
948 }
949 }
950 break;
951
952 case CBOR_TAG_VALUE_SHAREDREF:
953 {
954 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
955 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
956
957 UV idx = decode_uint (dec);
958
959 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable))
960 ERR ("corrupted CBOR data (sharedref index out of bounds)");
961
962 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
963
964 if (sv == &PL_sv_undef)
965 ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
966 }
967 break;
968
969 case CBOR_TAG_PERL_OBJECT:
970 {
971 sv = decode_sv (dec);
972
973 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
974 ERR ("corrupted CBOR data (non-array perl object)");
975
976 AV *av = (AV *)SvRV (sv);
977 int len = av_len (av) + 1;
978 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
979
980 if (!stash)
981 ERR ("cannot decode perl-object (package does not exist)");
982
983 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
984
985 if (!method)
986 ERR ("cannot decode perl-object (package does not have a THAW method)");
987
988 dSP;
989
990 ENTER; SAVETMPS; PUSHMARK (SP);
991 EXTEND (SP, len + 1);
992 // we re-bless the reference to get overload and other niceties right
993 PUSHs (*av_fetch (av, 0, 1));
994 PUSHs (sv_cbor);
995
996 int i;
997
998 for (i = 1; i < len; ++i)
999 PUSHs (*av_fetch (av, i, 1));
1000
1001 PUTBACK;
1002 call_sv ((SV *)GvCV (method), G_SCALAR | 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 SvREFCNT_dec (sv);
1012 sv = SvREFCNT_inc (POPs);
1013
1014 PUTBACK;
1015
1016 FREETMPS; LEAVE;
1017 }
1018 break;
1019
1020 default:
1021 {
1022 sv = decode_sv (dec);
1023
1024 dSP;
1025 ENTER; SAVETMPS; PUSHMARK (SP);
1026 EXTEND (SP, 2);
1027 PUSHs (newSVuv (tag));
1028 PUSHs (sv);
1029
1030 PUTBACK;
1031 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1032 SPAGAIN;
1033
1034 if (SvTRUE (ERRSV))
1035 {
1036 FREETMPS; LEAVE;
1037 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
1038 }
1039
1040 if (count)
1041 {
1042 SvREFCNT_dec (sv);
1043 sv = SvREFCNT_inc (POPs);
1044 }
1045 else
1046 {
1047 AV *av = newAV ();
1048 av_push (av, newSVuv (tag));
1049 av_push (av, sv);
1050
1051 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1052 ? cbor_tagged_stash
1053 : gv_stashpv ("CBOR::XS::Tagged" , 1);
1054 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
1055 }
1056
1057 PUTBACK;
1058
1059 FREETMPS; LEAVE;
1060 }
1061 break;
1062 }
1063
1064 return sv;
1065
1066fail:
1067 SvREFCNT_dec (sv);
782 return &PL_sv_undef; 1068 return &PL_sv_undef;
783} 1069}
784 1070
785static SV * 1071static SV *
786decode_sv (dec_t *dec) 1072decode_sv (dec_t *dec)
787{ 1073{
788 WANT (1); 1074 WANT (1);
789 1075
790 switch (*dec->cur >> 5) 1076 switch (*dec->cur >> MAJOR_SHIFT)
791 { 1077 {
792 case 0: // unsigned int 1078 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
793 //TODO: 64 bit values on 3 2bit perls 1079 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
794 return newSVuv (decode_uint (dec)); 1080 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
795 case 1: // negative int 1081 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
796 return newSViv (-1 - (IV)decode_uint (dec)); 1082 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
797 case 2: // octet string 1083 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
798 return decode_str (dec, 0); 1084 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
799 case 3: // utf-8 string 1085
800 return decode_str (dec, 1); 1086 case MAJOR_MISC >> MAJOR_SHIFT:
801 case 4: // array
802 return decode_av (dec);
803 case 5: // map
804 return decode_hv (dec);
805 case 6: // tag
806 abort ();
807 break;
808 case 7: // misc
809 switch (*dec->cur++ & 31) 1087 switch (*dec->cur++ & MINOR_MASK)
810 { 1088 {
811 case 20: 1089 case SIMPLE_FALSE:
812#if CBOR_SLOW 1090#if CBOR_SLOW
813 cbor_false = get_bool ("CBOR::XS::false"); 1091 types_false = get_bool ("Types::Serialiser::false");
814#endif 1092#endif
815 return newSVsv (cbor_false); 1093 return newSVsv (types_false);
816 case 21: 1094 case SIMPLE_TRUE:
817#if CBOR_SLOW 1095#if CBOR_SLOW
818 cbor_true = get_bool ("CBOR::XS::true"); 1096 types_true = get_bool ("Types::Serialiser::true");
819#endif 1097#endif
820 return newSVsv (cbor_true); 1098 return newSVsv (types_true);
821 case 22: 1099 case SIMPLE_NULL:
822 return newSVsv (&PL_sv_undef); 1100 return newSVsv (&PL_sv_undef);
1101 case SIMPLE_UNDEF:
1102#if CBOR_SLOW
1103 types_error = get_bool ("Types::Serialiser::error");
1104#endif
1105 return newSVsv (types_error);
823 1106
824 case 25: 1107 case MISC_FLOAT16:
825 // half float
826 abort ();
827 break; 1108 {
1109 WANT (2);
828 1110
1111 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
1112 dec->cur += 2;
1113
1114 return newSVnv (ecb_binary16_to_float (fp));
1115 }
1116
829 case 26: 1117 case MISC_FLOAT32:
830 { 1118 {
831 uint32_t fp; 1119 uint32_t fp;
832 WANT (4); 1120 WANT (4);
833 memcpy (&fp, dec->cur, 4); 1121 memcpy (&fp, dec->cur, 4);
834 dec->cur += 4; 1122 dec->cur += 4;
837 fp = ecb_bswap32 (fp); 1125 fp = ecb_bswap32 (fp);
838 1126
839 return newSVnv (ecb_binary32_to_float (fp)); 1127 return newSVnv (ecb_binary32_to_float (fp));
840 } 1128 }
841 1129
842 case 27: 1130 case MISC_FLOAT64:
843 { 1131 {
844 uint64_t fp; 1132 uint64_t fp;
845 WANT (8); 1133 WANT (8);
846 memcpy (&fp, dec->cur, 8); 1134 memcpy (&fp, dec->cur, 8);
847 dec->cur += 8; 1135 dec->cur += 8;
850 fp = ecb_bswap64 (fp); 1138 fp = ecb_bswap64 (fp);
851 1139
852 return newSVnv (ecb_binary64_to_double (fp)); 1140 return newSVnv (ecb_binary64_to_double (fp));
853 } 1141 }
854 1142
855 // 0..19 unassigned 1143 // 0..19 unassigned simple
856 // 24 reserved + unassigned (reserved values are not encodable) 1144 // 24 reserved + unassigned simple (reserved values are not encodable)
1145 // 28-30 unassigned misc
1146 // 31 break code
857 default: 1147 default:
858 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1148 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
859 } 1149 }
860 1150
861 break; 1151 break;
862 } 1152 }
863#if 0
864 switch (*dec->cur)
865 {
866 //case '"': ++dec->cur; return decode_str (dec);
867 case '[': ++dec->cur; return decode_av (dec);
868 case '{': ++dec->cur; return decode_hv (dec);
869
870 case '-':
871 case '0': case '1': case '2': case '3': case '4':
872 case '5': case '6': case '7': case '8': case '9':
873 //TODO return decode_num (dec);
874
875 case 't':
876 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
877 {
878 dec->cur += 4;
879#if CBOR_SLOW
880 cbor_true = get_bool ("CBOR::XS::true");
881#endif
882 return newSVsv (cbor_true);
883 }
884 else
885 ERR ("'true' expected");
886
887 break;
888
889 case 'f':
890 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
891 {
892 dec->cur += 5;
893#if CBOR_SLOW
894 cbor_false = get_bool ("CBOR::XS::false");
895#endif
896 return newSVsv (cbor_false);
897 }
898 else
899 ERR ("'false' expected");
900
901 break;
902
903 case 'n':
904 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
905 {
906 dec->cur += 4;
907 return newSVsv (&PL_sv_undef);
908 }
909 else
910 ERR ("'null' expected");
911
912 break;
913
914 default:
915 ERR ("malformed CBOR string, neither array, object, number, string or atom");
916 break;
917 }
918#endif
919 1153
920fail: 1154fail:
921 return &PL_sv_undef; 1155 return &PL_sv_undef;
922} 1156}
923 1157
924static SV * 1158static SV *
925decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1159decode_cbor (SV *string, CBOR *cbor, char **offset_return)
926{ 1160{
927 dec_t dec; 1161 dec_t dec = { };
928 SV *sv; 1162 SV *sv;
1163 STRLEN len;
1164 char *data = SvPVbyte (string, len);
929 1165
930 /* work around bugs in 5.10 where manipulating magic values
931 * makes perl ignore the magic in subsequent accesses.
932 * also make a copy of non-PV values, to get them into a clean
933 * state (SvPV should do that, but it's buggy, see below).
934 */
935 /*SvGETMAGIC (string);*/
936 if (SvMAGICAL (string) || !SvPOK (string))
937 string = sv_2mortal (newSVsv (string));
938
939 SvUPGRADE (string, SVt_PV);
940
941 /* work around a bug in perl 5.10, which causes SvCUR to fail an
942 * assertion with -DDEBUGGING, although SvCUR is documented to
943 * return the xpv_cur field which certainly exists after upgrading.
944 * according to nicholas clark, calling SvPOK fixes this.
945 * But it doesn't fix it, so try another workaround, call SvPV_nolen
946 * and hope for the best.
947 * Damnit, SvPV_nolen still trips over yet another assertion. This
948 * assertion business is seriously broken, try yet another workaround
949 * for the broken -DDEBUGGING.
950 */
951 {
952#ifdef DEBUGGING
953 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
954#else
955 STRLEN offset = SvCUR (string);
956#endif
957
958 if (offset > cbor->max_size && cbor->max_size) 1166 if (len > cbor->max_size && cbor->max_size)
959 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu", 1167 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
960 (unsigned long)SvCUR (string), (unsigned long)cbor->max_size); 1168 (unsigned long)len, (unsigned long)cbor->max_size);
961 }
962
963 sv_utf8_downgrade (string, 0);
964 1169
965 dec.cbor = *cbor; 1170 dec.cbor = *cbor;
966 dec.cur = (U8 *)SvPVX (string); 1171 dec.cur = (U8 *)data;
967 dec.end = (U8 *)SvEND (string); 1172 dec.end = (U8 *)data + len;
968 dec.err = 0;
969 dec.depth = 0;
970
971 if (dec.cbor.cb_object || dec.cbor.cb_sk_object)
972 ;//TODO dec.cbor.flags |= F_HOOK;
973 1173
974 sv = decode_sv (&dec); 1174 sv = decode_sv (&dec);
975 1175
976 if (offset_return) 1176 if (offset_return)
977 *offset_return = dec.cur; 1177 *offset_return = dec.cur;
978 1178
979 if (!(offset_return || !sv)) 1179 if (!(offset_return || !sv))
980 {
981 if (*dec.cur && !dec.err) 1180 if (dec.cur != dec.end && !dec.err)
982 {
983 dec.err = "garbage after CBOR object"; 1181 dec.err = "garbage after CBOR object";
1182
1183 if (dec.err)
1184 {
1185 if (dec.shareable)
1186 {
1187 // need to break cyclic links, which whould all be in shareable
1188 int i;
1189 SV **svp;
1190
1191 for (i = av_len (dec.shareable) + 1; i--; )
1192 if ((svp = av_fetch (dec.shareable, i, 0)))
1193 sv_setsv (*svp, &PL_sv_undef);
1194 }
1195
984 SvREFCNT_dec (sv); 1196 SvREFCNT_dec (sv);
985 sv = 0;
986 }
987 }
988
989 if (!sv)
990 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur); 1197 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1198 }
991 1199
992 sv = sv_2mortal (sv); 1200 sv = sv_2mortal (sv);
993 1201
994 return sv; 1202 return sv;
995} 1203}
996 1204
1205/////////////////////////////////////////////////////////////////////////////
1206// incremental parser
1207
1208#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
1209
1210// returns 0 for notyet, 1 for success or error
1211static int
1212incr_parse (CBOR *self, SV *cborstr)
1213{
1214 STRLEN cur;
1215 SvPV (cborstr, cur);
1216
1217 while (ecb_expect_true (self->incr_need <= cur))
1218 {
1219 // table of integer count bytes
1220 static I8 incr_len[MINOR_MASK + 1] = {
1221 0, 0, 0, 0, 0, 0, 0, 0,
1222 0, 0, 0, 0, 0, 0, 0, 0,
1223 0, 0, 0, 0, 0, 0, 0, 0,
1224 1, 2, 4, 8,-1,-1,-1,-2
1225 };
1226
1227 const U8 *p = SvPVX (cborstr) + self->incr_pos;
1228 U8 m = *p & MINOR_MASK;
1229 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1230 I8 ilen = incr_len[m];
1231
1232 self->incr_need = self->incr_pos + 1;
1233
1234 if (ecb_expect_false (ilen < 0))
1235 {
1236 if (m != MINOR_INDEF)
1237 return 1; // error
1238
1239 if (*p == (MAJOR_MISC | MINOR_INDEF))
1240 {
1241 if (count >= 0)
1242 return 1; // error
1243
1244 count = 1;
1245 }
1246 else
1247 {
1248 av_push (self->incr_count, newSViv (-1)); //TODO: nest
1249 count = -1;
1250 }
1251 }
1252 else
1253 {
1254 self->incr_need += ilen;
1255 if (ecb_expect_false (self->incr_need > cur))
1256 return 0;
1257
1258 int major = *p >> MAJOR_SHIFT;
1259
1260 switch (major)
1261 {
1262 case MAJOR_BYTES >> MAJOR_SHIFT:
1263 case MAJOR_TEXT >> MAJOR_SHIFT:
1264 case MAJOR_ARRAY >> MAJOR_SHIFT:
1265 case MAJOR_MAP >> MAJOR_SHIFT:
1266 {
1267 UV len;
1268
1269 if (ecb_expect_false (ilen))
1270 {
1271 len = 0;
1272
1273 do {
1274 len = (len << 8) | *++p;
1275 } while (--ilen);
1276 }
1277 else
1278 len = m;
1279
1280 switch (major)
1281 {
1282 case MAJOR_BYTES >> MAJOR_SHIFT:
1283 case MAJOR_TEXT >> MAJOR_SHIFT:
1284 self->incr_need += len;
1285 if (ecb_expect_false (self->incr_need > cur))
1286 return 0;
1287
1288 break;
1289
1290 case MAJOR_MAP >> MAJOR_SHIFT:
1291 len <<= 1;
1292 case MAJOR_ARRAY >> MAJOR_SHIFT:
1293 if (len)
1294 {
1295 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1296 count = len + 1;
1297 }
1298 break;
1299 }
1300 }
1301 }
1302 }
1303
1304 self->incr_pos = self->incr_need;
1305
1306 if (count > 0)
1307 {
1308 while (!--count)
1309 {
1310 if (!AvFILLp (self->incr_count))
1311 return 1; // done
1312
1313 SvREFCNT_dec_NN (av_pop (self->incr_count));
1314 count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1315 }
1316
1317 SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
1318 }
1319 }
1320
1321 return 0;
1322}
1323
1324
997///////////////////////////////////////////////////////////////////////////// 1325/////////////////////////////////////////////////////////////////////////////
998// XS interface functions 1326// XS interface functions
999 1327
1000MODULE = CBOR::XS PACKAGE = CBOR::XS 1328MODULE = CBOR::XS PACKAGE = CBOR::XS
1001 1329
1002BOOT: 1330BOOT:
1003{ 1331{
1004 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 1332 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1005 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1); 1333 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1006 1334
1007 cbor_true = get_bool ("CBOR::XS::true"); 1335 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1008 cbor_false = get_bool ("CBOR::XS::false"); 1336 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
1337
1338 types_true = get_bool ("Types::Serialiser::true" );
1339 types_false = get_bool ("Types::Serialiser::false");
1340 types_error = get_bool ("Types::Serialiser::error");
1341
1342 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1343
1344 sv_cbor = newSVpv ("CBOR", 0);
1345 SvREADONLY_on (sv_cbor);
1009} 1346}
1010 1347
1011PROTOTYPES: DISABLE 1348PROTOTYPES: DISABLE
1012 1349
1013void CLONE (...) 1350void CLONE (...)
1014 CODE: 1351 CODE:
1015 cbor_stash = 0; 1352 cbor_stash = 0;
1353 cbor_tagged_stash = 0;
1354 types_error_stash = 0;
1016 cbor_boolean_stash = 0; 1355 types_boolean_stash = 0;
1017 1356
1018void new (char *klass) 1357void new (char *klass)
1019 PPCODE: 1358 PPCODE:
1020{ 1359{
1021 SV *pv = NEWSV (0, sizeof (CBOR)); 1360 SV *pv = NEWSV (0, sizeof (CBOR));
1029 1368
1030void shrink (CBOR *self, int enable = 1) 1369void shrink (CBOR *self, int enable = 1)
1031 ALIAS: 1370 ALIAS:
1032 shrink = F_SHRINK 1371 shrink = F_SHRINK
1033 allow_unknown = F_ALLOW_UNKNOWN 1372 allow_unknown = F_ALLOW_UNKNOWN
1373 allow_sharing = F_ALLOW_SHARING
1374 allow_cycles = F_ALLOW_CYCLES
1375 pack_strings = F_PACK_STRINGS
1376 validate_utf8 = F_VALIDATE_UTF8
1034 PPCODE: 1377 PPCODE:
1035{ 1378{
1036 if (enable) 1379 if (enable)
1037 self->flags |= ix; 1380 self->flags |= ix;
1038 else 1381 else
1043 1386
1044void get_shrink (CBOR *self) 1387void get_shrink (CBOR *self)
1045 ALIAS: 1388 ALIAS:
1046 get_shrink = F_SHRINK 1389 get_shrink = F_SHRINK
1047 get_allow_unknown = F_ALLOW_UNKNOWN 1390 get_allow_unknown = F_ALLOW_UNKNOWN
1391 get_allow_sharing = F_ALLOW_SHARING
1392 get_allow_cycles = F_ALLOW_CYCLES
1393 get_pack_strings = F_PACK_STRINGS
1394 get_validate_utf8 = F_VALIDATE_UTF8
1048 PPCODE: 1395 PPCODE:
1049 XPUSHs (boolSV (self->flags & ix)); 1396 XPUSHs (boolSV (self->flags & ix));
1050 1397
1051void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1398void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1052 PPCODE: 1399 PPCODE:
1068 CODE: 1415 CODE:
1069 RETVAL = self->max_size; 1416 RETVAL = self->max_size;
1070 OUTPUT: 1417 OUTPUT:
1071 RETVAL 1418 RETVAL
1072 1419
1073#if 0 //TODO 1420void filter (CBOR *self, SV *filter = 0)
1074
1075void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
1076 PPCODE: 1421 PPCODE:
1077{
1078 SvREFCNT_dec (self->cb_object); 1422 SvREFCNT_dec (self->filter);
1079 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0; 1423 self->filter = filter ? newSVsv (filter) : filter;
1080
1081 XPUSHs (ST (0)); 1424 XPUSHs (ST (0));
1082}
1083 1425
1084void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef) 1426SV *get_filter (CBOR *self)
1085 PPCODE: 1427 CODE:
1086{ 1428 RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1087 if (!self->cb_sk_object) 1429 OUTPUT:
1088 self->cb_sk_object = newHV (); 1430 RETVAL
1089
1090 if (SvOK (cb))
1091 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1092 else
1093 {
1094 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1095
1096 if (!HvKEYS (self->cb_sk_object))
1097 {
1098 SvREFCNT_dec (self->cb_sk_object);
1099 self->cb_sk_object = 0;
1100 }
1101 }
1102
1103 XPUSHs (ST (0));
1104}
1105
1106#endif
1107 1431
1108void encode (CBOR *self, SV *scalar) 1432void encode (CBOR *self, SV *scalar)
1109 PPCODE: 1433 PPCODE:
1110 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1434 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1111 XPUSHs (scalar); 1435 XPUSHs (scalar);
1124 EXTEND (SP, 2); 1448 EXTEND (SP, 2);
1125 PUSHs (sv); 1449 PUSHs (sv);
1126 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1450 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1127} 1451}
1128 1452
1453void incr_parse (CBOR *self, SV *cborstr)
1454 ALIAS:
1455 incr_parse_multiple = 1
1456 PPCODE:
1457{
1458 if (SvUTF8 (cborstr))
1459 sv_utf8_downgrade (cborstr, 0);
1460
1461 if (!self->incr_count)
1462 {
1463 self->incr_count = newAV ();
1464 self->incr_pos = 0;
1465 self->incr_need = 1;
1466
1467 av_push (self->incr_count, newSViv (1));
1468 }
1469
1470 do
1471 {
1472 if (!incr_parse (self, cborstr))
1473 {
1474 if (self->incr_need > self->max_size && self->max_size)
1475 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
1476 (unsigned long)self->incr_need, (unsigned long)self->max_size);
1477
1478 break;
1479 }
1480
1481 SV *sv;
1482 char *offset;
1483
1484 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
1485 XPUSHs (sv);
1486
1487 sv_chop (cborstr, offset);
1488
1489 av_clear (self->incr_count);
1490 av_push (self->incr_count, newSViv (1));
1491
1492 self->incr_pos = 0;
1493 self->incr_need = self->incr_pos + 1;
1494 }
1495 while (ix);
1496}
1497
1498void incr_reset (CBOR *self)
1499 CODE:
1500{
1501 SvREFCNT_dec (self->incr_count);
1502 self->incr_count = 0;
1503}
1504
1129void DESTROY (CBOR *self) 1505void DESTROY (CBOR *self)
1130 CODE: 1506 PPCODE:
1131 SvREFCNT_dec (self->cb_sk_object); 1507 cbor_free (self);
1132 SvREFCNT_dec (self->cb_object);
1133 1508
1134PROTOTYPES: ENABLE 1509PROTOTYPES: ENABLE
1135 1510
1136void encode_cbor (SV *scalar) 1511void encode_cbor (SV *scalar)
1512 ALIAS:
1513 encode_cbor = 0
1514 encode_cbor_sharing = F_ALLOW_SHARING
1137 PPCODE: 1515 PPCODE:
1138{ 1516{
1139 CBOR cbor; 1517 CBOR cbor;
1140 cbor_init (&cbor); 1518 cbor_init (&cbor);
1519 cbor.flags |= ix;
1141 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1520 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1142 XPUSHs (scalar); 1521 XPUSHs (scalar);
1143} 1522}
1144 1523
1145void decode_cbor (SV *cborstr) 1524void decode_cbor (SV *cborstr)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines