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.38 by root, Sun Dec 1 14:30:52 2013 UTC vs.
Revision 1.55 by root, Fri Nov 25 06:13:16 2016 UTC

… …
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11 11
12#define ECB_NO_THREADS 1
12#include "ecb.h" 13#include "ecb.h"
13 14
14// compatibility with perl <5.18 15// compatibility with perl <5.18
15#ifndef HvNAMELEN_get 16#ifndef HvNAMELEN_get
16# define HvNAMELEN_get(hv) strlen (HvNAME (hv)) 17# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
… …
99#define F_SHRINK 0x00000001UL 100#define F_SHRINK 0x00000001UL
100#define F_ALLOW_UNKNOWN 0x00000002UL 101#define F_ALLOW_UNKNOWN 0x00000002UL
101#define F_ALLOW_SHARING 0x00000004UL 102#define F_ALLOW_SHARING 0x00000004UL
102#define F_ALLOW_CYCLES 0x00000008UL 103#define F_ALLOW_CYCLES 0x00000008UL
103#define F_PACK_STRINGS 0x00000010UL 104#define F_PACK_STRINGS 0x00000010UL
105#define F_TEXT_KEYS 0x00000020UL
106#define F_TEXT_STRINGS 0x00000040UL
104#define F_VALIDATE_UTF8 0x00000020UL 107#define F_VALIDATE_UTF8 0x00000080UL
105 108
106#define INIT_SIZE 32 // initial scalar size to be allocated 109#define INIT_SIZE 32 // initial scalar size to be allocated
107 110
108#define SB do { 111#define SB do {
109#define SE } while (0) 112#define SE } while (0)
… …
128typedef struct { 131typedef struct {
129 U32 flags; 132 U32 flags;
130 U32 max_depth; 133 U32 max_depth;
131 STRLEN max_size; 134 STRLEN max_size;
132 SV *filter; 135 SV *filter;
136
137 // for the incremental parser
138 STRLEN incr_pos; // the current offset into the text
139 STRLEN incr_need; // minimum bytes needed to decode
140 AV *incr_count; // for every nesting level, the number of outstanding values, or -1 for indef.
133} CBOR; 141} CBOR;
134 142
135ecb_inline void 143ecb_inline void
136cbor_init (CBOR *cbor) 144cbor_init (CBOR *cbor)
137{ 145{
… …
141 149
142ecb_inline void 150ecb_inline void
143cbor_free (CBOR *cbor) 151cbor_free (CBOR *cbor)
144{ 152{
145 SvREFCNT_dec (cbor->filter); 153 SvREFCNT_dec (cbor->filter);
154 SvREFCNT_dec (cbor->incr_count);
146} 155}
147 156
148///////////////////////////////////////////////////////////////////////////// 157/////////////////////////////////////////////////////////////////////////////
149// utility functions 158// utility functions
150 159
… …
269encode_tag (enc_t *enc, UV tag) 278encode_tag (enc_t *enc, UV tag)
270{ 279{
271 encode_uint (enc, MAJOR_TAG, tag); 280 encode_uint (enc, MAJOR_TAG, tag);
272} 281}
273 282
283// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
284ecb_noinline static void
285encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
286{
287 STRLEN ulen = len;
288 U8 *p, *pend = (U8 *)str + len;
289
290 for (p = (U8 *)str; p < pend; ++p)
291 ulen += *p >> 7; // count set high bits
292
293 encode_uint (enc, MAJOR_TEXT, ulen);
294
295 need (enc, ulen);
296 for (p = (U8 *)str; p < pend; ++p)
297 if (*p < 0x80)
298 *enc->cur++ = *p;
299 else
300 {
301 *enc->cur++ = 0xc0 + (*p >> 6);
302 *enc->cur++ = 0x80 + (*p & 63);
303 }
304}
305
274ecb_inline void 306ecb_inline void
275encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 307encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
276{ 308{
309 if (ecb_expect_false (upgrade_utf8))
310 if (!utf8)
311 {
312 encode_str_utf8 (enc, utf8, str, len);
313 return;
314 }
315
277 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 316 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
278 need (enc, len); 317 need (enc, len);
279 memcpy (enc->cur, str, len); 318 memcpy (enc->cur, str, len);
280 enc->cur += len; 319 enc->cur += len;
281} 320}
282 321
283static void 322ecb_inline void
284encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 323encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
285{ 324{
286 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 325 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
287 { 326 {
288 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 327 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
289 328
… …
300 sv_setuv (*svp, enc->stringref_idx); 339 sv_setuv (*svp, enc->stringref_idx);
301 ++enc->stringref_idx; 340 ++enc->stringref_idx;
302 } 341 }
303 } 342 }
304 343
305 encode_str (enc, utf8, str, len); 344 encode_str (enc, upgrade_utf8, utf8, str, len);
306} 345}
307 346
308static void encode_sv (enc_t *enc, SV *sv); 347static void encode_sv (enc_t *enc, SV *sv);
309 348
310static void 349static void
… …
317 356
318 ++enc->depth; 357 ++enc->depth;
319 358
320 encode_uint (enc, MAJOR_ARRAY, len + 1); 359 encode_uint (enc, MAJOR_ARRAY, len + 1);
321 360
361 if (SvMAGICAL (av))
322 for (i = 0; i <= len; ++i) 362 for (i = 0; i <= len; ++i)
323 { 363 {
324 SV **svp = av_fetch (av, i, 0); 364 SV **svp = av_fetch (av, i, 0);
325 encode_sv (enc, svp ? *svp : &PL_sv_undef); 365 encode_sv (enc, svp ? *svp : &PL_sv_undef);
326 } 366 }
367 else
368 for (i = 0; i <= len; ++i)
369 {
370 SV *sv = AvARRAY (av)[i];
371 encode_sv (enc, sv ? sv : &PL_sv_undef);
372 }
327 373
328 --enc->depth; 374 --enc->depth;
329} 375}
330 376
331static void 377static void
… …
349 while ((he = hv_iternext (hv))) 395 while ((he = hv_iternext (hv)))
350 { 396 {
351 if (HeKLEN (he) == HEf_SVKEY) 397 if (HeKLEN (he) == HEf_SVKEY)
352 encode_sv (enc, HeSVKEY (he)); 398 encode_sv (enc, HeSVKEY (he));
353 else 399 else
354 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 400 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
355 401
356 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 402 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
357 } 403 }
358 404
359 if (mg) 405 if (mg)
… …
435 481
436 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 482 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
437 { 483 {
438 dSP; 484 dSP;
439 485
440 ENTER; SAVETMPS; PUSHMARK (SP); 486 ENTER; SAVETMPS;
487 PUSHMARK (SP);
441 // we re-bless the reference to get overload and other niceties right 488 // we re-bless the reference to get overload and other niceties right
442 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 489 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
443 490
444 PUTBACK; 491 PUTBACK;
445 // G_SCALAR ensures that return value is 1 492 // G_SCALAR ensures that return value is 1
… …
458 } 505 }
459 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 506 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
460 { 507 {
461 dSP; 508 dSP;
462 509
463 ENTER; SAVETMPS; PUSHMARK (SP); 510 ENTER; SAVETMPS;
511 SAVESTACK_POS ();
512 PUSHMARK (SP);
464 EXTEND (SP, 2); 513 EXTEND (SP, 2);
465 // we re-bless the reference to get overload and other niceties right 514 // we re-bless the reference to get overload and other niceties right
466 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 515 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
467 PUSHs (sv_cbor); 516 PUSHs (sv_cbor);
468 517
… …
474 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 523 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
475 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 524 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
476 525
477 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 526 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
478 encode_uint (enc, MAJOR_ARRAY, count + 1); 527 encode_uint (enc, MAJOR_ARRAY, count + 1);
479 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 528 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
480 529
481 while (count) 530 while (count)
482 encode_sv (enc, SP[1 - count--]); 531 encode_sv (enc, SP[1 - count--]);
483 532
484 PUTBACK; 533 PUTBACK;
… …
543 592
544 if (SvPOKp (sv)) 593 if (SvPOKp (sv))
545 { 594 {
546 STRLEN len; 595 STRLEN len;
547 char *str = SvPV (sv, len); 596 char *str = SvPV (sv, len);
548 encode_strref (enc, SvUTF8 (sv), str, len); 597 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
549 } 598 }
550 else if (SvNOKp (sv)) 599 else if (SvNOKp (sv))
551 encode_nv (enc, sv); 600 encode_nv (enc, sv);
552 else if (SvIOKp (sv)) 601 else if (SvIOKp (sv))
553 { 602 {
… …
570} 619}
571 620
572static SV * 621static SV *
573encode_cbor (SV *scalar, CBOR *cbor) 622encode_cbor (SV *scalar, CBOR *cbor)
574{ 623{
575 enc_t enc = { }; 624 enc_t enc = { 0 };
576 625
577 enc.cbor = *cbor; 626 enc.cbor = *cbor;
578 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 627 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
579 enc.cur = SvPVX (enc.sv); 628 enc.cur = SvPVX (enc.sv);
580 enc.end = SvEND (enc.sv); 629 enc.end = SvEND (enc.sv);
… …
730{ 779{
731 // for speed reasons, we specialcase single-string 780 // for speed reasons, we specialcase single-string
732 // byte or utf-8 strings as keys, but only when !stringref 781 // byte or utf-8 strings as keys, but only when !stringref
733 782
734 if (ecb_expect_true (!dec->stringref)) 783 if (ecb_expect_true (!dec->stringref))
735 if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 784 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
736 { 785 {
737 I32 len = decode_uint (dec); 786 I32 len = decode_uint (dec);
738 char *key = (char *)dec->cur; 787 char *key = (char *)dec->cur;
739 788
789 WANT (len);
740 dec->cur += len; 790 dec->cur += len;
741 791
742 hv_store (hv, key, len, decode_sv (dec), 0); 792 hv_store (hv, key, len, decode_sv (dec), 0);
743 793
744 return; 794 return;
745 } 795 }
746 else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 796 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
747 { 797 {
748 I32 len = decode_uint (dec); 798 I32 len = decode_uint (dec);
749 char *key = (char *)dec->cur; 799 char *key = (char *)dec->cur;
750 800
801 WANT (len);
751 dec->cur += len; 802 dec->cur += len;
752 803
753 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 804 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
754 if (!is_utf8_string (key, len)) 805 if (!is_utf8_string (key, len))
755 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 806 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
… …
891 sv = newRV_noinc (decode_sv (dec)); 942 sv = newRV_noinc (decode_sv (dec));
892 break; 943 break;
893 944
894 case CBOR_TAG_STRINGREF_NAMESPACE: 945 case CBOR_TAG_STRINGREF_NAMESPACE:
895 { 946 {
947 // do nmot use SAVETMPS/FREETMPS, as these will
948 // erase mortalised caches, e.g. "shareable"
896 ENTER; SAVETMPS; 949 ENTER;
897 950
898 SAVESPTR (dec->stringref); 951 SAVESPTR (dec->stringref);
899 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 952 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
900 953
901 sv = decode_sv (dec); 954 sv = decode_sv (dec);
902 955
903 FREETMPS; LEAVE; 956 LEAVE;
904 } 957 }
905 break; 958 break;
906 959
907 case CBOR_TAG_STRINGREF: 960 case CBOR_TAG_STRINGREF:
908 { 961 {
… …
978 if (!method) 1031 if (!method)
979 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1032 ERR ("cannot decode perl-object (package does not have a THAW method)");
980 1033
981 dSP; 1034 dSP;
982 1035
983 ENTER; SAVETMPS; PUSHMARK (SP); 1036 ENTER; SAVETMPS;
1037 PUSHMARK (SP);
984 EXTEND (SP, len + 1); 1038 EXTEND (SP, len + 1);
985 // we re-bless the reference to get overload and other niceties right 1039 // we re-bless the reference to get overload and other niceties right
986 PUSHs (*av_fetch (av, 0, 1)); 1040 PUSHs (*av_fetch (av, 0, 1));
987 PUSHs (sv_cbor); 1041 PUSHs (sv_cbor);
988 1042
… …
1013 default: 1067 default:
1014 { 1068 {
1015 sv = decode_sv (dec); 1069 sv = decode_sv (dec);
1016 1070
1017 dSP; 1071 dSP;
1018 ENTER; SAVETMPS; PUSHMARK (SP); 1072 ENTER; SAVETMPS;
1073 SAVESTACK_POS ();
1074 PUSHMARK (SP);
1019 EXTEND (SP, 2); 1075 EXTEND (SP, 2);
1020 PUSHs (newSVuv (tag)); 1076 PUSHs (newSVuv (tag));
1021 PUSHs (sv); 1077 PUSHs (sv);
1022 1078
1023 PUTBACK; 1079 PUTBACK;
… …
1132 1188
1133 return newSVnv (ecb_binary64_to_double (fp)); 1189 return newSVnv (ecb_binary64_to_double (fp));
1134 } 1190 }
1135 1191
1136 // 0..19 unassigned simple 1192 // 0..19 unassigned simple
1137 // 24 reserved + unassigned (reserved values are not encodable) 1193 // 24 reserved + unassigned simple (reserved values are not encodable)
1194 // 28-30 unassigned misc
1195 // 31 break code
1138 default: 1196 default:
1139 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1197 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1140 } 1198 }
1141 1199
1142 break; 1200 break;
1143 } 1201 }
1144 1202
… …
1147} 1205}
1148 1206
1149static SV * 1207static SV *
1150decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1208decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1151{ 1209{
1152 dec_t dec = { }; 1210 dec_t dec = { 0 };
1153 SV *sv; 1211 SV *sv;
1154 STRLEN len; 1212 STRLEN len;
1155 char *data = SvPVbyte (string, len); 1213 char *data = SvPVbyte (string, len);
1156 1214
1157 if (len > cbor->max_size && cbor->max_size) 1215 if (len > cbor->max_size && cbor->max_size)
… …
1171 if (dec.cur != dec.end && !dec.err) 1229 if (dec.cur != dec.end && !dec.err)
1172 dec.err = "garbage after CBOR object"; 1230 dec.err = "garbage after CBOR object";
1173 1231
1174 if (dec.err) 1232 if (dec.err)
1175 { 1233 {
1234 if (dec.shareable)
1235 {
1236 // need to break cyclic links, which whould all be in shareable
1237 int i;
1238 SV **svp;
1239
1240 for (i = av_len (dec.shareable) + 1; i--; )
1241 if ((svp = av_fetch (dec.shareable, i, 0)))
1242 sv_setsv (*svp, &PL_sv_undef);
1243 }
1244
1176 SvREFCNT_dec (sv); 1245 SvREFCNT_dec (sv);
1177 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1246 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1178 } 1247 }
1179 1248
1180 sv = sv_2mortal (sv); 1249 sv = sv_2mortal (sv);
1181 1250
1182 return sv; 1251 return sv;
1183} 1252}
1184 1253
1254/////////////////////////////////////////////////////////////////////////////
1255// incremental parser
1256
1257#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
1258
1259// returns 0 for notyet, 1 for success or error
1260static int
1261incr_parse (CBOR *self, SV *cborstr)
1262{
1263 STRLEN cur;
1264 SvPV (cborstr, cur);
1265
1266 while (ecb_expect_true (self->incr_need <= cur))
1267 {
1268 // table of integer count bytes
1269 static I8 incr_len[MINOR_MASK + 1] = {
1270 0, 0, 0, 0, 0, 0, 0, 0,
1271 0, 0, 0, 0, 0, 0, 0, 0,
1272 0, 0, 0, 0, 0, 0, 0, 0,
1273 1, 2, 4, 8,-1,-1,-1,-2
1274 };
1275
1276 const U8 *p = SvPVX (cborstr) + self->incr_pos;
1277 U8 m = *p & MINOR_MASK;
1278 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1279 I8 ilen = incr_len[m];
1280
1281 self->incr_need = self->incr_pos + 1;
1282
1283 if (ecb_expect_false (ilen < 0))
1284 {
1285 if (m != MINOR_INDEF)
1286 return 1; // error
1287
1288 if (*p == (MAJOR_MISC | MINOR_INDEF))
1289 {
1290 if (count >= 0)
1291 return 1; // error
1292
1293 count = 1;
1294 }
1295 else
1296 {
1297 av_push (self->incr_count, newSViv (-1)); //TODO: nest
1298 count = -1;
1299 }
1300 }
1301 else
1302 {
1303 self->incr_need += ilen;
1304 if (ecb_expect_false (self->incr_need > cur))
1305 return 0;
1306
1307 int major = *p >> MAJOR_SHIFT;
1308
1309 switch (major)
1310 {
1311 case MAJOR_TAG >> MAJOR_SHIFT:
1312 ++count; // tags merely prefix another value
1313 break;
1314
1315 case MAJOR_BYTES >> MAJOR_SHIFT:
1316 case MAJOR_TEXT >> MAJOR_SHIFT:
1317 case MAJOR_ARRAY >> MAJOR_SHIFT:
1318 case MAJOR_MAP >> MAJOR_SHIFT:
1319 {
1320 UV len;
1321
1322 if (ecb_expect_false (ilen))
1323 {
1324 len = 0;
1325
1326 do {
1327 len = (len << 8) | *++p;
1328 } while (--ilen);
1329 }
1330 else
1331 len = m;
1332
1333 switch (major)
1334 {
1335 case MAJOR_BYTES >> MAJOR_SHIFT:
1336 case MAJOR_TEXT >> MAJOR_SHIFT:
1337 self->incr_need += len;
1338 if (ecb_expect_false (self->incr_need > cur))
1339 return 0;
1340
1341 break;
1342
1343 case MAJOR_MAP >> MAJOR_SHIFT:
1344 len <<= 1;
1345 case MAJOR_ARRAY >> MAJOR_SHIFT:
1346 if (len)
1347 {
1348 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1349 count = len + 1;
1350 }
1351 break;
1352 }
1353 }
1354 }
1355 }
1356
1357 self->incr_pos = self->incr_need;
1358
1359 if (count > 0)
1360 {
1361 while (!--count)
1362 {
1363 if (!AvFILLp (self->incr_count))
1364 return 1; // done
1365
1366 SvREFCNT_dec_NN (av_pop (self->incr_count));
1367 count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1368 }
1369
1370 SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
1371 }
1372 }
1373
1374 return 0;
1375}
1376
1377
1185///////////////////////////////////////////////////////////////////////////// 1378/////////////////////////////////////////////////////////////////////////////
1186// XS interface functions 1379// XS interface functions
1187 1380
1188MODULE = CBOR::XS PACKAGE = CBOR::XS 1381MODULE = CBOR::XS PACKAGE = CBOR::XS
1189 1382
… …
1231 shrink = F_SHRINK 1424 shrink = F_SHRINK
1232 allow_unknown = F_ALLOW_UNKNOWN 1425 allow_unknown = F_ALLOW_UNKNOWN
1233 allow_sharing = F_ALLOW_SHARING 1426 allow_sharing = F_ALLOW_SHARING
1234 allow_cycles = F_ALLOW_CYCLES 1427 allow_cycles = F_ALLOW_CYCLES
1235 pack_strings = F_PACK_STRINGS 1428 pack_strings = F_PACK_STRINGS
1429 text_keys = F_TEXT_KEYS
1430 text_strings = F_TEXT_STRINGS
1236 validate_utf8 = F_VALIDATE_UTF8 1431 validate_utf8 = F_VALIDATE_UTF8
1237 PPCODE: 1432 PPCODE:
1238{ 1433{
1239 if (enable) 1434 if (enable)
1240 self->flags |= ix; 1435 self->flags |= ix;
… …
1249 get_shrink = F_SHRINK 1444 get_shrink = F_SHRINK
1250 get_allow_unknown = F_ALLOW_UNKNOWN 1445 get_allow_unknown = F_ALLOW_UNKNOWN
1251 get_allow_sharing = F_ALLOW_SHARING 1446 get_allow_sharing = F_ALLOW_SHARING
1252 get_allow_cycles = F_ALLOW_CYCLES 1447 get_allow_cycles = F_ALLOW_CYCLES
1253 get_pack_strings = F_PACK_STRINGS 1448 get_pack_strings = F_PACK_STRINGS
1449 get_text_keys = F_TEXT_KEYS
1450 get_text_strings = F_TEXT_STRINGS
1254 get_validate_utf8 = F_VALIDATE_UTF8 1451 get_validate_utf8 = F_VALIDATE_UTF8
1255 PPCODE: 1452 PPCODE:
1256 XPUSHs (boolSV (self->flags & ix)); 1453 XPUSHs (boolSV (self->flags & ix));
1257 1454
1258void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1455void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
… …
1308 EXTEND (SP, 2); 1505 EXTEND (SP, 2);
1309 PUSHs (sv); 1506 PUSHs (sv);
1310 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1507 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1311} 1508}
1312 1509
1510void incr_parse (CBOR *self, SV *cborstr)
1511 ALIAS:
1512 incr_parse_multiple = 1
1513 PPCODE:
1514{
1515 if (SvUTF8 (cborstr))
1516 sv_utf8_downgrade (cborstr, 0);
1517
1518 if (!self->incr_count)
1519 {
1520 self->incr_count = newAV ();
1521 self->incr_pos = 0;
1522 self->incr_need = 1;
1523
1524 av_push (self->incr_count, newSViv (1));
1525 }
1526
1527 do
1528 {
1529 if (!incr_parse (self, cborstr))
1530 {
1531 if (self->incr_need > self->max_size && self->max_size)
1532 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
1533 (unsigned long)self->incr_need, (unsigned long)self->max_size);
1534
1535 break;
1536 }
1537
1538 SV *sv;
1539 char *offset;
1540
1541 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
1542 XPUSHs (sv);
1543
1544 sv_chop (cborstr, offset);
1545
1546 av_clear (self->incr_count);
1547 av_push (self->incr_count, newSViv (1));
1548
1549 self->incr_pos = 0;
1550 self->incr_need = self->incr_pos + 1;
1551 }
1552 while (ix);
1553}
1554
1555void incr_reset (CBOR *self)
1556 CODE:
1557{
1558 SvREFCNT_dec (self->incr_count);
1559 self->incr_count = 0;
1560}
1561
1313void DESTROY (CBOR *self) 1562void DESTROY (CBOR *self)
1314 PPCODE: 1563 PPCODE:
1315 cbor_free (self); 1564 cbor_free (self);
1316 1565
1317PROTOTYPES: ENABLE 1566PROTOTYPES: ENABLE

Diff Legend

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