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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC vs.
Revision 1.34 by root, Sat Nov 30 16:19:59 2013 UTC

       HV *tagged_stash  = !CBOR_SLOW || cbor_tagged_stash
                           ? cbor_tagged_stash
                           : gv_stashpv ("CBOR::XS::Tagged" , 1);
       HV *stash = SvSTASH (sv);
-      GV *method;
       if (stash == boolean_stash)
+        {
-        encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
+          encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
+          return;
+        }
       else if (stash == error_stash)
+        {
-        encode_ch (enc, 0xe0 | 23);
+          encode_ch (enc, 0xe0 | 23);
+          return;
+        }
       else if (stash == tagged_stash)
         {
           if (svt != SVt_PVAV)
             croak ("encountered CBOR::XS::Tagged object that isn't an array");
           encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));
           encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
+          return;
+        }
+    }
+  if (ecb_expect_false (SvREFCNT (sv) > 1)
+      && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
+    {
+      if (!enc->shareable)
+        enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
+      SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
+      if (SvOK (*svp))
-        }
+        {
+          encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
+          encode_uint (enc, 0x00, SvUV (*svp));
+          return;
+        }
+      else
+        {
+          sv_setuv (*svp, enc->shareable_idx);
+          ++enc->shareable_idx;
+          encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
+        }
+    }
+  if (ecb_expect_false (SvOBJECT (sv)))
+    {
+      HV *stash = SvSTASH (sv);
+      GV *method;
-      else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
+      if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
         {
           dSP;
           ENTER; SAVETMPS; PUSHMARK (SP);
           // we re-bless the reference to get overload and other niceties right
     encode_hv (enc, (HV *)sv);
   else if (svt == SVt_PVAV)
     encode_av (enc, (AV *)sv);
   else
     {
-      if (ecb_expect_false (SvREFCNT (sv) > 1)
-          && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
-        {
-          if (!enc->shareable)
-            enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
-          SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
-          if (SvOK (*svp))
-            {
-              encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
-              encode_uint (enc, 0x00, SvUV (*svp));
-              return;
-            }
-          else
-            {
-              sv_setuv (*svp, enc->shareable_idx);
-              ++enc->shareable_idx;
-              encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
-            }
-        }
       encode_tag (enc, CBOR_TAG_INDIRECTION);
       encode_sv (enc, sv);
     }
 }
              |  ((UV)dec->cur[-1]);
       case 27:
         WANT (9);
         dec->cur += 9;
+        return
+#if UVSIZE < 8
+               0
+#else
-        return (((UV)dec->cur[-8]) << 56)
+               (((UV)dec->cur[-8]) << 56)
              | (((UV)dec->cur[-7]) << 48)
              | (((UV)dec->cur[-6]) << 40)
              | (((UV)dec->cur[-5]) << 32)
+#endif
              | (((UV)dec->cur[-4]) << 24)
              | (((UV)dec->cur[-3]) << 16)
              | (((UV)dec->cur[-2]) <<  8)
              |  ((UV)dec->cur[-1]);

Diff Legend

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

Comparing CBOR-XS/XS.xs (file contents): Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC vs. Revision 1.34 by root, Sat Nov 30 16:19:59 2013 UTC

Diff Legend

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.33 by root, Sat Nov 30 15:23:59 2013 UTC vs.
Revision 1.34 by root, Sat Nov 30 16:19:59 2013 UTC