Changeset a15a71 in git for kernel

Timestamp:

Aug 31, 2017, 3:28:53 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

04b76976356e711219b4271eacede2aad8c2b5eb

Parents:

639345cb183019a538568be59dbe1acb10fa6e52

Message:

chg: simplyfied p_DivideM, rChangeCurrRing(NULL)

File:

• kernel/polys.cc (modified) (4 diffs)

kernel/polys.cc

@@ -21 +21 @@
   }
   #endif
+  //------------ set global ring vars --------------------------------
+  currRing = r;
   if( r != NULL )
   {
     rTest(r);
-
-    //------------ set global ring vars --------------------------------
-    currRing = r;
     //------------ global variables related to coefficients ------------
     assume( r->cf!= NULL );
@@ -33 +32 @@
     p_SetGlobals(r);
     //------------ global variables related to factory -----------------
-  }
-  else
-  {
-    currRing = NULL;
   }
 }
@@ -56 +51 @@
         ideal ui=idInit(1,1); ui->m[0]=p;
         ideal R; matrix U;
-        if (r!=currRing)
-        {
-          WerrorS("internal error: idLift not in currRing");
-          return NULL;
-        }
+        ring save_ring=currRing;
+        if (r!=currRing) rChangeCurrRing(r);
+        int save_opt;
+        SI_SAVE_OPT1(save_opt);
+        si_opt_1 &= ~(Sy_bit(OPT_PROT));
         ideal m = idLift(vi,ui,&R, FALSE,TRUE,TRUE,&U);
-        matrix T = id_Module2formatedMatrix(m,1,1,currRing);
+        SI_RESTORE_OPT1(save_opt);
+        if (r!=save_ring) rChangeCurrRing(save_ring);
+        matrix T = id_Module2formatedMatrix(m,1,1,r);
         p=MATELEM(T,1,1); MATELEM(T,1,1)=NULL;
         id_Delete((ideal *)&T,r);
@@ -105 +102 @@
             ideal ui=idInit(1,1); ui->m[0]=I->m[i];
             ideal R; matrix U;
-            ring save_ring=currRing;
+            ring save_ring=currRing;
             if (r!=currRing) rChangeCurrRing(r);
+            int save_opt;
+            SI_SAVE_OPT1(save_opt);
+            si_opt_1 &= ~(Sy_bit(OPT_PROT));
             ideal m = idLift(vi,ui,&R, FALSE,TRUE,TRUE,&U);
-            if (r!=save_ring) rChangeCurrRing(save_ring);
+            SI_RESTORE_OPT1(save_opt);
+            if (r!=save_ring) rChangeCurrRing(save_ring);
             matrix T = id_Module2formatedMatrix(m,1,1,r);
             h=MATELEM(T,1,1); MATELEM(T,1,1)=NULL;