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.4 by root, Sat Oct 26 21:06:37 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
15// compatibility with perl <5.18
16#ifndef HvNAMELEN_get
17# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
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
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
14#define F_SHRINK 0x00000200UL 100#define F_SHRINK 0x00000001UL
15#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
16 106
17#define INIT_SIZE 32 // initial scalar size to be allocated 107#define INIT_SIZE 32 // initial scalar size to be allocated
18 108
19#define SB do { 109#define SB do {
20#define SE } while (0) 110#define SE } while (0)
21
22#if __GNUC__ >= 3
23# define expect(expr,value) __builtin_expect ((expr), (value))
24# define INLINE static inline
25#else
26# define expect(expr,value) (expr)
27# define INLINE static
28#endif
29
30#define expect_false(expr) expect ((expr) != 0, 0)
31#define expect_true(expr) expect ((expr) != 0, 1)
32 111
33#define IN_RANGE_INC(type,val,beg,end) \ 112#define IN_RANGE_INC(type,val,beg,end) \
34 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 113 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
35 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 114 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
36 115
42#else 121#else
43# define CBOR_SLOW 0 122# define CBOR_SLOW 0
44# define CBOR_STASH cbor_stash 123# define CBOR_STASH cbor_stash
45#endif 124#endif
46 125
47static HV *cbor_stash, *cbor_boolean_stash; // CBOR::XS:: 126static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
48static SV *cbor_true, *cbor_false; 127static SV *types_true, *types_false, *types_error, *sv_cbor, *default_filter;
49 128
50typedef struct { 129typedef struct {
51 U32 flags; 130 U32 flags;
52 U32 max_depth; 131 U32 max_depth;
53 STRLEN max_size; 132 STRLEN max_size;
133 SV *filter;
54 134
55 SV *cb_object; 135 // for the incremental parser
56 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.
57} CBOR; 139} CBOR;
58 140
59INLINE void 141ecb_inline void
60cbor_init (CBOR *cbor) 142cbor_init (CBOR *cbor)
61{ 143{
62 Zero (cbor, 1, CBOR); 144 Zero (cbor, 1, CBOR);
63 cbor->max_depth = 512; 145 cbor->max_depth = 512;
64} 146}
65 147
148ecb_inline void
149cbor_free (CBOR *cbor)
150{
151 SvREFCNT_dec (cbor->filter);
152 SvREFCNT_dec (cbor->incr_count);
153}
154
66///////////////////////////////////////////////////////////////////////////// 155/////////////////////////////////////////////////////////////////////////////
67// utility functions 156// utility functions
68 157
69INLINE SV * 158ecb_inline SV *
70get_bool (const char *name) 159get_bool (const char *name)
71{ 160{
72 SV *sv = get_sv (name, 1); 161 SV *sv = get_sv (name, 1);
73 162
74 SvREADONLY_on (sv); 163 SvREADONLY_on (sv);
75 SvREADONLY_on (SvRV (sv)); 164 SvREADONLY_on (SvRV (sv));
76 165
77 return sv; 166 return sv;
78} 167}
79 168
80INLINE void 169ecb_inline void
81shrink (SV *sv) 170shrink (SV *sv)
82{ 171{
83 sv_utf8_downgrade (sv, 1); 172 sv_utf8_downgrade (sv, 1);
84 173
85 if (SvLEN (sv) > SvCUR (sv) + 1) 174 if (SvLEN (sv) > SvCUR (sv) + 1)
90 SvPV_renew (sv, SvCUR (sv) + 1); 179 SvPV_renew (sv, SvCUR (sv) + 1);
91#endif 180#endif
92 } 181 }
93} 182}
94 183
95///////////////////////////////////////////////////////////////////////////// 184// minimum length of a string to be registered for stringref
96// fp hell 185ecb_inline int
97 186minimum_string_length (UV idx)
98//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}
99 198
100///////////////////////////////////////////////////////////////////////////// 199/////////////////////////////////////////////////////////////////////////////
101// encoder 200// encoder
102 201
103// structure used for encoding CBOR 202// structure used for encoding CBOR
106 char *cur; // SvPVX (sv) + current output position 205 char *cur; // SvPVX (sv) + current output position
107 char *end; // SvEND (sv) 206 char *end; // SvEND (sv)
108 SV *sv; // result scalar 207 SV *sv; // result scalar
109 CBOR cbor; 208 CBOR cbor;
110 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;
111} enc_t; 214} enc_t;
112 215
113INLINE void 216ecb_inline void
114need (enc_t *enc, STRLEN len) 217need (enc_t *enc, STRLEN len)
115{ 218{
116 if (expect_false (enc->cur + len >= enc->end)) 219 if (ecb_expect_false (enc->cur + len >= enc->end))
117 { 220 {
118 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 221 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
119 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 222 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
120 enc->cur = SvPVX (enc->sv) + cur; 223 enc->cur = SvPVX (enc->sv) + cur;
121 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 224 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
122 } 225 }
123} 226}
124 227
125INLINE void 228ecb_inline void
126encode_ch (enc_t *enc, char ch) 229encode_ch (enc_t *enc, char ch)
127{ 230{
128 need (enc, 1); 231 need (enc, 1);
129 *enc->cur++ = ch; 232 *enc->cur++ = ch;
130} 233}
132static void 235static void
133encode_uint (enc_t *enc, int major, UV len) 236encode_uint (enc_t *enc, int major, UV len)
134{ 237{
135 need (enc, 9); 238 need (enc, 9);
136 239
137 if (len < 24) 240 if (ecb_expect_true (len < LENGTH_EXT1))
138 *enc->cur++ = major | len; 241 *enc->cur++ = major | len;
139 else if (len <= 0xff) 242 else if (ecb_expect_true (len <= 0xffU))
140 { 243 {
141 *enc->cur++ = major | 24; 244 *enc->cur++ = major | LENGTH_EXT1;
142 *enc->cur++ = len; 245 *enc->cur++ = len;
143 } 246 }
144 else if (len <= 0xffff) 247 else if (len <= 0xffffU)
145 { 248 {
146 *enc->cur++ = major | 25; 249 *enc->cur++ = major | LENGTH_EXT2;
147 *enc->cur++ = len >> 8; 250 *enc->cur++ = len >> 8;
148 *enc->cur++ = len; 251 *enc->cur++ = len;
149 } 252 }
150 else if (len <= 0xffffffff) 253 else if (len <= 0xffffffffU)
151 { 254 {
152 *enc->cur++ = major | 26; 255 *enc->cur++ = major | LENGTH_EXT4;
153 *enc->cur++ = len >> 24; 256 *enc->cur++ = len >> 24;
154 *enc->cur++ = len >> 16; 257 *enc->cur++ = len >> 16;
155 *enc->cur++ = len >> 8; 258 *enc->cur++ = len >> 8;
156 *enc->cur++ = len; 259 *enc->cur++ = len;
157 } 260 }
158 else 261 else
159 { 262 {
160 *enc->cur++ = major | 27; 263 *enc->cur++ = major | LENGTH_EXT8;
161 *enc->cur++ = len >> 56; 264 *enc->cur++ = len >> 56;
162 *enc->cur++ = len >> 48; 265 *enc->cur++ = len >> 48;
163 *enc->cur++ = len >> 40; 266 *enc->cur++ = len >> 40;
164 *enc->cur++ = len >> 32; 267 *enc->cur++ = len >> 32;
165 *enc->cur++ = len >> 24; 268 *enc->cur++ = len >> 24;
167 *enc->cur++ = len >> 8; 270 *enc->cur++ = len >> 8;
168 *enc->cur++ = len; 271 *enc->cur++ = len;
169 } 272 }
170} 273}
171 274
172static void 275ecb_inline void
276encode_tag (enc_t *enc, UV tag)
277{
278 encode_uint (enc, MAJOR_TAG, tag);
279}
280
281ecb_inline void
173encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 282encode_str (enc_t *enc, int utf8, char *str, STRLEN len)
174{ 283{
175 encode_uint (enc, utf8 ? 0x60 : 0x40, len); 284 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
176 need (enc, len); 285 need (enc, len);
177 memcpy (enc->cur, str, len); 286 memcpy (enc->cur, str, len);
178 enc->cur += len; 287 enc->cur += len;
179} 288}
180 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
181static void encode_sv (enc_t *enc, SV *sv); 315static void encode_sv (enc_t *enc, SV *sv);
182 316
183static void 317static void
184encode_av (enc_t *enc, AV *av) 318encode_av (enc_t *enc, AV *av)
185{ 319{
188 if (enc->depth >= enc->cbor.max_depth) 322 if (enc->depth >= enc->cbor.max_depth)
189 croak (ERR_NESTING_EXCEEDED); 323 croak (ERR_NESTING_EXCEEDED);
190 324
191 ++enc->depth; 325 ++enc->depth;
192 326
193 encode_uint (enc, 0x80, len + 1); 327 encode_uint (enc, MAJOR_ARRAY, len + 1);
194 328
195 for (i = 0; i <= len; ++i) 329 for (i = 0; i <= len; ++i)
196 { 330 {
197 SV **svp = av_fetch (av, i, 0); 331 SV **svp = av_fetch (av, i, 0);
198 encode_sv (enc, svp ? *svp : &PL_sv_undef); 332 encode_sv (enc, svp ? *svp : &PL_sv_undef);
213 347
214 int pairs = hv_iterinit (hv); 348 int pairs = hv_iterinit (hv);
215 int mg = SvMAGICAL (hv); 349 int mg = SvMAGICAL (hv);
216 350
217 if (mg) 351 if (mg)
218 encode_ch (enc, 0xa0 | 31); 352 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
219 else 353 else
220 encode_uint (enc, 0xa0, pairs); 354 encode_uint (enc, MAJOR_MAP, pairs);
221 355
222 while ((he = hv_iternext (hv))) 356 while ((he = hv_iternext (hv)))
223 { 357 {
224 if (HeKLEN (he) == HEf_SVKEY) 358 if (HeKLEN (he) == HEf_SVKEY)
225 encode_sv (enc, HeSVKEY (he)); 359 encode_sv (enc, HeSVKEY (he));
226 else 360 else
227 encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 361 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
228 362
229 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));
230 } 364 }
231 365
232 if (mg) 366 if (mg)
233 encode_ch (enc, 0xe0 | 31); 367 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
234 368
235 --enc->depth; 369 --enc->depth;
236} 370}
237 371
238// encode objects, arrays and special \0=false and \1=true values. 372// encode objects, arrays and special \0=false and \1=true values.
239static void 373static void
240encode_rv (enc_t *enc, SV *sv) 374encode_rv (enc_t *enc, SV *sv)
241{ 375{
242 svtype svt;
243
244 SvGETMAGIC (sv); 376 SvGETMAGIC (sv);
377
245 svt = SvTYPE (sv); 378 svtype svt = SvTYPE (sv);
246 379
247 if (expect_false (SvOBJECT (sv))) 380 if (ecb_expect_false (SvOBJECT (sv)))
248 { 381 {
249 HV *stash = !CBOR_SLOW || cbor_boolean_stash 382 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
250 ? 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
251 : gv_stashpv ("CBOR::XS::Boolean", 1); 390 : gv_stashpv ("CBOR::XS::Tagged" , 1);
252 391
253 if (SvSTASH (sv) == stash) 392 HV *stash = SvSTASH (sv);
254 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 }
255 else 430 else
256 { 431 {
257#if 0 //TODO 432 sv_setuv (*svp, enc->shareable_idx);
258 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)))
259 { 444 {
445 dSP;
446
447 ENTER; SAVETMPS; PUSHMARK (SP);
260 // 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
261 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
262
263 if (to_cbor)
264 {
265 dSP;
266
267 ENTER; SAVETMPS; PUSHMARK (SP);
268 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 449 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
269 450
270 // calling with G_SCALAR ensures that we always get a 1 return value
271 PUTBACK; 451 PUTBACK;
452 // G_SCALAR ensures that return value is 1
272 call_sv ((SV *)GvCV (to_cbor), G_SCALAR); 453 call_sv ((SV *)GvCV (method), G_SCALAR);
273 SPAGAIN; 454 SPAGAIN;
274 455
275 // catch this surprisingly common error 456 // catch this surprisingly common error
276 if (SvROK (TOPs) && SvRV (TOPs) == sv) 457 if (SvROK (TOPs) && SvRV (TOPs) == sv)
277 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv))); 458 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
278 459
279 sv = POPs;
280 PUTBACK;
281
282 encode_sv (enc, sv); 460 encode_sv (enc, POPs);
283 461
462 PUTBACK;
463
284 FREETMPS; LEAVE; 464 FREETMPS; LEAVE;
285 }
286 else if (enc->cbor.flags & F_ALLOW_BLESSED)
287 encode_str (enc, "null", 4, 0);
288 else
289 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_CBOR method available on it",
290 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
291 } 465 }
292 else if (enc->cbor.flags & F_ALLOW_BLESSED) 466 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
293 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 }
294 else 495 else
295 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",
296 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 497 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
297#endif
298 }
299 } 498 }
300 else if (svt == SVt_PVHV) 499 else if (svt == SVt_PVHV)
301 encode_hv (enc, (HV *)sv); 500 encode_hv (enc, (HV *)sv);
302 else if (svt == SVt_PVAV) 501 else if (svt == SVt_PVAV)
303 encode_av (enc, (AV *)sv); 502 encode_av (enc, (AV *)sv);
304 else if (svt < SVt_PVAV)
305 {
306 STRLEN len = 0;
307 char *pv = svt ? SvPV (sv, len) : 0;
308
309 if (len == 1 && *pv == '1')
310 encode_ch (enc, 0xe0 | 21);
311 else if (len == 1 && *pv == '0')
312 encode_ch (enc, 0xe0 | 20);
313 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
314 encode_ch (enc, 0xe0 | 23);
315 else
316 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
317 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
318 }
319 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
320 encode_ch (enc, 0xe0 | 23);
321 else 503 else
322 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 504 {
323 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 505 encode_tag (enc, CBOR_TAG_INDIRECTION);
506 encode_sv (enc, sv);
507 }
324} 508}
325 509
326static void 510static void
327encode_nv (enc_t *enc, SV *sv) 511encode_nv (enc_t *enc, SV *sv)
328{ 512{
329 double nv = SvNVX (sv); 513 double nv = SvNVX (sv);
330 514
331 need (enc, 9); 515 need (enc, 9);
332 516
333 if (expect_false (nv == (U32)nv)) 517 if (ecb_expect_false (nv == (NV)(U32)nv))
334 encode_uint (enc, 0x00, (U32)nv); 518 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
335 //TODO: maybe I32? 519 //TODO: maybe I32?
336 else if (expect_false (nv == (float)nv)) 520 else if (ecb_expect_false (nv == (float)nv))
337 { 521 {
338 uint32_t fp = ecb_float_to_binary32 (nv); 522 uint32_t fp = ecb_float_to_binary32 (nv);
339 523
340 *enc->cur++ = 0xe0 | 26; 524 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
341 525
342 if (!ecb_big_endian ()) 526 if (!ecb_big_endian ())
343 fp = ecb_bswap32 (fp); 527 fp = ecb_bswap32 (fp);
344 528
345 memcpy (enc->cur, &fp, 4); 529 memcpy (enc->cur, &fp, 4);
347 } 531 }
348 else 532 else
349 { 533 {
350 uint64_t fp = ecb_double_to_binary64 (nv); 534 uint64_t fp = ecb_double_to_binary64 (nv);
351 535
352 *enc->cur++ = 0xe0 | 27; 536 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
353 537
354 if (!ecb_big_endian ()) 538 if (!ecb_big_endian ())
355 fp = ecb_bswap64 (fp); 539 fp = ecb_bswap64 (fp);
356 540
357 memcpy (enc->cur, &fp, 8); 541 memcpy (enc->cur, &fp, 8);
366 550
367 if (SvPOKp (sv)) 551 if (SvPOKp (sv))
368 { 552 {
369 STRLEN len; 553 STRLEN len;
370 char *str = SvPV (sv, len); 554 char *str = SvPV (sv, len);
371 encode_str (enc, SvUTF8 (sv), str, len); 555 encode_strref (enc, SvUTF8 (sv), str, len);
372 } 556 }
373 else if (SvNOKp (sv)) 557 else if (SvNOKp (sv))
374 encode_nv (enc, sv); 558 encode_nv (enc, sv);
375 else if (SvIOKp (sv)) 559 else if (SvIOKp (sv))
376 { 560 {
377 if (SvIsUV (sv)) 561 if (SvIsUV (sv))
378 encode_uint (enc, 0x00, SvUVX (sv)); 562 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
379 else if (SvIVX (sv) >= 0) 563 else if (SvIVX (sv) >= 0)
380 encode_uint (enc, 0x00, SvIVX (sv)); 564 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
381 else 565 else
382 encode_uint (enc, 0x20, -(SvIVX (sv) + 1)); 566 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
383 } 567 }
384 else if (SvROK (sv)) 568 else if (SvROK (sv))
385 encode_rv (enc, SvRV (sv)); 569 encode_rv (enc, SvRV (sv));
386 else if (!SvOK (sv)) 570 else if (!SvOK (sv))
387 encode_ch (enc, 0xe0 | 22); 571 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
388 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 572 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
389 encode_ch (enc, 0xe0 | 23); 573 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
390 else 574 else
391 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",
392 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 576 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
393} 577}
394 578
395static SV * 579static SV *
396encode_cbor (SV *scalar, CBOR *cbor) 580encode_cbor (SV *scalar, CBOR *cbor)
397{ 581{
398 enc_t enc; 582 enc_t enc = { };
399 583
400 enc.cbor = *cbor; 584 enc.cbor = *cbor;
401 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 585 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
402 enc.cur = SvPVX (enc.sv); 586 enc.cur = SvPVX (enc.sv);
403 enc.end = SvEND (enc.sv); 587 enc.end = SvEND (enc.sv);
404 enc.depth = 0;
405 588
406 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
407 encode_sv (&enc, scalar); 598 encode_sv (&enc, scalar);
408 599
409 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 600 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
410 *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
411 602
425 U8 *end; // end of input string 616 U8 *end; // end of input string
426 const char *err; // parse error, if != 0 617 const char *err; // parse error, if != 0
427 CBOR cbor; 618 CBOR cbor;
428 U32 depth; // recursion depth 619 U32 depth; // recursion depth
429 U32 maxdepth; // recursion depth limit 620 U32 maxdepth; // recursion depth limit
621 AV *shareable;
622 AV *stringref;
623 SV *decode_tagged;
430} dec_t; 624} dec_t;
431 625
432#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
433 627
434#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")
435 629
436#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)
437#define DEC_DEC_DEPTH --dec->depth 631#define DEC_DEC_DEPTH --dec->depth
438 632
439static UV 633static UV
440decode_uint (dec_t *dec) 634decode_uint (dec_t *dec)
441{ 635{
442 switch (*dec->cur & 31) 636 U8 m = *dec->cur & MINOR_MASK;
443 { 637 ++dec->cur;
444 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
445 case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
446 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
447 return *dec->cur++ & 31;
448 638
449 case 24: 639 if (ecb_expect_true (m < LENGTH_EXT1))
640 return m;
641 else if (ecb_expect_true (m == LENGTH_EXT1))
642 {
450 WANT (2); 643 WANT (1);
451 dec->cur += 2; 644 dec->cur += 1;
452 return dec->cur[-1]; 645 return dec->cur[-1];
453 646 }
454 case 25: 647 else if (ecb_expect_true (m == LENGTH_EXT2))
648 {
455 WANT (3); 649 WANT (2);
456 dec->cur += 3; 650 dec->cur += 2;
457 return (((UV)dec->cur[-2]) << 8) 651 return (((UV)dec->cur[-2]) << 8)
458 | ((UV)dec->cur[-1]); 652 | ((UV)dec->cur[-1]);
459 653 }
460 case 26: 654 else if (ecb_expect_true (m == LENGTH_EXT4))
655 {
461 WANT (5); 656 WANT (4);
462 dec->cur += 5; 657 dec->cur += 4;
463 return (((UV)dec->cur[-4]) << 24) 658 return (((UV)dec->cur[-4]) << 24)
464 | (((UV)dec->cur[-3]) << 16) 659 | (((UV)dec->cur[-3]) << 16)
465 | (((UV)dec->cur[-2]) << 8) 660 | (((UV)dec->cur[-2]) << 8)
466 | ((UV)dec->cur[-1]); 661 | ((UV)dec->cur[-1]);
467 662 }
468 case 27: 663 else if (ecb_expect_true (m == LENGTH_EXT8))
664 {
469 WANT (9); 665 WANT (8);
470 dec->cur += 9; 666 dec->cur += 8;
667
668 return
669#if UVSIZE < 8
670 0
671#else
471 return (((UV)dec->cur[-8]) << 56) 672 (((UV)dec->cur[-8]) << 56)
472 | (((UV)dec->cur[-7]) << 48) 673 | (((UV)dec->cur[-7]) << 48)
473 | (((UV)dec->cur[-6]) << 40) 674 | (((UV)dec->cur[-6]) << 40)
474 | (((UV)dec->cur[-5]) << 32) 675 | (((UV)dec->cur[-5]) << 32)
676#endif
475 | (((UV)dec->cur[-4]) << 24) 677 | (((UV)dec->cur[-4]) << 24)
476 | (((UV)dec->cur[-3]) << 16) 678 | (((UV)dec->cur[-3]) << 16)
477 | (((UV)dec->cur[-2]) << 8) 679 | (((UV)dec->cur[-2]) << 8)
478 | ((UV)dec->cur[-1]); 680 | ((UV)dec->cur[-1]);
479 681 }
480 default: 682 else
481 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 683 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
482 }
483 684
484fail: 685fail:
485 return 0; 686 return 0;
486} 687}
487 688
492{ 693{
493 AV *av = newAV (); 694 AV *av = newAV ();
494 695
495 DEC_INC_DEPTH; 696 DEC_INC_DEPTH;
496 697
497 if ((*dec->cur & 31) == 31) 698 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
498 { 699 {
499 ++dec->cur; 700 ++dec->cur;
500 701
501 for (;;) 702 for (;;)
502 { 703 {
503 WANT (1); 704 WANT (1);
504 705
505 if (*dec->cur == (0xe0 | 31)) 706 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
506 { 707 {
507 ++dec->cur; 708 ++dec->cur;
508 break; 709 break;
509 } 710 }
510 711
513 } 714 }
514 else 715 else
515 { 716 {
516 int i, len = decode_uint (dec); 717 int i, len = decode_uint (dec);
517 718
719 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
518 av_fill (av, len - 1); 720 av_fill (av, len - 1);
519 721
520 for (i = 0; i < len; ++i) 722 for (i = 0; i < len; ++i)
521 AvARRAY (av)[i] = decode_sv (dec); 723 AvARRAY (av)[i] = decode_sv (dec);
522 } 724 }
528 SvREFCNT_dec (av); 730 SvREFCNT_dec (av);
529 DEC_DEC_DEPTH; 731 DEC_DEC_DEPTH;
530 return &PL_sv_undef; 732 return &PL_sv_undef;
531} 733}
532 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
533static SV * 779static SV *
534decode_hv (dec_t *dec) 780decode_hv (dec_t *dec)
535{ 781{
536 HV *hv = newHV (); 782 HV *hv = newHV ();
537 783
538 DEC_INC_DEPTH; 784 DEC_INC_DEPTH;
539 785
540 if ((*dec->cur & 31) == 31) 786 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
541 { 787 {
542 ++dec->cur; 788 ++dec->cur;
543 789
544 for (;;) 790 for (;;)
545 { 791 {
546 WANT (1); 792 WANT (1);
547 793
548 if (*dec->cur == (0xe0 | 31)) 794 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
549 { 795 {
550 ++dec->cur; 796 ++dec->cur;
551 break; 797 break;
552 } 798 }
553 799
554 SV *k = decode_sv (dec); 800 decode_he (dec, hv);
555 SV *v = decode_sv (dec);
556
557 hv_store_ent (hv, k, v, 0);
558 } 801 }
559 } 802 }
560 else 803 else
561 { 804 {
562 int len = decode_uint (dec); 805 int pairs = decode_uint (dec);
563 806
564 while (len--) 807 while (pairs--)
565 { 808 decode_he (dec, hv);
566 SV *k = decode_sv (dec);
567 SV *v = decode_sv (dec);
568
569 hv_store_ent (hv, k, v, 0);
570 }
571 } 809 }
572 810
573 DEC_DEC_DEPTH; 811 DEC_DEC_DEPTH;
574 return newRV_noinc ((SV *)hv); 812 return newRV_noinc ((SV *)hv);
575
576#if 0
577 SV *sv;
578 HV *hv = newHV ();
579
580 DEC_INC_DEPTH;
581 decode_ws (dec);
582
583 for (;;)
584 {
585 // heuristic: assume that
586 // a) decode_str + hv_store_ent are abysmally slow.
587 // b) most hash keys are short, simple ascii text.
588 // => try to "fast-match" such strings to avoid
589 // the overhead of decode_str + hv_store_ent.
590 {
591 SV *value;
592 char *p = dec->cur;
593 char *e = p + 24; // only try up to 24 bytes
594
595 for (;;)
596 {
597 // the >= 0x80 is false on most architectures
598 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
599 {
600 // slow path, back up and use decode_str
601 SV *key = decode_str (dec);
602 if (!key)
603 goto fail;
604
605 decode_ws (dec); EXPECT_CH (':');
606
607 decode_ws (dec);
608 value = decode_sv (dec);
609 if (!value)
610 {
611 SvREFCNT_dec (key);
612 goto fail;
613 }
614
615 hv_store_ent (hv, key, value, 0);
616 SvREFCNT_dec (key);
617
618 break;
619 }
620 else if (*p == '"')
621 {
622 // fast path, got a simple key
623 char *key = dec->cur;
624 int len = p - key;
625 dec->cur = p + 1;
626
627 decode_ws (dec); EXPECT_CH (':');
628
629 decode_ws (dec);
630 value = decode_sv (dec);
631 if (!value)
632 goto fail;
633
634 hv_store (hv, key, len, value, 0);
635
636 break;
637 }
638
639 ++p;
640 }
641 }
642
643 decode_ws (dec);
644
645 if (*dec->cur == '}')
646 {
647 ++dec->cur;
648 break;
649 }
650
651 if (*dec->cur != ',')
652 ERR (", or } expected while parsing object/hash");
653
654 ++dec->cur;
655
656 decode_ws (dec);
657
658 if (*dec->cur == '}' && dec->cbor.flags & F_RELAXED)
659 {
660 ++dec->cur;
661 break;
662 }
663 }
664
665 DEC_DEC_DEPTH;
666 sv = newRV_noinc ((SV *)hv);
667
668 // check filter callbacks
669 if (dec->cbor.flags & F_HOOK)
670 {
671 if (dec->cbor.cb_sk_object && HvKEYS (hv) == 1)
672 {
673 HE *cb, *he;
674
675 hv_iterinit (hv);
676 he = hv_iternext (hv);
677 hv_iterinit (hv);
678
679 // the next line creates a mortal sv each time its called.
680 // might want to optimise this for common cases.
681 cb = hv_fetch_ent (dec->cbor.cb_sk_object, hv_iterkeysv (he), 0, 0);
682
683 if (cb)
684 {
685 dSP;
686 int count;
687
688 ENTER; SAVETMPS; PUSHMARK (SP);
689 XPUSHs (HeVAL (he));
690 sv_2mortal (sv);
691
692 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
693
694 if (count == 1)
695 {
696 sv = newSVsv (POPs);
697 FREETMPS; LEAVE;
698 return sv;
699 }
700
701 SvREFCNT_inc (sv);
702 FREETMPS; LEAVE;
703 }
704 }
705
706 if (dec->cbor.cb_object)
707 {
708 dSP;
709 int count;
710
711 ENTER; SAVETMPS; PUSHMARK (SP);
712 XPUSHs (sv_2mortal (sv));
713
714 PUTBACK; count = call_sv (dec->cbor.cb_object, G_ARRAY); SPAGAIN;
715
716 if (count == 1)
717 {
718 sv = newSVsv (POPs);
719 FREETMPS; LEAVE;
720 return sv;
721 }
722
723 SvREFCNT_inc (sv);
724 FREETMPS; LEAVE;
725 }
726 }
727
728 return sv;
729#endif
730 813
731fail: 814fail:
732 SvREFCNT_dec (hv); 815 SvREFCNT_dec (hv);
733 DEC_DEC_DEPTH; 816 DEC_DEC_DEPTH;
734 return &PL_sv_undef; 817 return &PL_sv_undef;
735} 818}
736 819
737static SV * 820static SV *
738decode_str (dec_t *dec, int utf8) 821decode_str (dec_t *dec, int utf8)
739{ 822{
740 SV *sv; 823 SV *sv = 0;
741 824
742 if ((*dec->cur & 31) == 31) 825 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
743 { 826 {
827 // indefinite length strings
744 ++dec->cur; 828 ++dec->cur;
745 829
830 U8 major = *dec->cur & MAJOR_MISC;
831
746 sv = newSVpvn ("", 0); 832 sv = newSVpvn ("", 0);
747 833
748 // not very fast, and certainly not robust against illegal input
749 for (;;) 834 for (;;)
750 { 835 {
751 WANT (1); 836 WANT (1);
752 837
753 if (*dec->cur == (0xe0 | 31)) 838 if ((*dec->cur - major) > LENGTH_EXT8)
839 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
754 { 840 {
755 ++dec->cur; 841 ++dec->cur;
756 break; 842 break;
757 } 843 }
844 else
845 ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
758 846
759 SV *sv2 = decode_sv (dec); 847 STRLEN len = decode_uint (dec);
760 sv_catsv (sv, sv2); 848
849 WANT (len);
850 sv_catpvn (sv, dec->cur, len);
851 dec->cur += len;
761 } 852 }
762 } 853 }
763 else 854 else
764 { 855 {
765 STRLEN len = decode_uint (dec); 856 STRLEN len = decode_uint (dec);
766 857
767 WANT (len); 858 WANT (len);
768 sv = newSVpvn (dec->cur, len); 859 sv = newSVpvn (dec->cur, len);
769 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));
770 } 865 }
771 866
772 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
773 SvUTF8_on (sv); 873 SvUTF8_on (sv);
874 }
774 875
775 return sv; 876 return sv;
776 877
777fail: 878fail:
879 SvREFCNT_dec (sv);
778 return &PL_sv_undef; 880 return &PL_sv_undef;
779} 881}
780 882
781static SV * 883static SV *
782decode_tagged (dec_t *dec) 884decode_tagged (dec_t *dec)
783{ 885{
886 SV *sv = 0;
784 UV tag = decode_uint (dec); 887 UV tag = decode_uint (dec);
888
889 WANT (1);
890
891 switch (tag)
892 {
893 case CBOR_TAG_MAGIC:
785 SV *sv = decode_sv (dec); 894 sv = decode_sv (dec);
895 break;
786 896
787 if (tag == 55799) // 2.4.5 Self-Describe CBOR 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
788 return sv; 1064 return sv;
789 1065
790 AV *av = newAV (); 1066fail:
791 av_push (av, newSVuv (tag)); 1067 SvREFCNT_dec (sv);
792 av_push (av, sv); 1068 return &PL_sv_undef;
793 return newRV_noinc ((SV *)av);
794} 1069}
795 1070
796static SV * 1071static SV *
797decode_sv (dec_t *dec) 1072decode_sv (dec_t *dec)
798{ 1073{
799 WANT (1); 1074 WANT (1);
800 1075
801 switch (*dec->cur >> 5) 1076 switch (*dec->cur >> MAJOR_SHIFT)
802 { 1077 {
803 case 0: // unsigned int 1078 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
804 //TODO: 64 bit values on 3 2bit perls 1079 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
805 return newSVuv (decode_uint (dec)); 1080 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
806 case 1: // negative int 1081 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
807 return newSViv (-1 - (IV)decode_uint (dec)); 1082 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
808 case 2: // octet string 1083 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
809 return decode_str (dec, 0); 1084 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
810 case 3: // utf-8 string 1085
811 return decode_str (dec, 1); 1086 case MAJOR_MISC >> MAJOR_SHIFT:
812 case 4: // array
813 return decode_av (dec);
814 case 5: // map
815 return decode_hv (dec);
816 case 6: // tag
817 return decode_tagged (dec);
818 case 7: // misc
819 switch (*dec->cur++ & 31) 1087 switch (*dec->cur++ & MINOR_MASK)
820 { 1088 {
821 case 20: 1089 case SIMPLE_FALSE:
822#if CBOR_SLOW 1090#if CBOR_SLOW
823 cbor_false = get_bool ("CBOR::XS::false"); 1091 types_false = get_bool ("Types::Serialiser::false");
824#endif 1092#endif
825 return newSVsv (cbor_false); 1093 return newSVsv (types_false);
826 case 21: 1094 case SIMPLE_TRUE:
827#if CBOR_SLOW 1095#if CBOR_SLOW
828 cbor_true = get_bool ("CBOR::XS::true"); 1096 types_true = get_bool ("Types::Serialiser::true");
829#endif 1097#endif
830 return newSVsv (cbor_true); 1098 return newSVsv (types_true);
831 case 22: 1099 case SIMPLE_NULL:
832 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);
833 1106
834 case 25: 1107 case MISC_FLOAT16:
835 { 1108 {
836 WANT (2); 1109 WANT (2);
837 1110
838 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1111 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
839 dec->cur += 2; 1112 dec->cur += 2;
840 1113
841 return newSVnv (ecb_binary16_to_float (fp)); 1114 return newSVnv (ecb_binary16_to_float (fp));
842 } 1115 }
843 1116
844 case 26: 1117 case MISC_FLOAT32:
845 { 1118 {
846 uint32_t fp; 1119 uint32_t fp;
847 WANT (4); 1120 WANT (4);
848 memcpy (&fp, dec->cur, 4); 1121 memcpy (&fp, dec->cur, 4);
849 dec->cur += 4; 1122 dec->cur += 4;
852 fp = ecb_bswap32 (fp); 1125 fp = ecb_bswap32 (fp);
853 1126
854 return newSVnv (ecb_binary32_to_float (fp)); 1127 return newSVnv (ecb_binary32_to_float (fp));
855 } 1128 }
856 1129
857 case 27: 1130 case MISC_FLOAT64:
858 { 1131 {
859 uint64_t fp; 1132 uint64_t fp;
860 WANT (8); 1133 WANT (8);
861 memcpy (&fp, dec->cur, 8); 1134 memcpy (&fp, dec->cur, 8);
862 dec->cur += 8; 1135 dec->cur += 8;
865 fp = ecb_bswap64 (fp); 1138 fp = ecb_bswap64 (fp);
866 1139
867 return newSVnv (ecb_binary64_to_double (fp)); 1140 return newSVnv (ecb_binary64_to_double (fp));
868 } 1141 }
869 1142
870 // 0..19 unassigned 1143 // 0..19 unassigned simple
871 // 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
872 default: 1147 default:
873 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1148 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
874 } 1149 }
875 1150
876 break; 1151 break;
877 } 1152 }
878#if 0
879 switch (*dec->cur)
880 {
881 //case '"': ++dec->cur; return decode_str (dec);
882 case '[': ++dec->cur; return decode_av (dec);
883 case '{': ++dec->cur; return decode_hv (dec);
884
885 case '-':
886 case '0': case '1': case '2': case '3': case '4':
887 case '5': case '6': case '7': case '8': case '9':
888 //TODO return decode_num (dec);
889
890 case 't':
891 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
892 {
893 dec->cur += 4;
894#if CBOR_SLOW
895 cbor_true = get_bool ("CBOR::XS::true");
896#endif
897 return newSVsv (cbor_true);
898 }
899 else
900 ERR ("'true' expected");
901
902 break;
903
904 case 'f':
905 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
906 {
907 dec->cur += 5;
908#if CBOR_SLOW
909 cbor_false = get_bool ("CBOR::XS::false");
910#endif
911 return newSVsv (cbor_false);
912 }
913 else
914 ERR ("'false' expected");
915
916 break;
917
918 case 'n':
919 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
920 {
921 dec->cur += 4;
922 return newSVsv (&PL_sv_undef);
923 }
924 else
925 ERR ("'null' expected");
926
927 break;
928
929 default:
930 ERR ("malformed CBOR string, neither array, object, number, string or atom");
931 break;
932 }
933#endif
934 1153
935fail: 1154fail:
936 return &PL_sv_undef; 1155 return &PL_sv_undef;
937} 1156}
938 1157
939static SV * 1158static SV *
940decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1159decode_cbor (SV *string, CBOR *cbor, char **offset_return)
941{ 1160{
942 dec_t dec; 1161 dec_t dec = { };
943 SV *sv; 1162 SV *sv;
1163 STRLEN len;
1164 char *data = SvPVbyte (string, len);
944 1165
945 /* work around bugs in 5.10 where manipulating magic values
946 * makes perl ignore the magic in subsequent accesses.
947 * also make a copy of non-PV values, to get them into a clean
948 * state (SvPV should do that, but it's buggy, see below).
949 */
950 /*SvGETMAGIC (string);*/
951 if (SvMAGICAL (string) || !SvPOK (string))
952 string = sv_2mortal (newSVsv (string));
953
954 SvUPGRADE (string, SVt_PV);
955
956 /* work around a bug in perl 5.10, which causes SvCUR to fail an
957 * assertion with -DDEBUGGING, although SvCUR is documented to
958 * return the xpv_cur field which certainly exists after upgrading.
959 * according to nicholas clark, calling SvPOK fixes this.
960 * But it doesn't fix it, so try another workaround, call SvPV_nolen
961 * and hope for the best.
962 * Damnit, SvPV_nolen still trips over yet another assertion. This
963 * assertion business is seriously broken, try yet another workaround
964 * for the broken -DDEBUGGING.
965 */
966 {
967#ifdef DEBUGGING
968 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
969#else
970 STRLEN offset = SvCUR (string);
971#endif
972
973 if (offset > cbor->max_size && cbor->max_size) 1166 if (len > cbor->max_size && cbor->max_size)
974 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",
975 (unsigned long)SvCUR (string), (unsigned long)cbor->max_size); 1168 (unsigned long)len, (unsigned long)cbor->max_size);
976 }
977
978 sv_utf8_downgrade (string, 0);
979 1169
980 dec.cbor = *cbor; 1170 dec.cbor = *cbor;
981 dec.cur = (U8 *)SvPVX (string); 1171 dec.cur = (U8 *)data;
982 dec.end = (U8 *)SvEND (string); 1172 dec.end = (U8 *)data + len;
983 dec.err = 0;
984 dec.depth = 0;
985
986 if (dec.cbor.cb_object || dec.cbor.cb_sk_object)
987 ;//TODO dec.cbor.flags |= F_HOOK;
988 1173
989 sv = decode_sv (&dec); 1174 sv = decode_sv (&dec);
990 1175
991 if (offset_return) 1176 if (offset_return)
992 *offset_return = dec.cur; 1177 *offset_return = dec.cur;
995 if (dec.cur != dec.end && !dec.err) 1180 if (dec.cur != dec.end && !dec.err)
996 dec.err = "garbage after CBOR object"; 1181 dec.err = "garbage after CBOR object";
997 1182
998 if (dec.err) 1183 if (dec.err)
999 { 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
1000 SvREFCNT_dec (sv); 1196 SvREFCNT_dec (sv);
1001 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);
1002 } 1198 }
1003 1199
1004 sv = sv_2mortal (sv); 1200 sv = sv_2mortal (sv);
1005 1201
1006 return sv; 1202 return sv;
1007} 1203}
1008 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
1009///////////////////////////////////////////////////////////////////////////// 1325/////////////////////////////////////////////////////////////////////////////
1010// XS interface functions 1326// XS interface functions
1011 1327
1012MODULE = CBOR::XS PACKAGE = CBOR::XS 1328MODULE = CBOR::XS PACKAGE = CBOR::XS
1013 1329
1014BOOT: 1330BOOT:
1015{ 1331{
1016 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 1332 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1017 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1); 1333 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1018 1334
1019 cbor_true = get_bool ("CBOR::XS::true"); 1335 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1020 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);
1021} 1346}
1022 1347
1023PROTOTYPES: DISABLE 1348PROTOTYPES: DISABLE
1024 1349
1025void CLONE (...) 1350void CLONE (...)
1026 CODE: 1351 CODE:
1027 cbor_stash = 0; 1352 cbor_stash = 0;
1353 cbor_tagged_stash = 0;
1354 types_error_stash = 0;
1028 cbor_boolean_stash = 0; 1355 types_boolean_stash = 0;
1029 1356
1030void new (char *klass) 1357void new (char *klass)
1031 PPCODE: 1358 PPCODE:
1032{ 1359{
1033 SV *pv = NEWSV (0, sizeof (CBOR)); 1360 SV *pv = NEWSV (0, sizeof (CBOR));
1041 1368
1042void shrink (CBOR *self, int enable = 1) 1369void shrink (CBOR *self, int enable = 1)
1043 ALIAS: 1370 ALIAS:
1044 shrink = F_SHRINK 1371 shrink = F_SHRINK
1045 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
1046 PPCODE: 1377 PPCODE:
1047{ 1378{
1048 if (enable) 1379 if (enable)
1049 self->flags |= ix; 1380 self->flags |= ix;
1050 else 1381 else
1055 1386
1056void get_shrink (CBOR *self) 1387void get_shrink (CBOR *self)
1057 ALIAS: 1388 ALIAS:
1058 get_shrink = F_SHRINK 1389 get_shrink = F_SHRINK
1059 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
1060 PPCODE: 1395 PPCODE:
1061 XPUSHs (boolSV (self->flags & ix)); 1396 XPUSHs (boolSV (self->flags & ix));
1062 1397
1063void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1398void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1064 PPCODE: 1399 PPCODE:
1080 CODE: 1415 CODE:
1081 RETVAL = self->max_size; 1416 RETVAL = self->max_size;
1082 OUTPUT: 1417 OUTPUT:
1083 RETVAL 1418 RETVAL
1084 1419
1085#if 0 //TODO 1420void filter (CBOR *self, SV *filter = 0)
1086
1087void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
1088 PPCODE: 1421 PPCODE:
1089{
1090 SvREFCNT_dec (self->cb_object); 1422 SvREFCNT_dec (self->filter);
1091 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0; 1423 self->filter = filter ? newSVsv (filter) : filter;
1092
1093 XPUSHs (ST (0)); 1424 XPUSHs (ST (0));
1094}
1095 1425
1096void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef) 1426SV *get_filter (CBOR *self)
1097 PPCODE: 1427 CODE:
1098{ 1428 RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1099 if (!self->cb_sk_object) 1429 OUTPUT:
1100 self->cb_sk_object = newHV (); 1430 RETVAL
1101
1102 if (SvOK (cb))
1103 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1104 else
1105 {
1106 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1107
1108 if (!HvKEYS (self->cb_sk_object))
1109 {
1110 SvREFCNT_dec (self->cb_sk_object);
1111 self->cb_sk_object = 0;
1112 }
1113 }
1114
1115 XPUSHs (ST (0));
1116}
1117
1118#endif
1119 1431
1120void encode (CBOR *self, SV *scalar) 1432void encode (CBOR *self, SV *scalar)
1121 PPCODE: 1433 PPCODE:
1122 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1434 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1123 XPUSHs (scalar); 1435 XPUSHs (scalar);
1136 EXTEND (SP, 2); 1448 EXTEND (SP, 2);
1137 PUSHs (sv); 1449 PUSHs (sv);
1138 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1450 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1139} 1451}
1140 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
1141void DESTROY (CBOR *self) 1505void DESTROY (CBOR *self)
1142 CODE: 1506 PPCODE:
1143 SvREFCNT_dec (self->cb_sk_object); 1507 cbor_free (self);
1144 SvREFCNT_dec (self->cb_object);
1145 1508
1146PROTOTYPES: ENABLE 1509PROTOTYPES: ENABLE
1147 1510
1148void encode_cbor (SV *scalar) 1511void encode_cbor (SV *scalar)
1512 ALIAS:
1513 encode_cbor = 0
1514 encode_cbor_sharing = F_ALLOW_SHARING
1149 PPCODE: 1515 PPCODE:
1150{ 1516{
1151 CBOR cbor; 1517 CBOR cbor;
1152 cbor_init (&cbor); 1518 cbor_init (&cbor);
1519 cbor.flags |= ix;
1153 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1520 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1154 XPUSHs (scalar); 1521 XPUSHs (scalar);
1155} 1522}
1156 1523
1157void decode_cbor (SV *cborstr) 1524void decode_cbor (SV *cborstr)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines