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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines