6 files changed, 21 insertions, 6 deletions

diff --git a/reldiff.c b/reldiff.c
index 23772a4d4..28d717073 100644
--- a/reldiff.c
+++ b/reldiff.c
@@ -48,9 +48,10 @@ mpfr_reldiff(a, b, c, rnd_mode)
 
   if (MPFR_IS_INF(c)) 
     {
-      if (MPFR_SIGN(a) != MPFR_SIGN(b)) { MPFR_CHANGE_SIGN(a); }
+      MPFR_SET_SAME_SIGN(a, b);
       MPFR_CLEAR_FLAGS(a);
       MPFR_SET_INF(a);
+      return;
     }
 
   if (MPFR_IS_ZERO(b)) /* reldiff = abs(c)/c = sign(c) */
diff --git a/set.c b/set.c
index ba8a6dd85..4556a672b 100644
--- a/set.c
+++ b/set.c
@@ -37,9 +37,11 @@ mpfr_set4(a, b, rnd_mode, signb)
 {
   int carry, an, preca = MPFR_PREC(a), sh; mp_limb_t *ap = MPFR_MANT(a);
 
-  if (MPFR_IS_NAN(b)) { MPFR_SET_NAN(a); return; }
+  if (MPFR_IS_NAN(b))
+    { MPFR_CLEAR_FLAGS(a); MPFR_SET_NAN(a); return; }
   if (MPFR_IS_INF(b)) 
     { 
+      MPFR_CLEAR_FLAGS(a);
       MPFR_SET_INF(a); 
       if (MPFR_SIGN(a) * signb < 0) MPFR_CHANGE_SIGN(a); 
       return; 
diff --git a/set_d.c b/set_d.c
index c834cff51..a56022706 100644
--- a/set_d.c
+++ b/set_d.c
@@ -242,7 +242,7 @@ mpfr_set_d(r, d, rnd_mode)
 {
   int signd, sizer; unsigned int cnt;
 
-  
+  MPFR_CLEAR_FLAGS(r);
   if (d == 0) { MPFR_SET_ZERO(r); return; }
   else if (DOUBLE_ISNAN(d)) { MPFR_SET_NAN(r); return; }
   else if (DOUBLE_ISINF(d))
@@ -253,7 +253,6 @@ mpfr_set_d(r, d, rnd_mode)
       return;
     }
 
-  MPFR_CLEAR_FLAGS(r); 
   signd = (d < 0) ? -1 : 1;
   d = ABS (d);
   sizer = (MPFR_PREC(r)-1)/BITS_PER_MP_LIMB + 1;
diff --git a/set_f.c b/set_f.c
index 16e70e7f3..11ea6a5ec 100644
--- a/set_f.c
+++ b/set_f.c
@@ -38,6 +38,18 @@ mpfr_set_f(y, x, rnd_mode)
   mp_limb_t *my, *mx, *tmp; unsigned long cnt, sx, sy;
   TMP_DECL(marker);
 
+  if (MPFR_IS_NAN(x))
+    { MPFR_CLEAR_FLAGS(y); MPFR_SET_NAN(y); return; }
+
+  MPFR_SET_SAME_SIGN(y, x);
+
+  if (MPFR_IS_INF(x))
+    {
+      MPFR_CLEAR_FLAGS(y);
+      MPFR_SET_INF(y);
+      return;
+    }
+
   TMP_MARK(marker);
   sx = ABS(SIZ(x)); sy = MPFR_ABSSIZE(y);
   my = MPFR_MANT(y); mx = MPFR_MANT(x);
@@ -48,8 +60,6 @@ mpfr_set_f(y, x, rnd_mode)
 
   count_leading_zeros(cnt, mx[sx - 1]);  
 
-  if (SIZ(x)*MPFR_SIGN(y)<0) MPFR_CHANGE_SIGN(y);
-
   if (sy < sx)
     {
       unsigned long xprec = sx * BITS_PER_MP_LIMB;
diff --git a/set_q.c b/set_q.c
index d78fb2c67..ad39e702d 100644
--- a/set_q.c
+++ b/set_q.c
@@ -40,6 +40,7 @@ mpfr_set_q (f, q, rnd)
   unsigned int prec;
   mpfr_t n,d;
 
+  MPFR_CLEAR_FLAGS(f);
   num = mpq_numref(q);
   sign = mpz_cmp_ui(num, 0);
   if (sign==0) {
diff --git a/set_si.c b/set_si.c
index eb306902f..7691f2d31 100644
--- a/set_si.c
+++ b/set_si.c
@@ -37,6 +37,7 @@ mpfr_set_si(x, i, rnd_mode)
 {
   unsigned long xn, cnt; mp_limb_t ai, *xp;
 
+  MPFR_CLEAR_FLAGS(x);
   if (i==0) { MPFR_SET_ZERO(x); return; }
   xn = (MPFR_PREC(x)-1)/BITS_PER_MP_LIMB;
   ai = ABS(i); 
@@ -78,6 +79,7 @@ mpfr_set_ui(x, i, rnd_mode)
 {
   unsigned int xn, cnt; mp_limb_t *xp;
 
+  MPFR_CLEAR_FLAGS(x);
   if (i==0) { MPFR_SET_ZERO(x); return; }
   xn = (MPFR_PREC(x)-1)/BITS_PER_MP_LIMB;
   count_leading_zeros(cnt, (mp_limb_t) i);