X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FScalar-Vec-Util.git;a=blobdiff_plain;f=Util.xs;h=d878813aba6d96e200d7dea679b29923683bfa06;hp=6733972275805f09ed91925b6899ffa744afa19e;hb=HEAD;hpb=0b682e5240292b703752516ae09ca0d859f74da9

diff --git a/Util.xs b/Util.xs
index 6733972..d878813 100644
--- a/Util.xs
+++ b/Util.xs
@@ -11,7 +11,11 @@
 
 #include "bitvect.h"
 
-STATIC size_t svu_validate_uv(pTHX_ SV *sv, const char *desc) {
+#ifndef SVU_SIZE
+# define SVU_SIZE (CHAR_BIT * sizeof(BV_UNIT))
+#endif
+
+static size_t svu_validate_uv(pTHX_ SV *sv, const char *desc) {
 #define svu_validate_uv(S, D) svu_validate_uv(aTHX_ (S), (D))
  IV i;
 
@@ -33,7 +37,7 @@ STATIC size_t svu_validate_uv(pTHX_ SV *sv, const char *desc) {
  return 0;
 }
 
-STATIC char *svu_prepare_sv(pTHX_ SV *sv, size_t s, size_t l) {
+static char *svu_prepare_sv(pTHX_ SV *sv, size_t s, size_t l) {
 #define svu_prepare_sv(S, I, L) svu_prepare_sv(aTHX_ (S), (I), (L))
  STRLEN  c;
  size_t  n = s + l, i, js, jz, k, z;
@@ -98,8 +102,8 @@ void
 vcopy(SV *sf, SV *sfs, SV *st, SV *sts, SV *sl)
 PROTOTYPE: $$$$$
 PREINIT:
- size_t fs, ts, l, lf = 0, c;
- char *t, *f;
+ size_t fs, ts, l, e, lf, cf;
+ char *vt, *vf;
 CODE:
  l = svu_validate_uv(sl, "length");
  if (!l)
@@ -107,24 +111,25 @@ CODE:
  fs = svu_validate_uv(sfs, "offset");
  ts = svu_validate_uv(sts, "offset");
 
- t = svu_prepare_sv(st, ts, l);
-
- f = SvPVX(sf); /* We do it there in case st == sf. */
- c = SvCUR(sf);
- if (c * CHAR_BIT <= fs + l && c <= SvCUR(st)) {
-  lf = fs + l - c * CHAR_BIT;
-  l  = c * CHAR_BIT - fs;
- }
-
- if (f == t) {
-  bv_move(f, ts, fs, l);
- } else {
-  bv_copy(t, ts, f, fs, l);
+ SvUPGRADE(sf, SVt_PV);
+ vt = svu_prepare_sv(st, ts, l);
+
+ /* We fetch vf after upgrading st in case st == sf. */
+ vf = SvPVX(sf);
+ cf = SvCUR(sf) * CHAR_BIT;
+ lf = fs + l;
+ e  = lf > cf ? lf - cf : 0;
+ l  =  l > e  ?  l - e  : 0;
+
+ if (l) {
+  if (vf == vt)
+   bv_move(vf, ts, fs, l);
+  else
+   bv_copy(vt, ts, vf, fs, l);
  }
 
- if (lf) {
-  bv_fill(t, ts + l, lf, 0);
- }
+ if (e)
+  bv_fill(vt, ts + l, e, 0);
 
  XSRETURN(0);