Changeset 143730 in git

Timestamp:

Feb 4, 2002, 6:12:59 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

28e0ac8cfc405def682d3274f90c18f7d6cc46f5

Parents:

38900091e042419b890903cee4c2f780c11413ea

Message:

*hannes: rCompose(varnames may be ringvars)


git-svn-id: file:///usr/local/Singular/svn/trunk@5838 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/ring.cc (modified) (6 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.180 2002-02-04 14:23:18 Singular Exp $ */
+/* $Id: ring.cc,v 1.181 2002-02-04 17:12:59 Singular Exp $ */
 
 /*
@@ -2649 +2649 @@
   /*polynomial ring*/
   res->OrdSgn    = 1;
-  
+
   int tmpref=r->cf->ref;
   rComplete(res, 1);
@@ -2664 +2664 @@
     WarnS("Hannes: you still need to implement this");
     // simple=FALSE; // sorting needed
-  }  
+  }
   return rModifyRing(r, ommit_degree, ommit_comp, exp_limit);
 }
@@ -2673 +2673 @@
 }
 
-  
+
 void rKillModifiedRing(ring r)
 {
@@ -4042 +4042 @@
       if (v->m[i].Typ()==STRING_CMD)
         R->names[i]=omStrDup((char *)v->m[i].Data());
+      else if (v->m[i].Typ()==POLY_CMD)
+      {
+        poly p=(poly)v->m[i].Data();
+        int nr=pIsPurePower(p);
+        if (nr>0)
+          R->names[i]=omStrDup(currRing->names[nr-1]);
+        else
+        {
+          Werror("var name %d must be a string or a ring variable",i+1);
+          goto rCompose_err;
+        }
+      }
       else
       {
-        i--;
-        while (i>=0) { omFree(R->names[i]); i--; }
-        omFree(R->names);
         Werror("var name %d must be `string`",i+1);
         goto rCompose_err;
@@ -4167 +4176 @@
 
 rCompose_err:
+  if (R->N>0)
+  {
+    int i;
+    if (R->names!=NULL)
+    {
+      i=R->N;
+      while (i>=0) { if (R->names[i]!=NULL) omFree(R->names[i]); i--; }
+      omFree(R->names);
+    }
+  }
+  if (R->order!=NULL) omFree(R->order);
+  if (R->block0!=NULL) omFree(R->block0);
+  if (R->block1!=NULL) omFree(R->block1);
+  if (R->wvhdl!=NULL) omFree(R->wvhdl);
   omFree(R);
   return NULL;