ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CBOR-XS/XS.xs
(Generate patch)

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.1 by root, Fri Oct 25 23:09:45 2013 UTC vs.
Revision 1.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#if defined(__BORLANDC__) || defined(_MSC_VER) 14// compatibility with perl <5.18
15# define snprintf _snprintf // C compilers have this in stdio.h 15#ifndef HvNAMELEN_get
16# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
16#endif 17#endif
18#ifndef HvNAMELEN
19# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20#endif
21#ifndef HvNAMEUTF8
22# define HvNAMEUTF8(hv) 0
23#endif
17 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
18#define F_SHRINK 0x00000200UL 59#define F_SHRINK 0x00000001UL
19#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
20 64
21#define INIT_SIZE 32 // initial scalar size to be allocated 65#define INIT_SIZE 32 // initial scalar size to be allocated
22 66
23#define SB do { 67#define SB do {
24#define SE } while (0) 68#define SE } while (0)
25
26#if __GNUC__ >= 3
27# define expect(expr,value) __builtin_expect ((expr), (value))
28# define INLINE static inline
29#else
30# define expect(expr,value) (expr)
31# define INLINE static
32#endif
33
34#define expect_false(expr) expect ((expr) != 0, 0)
35#define expect_true(expr) expect ((expr) != 0, 1)
36 69
37#define IN_RANGE_INC(type,val,beg,end) \ 70#define IN_RANGE_INC(type,val,beg,end) \
38 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 71 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
39 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 72 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
40 73
… …
46#else 79#else
47# define CBOR_SLOW 0 80# define CBOR_SLOW 0
48# define CBOR_STASH cbor_stash 81# define CBOR_STASH cbor_stash
49#endif 82#endif
50 83
51static HV *cbor_stash, *cbor_boolean_stash; // CBOR::XS:: 84static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
52static SV *cbor_true, *cbor_false; 85static SV *types_true, *types_false, *types_error, *sv_cbor;
53 86
54typedef struct { 87typedef struct {
55 U32 flags; 88 U32 flags;
56 U32 max_depth; 89 U32 max_depth;
57 STRLEN max_size; 90 STRLEN max_size;
58
59 SV *cb_object;
60 HV *cb_sk_object;
61} CBOR; 91} CBOR;
62 92
63INLINE void 93ecb_inline void
64cbor_init (CBOR *cbor) 94cbor_init (CBOR *cbor)
65{ 95{
66 Zero (cbor, 1, CBOR); 96 Zero (cbor, 1, CBOR);
67 cbor->max_depth = 512; 97 cbor->max_depth = 512;
68} 98}
69 99
70///////////////////////////////////////////////////////////////////////////// 100/////////////////////////////////////////////////////////////////////////////
71// utility functions 101// utility functions
72 102
73INLINE SV * 103ecb_inline SV *
74get_bool (const char *name) 104get_bool (const char *name)
75{ 105{
76 SV *sv = get_sv (name, 1); 106 SV *sv = get_sv (name, 1);
77 107
78 SvREADONLY_on (sv); 108 SvREADONLY_on (sv);
79 SvREADONLY_on (SvRV (sv)); 109 SvREADONLY_on (SvRV (sv));
80 110
81 return sv; 111 return sv;
82} 112}
83 113
84INLINE void 114ecb_inline void
85shrink (SV *sv) 115shrink (SV *sv)
86{ 116{
87 sv_utf8_downgrade (sv, 1); 117 sv_utf8_downgrade (sv, 1);
88 118
89 if (SvLEN (sv) > SvCUR (sv) + 1) 119 if (SvLEN (sv) > SvCUR (sv) + 1)
… …
95#endif 125#endif
96 } 126 }
97} 127}
98 128
99///////////////////////////////////////////////////////////////////////////// 129/////////////////////////////////////////////////////////////////////////////
100// fp hell
101
102//TODO
103
104/////////////////////////////////////////////////////////////////////////////
105// encoder 130// encoder
106 131
107// structure used for encoding CBOR 132// structure used for encoding CBOR
108typedef struct 133typedef struct
109{ 134{
110 char *cur; // SvPVX (sv) + current output position 135 char *cur; // SvPVX (sv) + current output position
111 char *end; // SvEND (sv) 136 char *end; // SvEND (sv)
112 SV *sv; // result scalar 137 SV *sv; // result scalar
113 CBOR cbor; 138 CBOR cbor;
114 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;
115} enc_t; 144} enc_t;
116 145
117INLINE void 146ecb_inline void
118need (enc_t *enc, STRLEN len) 147need (enc_t *enc, STRLEN len)
119{ 148{
120 if (expect_false (enc->cur + len >= enc->end)) 149 if (ecb_expect_false (enc->cur + len >= enc->end))
121 { 150 {
122 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 151 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
123 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 152 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
124 enc->cur = SvPVX (enc->sv) + cur; 153 enc->cur = SvPVX (enc->sv) + cur;
125 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 154 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
126 } 155 }
127} 156}
128 157
129INLINE void 158ecb_inline void
130encode_ch (enc_t *enc, char ch) 159encode_ch (enc_t *enc, char ch)
131{ 160{
132 need (enc, 1); 161 need (enc, 1);
133 *enc->cur++ = ch; 162 *enc->cur++ = ch;
134} 163}
… …
138{ 167{
139 need (enc, 9); 168 need (enc, 9);
140 169
141 if (len < 24) 170 if (len < 24)
142 *enc->cur++ = major | len; 171 *enc->cur++ = major | len;
143 else if (len < 0x100) 172 else if (len <= 0xff)
144 { 173 {
145 *enc->cur++ = major | 24; 174 *enc->cur++ = major | 24;
146 *enc->cur++ = len; 175 *enc->cur++ = len;
147 } 176 }
148 else if (len < 0x10000) 177 else if (len <= 0xffff)
149 { 178 {
150 *enc->cur++ = major | 25; 179 *enc->cur++ = major | 25;
151 *enc->cur++ = len >> 8; 180 *enc->cur++ = len >> 8;
152 *enc->cur++ = len; 181 *enc->cur++ = len;
153 } 182 }
154 else if (len < 0x100000000) 183 else if (len <= 0xffffffff)
155 { 184 {
156 *enc->cur++ = major | 26; 185 *enc->cur++ = major | 26;
157 *enc->cur++ = len >> 24; 186 *enc->cur++ = len >> 24;
158 *enc->cur++ = len >> 16; 187 *enc->cur++ = len >> 16;
159 *enc->cur++ = len >> 8; 188 *enc->cur++ = len >> 8;
160 *enc->cur++ = len; 189 *enc->cur++ = len;
161 } 190 }
162 else if (len) 191 else
163 { 192 {
164 *enc->cur++ = major | 27; 193 *enc->cur++ = major | 27;
165 *enc->cur++ = len >> 56; 194 *enc->cur++ = len >> 56;
166 *enc->cur++ = len >> 48; 195 *enc->cur++ = len >> 48;
167 *enc->cur++ = len >> 40; 196 *enc->cur++ = len >> 40;
… …
180 need (enc, len); 209 need (enc, len);
181 memcpy (enc->cur, str, len); 210 memcpy (enc->cur, str, len);
182 enc->cur += len; 211 enc->cur += len;
183} 212}
184 213
214ecb_inline void
215encode_tag (enc_t *enc, UV tag)
216{
217 encode_uint (enc, 0xc0, tag);
218}
219
185static void encode_sv (enc_t *enc, SV *sv); 220static void encode_sv (enc_t *enc, SV *sv);
186 221
187static void 222static void
188encode_av (enc_t *enc, AV *av) 223encode_av (enc_t *enc, AV *av)
189{ 224{
… …
201 SV **svp = av_fetch (av, i, 0); 236 SV **svp = av_fetch (av, i, 0);
202 encode_sv (enc, svp ? *svp : &PL_sv_undef); 237 encode_sv (enc, svp ? *svp : &PL_sv_undef);
203 } 238 }
204 239
205 --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));
206} 250}
207 251
208static void 252static void
209encode_hv (enc_t *enc, HV *hv) 253encode_hv (enc_t *enc, HV *hv)
210{ 254{
… …
223 else 267 else
224 encode_uint (enc, 0xa0, pairs); 268 encode_uint (enc, 0xa0, pairs);
225 269
226 while ((he = hv_iternext (hv))) 270 while ((he = hv_iternext (hv)))
227 { 271 {
272 if (ecb_expect_false (enc->cbor.flags & (F_DEDUP_STRINGS | F_DEDUP_KEYS)))
273 {
274 SV **svp;
275
228 if (HeKLEN (he) == HEf_SVKEY) 276 if (HeKLEN (he) == HEf_SVKEY)
229 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 }
230 else 293 else
231 encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 294 encode_he (enc, he);
232 295
233 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));
234 } 297 }
235 298
236 if (mg) 299 if (mg)
237 encode_ch (enc, 0xe0 | 31); 300 encode_ch (enc, 0xe0 | 31);
238 301
… …
241 304
242// encode objects, arrays and special \0=false and \1=true values. 305// encode objects, arrays and special \0=false and \1=true values.
243static void 306static void
244encode_rv (enc_t *enc, SV *sv) 307encode_rv (enc_t *enc, SV *sv)
245{ 308{
246 svtype svt;
247
248 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
249 svt = SvTYPE (sv); 333 svtype svt = SvTYPE (sv);
250 334
251 if (expect_false (SvOBJECT (sv))) 335 if (ecb_expect_false (SvOBJECT (sv)))
252 { 336 {
253 HV *stash = !CBOR_SLOW || cbor_boolean_stash 337 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
254 ? 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
255 : gv_stashpv ("CBOR::XS::Boolean", 1); 345 : gv_stashpv ("CBOR::XS::Tagged" , 1);
256 346
257 if (SvSTASH (sv) == stash) 347 HV *stash = SvSTASH (sv);
348 GV *method;
349
350 if (stash == boolean_stash)
258 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 }
259 else 414 else
260 {
261#if 0 //TODO
262 if (enc->cbor.flags & F_CONV_BLESSED)
263 {
264 // we re-bless the reference to get overload and other niceties right
265 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
266
267 if (to_cbor)
268 {
269 dSP;
270
271 ENTER; SAVETMPS; PUSHMARK (SP);
272 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
273
274 // calling with G_SCALAR ensures that we always get a 1 return value
275 PUTBACK;
276 call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
277 SPAGAIN;
278
279 // catch this surprisingly common error
280 if (SvROK (TOPs) && SvRV (TOPs) == sv)
281 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
282
283 sv = POPs;
284 PUTBACK;
285
286 encode_sv (enc, sv);
287
288 FREETMPS; LEAVE;
289 }
290 else if (enc->cbor.flags & F_ALLOW_BLESSED)
291 encode_str (enc, "null", 4, 0);
292 else
293 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_CBOR method available on it", 415 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
294 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
295 }
296 else if (enc->cbor.flags & F_ALLOW_BLESSED)
297 encode_str (enc, "null", 4, 0);
298 else
299 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
300 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 416 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
301#endif
302 }
303 } 417 }
304 else if (svt == SVt_PVHV) 418 else if (svt == SVt_PVHV)
305 encode_hv (enc, (HV *)sv); 419 encode_hv (enc, (HV *)sv);
306 else if (svt == SVt_PVAV) 420 else if (svt == SVt_PVAV)
307 encode_av (enc, (AV *)sv); 421 encode_av (enc, (AV *)sv);
308 else if (svt < SVt_PVAV)
309 {
310 STRLEN len = 0;
311 char *pv = svt ? SvPV (sv, len) : 0;
312
313 if (len == 1 && *pv == '1')
314 encode_ch (enc, 0xe0 | 21);
315 else if (len == 1 && *pv == '0')
316 encode_ch (enc, 0xe0 | 20);
317 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
318 encode_ch (enc, 0xe0 | 23);
319 else
320 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
321 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
322 }
323 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
324 encode_ch (enc, 0xe0 | 23);
325 else 422 else
326 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 423 {
327 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 424 encode_tag (enc, CBOR_TAG_INDIRECTION);
425 encode_sv (enc, sv);
426 }
328} 427}
329 428
330static void 429static void
331encode_nv (enc_t *enc, SV *sv) 430encode_nv (enc_t *enc, SV *sv)
332{ 431{
333 double nv = SvNVX (sv); 432 double nv = SvNVX (sv);
334 433
335 need (enc, 9); 434 need (enc, 9);
336 435
337 if (expect_false (nv == (U32)nv)) 436 if (ecb_expect_false (nv == (U32)nv))
338 encode_uint (enc, 0x00, (U32)nv); 437 encode_uint (enc, 0x00, (U32)nv);
339 //TODO: maybe I32? 438 //TODO: maybe I32?
340 else if (expect_false (nv == (float)nv)) 439 else if (ecb_expect_false (nv == (float)nv))
341 { 440 {
342 uint32_t fp = ecb_float_to_binary32 (nv); 441 uint32_t fp = ecb_float_to_binary32 (nv);
343 442
344 *enc->cur++ = 0xe0 | 26; 443 *enc->cur++ = 0xe0 | 26;
345 444
… …
397} 496}
398 497
399static SV * 498static SV *
400encode_cbor (SV *scalar, CBOR *cbor) 499encode_cbor (SV *scalar, CBOR *cbor)
401{ 500{
402 enc_t enc; 501 enc_t enc = { };
403 502
404 enc.cbor = *cbor; 503 enc.cbor = *cbor;
405 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 504 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
406 enc.cur = SvPVX (enc.sv); 505 enc.cur = SvPVX (enc.sv);
407 enc.end = SvEND (enc.sv); 506 enc.end = SvEND (enc.sv);
408 enc.depth = 0;
409 507
410 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
411 encode_sv (&enc, scalar); 517 encode_sv (&enc, scalar);
412 518
413 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 519 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
414 *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
415 521
… …
429 U8 *end; // end of input string 535 U8 *end; // end of input string
430 const char *err; // parse error, if != 0 536 const char *err; // parse error, if != 0
431 CBOR cbor; 537 CBOR cbor;
432 U32 depth; // recursion depth 538 U32 depth; // recursion depth
433 U32 maxdepth; // recursion depth limit 539 U32 maxdepth; // recursion depth limit
540 AV *shareable;
541 AV *stringref;
434} dec_t; 542} dec_t;
435 543
436#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
437 545
438#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")
439 547
440#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)
441#define DEC_DEC_DEPTH --dec->depth 549#define DEC_DEC_DEPTH --dec->depth
442 550
443static UV 551static UV
… …
504 612
505 for (;;) 613 for (;;)
506 { 614 {
507 WANT (1); 615 WANT (1);
508 616
509 if (*dec->cur == 0xe0 | 31) 617 if (*dec->cur == (0xe0 | 31))
510 { 618 {
511 ++dec->cur; 619 ++dec->cur;
512 break; 620 break;
513 } 621 }
514 622
… …
532 SvREFCNT_dec (av); 640 SvREFCNT_dec (av);
533 DEC_DEC_DEPTH; 641 DEC_DEC_DEPTH;
534 return &PL_sv_undef; 642 return &PL_sv_undef;
535} 643}
536 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
537static SV * 685static SV *
538decode_hv (dec_t *dec) 686decode_hv (dec_t *dec)
539{ 687{
540 HV *hv = newHV (); 688 HV *hv = newHV ();
541 689
… …
547 695
548 for (;;) 696 for (;;)
549 { 697 {
550 WANT (1); 698 WANT (1);
551 699
552 if (*dec->cur == 0xe0 | 31) 700 if (*dec->cur == (0xe0 | 31))
553 { 701 {
554 ++dec->cur; 702 ++dec->cur;
555 break; 703 break;
556 } 704 }
557 705
558 SV *k = decode_sv (dec); 706 decode_he (dec, hv);
559 SV *v = decode_sv (dec);
560
561 hv_store_ent (hv, k, v, 0);
562 } 707 }
563 } 708 }
564 else 709 else
565 { 710 {
566 int len = decode_uint (dec); 711 int pairs = decode_uint (dec);
567 712
568 while (len--) 713 while (pairs--)
569 { 714 decode_he (dec, hv);
570 SV *k = decode_sv (dec);
571 SV *v = decode_sv (dec);
572
573 hv_store_ent (hv, k, v, 0);
574 }
575 } 715 }
576 716
577 DEC_DEC_DEPTH; 717 DEC_DEC_DEPTH;
578 return newRV_noinc ((SV *)hv); 718 return newRV_noinc ((SV *)hv);
579
580#if 0
581 SV *sv;
582 HV *hv = newHV ();
583
584 DEC_INC_DEPTH;
585 decode_ws (dec);
586
587 for (;;)
588 {
589 // heuristic: assume that
590 // a) decode_str + hv_store_ent are abysmally slow.
591 // b) most hash keys are short, simple ascii text.
592 // => try to "fast-match" such strings to avoid
593 // the overhead of decode_str + hv_store_ent.
594 {
595 SV *value;
596 char *p = dec->cur;
597 char *e = p + 24; // only try up to 24 bytes
598
599 for (;;)
600 {
601 // the >= 0x80 is false on most architectures
602 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
603 {
604 // slow path, back up and use decode_str
605 SV *key = decode_str (dec);
606 if (!key)
607 goto fail;
608
609 decode_ws (dec); EXPECT_CH (':');
610
611 decode_ws (dec);
612 value = decode_sv (dec);
613 if (!value)
614 {
615 SvREFCNT_dec (key);
616 goto fail;
617 }
618
619 hv_store_ent (hv, key, value, 0);
620 SvREFCNT_dec (key);
621
622 break;
623 }
624 else if (*p == '"')
625 {
626 // fast path, got a simple key
627 char *key = dec->cur;
628 int len = p - key;
629 dec->cur = p + 1;
630
631 decode_ws (dec); EXPECT_CH (':');
632
633 decode_ws (dec);
634 value = decode_sv (dec);
635 if (!value)
636 goto fail;
637
638 hv_store (hv, key, len, value, 0);
639
640 break;
641 }
642
643 ++p;
644 }
645 }
646
647 decode_ws (dec);
648
649 if (*dec->cur == '}')
650 {
651 ++dec->cur;
652 break;
653 }
654
655 if (*dec->cur != ',')
656 ERR (", or } expected while parsing object/hash");
657
658 ++dec->cur;
659
660 decode_ws (dec);
661
662 if (*dec->cur == '}' && dec->cbor.flags & F_RELAXED)
663 {
664 ++dec->cur;
665 break;
666 }
667 }
668
669 DEC_DEC_DEPTH;
670 sv = newRV_noinc ((SV *)hv);
671
672 // check filter callbacks
673 if (dec->cbor.flags & F_HOOK)
674 {
675 if (dec->cbor.cb_sk_object && HvKEYS (hv) == 1)
676 {
677 HE *cb, *he;
678
679 hv_iterinit (hv);
680 he = hv_iternext (hv);
681 hv_iterinit (hv);
682
683 // the next line creates a mortal sv each time its called.
684 // might want to optimise this for common cases.
685 cb = hv_fetch_ent (dec->cbor.cb_sk_object, hv_iterkeysv (he), 0, 0);
686
687 if (cb)
688 {
689 dSP;
690 int count;
691
692 ENTER; SAVETMPS; PUSHMARK (SP);
693 XPUSHs (HeVAL (he));
694 sv_2mortal (sv);
695
696 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
697
698 if (count == 1)
699 {
700 sv = newSVsv (POPs);
701 FREETMPS; LEAVE;
702 return sv;
703 }
704
705 SvREFCNT_inc (sv);
706 FREETMPS; LEAVE;
707 }
708 }
709
710 if (dec->cbor.cb_object)
711 {
712 dSP;
713 int count;
714
715 ENTER; SAVETMPS; PUSHMARK (SP);
716 XPUSHs (sv_2mortal (sv));
717
718 PUTBACK; count = call_sv (dec->cbor.cb_object, G_ARRAY); SPAGAIN;
719
720 if (count == 1)
721 {
722 sv = newSVsv (POPs);
723 FREETMPS; LEAVE;
724 return sv;
725 }
726
727 SvREFCNT_inc (sv);
728 FREETMPS; LEAVE;
729 }
730 }
731
732 return sv;
733#endif
734 719
735fail: 720fail:
736 SvREFCNT_dec (hv); 721 SvREFCNT_dec (hv);
737 DEC_DEC_DEPTH; 722 DEC_DEC_DEPTH;
738 return &PL_sv_undef; 723 return &PL_sv_undef;
739} 724}
740 725
741static SV * 726static SV *
742decode_str (dec_t *dec, int utf8) 727decode_str (dec_t *dec, int utf8)
743{ 728{
744 SV *sv; 729 SV *sv = 0;
745 730
746 if ((*dec->cur & 31) == 31) 731 if ((*dec->cur & 31) == 31)
747 { 732 {
748 ++dec->cur; 733 ++dec->cur;
749 734
… …
752 // not very fast, and certainly not robust against illegal input 737 // not very fast, and certainly not robust against illegal input
753 for (;;) 738 for (;;)
754 { 739 {
755 WANT (1); 740 WANT (1);
756 741
757 if (*dec->cur == 0xe0 | 31) 742 if (*dec->cur == (0xe0 | 31))
758 { 743 {
759 ++dec->cur; 744 ++dec->cur;
760 break; 745 break;
761 } 746 }
762 747
763 SV *sv2 = decode_sv (dec);
764 sv_catsv (sv, sv2); 748 sv_catsv (sv, decode_sv (dec));
765 } 749 }
766 } 750 }
767 else 751 else
768 { 752 {
769 STRLEN len = decode_uint (dec); 753 STRLEN len = decode_uint (dec);
… …
774 } 758 }
775 759
776 if (utf8) 760 if (utf8)
777 SvUTF8_on (sv); 761 SvUTF8_on (sv);
778 762
763 if (ecb_expect_false (dec->stringref))
764 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
765
779 return sv; 766 return sv;
780 767
781fail: 768fail:
769 SvREFCNT_dec (sv);
770 return &PL_sv_undef;
771}
772
773static SV *
774decode_tagged (dec_t *dec)
775{
776 SV *sv = 0;
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
826 SV *osv = decode_sv (dec);
827 sv_setsv (sv, osv);
828 SvREFCNT_dec_NN (osv);
829 }
830 break;
831
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
914 return sv;
915
916fail:
917 SvREFCNT_dec (sv);
782 return &PL_sv_undef; 918 return &PL_sv_undef;
783} 919}
784 920
785static SV * 921static SV *
786decode_sv (dec_t *dec) 922decode_sv (dec_t *dec)
… …
788 WANT (1); 924 WANT (1);
789 925
790 switch (*dec->cur >> 5) 926 switch (*dec->cur >> 5)
791 { 927 {
792 case 0: // unsigned int 928 case 0: // unsigned int
793 //TODO: 64 bit values on 3 2bit perls
794 return newSVuv (decode_uint (dec)); 929 return newSVuv (decode_uint (dec));
795 case 1: // negative int 930 case 1: // negative int
796 return newSViv (-1 - (IV)decode_uint (dec)); 931 return newSViv (-1 - (IV)decode_uint (dec));
797 case 2: // octet string 932 case 2: // octet string
798 return decode_str (dec, 0); 933 return decode_str (dec, 0);
… …
801 case 4: // array 936 case 4: // array
802 return decode_av (dec); 937 return decode_av (dec);
803 case 5: // map 938 case 5: // map
804 return decode_hv (dec); 939 return decode_hv (dec);
805 case 6: // tag 940 case 6: // tag
806 abort (); 941 return decode_tagged (dec);
807 break;
808 case 7: // misc 942 case 7: // misc
809 switch (*dec->cur++ & 31) 943 switch (*dec->cur++ & 31)
810 { 944 {
811 case 20: 945 case 20:
812#if CBOR_SLOW 946#if CBOR_SLOW
813 cbor_false = get_bool ("CBOR::XS::false"); 947 types_false = get_bool ("Types::Serialiser::false");
814#endif 948#endif
815 return newSVsv (cbor_false); 949 return newSVsv (types_false);
816 case 21: 950 case 21:
817#if CBOR_SLOW 951#if CBOR_SLOW
818 cbor_true = get_bool ("CBOR::XS::true"); 952 types_true = get_bool ("Types::Serialiser::true");
819#endif 953#endif
820 return newSVsv (cbor_true); 954 return newSVsv (types_true);
821 case 22: 955 case 22:
822 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);
823 962
824 case 25: 963 case 25:
825 // half float
826 abort ();
827 break; 964 {
965 WANT (2);
966
967 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
968 dec->cur += 2;
969
970 return newSVnv (ecb_binary16_to_float (fp));
971 }
828 972
829 case 26: 973 case 26:
830 { 974 {
831 uint32_t fp; 975 uint32_t fp;
832 WANT (4); 976 WANT (4);
… …
858 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1002 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
859 } 1003 }
860 1004
861 break; 1005 break;
862 } 1006 }
863#if 0
864 switch (*dec->cur)
865 {
866 //case '"': ++dec->cur; return decode_str (dec);
867 case '[': ++dec->cur; return decode_av (dec);
868 case '{': ++dec->cur; return decode_hv (dec);
869
870 case '-':
871 case '0': case '1': case '2': case '3': case '4':
872 case '5': case '6': case '7': case '8': case '9':
873 //TODO return decode_num (dec);
874
875 case 't':
876 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
877 {
878 dec->cur += 4;
879#if CBOR_SLOW
880 cbor_true = get_bool ("CBOR::XS::true");
881#endif
882 return newSVsv (cbor_true);
883 }
884 else
885 ERR ("'true' expected");
886
887 break;
888
889 case 'f':
890 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
891 {
892 dec->cur += 5;
893#if CBOR_SLOW
894 cbor_false = get_bool ("CBOR::XS::false");
895#endif
896 return newSVsv (cbor_false);
897 }
898 else
899 ERR ("'false' expected");
900
901 break;
902
903 case 'n':
904 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
905 {
906 dec->cur += 4;
907 return newSVsv (&PL_sv_undef);
908 }
909 else
910 ERR ("'null' expected");
911
912 break;
913
914 default:
915 ERR ("malformed CBOR string, neither array, object, number, string or atom");
916 break;
917 }
918#endif
919 1007
920fail: 1008fail:
921 return &PL_sv_undef; 1009 return &PL_sv_undef;
922} 1010}
923 1011
924static SV * 1012static SV *
925decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1013decode_cbor (SV *string, CBOR *cbor, char **offset_return)
926{ 1014{
927 dec_t dec; 1015 dec_t dec = { };
928 SV *sv; 1016 SV *sv;
1017 STRLEN len;
1018 char *data = SvPVbyte (string, len);
929 1019
930 /* work around bugs in 5.10 where manipulating magic values
931 * makes perl ignore the magic in subsequent accesses.
932 * also make a copy of non-PV values, to get them into a clean
933 * state (SvPV should do that, but it's buggy, see below).
934 */
935 /*SvGETMAGIC (string);*/
936 if (SvMAGICAL (string) || !SvPOK (string))
937 string = sv_2mortal (newSVsv (string));
938
939 SvUPGRADE (string, SVt_PV);
940
941 /* work around a bug in perl 5.10, which causes SvCUR to fail an
942 * assertion with -DDEBUGGING, although SvCUR is documented to
943 * return the xpv_cur field which certainly exists after upgrading.
944 * according to nicholas clark, calling SvPOK fixes this.
945 * But it doesn't fix it, so try another workaround, call SvPV_nolen
946 * and hope for the best.
947 * Damnit, SvPV_nolen still trips over yet another assertion. This
948 * assertion business is seriously broken, try yet another workaround
949 * for the broken -DDEBUGGING.
950 */
951 {
952#ifdef DEBUGGING
953 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
954#else
955 STRLEN offset = SvCUR (string);
956#endif
957
958 if (offset > cbor->max_size && cbor->max_size) 1020 if (len > cbor->max_size && cbor->max_size)
959 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu", 1021 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
960 (unsigned long)SvCUR (string), (unsigned long)cbor->max_size); 1022 (unsigned long)len, (unsigned long)cbor->max_size);
961 }
962
963 sv_utf8_downgrade (string, 0);
964 1023
965 dec.cbor = *cbor; 1024 dec.cbor = *cbor;
966 dec.cur = (U8 *)SvPVX (string); 1025 dec.cur = (U8 *)data;
967 dec.end = (U8 *)SvEND (string); 1026 dec.end = (U8 *)data + len;
968 dec.err = 0;
969 dec.depth = 0;
970
971 if (dec.cbor.cb_object || dec.cbor.cb_sk_object)
972 ;//TODO dec.cbor.flags |= F_HOOK;
973 1027
974 sv = decode_sv (&dec); 1028 sv = decode_sv (&dec);
975 1029
976 if (offset_return) 1030 if (offset_return)
977 *offset_return = dec.cur; 1031 *offset_return = dec.cur;
978 1032
979 if (!(offset_return || !sv)) 1033 if (!(offset_return || !sv))
980 {
981 if (*dec.cur && !dec.err) 1034 if (dec.cur != dec.end && !dec.err)
982 {
983 dec.err = "garbage after CBOR object"; 1035 dec.err = "garbage after CBOR object";
1036
1037 if (dec.err)
1038 {
984 SvREFCNT_dec (sv); 1039 SvREFCNT_dec (sv);
985 sv = 0;
986 }
987 }
988
989 if (!sv)
990 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur); 1040 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1041 }
991 1042
992 sv = sv_2mortal (sv); 1043 sv = sv_2mortal (sv);
993 1044
994 return sv; 1045 return sv;
995} 1046}
… …
1000MODULE = CBOR::XS PACKAGE = CBOR::XS 1051MODULE = CBOR::XS PACKAGE = CBOR::XS
1001 1052
1002BOOT: 1053BOOT:
1003{ 1054{
1004 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 1055 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1005 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1); 1056 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1006 1057
1007 cbor_true = get_bool ("CBOR::XS::true"); 1058 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1008 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);
1009} 1067}
1010 1068
1011PROTOTYPES: DISABLE 1069PROTOTYPES: DISABLE
1012 1070
1013void CLONE (...) 1071void CLONE (...)
1014 CODE: 1072 CODE:
1015 cbor_stash = 0; 1073 cbor_stash = 0;
1074 cbor_tagged_stash = 0;
1075 types_error_stash = 0;
1016 cbor_boolean_stash = 0; 1076 types_boolean_stash = 0;
1017 1077
1018void new (char *klass) 1078void new (char *klass)
1019 PPCODE: 1079 PPCODE:
1020{ 1080{
1021 SV *pv = NEWSV (0, sizeof (CBOR)); 1081 SV *pv = NEWSV (0, sizeof (CBOR));
… …
1029 1089
1030void shrink (CBOR *self, int enable = 1) 1090void shrink (CBOR *self, int enable = 1)
1031 ALIAS: 1091 ALIAS:
1032 shrink = F_SHRINK 1092 shrink = F_SHRINK
1033 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
1034 PPCODE: 1097 PPCODE:
1035{ 1098{
1036 if (enable) 1099 if (enable)
1037 self->flags |= ix; 1100 self->flags |= ix;
1038 else 1101 else
… …
1043 1106
1044void get_shrink (CBOR *self) 1107void get_shrink (CBOR *self)
1045 ALIAS: 1108 ALIAS:
1046 get_shrink = F_SHRINK 1109 get_shrink = F_SHRINK
1047 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
1048 PPCODE: 1114 PPCODE:
1049 XPUSHs (boolSV (self->flags & ix)); 1115 XPUSHs (boolSV (self->flags & ix));
1050 1116
1051void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1117void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1052 PPCODE: 1118 PPCODE:
… …
1067int get_max_size (CBOR *self) 1133int get_max_size (CBOR *self)
1068 CODE: 1134 CODE:
1069 RETVAL = self->max_size; 1135 RETVAL = self->max_size;
1070 OUTPUT: 1136 OUTPUT:
1071 RETVAL 1137 RETVAL
1072
1073#if 0 //TODO
1074
1075void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
1076 PPCODE:
1077{
1078 SvREFCNT_dec (self->cb_object);
1079 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1080
1081 XPUSHs (ST (0));
1082}
1083
1084void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef)
1085 PPCODE:
1086{
1087 if (!self->cb_sk_object)
1088 self->cb_sk_object = newHV ();
1089
1090 if (SvOK (cb))
1091 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1092 else
1093 {
1094 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1095
1096 if (!HvKEYS (self->cb_sk_object))
1097 {
1098 SvREFCNT_dec (self->cb_sk_object);
1099 self->cb_sk_object = 0;
1100 }
1101 }
1102
1103 XPUSHs (ST (0));
1104}
1105
1106#endif
1107 1138
1108void encode (CBOR *self, SV *scalar) 1139void encode (CBOR *self, SV *scalar)
1109 PPCODE: 1140 PPCODE:
1110 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1141 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1111 XPUSHs (scalar); 1142 XPUSHs (scalar);
… …
1124 EXTEND (SP, 2); 1155 EXTEND (SP, 2);
1125 PUSHs (sv); 1156 PUSHs (sv);
1126 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1157 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1127} 1158}
1128 1159
1129void DESTROY (CBOR *self)
1130 CODE:
1131 SvREFCNT_dec (self->cb_sk_object);
1132 SvREFCNT_dec (self->cb_object);
1133
1134PROTOTYPES: ENABLE 1160PROTOTYPES: ENABLE
1135 1161
1136void encode_cbor (SV *scalar) 1162void encode_cbor (SV *scalar)
1137 PPCODE: 1163 PPCODE:
1138{ 1164{

Diff Legend

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