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.3 by root, Sat Oct 26 11:08:34 2013 UTC vs.
Revision 1.20 by root, Wed Nov 20 11:06:42 2013 UTC

… …
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11 11
12#include "ecb.h" 12#include "ecb.h"
13 13
14// compatibility with perl <5.18
15#ifndef HvNAMELEN_get
16# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
17#endif
18#ifndef HvNAMELEN
19# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20#endif
21#ifndef HvNAMEUTF8
22# define HvNAMEUTF8(hv) 0
23#endif
24
25// known tags
26enum cbor_tag
27{
28 // inofficial extensions (pending iana registration)
29 CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object
30 CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object
31 CBOR_TAG_VALUE_SHAREABLE = 26, // http://cbor.schmorp.de/value-sharing
32 CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing
33 CBOR_TAG_STRINGREF_NAMESPACE = 65537, // http://cbor.schmorp.de/stringref
34 CBOR_TAG_STRINGREF = 28, // http://cbor.schmorp.de/stringref
35 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
36
37 // rfc7049
38 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
39 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
40 CBOR_TAG_POS_BIGNUM = 2, // byte string
41 CBOR_TAG_NEG_BIGNUM = 3, // byte string
42 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
43 CBOR_TAG_BIGFLOAT = 5, // array
44
45 CBOR_TAG_CONV_B64U = 21, // base64url, any
46 CBOR_TAG_CONV_B64 = 22, // base64, any
47 CBOR_TAG_CONV_HEX = 23, // base16, any
48 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
49
50 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
51 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
52 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
53 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
54 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
55
56 CBOR_TAG_MAGIC = 55799 // self-describe cbor
57};
58
14#define F_SHRINK 0x00000200UL 59#define F_SHRINK 0x00000001UL
15#define F_ALLOW_UNKNOWN 0x00002000UL 60#define F_ALLOW_UNKNOWN 0x00000002UL
61#define F_ALLOW_SHARING 0x00000004UL //TODO
62#define F_DEDUP_STRINGS 0x00000008UL //TODO
63#define F_DEDUP_KEYS 0x00000010UL //TODO
16 64
17#define INIT_SIZE 32 // initial scalar size to be allocated 65#define INIT_SIZE 32 // initial scalar size to be allocated
18 66
19#define SB do { 67#define SB do {
20#define SE } while (0) 68#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 69
33#define IN_RANGE_INC(type,val,beg,end) \ 70#define IN_RANGE_INC(type,val,beg,end) \
34 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 71 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
35 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 72 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
36 73
… …
42#else 79#else
43# define CBOR_SLOW 0 80# define CBOR_SLOW 0
44# define CBOR_STASH cbor_stash 81# define CBOR_STASH cbor_stash
45#endif 82#endif
46 83
47static HV *cbor_stash, *cbor_boolean_stash; // CBOR::XS:: 84static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
48static SV *cbor_true, *cbor_false; 85static SV *types_true, *types_false, *types_error, *sv_cbor;
49 86
50typedef struct { 87typedef struct {
51 U32 flags; 88 U32 flags;
52 U32 max_depth; 89 U32 max_depth;
53 STRLEN max_size; 90 STRLEN max_size;
54
55 SV *cb_object;
56 HV *cb_sk_object;
57} CBOR; 91} CBOR;
58 92
59INLINE void 93ecb_inline void
60cbor_init (CBOR *cbor) 94cbor_init (CBOR *cbor)
61{ 95{
62 Zero (cbor, 1, CBOR); 96 Zero (cbor, 1, CBOR);
63 cbor->max_depth = 512; 97 cbor->max_depth = 512;
64} 98}
65 99
66///////////////////////////////////////////////////////////////////////////// 100/////////////////////////////////////////////////////////////////////////////
67// utility functions 101// utility functions
68 102
69INLINE SV * 103ecb_inline SV *
70get_bool (const char *name) 104get_bool (const char *name)
71{ 105{
72 SV *sv = get_sv (name, 1); 106 SV *sv = get_sv (name, 1);
73 107
74 SvREADONLY_on (sv); 108 SvREADONLY_on (sv);
75 SvREADONLY_on (SvRV (sv)); 109 SvREADONLY_on (SvRV (sv));
76 110
77 return sv; 111 return sv;
78} 112}
79 113
80INLINE void 114ecb_inline void
81shrink (SV *sv) 115shrink (SV *sv)
82{ 116{
83 sv_utf8_downgrade (sv, 1); 117 sv_utf8_downgrade (sv, 1);
84 118
85 if (SvLEN (sv) > SvCUR (sv) + 1) 119 if (SvLEN (sv) > SvCUR (sv) + 1)
… …
91#endif 125#endif
92 } 126 }
93} 127}
94 128
95///////////////////////////////////////////////////////////////////////////// 129/////////////////////////////////////////////////////////////////////////////
96// fp hell
97
98//TODO
99
100/////////////////////////////////////////////////////////////////////////////
101// encoder 130// encoder
102 131
103// structure used for encoding CBOR 132// structure used for encoding CBOR
104typedef struct 133typedef struct
105{ 134{
106 char *cur; // SvPVX (sv) + current output position 135 char *cur; // SvPVX (sv) + current output position
107 char *end; // SvEND (sv) 136 char *end; // SvEND (sv)
108 SV *sv; // result scalar 137 SV *sv; // result scalar
109 CBOR cbor; 138 CBOR cbor;
110 U32 depth; // recursion level 139 U32 depth; // recursion level
140 HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
141 UV stringref_idx;
142 HV *shareable; // ptr => index, or 0
143 UV shareable_idx;
111} enc_t; 144} enc_t;
112 145
113INLINE void 146ecb_inline void
114need (enc_t *enc, STRLEN len) 147need (enc_t *enc, STRLEN len)
115{ 148{
116 if (expect_false (enc->cur + len >= enc->end)) 149 if (ecb_expect_false (enc->cur + len >= enc->end))
117 { 150 {
118 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 151 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
119 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 152 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
120 enc->cur = SvPVX (enc->sv) + cur; 153 enc->cur = SvPVX (enc->sv) + cur;
121 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 154 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
122 } 155 }
123} 156}
124 157
125INLINE void 158ecb_inline void
126encode_ch (enc_t *enc, char ch) 159encode_ch (enc_t *enc, char ch)
127{ 160{
128 need (enc, 1); 161 need (enc, 1);
129 *enc->cur++ = ch; 162 *enc->cur++ = ch;
130} 163}
… …
134{ 167{
135 need (enc, 9); 168 need (enc, 9);
136 169
137 if (len < 24) 170 if (len < 24)
138 *enc->cur++ = major | len; 171 *enc->cur++ = major | len;
139 else if (len < 0x100) 172 else if (len <= 0xff)
140 { 173 {
141 *enc->cur++ = major | 24; 174 *enc->cur++ = major | 24;
142 *enc->cur++ = len; 175 *enc->cur++ = len;
143 } 176 }
144 else if (len < 0x10000) 177 else if (len <= 0xffff)
145 { 178 {
146 *enc->cur++ = major | 25; 179 *enc->cur++ = major | 25;
147 *enc->cur++ = len >> 8; 180 *enc->cur++ = len >> 8;
148 *enc->cur++ = len; 181 *enc->cur++ = len;
149 } 182 }
150 else if (len < 0x100000000) 183 else if (len <= 0xffffffff)
151 { 184 {
152 *enc->cur++ = major | 26; 185 *enc->cur++ = major | 26;
153 *enc->cur++ = len >> 24; 186 *enc->cur++ = len >> 24;
154 *enc->cur++ = len >> 16; 187 *enc->cur++ = len >> 16;
155 *enc->cur++ = len >> 8; 188 *enc->cur++ = len >> 8;
156 *enc->cur++ = len; 189 *enc->cur++ = len;
157 } 190 }
158 else if (len) 191 else
159 { 192 {
160 *enc->cur++ = major | 27; 193 *enc->cur++ = major | 27;
161 *enc->cur++ = len >> 56; 194 *enc->cur++ = len >> 56;
162 *enc->cur++ = len >> 48; 195 *enc->cur++ = len >> 48;
163 *enc->cur++ = len >> 40; 196 *enc->cur++ = len >> 40;
… …
176 need (enc, len); 209 need (enc, len);
177 memcpy (enc->cur, str, len); 210 memcpy (enc->cur, str, len);
178 enc->cur += len; 211 enc->cur += len;
179} 212}
180 213
214ecb_inline void
215encode_tag (enc_t *enc, UV tag)
216{
217 encode_uint (enc, 0xc0, tag);
218}
219
181static void encode_sv (enc_t *enc, SV *sv); 220static void encode_sv (enc_t *enc, SV *sv);
182 221
183static void 222static void
184encode_av (enc_t *enc, AV *av) 223encode_av (enc_t *enc, AV *av)
185{ 224{
… …
197 SV **svp = av_fetch (av, i, 0); 236 SV **svp = av_fetch (av, i, 0);
198 encode_sv (enc, svp ? *svp : &PL_sv_undef); 237 encode_sv (enc, svp ? *svp : &PL_sv_undef);
199 } 238 }
200 239
201 --enc->depth; 240 --enc->depth;
241}
242
243ecb_inline void
244encode_he (enc_t *enc, HE *he)
245{
246 if (HeKLEN (he) == HEf_SVKEY)
247 encode_sv (enc, HeSVKEY (he));
248 else
249 encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
202} 250}
203 251
204static void 252static void
205encode_hv (enc_t *enc, HV *hv) 253encode_hv (enc_t *enc, HV *hv)
206{ 254{
… …
219 else 267 else
220 encode_uint (enc, 0xa0, pairs); 268 encode_uint (enc, 0xa0, pairs);
221 269
222 while ((he = hv_iternext (hv))) 270 while ((he = hv_iternext (hv)))
223 { 271 {
272 if (ecb_expect_false (enc->cbor.flags & (F_DEDUP_STRINGS | F_DEDUP_KEYS)))
273 {
274 SV **svp;
275
224 if (HeKLEN (he) == HEf_SVKEY) 276 if (HeKLEN (he) == HEf_SVKEY)
225 encode_sv (enc, HeSVKEY (he)); 277 svp = hv_fetch_ent (enc->stringref[!! SvUTF8 (HeSVKEY (he))], HeSVKEY (he) , 1, 0);//TODO return HE :/
278 else
279 svp = hv_fetch (enc->stringref[!! HeKUTF8 (he) ], HeKEY (he), HeKLEN (he), 1);
280
281 if (SvOK (*svp))
282 {
283 encode_tag (enc, CBOR_TAG_STRINGREF);
284 encode_uint (enc, 0x00, SvUV (*svp));
285 }
286 else
287 {
288 sv_setuv (*svp, enc->stringref_idx);
289 ++enc->stringref_idx;
290 encode_he (enc, he);
291 }
292 }
226 else 293 else
227 encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 294 encode_he (enc, he);
228 295
229 encode_sv (enc, expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 296 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
230 } 297 }
231 298
232 if (mg) 299 if (mg)
233 encode_ch (enc, 0xe0 | 31); 300 encode_ch (enc, 0xe0 | 31);
234 301
… …
237 304
238// encode objects, arrays and special \0=false and \1=true values. 305// encode objects, arrays and special \0=false and \1=true values.
239static void 306static void
240encode_rv (enc_t *enc, SV *sv) 307encode_rv (enc_t *enc, SV *sv)
241{ 308{
242 svtype svt;
243
244 SvGETMAGIC (sv); 309 SvGETMAGIC (sv);
310
311 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
312 && ecb_expect_false (SvREFCNT (sv) > 1))
313 {
314 if (!enc->shareable)
315 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
316
317 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
318
319 if (SvOK (*svp))
320 {
321 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
322 encode_uint (enc, 0x00, SvUV (*svp));
323 return;
324 }
325 else
326 {
327 sv_setuv (*svp, enc->shareable_idx);
328 ++enc->shareable_idx;
329 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
330 }
331 }
332
245 svt = SvTYPE (sv); 333 svtype svt = SvTYPE (sv);
246 334
247 if (expect_false (SvOBJECT (sv))) 335 if (ecb_expect_false (SvOBJECT (sv)))
248 { 336 {
249 HV *stash = !CBOR_SLOW || cbor_boolean_stash 337 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
250 ? cbor_boolean_stash 338 ? types_boolean_stash
339 : gv_stashpv ("Types::Serialiser::Boolean", 1);
340 HV *error_stash = !CBOR_SLOW || types_error_stash
341 ? types_error_stash
342 : gv_stashpv ("Types::Serialiser::Error", 1);
343 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
344 ? cbor_tagged_stash
251 : gv_stashpv ("CBOR::XS::Boolean", 1); 345 : gv_stashpv ("CBOR::XS::Tagged" , 1);
252 346
253 if (SvSTASH (sv) == stash) 347 HV *stash = SvSTASH (sv);
348 GV *method;
349
350 if (stash == boolean_stash)
254 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 351 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
352 else if (stash == error_stash)
353 encode_ch (enc, 0xe0 | 23);
354 else if (stash == tagged_stash)
355 {
356 if (svt != SVt_PVAV)
357 croak ("encountered CBOR::XS::Tagged object that isn't an array");
358
359 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));
360 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
361 }
362 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
363 {
364 dSP;
365
366 ENTER; SAVETMPS; PUSHMARK (SP);
367 // we re-bless the reference to get overload and other niceties right
368 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
369
370 PUTBACK;
371 // G_SCALAR ensures that return value is 1
372 call_sv ((SV *)GvCV (method), G_SCALAR);
373 SPAGAIN;
374
375 // catch this surprisingly common error
376 if (SvROK (TOPs) && SvRV (TOPs) == sv)
377 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
378
379 encode_sv (enc, POPs);
380
381 PUTBACK;
382
383 FREETMPS; LEAVE;
384 }
385 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
386 {
387 dSP;
388
389 ENTER; SAVETMPS; PUSHMARK (SP);
390 EXTEND (SP, 2);
391 // we re-bless the reference to get overload and other niceties right
392 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
393 PUSHs (sv_cbor);
394
395 PUTBACK;
396 int count = call_sv ((SV *)GvCV (method), G_ARRAY);
397 SPAGAIN;
398
399 // catch this surprisingly common error
400 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
401 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
402
403 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
404 encode_uint (enc, 0x80, count + 1);
405 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
406
407 while (count)
408 encode_sv (enc, SP[1 - count--]);
409
410 PUTBACK;
411
412 FREETMPS; LEAVE;
413 }
255 else 414 else
256 {
257#if 0 //TODO
258 if (enc->cbor.flags & F_CONV_BLESSED)
259 {
260 // 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)));
269
270 // calling with G_SCALAR ensures that we always get a 1 return value
271 PUTBACK;
272 call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
273 SPAGAIN;
274
275 // catch this surprisingly common error
276 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)));
278
279 sv = POPs;
280 PUTBACK;
281
282 encode_sv (enc, sv);
283
284 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", 415 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
290 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
291 }
292 else if (enc->cbor.flags & F_ALLOW_BLESSED)
293 encode_str (enc, "null", 4, 0);
294 else
295 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
296 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 416 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
297#endif
298 }
299 } 417 }
300 else if (svt == SVt_PVHV) 418 else if (svt == SVt_PVHV)
301 encode_hv (enc, (HV *)sv); 419 encode_hv (enc, (HV *)sv);
302 else if (svt == SVt_PVAV) 420 else if (svt == SVt_PVAV)
303 encode_av (enc, (AV *)sv); 421 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 422 else
322 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 423 {
323 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 424 encode_tag (enc, CBOR_TAG_INDIRECTION);
425 encode_sv (enc, sv);
426 }
324} 427}
325 428
326static void 429static void
327encode_nv (enc_t *enc, SV *sv) 430encode_nv (enc_t *enc, SV *sv)
328{ 431{
329 double nv = SvNVX (sv); 432 double nv = SvNVX (sv);
330 433
331 need (enc, 9); 434 need (enc, 9);
332 435
333 if (expect_false (nv == (U32)nv)) 436 if (ecb_expect_false (nv == (U32)nv))
334 encode_uint (enc, 0x00, (U32)nv); 437 encode_uint (enc, 0x00, (U32)nv);
335 //TODO: maybe I32? 438 //TODO: maybe I32?
336 else if (expect_false (nv == (float)nv)) 439 else if (ecb_expect_false (nv == (float)nv))
337 { 440 {
338 uint32_t fp = ecb_float_to_binary32 (nv); 441 uint32_t fp = ecb_float_to_binary32 (nv);
339 442
340 *enc->cur++ = 0xe0 | 26; 443 *enc->cur++ = 0xe0 | 26;
341 444
… …
393} 496}
394 497
395static SV * 498static SV *
396encode_cbor (SV *scalar, CBOR *cbor) 499encode_cbor (SV *scalar, CBOR *cbor)
397{ 500{
398 enc_t enc; 501 enc_t enc = { };
399 502
400 enc.cbor = *cbor; 503 enc.cbor = *cbor;
401 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 504 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
402 enc.cur = SvPVX (enc.sv); 505 enc.cur = SvPVX (enc.sv);
403 enc.end = SvEND (enc.sv); 506 enc.end = SvEND (enc.sv);
404 enc.depth = 0;
405 507
406 SvPOK_only (enc.sv); 508 SvPOK_only (enc.sv);
509
510 if (cbor->flags & (F_DEDUP_STRINGS | F_DEDUP_KEYS))
511 {
512 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
513 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
514 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
515 }
516
407 encode_sv (&enc, scalar); 517 encode_sv (&enc, scalar);
408 518
409 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 519 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
410 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 520 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
411 521
… …
425 U8 *end; // end of input string 535 U8 *end; // end of input string
426 const char *err; // parse error, if != 0 536 const char *err; // parse error, if != 0
427 CBOR cbor; 537 CBOR cbor;
428 U32 depth; // recursion depth 538 U32 depth; // recursion depth
429 U32 maxdepth; // recursion depth limit 539 U32 maxdepth; // recursion depth limit
540 AV *shareable;
541 AV *stringref;
430} dec_t; 542} dec_t;
431 543
432#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 544#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
433 545
434#define WANT(len) if (expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data"); 546#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
435 547
436#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 548#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)
437#define DEC_DEC_DEPTH --dec->depth 549#define DEC_DEC_DEPTH --dec->depth
438 550
439static UV 551static UV
… …
528 SvREFCNT_dec (av); 640 SvREFCNT_dec (av);
529 DEC_DEC_DEPTH; 641 DEC_DEC_DEPTH;
530 return &PL_sv_undef; 642 return &PL_sv_undef;
531} 643}
532 644
645static void
646decode_he (dec_t *dec, HV *hv)
647{
648 // for speed reasons, we specialcase single-string
649 // byte or utf-8 strings as keys.
650
651 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27)
652 {
653 I32 len = decode_uint (dec);
654 char *key = (char *)dec->cur;
655
656 dec->cur += len;
657
658 if (ecb_expect_false (dec->stringref))
659 av_push (dec->stringref, newSVpvn (key, len));
660
661 hv_store (hv, key, len, decode_sv (dec), 0);
662 }
663 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27)
664 {
665 I32 len = decode_uint (dec);
666 char *key = (char *)dec->cur;
667
668 dec->cur += len;
669
670 if (ecb_expect_false (dec->stringref))
671 av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
672
673 hv_store (hv, key, -len, decode_sv (dec), 0);
674 }
675 else
676 {
677 SV *k = decode_sv (dec);
678 SV *v = decode_sv (dec);
679
680 hv_store_ent (hv, k, v, 0);
681 SvREFCNT_dec (k);
682 }
683}
684
533static SV * 685static SV *
534decode_hv (dec_t *dec) 686decode_hv (dec_t *dec)
535{ 687{
536 HV *hv = newHV (); 688 HV *hv = newHV ();
537 689
… …
549 { 701 {
550 ++dec->cur; 702 ++dec->cur;
551 break; 703 break;
552 } 704 }
553 705
554 SV *k = decode_sv (dec); 706 decode_he (dec, hv);
555 SV *v = decode_sv (dec);
556
557 hv_store_ent (hv, k, v, 0);
558 } 707 }
559 } 708 }
560 else 709 else
561 { 710 {
562 int len = decode_uint (dec); 711 int pairs = decode_uint (dec);
563 712
564 while (len--) 713 while (pairs--)
565 { 714 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 } 715 }
572 716
573 DEC_DEC_DEPTH; 717 DEC_DEC_DEPTH;
574 return newRV_noinc ((SV *)hv); 718 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 719
731fail: 720fail:
732 SvREFCNT_dec (hv); 721 SvREFCNT_dec (hv);
733 DEC_DEC_DEPTH; 722 DEC_DEC_DEPTH;
734 return &PL_sv_undef; 723 return &PL_sv_undef;
735} 724}
736 725
737static SV * 726static SV *
738decode_str (dec_t *dec, int utf8) 727decode_str (dec_t *dec, int utf8)
739{ 728{
740 SV *sv; 729 SV *sv = 0;
741 730
742 if ((*dec->cur & 31) == 31) 731 if ((*dec->cur & 31) == 31)
743 { 732 {
744 ++dec->cur; 733 ++dec->cur;
745 734
… …
754 { 743 {
755 ++dec->cur; 744 ++dec->cur;
756 break; 745 break;
757 } 746 }
758 747
759 SV *sv2 = decode_sv (dec);
760 sv_catsv (sv, sv2); 748 sv_catsv (sv, decode_sv (dec));
761 } 749 }
762 } 750 }
763 else 751 else
764 { 752 {
765 STRLEN len = decode_uint (dec); 753 STRLEN len = decode_uint (dec);
… …
770 } 758 }
771 759
772 if (utf8) 760 if (utf8)
773 SvUTF8_on (sv); 761 SvUTF8_on (sv);
774 762
763 if (ecb_expect_false (dec->stringref))
764 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
765
775 return sv; 766 return sv;
776 767
777fail: 768fail:
769 SvREFCNT_dec (sv);
778 return &PL_sv_undef; 770 return &PL_sv_undef;
779} 771}
780 772
781static SV * 773static SV *
782decode_tagged (dec_t *dec) 774decode_tagged (dec_t *dec)
783{ 775{
776 SV *sv = 0;
784 UV tag = decode_uint (dec); 777 UV tag = decode_uint (dec);
778
779 WANT (1);
780
781 switch (tag)
782 {
783 case CBOR_TAG_MAGIC:
784 sv = decode_sv (dec);
785 break;
786
787 case CBOR_TAG_INDIRECTION:
788 sv = newRV_noinc (decode_sv (dec));
789 break;
790
791 case CBOR_TAG_STRINGREF_NAMESPACE:
792 {
793 ENTER; SAVETMPS;
794
795 SAVESPTR (dec->stringref);
796 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
797
798 sv = decode_sv (dec);
799
800 FREETMPS; LEAVE;
801 }
802 break;
803
804 case CBOR_TAG_STRINGREF:
805 {
806 if ((*dec->cur >> 5) != 0)
807 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
808
809 UV idx = decode_uint (dec);
810
811 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref))
812 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
813
814 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
815 }
816 break;
817
818 case CBOR_TAG_VALUE_SHAREABLE:
819 {
820 if (ecb_expect_false (!dec->shareable))
821 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
822
823 sv = newSV (0);
824 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
825
785 SV *sv = decode_sv (dec); 826 SV *osv = decode_sv (dec);
827 sv_setsv (sv, osv);
828 SvREFCNT_dec_NN (osv);
829 }
830 break;
786 831
787 if (tag == 55799) // 2.4.5 Self-Describe CBOR 832 case CBOR_TAG_VALUE_SHAREDREF:
833 {
834 if ((*dec->cur >> 5) != 0)
835 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
836
837 UV idx = decode_uint (dec);
838
839 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable))
840 ERR ("corrupted CBOR data (sharedref index out of bounds)");
841
842 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
843 }
844 break;
845
846 case CBOR_TAG_PERL_OBJECT:
847 {
848 sv = decode_sv (dec);
849
850 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
851 ERR ("corrupted CBOR data (non-array perl object)");
852
853 AV *av = (AV *)SvRV (sv);
854 int len = av_len (av) + 1;
855 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
856
857 if (!stash)
858 ERR ("cannot decode perl-object (package does not exist)");
859
860 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
861
862 if (!method)
863 ERR ("cannot decode perl-object (package does not have a THAW method)");
864
865 dSP;
866
867 ENTER; SAVETMPS; PUSHMARK (SP);
868 EXTEND (SP, len + 1);
869 // we re-bless the reference to get overload and other niceties right
870 PUSHs (*av_fetch (av, 0, 1));
871 PUSHs (sv_cbor);
872
873 int i;
874
875 for (i = 1; i < len; ++i)
876 PUSHs (*av_fetch (av, i, 1));
877
878 PUTBACK;
879 call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
880 SPAGAIN;
881
882 if (SvTRUE (ERRSV))
883 {
884 FREETMPS; LEAVE;
885 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
886 }
887
888 SvREFCNT_dec (sv);
889 sv = SvREFCNT_inc (POPs);
890
891 PUTBACK;
892
893 FREETMPS; LEAVE;
894 }
895 break;
896
897 default:
898 {
899 sv = decode_sv (dec);
900
901 AV *av = newAV ();
902 av_push (av, newSVuv (tag));
903 av_push (av, sv);
904
905 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
906 ? cbor_tagged_stash
907 : gv_stashpv ("CBOR::XS::Tagged" , 1);
908
909 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
910 }
911 break;
912 }
913
788 return sv; 914 return sv;
789 915
790 AV *av = newAV (); 916fail:
791 av_push (av, newSVuv (tag)); 917 SvREFCNT_dec (sv);
792 av_push (av, sv); 918 return &PL_sv_undef;
793 return newRV_noinc ((SV *)av);
794} 919}
795 920
796static SV * 921static SV *
797decode_sv (dec_t *dec) 922decode_sv (dec_t *dec)
798{ 923{
799 WANT (1); 924 WANT (1);
800 925
801 switch (*dec->cur >> 5) 926 switch (*dec->cur >> 5)
802 { 927 {
803 case 0: // unsigned int 928 case 0: // unsigned int
804 //TODO: 64 bit values on 3 2bit perls
805 return newSVuv (decode_uint (dec)); 929 return newSVuv (decode_uint (dec));
806 case 1: // negative int 930 case 1: // negative int
807 return newSViv (-1 - (IV)decode_uint (dec)); 931 return newSViv (-1 - (IV)decode_uint (dec));
808 case 2: // octet string 932 case 2: // octet string
809 return decode_str (dec, 0); 933 return decode_str (dec, 0);
… …
818 case 7: // misc 942 case 7: // misc
819 switch (*dec->cur++ & 31) 943 switch (*dec->cur++ & 31)
820 { 944 {
821 case 20: 945 case 20:
822#if CBOR_SLOW 946#if CBOR_SLOW
823 cbor_false = get_bool ("CBOR::XS::false"); 947 types_false = get_bool ("Types::Serialiser::false");
824#endif 948#endif
825 return newSVsv (cbor_false); 949 return newSVsv (types_false);
826 case 21: 950 case 21:
827#if CBOR_SLOW 951#if CBOR_SLOW
828 cbor_true = get_bool ("CBOR::XS::true"); 952 types_true = get_bool ("Types::Serialiser::true");
829#endif 953#endif
830 return newSVsv (cbor_true); 954 return newSVsv (types_true);
831 case 22: 955 case 22:
832 return newSVsv (&PL_sv_undef); 956 return newSVsv (&PL_sv_undef);
957 case 23:
958#if CBOR_SLOW
959 types_error = get_bool ("Types::Serialiser::error");
960#endif
961 return newSVsv (types_error);
833 962
834 case 25: 963 case 25:
835 { 964 {
836 WANT (2); 965 WANT (2);
837 966
… …
873 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1002 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
874 } 1003 }
875 1004
876 break; 1005 break;
877 } 1006 }
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 1007
935fail: 1008fail:
936 return &PL_sv_undef; 1009 return &PL_sv_undef;
937} 1010}
938 1011
939static SV * 1012static SV *
940decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1013decode_cbor (SV *string, CBOR *cbor, char **offset_return)
941{ 1014{
942 dec_t dec; 1015 dec_t dec = { };
943 SV *sv; 1016 SV *sv;
1017 STRLEN len;
1018 char *data = SvPVbyte (string, len);
944 1019
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) 1020 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", 1021 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); 1022 (unsigned long)len, (unsigned long)cbor->max_size);
976 }
977
978 sv_utf8_downgrade (string, 0);
979 1023
980 dec.cbor = *cbor; 1024 dec.cbor = *cbor;
981 dec.cur = (U8 *)SvPVX (string); 1025 dec.cur = (U8 *)data;
982 dec.end = (U8 *)SvEND (string); 1026 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 1027
989 sv = decode_sv (&dec); 1028 sv = decode_sv (&dec);
990 1029
991 if (offset_return) 1030 if (offset_return)
992 *offset_return = dec.cur; 1031 *offset_return = dec.cur;
… …
996 dec.err = "garbage after CBOR object"; 1035 dec.err = "garbage after CBOR object";
997 1036
998 if (dec.err) 1037 if (dec.err)
999 { 1038 {
1000 SvREFCNT_dec (sv); 1039 SvREFCNT_dec (sv);
1001 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur); 1040 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1002 } 1041 }
1003 1042
1004 sv = sv_2mortal (sv); 1043 sv = sv_2mortal (sv);
1005 1044
1006 return sv; 1045 return sv;
… …
1012MODULE = CBOR::XS PACKAGE = CBOR::XS 1051MODULE = CBOR::XS PACKAGE = CBOR::XS
1013 1052
1014BOOT: 1053BOOT:
1015{ 1054{
1016 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 1055 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1017 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1); 1056 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1018 1057
1019 cbor_true = get_bool ("CBOR::XS::true"); 1058 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1020 cbor_false = get_bool ("CBOR::XS::false"); 1059 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
1060
1061 types_true = get_bool ("Types::Serialiser::true" );
1062 types_false = get_bool ("Types::Serialiser::false");
1063 types_error = get_bool ("Types::Serialiser::error");
1064
1065 sv_cbor = newSVpv ("CBOR", 0);
1066 SvREADONLY_on (sv_cbor);
1021} 1067}
1022 1068
1023PROTOTYPES: DISABLE 1069PROTOTYPES: DISABLE
1024 1070
1025void CLONE (...) 1071void CLONE (...)
1026 CODE: 1072 CODE:
1027 cbor_stash = 0; 1073 cbor_stash = 0;
1074 cbor_tagged_stash = 0;
1075 types_error_stash = 0;
1028 cbor_boolean_stash = 0; 1076 types_boolean_stash = 0;
1029 1077
1030void new (char *klass) 1078void new (char *klass)
1031 PPCODE: 1079 PPCODE:
1032{ 1080{
1033 SV *pv = NEWSV (0, sizeof (CBOR)); 1081 SV *pv = NEWSV (0, sizeof (CBOR));
… …
1041 1089
1042void shrink (CBOR *self, int enable = 1) 1090void shrink (CBOR *self, int enable = 1)
1043 ALIAS: 1091 ALIAS:
1044 shrink = F_SHRINK 1092 shrink = F_SHRINK
1045 allow_unknown = F_ALLOW_UNKNOWN 1093 allow_unknown = F_ALLOW_UNKNOWN
1094 allow_sharing = F_ALLOW_SHARING
1095 dedup_keys = F_DEDUP_KEYS
1096 dedup_strings = F_DEDUP_STRINGS
1046 PPCODE: 1097 PPCODE:
1047{ 1098{
1048 if (enable) 1099 if (enable)
1049 self->flags |= ix; 1100 self->flags |= ix;
1050 else 1101 else
… …
1055 1106
1056void get_shrink (CBOR *self) 1107void get_shrink (CBOR *self)
1057 ALIAS: 1108 ALIAS:
1058 get_shrink = F_SHRINK 1109 get_shrink = F_SHRINK
1059 get_allow_unknown = F_ALLOW_UNKNOWN 1110 get_allow_unknown = F_ALLOW_UNKNOWN
1111 get_allow_sharing = F_ALLOW_SHARING
1112 get_dedup_keys = F_DEDUP_KEYS
1113 get_dedup_strings = F_DEDUP_STRINGS
1060 PPCODE: 1114 PPCODE:
1061 XPUSHs (boolSV (self->flags & ix)); 1115 XPUSHs (boolSV (self->flags & ix));
1062 1116
1063void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1117void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1064 PPCODE: 1118 PPCODE:
… …
1079int get_max_size (CBOR *self) 1133int get_max_size (CBOR *self)
1080 CODE: 1134 CODE:
1081 RETVAL = self->max_size; 1135 RETVAL = self->max_size;
1082 OUTPUT: 1136 OUTPUT:
1083 RETVAL 1137 RETVAL
1084
1085#if 0 //TODO
1086
1087void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
1088 PPCODE:
1089{
1090 SvREFCNT_dec (self->cb_object);
1091 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1092
1093 XPUSHs (ST (0));
1094}
1095
1096void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef)
1097 PPCODE:
1098{
1099 if (!self->cb_sk_object)
1100 self->cb_sk_object = newHV ();
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 1138
1120void encode (CBOR *self, SV *scalar) 1139void encode (CBOR *self, SV *scalar)
1121 PPCODE: 1140 PPCODE:
1122 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1141 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1123 XPUSHs (scalar); 1142 XPUSHs (scalar);
… …
1136 EXTEND (SP, 2); 1155 EXTEND (SP, 2);
1137 PUSHs (sv); 1156 PUSHs (sv);
1138 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1157 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1139} 1158}
1140 1159
1141void DESTROY (CBOR *self)
1142 CODE:
1143 SvREFCNT_dec (self->cb_sk_object);
1144 SvREFCNT_dec (self->cb_object);
1145
1146PROTOTYPES: ENABLE 1160PROTOTYPES: ENABLE
1147 1161
1148void encode_cbor (SV *scalar) 1162void encode_cbor (SV *scalar)
1149 PPCODE: 1163 PPCODE:
1150{ 1164{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines