Changeset 0d84792 in git

Timestamp:

Jan 22, 1999, 7:23:21 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

8e012379f6186bcc208b49f8710913df381eb5e3

Parents:

31b8436f979efbf98c360c7279f6ef542bf0c26f

Message:

*hannes: fixed poly->any conversion


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

File:

• Singular/ipconv.cc (modified) (4 diffs)

Singular/ipconv.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipconv.cc,v 1.15 1998-11-12 14:44:37 siebert Exp $ */
+/* $Id: ipconv.cc,v 1.16 1999-01-22 18:23:21 Singular Exp $ */
 /*
 * ABSTRACT: automatic type conversions
@@ -153 +153 @@
   //{
   //  nDelete((number *)&data);
-  //}  
+  //}
   return (void *)p;
 }
@@ -169 +169 @@
   //{
   //  nDelete((number *)&data);
-  //}  
+  //}
   return (void *)I;
 }
@@ -290 +290 @@
       else if ((input->rtyp==POLY_CMD) && (input->name==NULL))
       {
-        int nr=pIsPurePower((poly)input->data);
-        if (nr!=0)
+        if (input->data!=NULL)
         {
-          if (pGetExp((poly)input->data,nr)==1)
+          int nr=pIsPurePower((poly)input->data);
+          if (nr!=0)
           {
-            output->name=mstrdup(currRing->names[nr-1]);
+            if (pGetExp((poly)input->data,nr)==1)
+            {
+              output->name=mstrdup(currRing->names[nr-1]);
+            }
+            else
+            {
+              output->name=(char *)AllocL(4);
+              sprintf(output->name,"%c%d",*(currRing->names[nr-1]),
+              pGetExp((poly)input->data,nr));
+            }
           }
+          else if(pIsConstant((poly)input->data))
+          {
+            output->name=nName(pGetCoeff((poly)input->data));
+          }
+#ifdef TEST
           else
           {
-            output->name=(char *)AllocL(4);
-            sprintf(output->name,"%c%d",*(currRing->names[nr-1]),
-              pGetExp((poly)input->data,nr));
+            WerrorS("wrong name, should not happen");
+            output->name=mstrdup("?");
           }
+#endif
         }
-        else if(pIsConstant((poly)input->data))
-        {
-          output->name=nName(pGetCoeff((poly)input->data));
-        }
-#ifdef TEST
-        else
-        {
-          WerrorS("wrong name, should not happen");
-          output->name=mstrdup("?");
-        }
-#endif
       }
       else if ((input->rtyp==NUMBER_CMD) && (input->name==NULL))