[ViewVC] Diff of: cvs/CBOR-XS/XS.xs

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.40 by root, Tue Dec 10 13:54:40 2013 UTC vs.
Revision 1.46 by root, Sun Dec 14 05:57:22 2014 UTC

 #include <stdlib.h>
 #include <stdio.h>
 #include <limits.h>
 #include <float.h>
+#define ECB_NO_THREADS 1
 #include "ecb.h"
 // compatibility with perl <5.18
 #ifndef HvNAMELEN_get
 # define HvNAMELEN_get(hv) strlen (HvNAME (hv))
   ++enc->depth;
   encode_uint (enc, MAJOR_ARRAY, len + 1);
+  if (SvMAGICAL (av))
-  for (i = 0; i <= len; ++i)
+    for (i = 0; i <= len; ++i)
-    {
+      {
-      SV **svp = av_fetch (av, i, 0);
+        SV **svp = av_fetch (av, i, 0);
-      encode_sv (enc, svp ? *svp : &PL_sv_undef);
+        encode_sv (enc, svp ? *svp : &PL_sv_undef);
-    }
+      }
+  else
+    for (i = 0; i <= len; ++i)
+      {
+        SV *sv = AvARRAY (av)[i];
+        encode_sv (enc, sv ? sv : &PL_sv_undef);
+      }
   --enc->depth;
 }
 static void
 {
   // for speed reasons, we specialcase single-string
   // byte or utf-8 strings as keys, but only when !stringref
   if (ecb_expect_true (!dec->stringref))
-    if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
+    if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
       {
         I32 len = decode_uint (dec);
         char *key = (char *)dec->cur;
         dec->cur += len;
         hv_store (hv, key,  len, decode_sv (dec), 0);
         return;
       }
-    else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
+    else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
       {
         I32 len = decode_uint (dec);
         char *key = (char *)dec->cur;
         dec->cur += len;
         EXTEND (SP, 2);
         PUSHs (sv);
         PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
 }
-void incr_parse (CBOR *self, SV *cborstr, int chop = 0)
+void incr_parse (CBOR *self, SV *cborstr)
+	ALIAS:
+        incr_parse_multiple = 1
 	PPCODE:
 {
         if (SvUTF8 (cborstr))
           sv_utf8_downgrade (cborstr, 0);
             self->incr_need  = 1;
             av_push (self->incr_count, newSViv (1));
           }
-        for (;;)
+        do
           {
             if (!incr_parse (self, cborstr))
               {
                 if (self->incr_need > self->max_size && self->max_size)
                   croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
                          (unsigned long)self->incr_need, (unsigned long)self->max_size);
                 break;
               }
-              SV *sv;
+            SV *sv;
-              char *offset;
+            char *offset;
-              PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
+            PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
-              XPUSHs (sv);
+            XPUSHs (sv);
+            sv_chop (cborstr, offset);
-              av_clear (self->incr_count);
+            av_clear (self->incr_count);
-              av_push (self->incr_count, newSViv (1));
+            av_push (self->incr_count, newSViv (1));
-              if (chop)
-                {
-                  self->incr_pos = 0;
+            self->incr_pos = 0;
-                  sv_chop (cborstr, offset);
-                }
-              else
-                self->incr_pos = offset - SvPVX (cborstr);
-              self->incr_need = self->incr_pos + 1;
+            self->incr_need = self->incr_pos + 1;
           }
+        while (ix);
 }
 void incr_reset (CBOR *self)
 	CODE:
 {

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.40 by root, Tue Dec 10 13:54:40 2013 UTC vs. Revision 1.46 by root, Sun Dec 14 05:57:22 2014 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.40 by root, Tue Dec 10 13:54:40 2013 UTC vs.
Revision 1.46 by root, Sun Dec 14 05:57:22 2014 UTC