Changeset 5fb90e in git

Timestamp:

Dec 14, 2011, 12:16:56 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

69ed5243c7b1d76bdf25206c9670341020c3e5d9

Parents:

635774baf3364550ff343f7f4de3f6c935d61e42

Message:

chg: move P_setGlobals to ring.cc, to be called from rComplete

Files:

• kernel/polys.cc (modified) (2 diffs)
• kernel/polys.h (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

kernel/polys.cc

@@ -10 +10 @@
 ideal currQuotient = NULL;
 
-/* -------------------------------------------------------- */
-/*2
-* change all global variables to fit the description of the new ring
-*/
-
-void p_SetGlobals(const ring r, BOOLEAN complete)
-{
-// // //  if (r->ppNoether!=NULL) p_Delete(&r->ppNoether,r); // ???
-
-  if (complete)
-  {
-    test &= ~ TEST_RINGDEP_OPTS;
-    test |= r->options;
-  }
-}
-
 void rChangeCurrRing(ring r)
 {
@@ -33 +17 @@
    nSetChar(r->cf);
    //------------ global variables related to polys -------------------
-   p_SetGlobals(r);
 }
 /*

kernel/polys.h

@@ -14 +14 @@
 extern ring currRing;
 void rChangeCurrRing(ring r);
-
-void p_SetGlobals(const ring r, BOOLEAN complete = TRUE);
 
 #include <coeffs/numbers.h>

libpolys/polys/monomials/ring.cc

@@ -3318 +3318 @@
 static void rCheckOrdSgn(ring r,int i/*current block*/);
 
+/* -------------------------------------------------------- */
+/*2
+* change all global variables to fit the description of the new ring
+*/
+
+void p_SetGlobals(const ring r, BOOLEAN complete)
+{
+// // //  if (r->ppNoether!=NULL) p_Delete(&r->ppNoether,r); // ???
+
+  if (complete)
+  {
+    test &= ~ TEST_RINGDEP_OPTS;
+    test |= r->options;
+  }
+}
+
 BOOLEAN rComplete(ring r, int force)
 {
@@ -3711 +3727 @@
   r->p_Procs = (p_Procs_s*)omAlloc(sizeof(p_Procs_s));
   p_ProcsSet(r, r->p_Procs);
+  p_SetGlobals(r);
   return FALSE;
 }

libpolys/polys/monomials/ring.h

@@ -488 +488 @@
 BOOLEAN rComplete(ring r, int force = 0);
 // use this to free fields created by rComplete //?
+
+/// set all properties of a new ring - also called by rComplete
+void p_SetGlobals(const ring r, BOOLEAN complete = TRUE);
 
 static inline int rBlocks(ring r)