Changeset 0d9fc0 in git

Timestamp:

May 28, 2020, 4:12:54 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

1e4e3f39315be2ea18add95393bd1a5628ab06cf6ed33f7cfb1c9c75df49da3de43fcd67b7b7b664

Parents:

c45564d321fe213add48624ae55ff67f14f6a885

Message:

jjSetMinpoly returns the ring or NULL for error

Location:

Singular

Files:

• ipassign.cc (modified) (7 diffs)
• ipshell.h (modified) (1 diff)

Singular/ipassign.cc

@@ -171 +171 @@
   }
 }
-BOOLEAN jjSetMinpoly(ring r, number a, BOOLEAN modify)
+ring jjSetMinpoly(ring r, number a, BOOLEAN modify)
 {
   if( !nCoeff_is_transExt(r->cf) && (r->idroot == NULL) && n_IsZero(a, r->cf) )
   {
-    return FALSE;
+    return r;
   }
 
@@ -184 +184 @@
     {
       WerrorS("cannot set minpoly for these coeffients");
-      return TRUE;
+      return NULL;
     }
   }
@@ -191 +191 @@
   {
     WerrorS("only univarite minpoly allowed");
-    return TRUE;
+    return NULL;
   }
 
@@ -210 +210 @@
     if( nCoeff_is_transExt(r->cf) )
     {
-      return FALSE;
+      return r;
     }
     WarnS("cannot set minpoly to 0 / alg. extension?");
-    return TRUE;
+    return NULL;
   }
   if (!modify) r=rCopy(r);
@@ -237 +237 @@
     rDelete( A.r );
     if (!modify) rDelete(r);
-    return TRUE;
+    return NULL;
   }
   if (!redefine_from_algext && (DEN((fraction)(p)) != NULL)) // minpoly must be a fraction with poly numerator...!!
@@ -268 +268 @@
     rDelete( A.r );
     if (!modify) rDelete(r);
-    return TRUE;
+    return NULL;
   }
   else
@@ -274 +274 @@
     nKillChar(r->cf); r->cf=new_cf;
   }
-  return FALSE;
+  return r;
 }
 static BOOLEAN jjMINPOLY(leftv, leftv a)
 {
-  return jjSetMinpoly(currRing,(number)a->Data(),TRUE);
+  return (jjSetMinpoly(currRing,(number)a->Data(),TRUE)==NULL);
 }
 

Singular/ipshell.h

@@ -171 +171 @@
 /* Assigments : */
 BOOLEAN iiAssign(leftv left, leftv right, BOOLEAN toplevel=TRUE);
-BOOLEAN jjSetMinpoly(ring r, number a, BOOLEAN modify);
+ring jjSetMinpoly(ring r, number a, BOOLEAN modify);
 
 typedef BOOLEAN (*proci)(leftv,leftv,Subexpr);