Changeset 81c5cb in git

Timestamp:

Feb 6, 2012, 6:20:45 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

9ec1669f774f9fd5bc45c6c9b8b224cff15ab286

Parents:

eb2d25597130bb1991b6b11239571930294ba1d7

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-06 18:20:45+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-06 19:38:19+01:00

Message:

temporary fix for local objects while setting minpoly

FIX: kill local objects (run debug version for details)

TODO: map local objects properly...

Location:

Singular

Files:

• idrec.h (modified) (1 diff)
• ipassign.cc (modified) (2 diffs)
• ipid.cc (modified) (2 diffs)

Singular/idrec.h

@@ -49 +49 @@
   idhdl get(const char * s, int lev);
   idhdl set(const char * s, int lev, int t/*typ*/, BOOLEAN init=TRUE);
-  char * String();
+  char * String(BOOLEAN typed = FALSE);
 //  ~idrec();
 };

Singular/ipassign.cc

@@ -200 +200 @@
   if ( currRing->idroot != NULL )
   {
-    WerrorS("no minpoly allowed if there are local objects belonging to the basering");
-    return TRUE;
-  }
+#ifndef NDEBUG      
+//    return TRUE;
+  idhdl p = currRing->idroot;
+     
+  WarnS("no minpoly allowed if there are local objects belonging to the basering: ");
+  while(p != NULL)
+  {
+    Print(p->String(TRUE)); PrintLn();
+    p = p->next;
+  }    
+#endif
+  }
+
+  assume (currRing->idroot==NULL);
   
   number p = (number)a->CopyD(NUMBER_CMD);
@@ -208 +219 @@
   if (n_IsZero(p, currRing->cf))
   {
+    n_Delete(&p, currRing);
     WerrorS("cannot set minpoly to 0");
     return TRUE;
   }
 
-  assume (currRing->idroot==NULL);
-  
   // remove all object currently in the ring
   while(currRing->idroot!=NULL)
   {
+#ifndef NDEBUG
+    Warn("killing a local object due to minpoly change: %s", IDID(currRing->idroot));
+#endif
     killhdl2(currRing->idroot,&(currRing->idroot),currRing);
   }

Singular/ipid.cc

@@ -223 +223 @@
 }
 
-char * idrec::String()
+char * idrec::String(BOOLEAN typed)
 {
   sleftv tmp;
@@ -230 +230 @@
   tmp.data=IDDATA(this);
   tmp.name=IDID(this);
-  return tmp.String();
+  return tmp.String(NULL, typed);
 }