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.49 by root, Mon Feb 8 04:11:11 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines