Changeset 778b36 in git

Timestamp:

Jul 4, 2013, 11:21:59 AM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

fff50d9b5c80dd9a6645078ab526d5eb384270df

Parents:

90e49f7869b86be3e49012a3f3091d48b56c09ad

Message:

chg: simplified nlDiv

from master

File:

• libpolys/coeffs/longrat.cc (modified) (5 diffs)

libpolys/coeffs/longrat.cc

@@ -835 +835 @@
 number nlDiv (number a, number b, const coeffs r)
 {
-  number u;
   if (nlIsZero(b,r))
   {
@@ -841 +840 @@
     return INT_TO_SR(0);
   }
-  u=ALLOC_RNUMBER();
-  u->s=0;
-#if defined(LDEBUG)
-  u->debug=123456;
-#endif
+  number u;
 // ---------- short / short ------------------------------------
   if (SR_HDL(a) & SR_HDL(b) & SR_INT)
@@ -851 +846 @@
     LONG i=SR_TO_INT(a);
     LONG j=SR_TO_INT(b);
+    if (j==1L) return a;
     if ((i==-POW_2_28) && (j== -1L))
     {
-      FREE_RNUMBER(u);
       return nlRInit(POW_2_28);
     }
@@ -859 +854 @@
     if (r==0)
     {
-      FREE_RNUMBER(u); // omFreeBin((void *)u, rnumber_bin);
       return INT_TO_SR(i/j);
     }
+    u=ALLOC_RNUMBER();
+    u->s=0;
+    #if defined(LDEBUG)
+    u->debug=123456;
+    #endif
     mpz_init_set_si(u->z,(long)i);
     mpz_init_set_si(u->n,(long)j);
@@ -867 +866 @@
   else
   {
+    u=ALLOC_RNUMBER();
+    u->s=0;
+    #if defined(LDEBUG)
+    u->debug=123456;
+    #endif
     mpz_init(u->z);
 // ---------- short / long ------------------------------------