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.42 by root, Tue Dec 10 15:31:40 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines