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.40 by root, Tue Dec 10 13:54:40 2013 UTC vs.
Revision 1.45 by root, Sun Dec 14 05:48:39 2014 UTC

… …
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11 11
12#define ECB_NO_THREADS 1
12#include "ecb.h" 13#include "ecb.h"
13 14
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))
… …
323 324
324 ++enc->depth; 325 ++enc->depth;
325 326
326 encode_uint (enc, MAJOR_ARRAY, len + 1); 327 encode_uint (enc, MAJOR_ARRAY, len + 1);
327 328
329 if (SvMAGICAL (av))
328 for (i = 0; i <= len; ++i) 330 for (i = 0; i <= len; ++i)
329 { 331 {
330 SV **svp = av_fetch (av, i, 0); 332 SV **svp = av_fetch (av, i, 0);
331 encode_sv (enc, svp ? *svp : &PL_sv_undef); 333 encode_sv (enc, svp ? *svp : &PL_sv_undef);
332 } 334 }
335 else
336 for (i = 0; i <= len; ++i)
337 encode_sv (enc, AvARRAY (av)[i]);
333 338
334 --enc->depth; 339 --enc->depth;
335} 340}
336 341
337static void 342static void
… …
736{ 741{
737 // for speed reasons, we specialcase single-string 742 // for speed reasons, we specialcase single-string
738 // byte or utf-8 strings as keys, but only when !stringref 743 // byte or utf-8 strings as keys, but only when !stringref
739 744
740 if (ecb_expect_true (!dec->stringref)) 745 if (ecb_expect_true (!dec->stringref))
741 if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 746 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
742 { 747 {
743 I32 len = decode_uint (dec); 748 I32 len = decode_uint (dec);
744 char *key = (char *)dec->cur; 749 char *key = (char *)dec->cur;
745 750
746 dec->cur += len; 751 dec->cur += len;
747 752
748 hv_store (hv, key, len, decode_sv (dec), 0); 753 hv_store (hv, key, len, decode_sv (dec), 0);
749 754
750 return; 755 return;
751 } 756 }
752 else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 757 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
753 { 758 {
754 I32 len = decode_uint (dec); 759 I32 len = decode_uint (dec);
755 char *key = (char *)dec->cur; 760 char *key = (char *)dec->cur;
756 761
757 dec->cur += len; 762 dec->cur += len;
… …
1447 EXTEND (SP, 2); 1452 EXTEND (SP, 2);
1448 PUSHs (sv); 1453 PUSHs (sv);
1449 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1454 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1450} 1455}
1451 1456
1452void incr_parse (CBOR *self, SV *cborstr, int chop = 0) 1457void incr_parse (CBOR *self, SV *cborstr)
1458 ALIAS:
1459 incr_parse_multiple = 1
1453 PPCODE: 1460 PPCODE:
1454{ 1461{
1455 if (SvUTF8 (cborstr)) 1462 if (SvUTF8 (cborstr))
1456 sv_utf8_downgrade (cborstr, 0); 1463 sv_utf8_downgrade (cborstr, 0);
1457 1464
… …
1462 self->incr_need = 1; 1469 self->incr_need = 1;
1463 1470
1464 av_push (self->incr_count, newSViv (1)); 1471 av_push (self->incr_count, newSViv (1));
1465 } 1472 }
1466 1473
1467 for (;;) 1474 do
1468 { 1475 {
1469 if (!incr_parse (self, cborstr)) 1476 if (!incr_parse (self, cborstr))
1470 { 1477 {
1471 if (self->incr_need > self->max_size && self->max_size) 1478 if (self->incr_need > self->max_size && self->max_size)
1472 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu", 1479 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
1473 (unsigned long)self->incr_need, (unsigned long)self->max_size); 1480 (unsigned long)self->incr_need, (unsigned long)self->max_size);
1474 1481
1475 break; 1482 break;
1476 } 1483 }
1477 1484
1478 SV *sv; 1485 SV *sv;
1479 char *offset; 1486 char *offset;
1480 1487
1481 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN; 1488 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
1482 XPUSHs (sv); 1489 XPUSHs (sv);
1483 1490
1491 sv_chop (cborstr, offset);
1492
1484 av_clear (self->incr_count); 1493 av_clear (self->incr_count);
1485 av_push (self->incr_count, newSViv (1)); 1494 av_push (self->incr_count, newSViv (1));
1486 1495
1487 if (chop)
1488 {
1489 self->incr_pos = 0; 1496 self->incr_pos = 0;
1490 sv_chop (cborstr, offset);
1491 }
1492 else
1493 self->incr_pos = offset - SvPVX (cborstr);
1494
1495 self->incr_need = self->incr_pos + 1; 1497 self->incr_need = self->incr_pos + 1;
1496 } 1498 }
1499 while (ix);
1497} 1500}
1498 1501
1499void incr_reset (CBOR *self) 1502void incr_reset (CBOR *self)
1500 CODE: 1503 CODE:
1501{ 1504{

Diff Legend

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