Changeset 745c46 in git

Timestamp:

Sep 14, 1998, 3:59:28 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

b379ce07407b5555b782a31bef7076f8de09c740

Parents:

a327f1e3e8ea89ef94b1e899a6a9c91aa5f13d7c

Message:

* hannes: fixed bug with [p1,p2,...]


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

File:

• Singular/grammar.y (modified) (2 diffs)

Singular/grammar.y

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: grammar.y,v 1.47 1998-09-01 14:58:25 Singular Exp $ */
+/* $Id: grammar.y,v 1.48 1998-09-14 13:59:28 Singular Exp $ */
 /*
 * ABSTRACT: SINGULAR shell grammatik
@@ -474 +474 @@
               if (k!=0)
               {
-                if (v->Typ() == INT_CMD)
-                {
-                  $$.data = (void *)pAdd((poly)$$.data,pMult(p,pISet(k)));
-                }
-                else if (v->Typ() == POLY_CMD)
-                {
-                  $$.data = (void *)pAdd((poly)$$.data,
-                                         pMult(p,(poly)(v->CopyD())) );
-                }
-                else
+                int i,t;
+                sleftv tmp;
+                memset(&tmp,0,sizeof(tmp));
+                i=iiTestConvert((t=v->Typ()),POLY_CMD);
+                if((i==0) || (iiConvert(t /*v->Typ()*/,POLY_CMD,i,v,&tmp))) 
+                {
+                  pDelete(&p);
+                  pDelete((poly *)&$$.data);
+                  $2.CleanUp();
                   MYYERROR("expected '[poly,...'");
+                }
+                $$.data = (void *)pAdd((poly)$$.data,
+                                               pMult(p,(poly)tmp.CopyD()));
+                v->next=tmp.next;tmp.next=NULL;
+                tmp.CleanUp();
               }
               else