Changeset 34ac5c in git

Timestamp:

Apr 25, 2020, 8:51:11 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

97545c1fa4c4b6d1064e403eea440425970b4a4d

Parents:

8e903f23324de1e4ec1dc9926b6de0a16de605d6

Message:

opt: jiAssign_1

File:

• Singular/ipassign.cc (modified) (8 diffs)

Singular/ipassign.cc

@@ -1115 +1115 @@
 * assign a = b
 */
-static BOOLEAN jiAssign_1(leftv l, leftv r, BOOLEAN toplevel, BOOLEAN is_qring=FALSE)
-{
-  int rt=r->Typ();
+static BOOLEAN jiAssign_1(leftv l, leftv r, int rt, BOOLEAN toplevel, BOOLEAN is_qring=FALSE)
+{
   if (rt==0)
   {
@@ -1384 +1383 @@
     h=l->next;
     l->next=NULL;
-    nok=jiAssign_1(l,&t,TRUE);
+    nok=jiAssign_1(l,&t,INT_CMD,TRUE);
     l->next=h;
     if (nok) return TRUE;
@@ -1418 +1417 @@
     h=l->next;
     l->next=NULL;
-    nok=jiAssign_1(l,&t,TRUE);
+    nok=jiAssign_1(l,&t,POLY_CMD,TRUE);
     l->next=h;
     t.CleanUp();
@@ -1656 +1655 @@
       idhdl hh=NULL;
       if ((l->rtyp==IDHDL)&&(l->Typ()==DEF_CMD)) hh=(idhdl)l->data;
-      nok=jiAssign_1(l,&t,TRUE);
+      nok=jiAssign_1(l,&t,POLY_CMD,TRUE);
       if (hh!=NULL) { ipMoveId(hh);hh=NULL;}
       l->next=h;
@@ -1732 +1731 @@
     h=l->next;
     l->next=NULL;
-    nok=jiAssign_1(l,&t,TRUE);
+    nok=jiAssign_1(l,&t,STRING_CMD,TRUE);
     if (nok)
     {
@@ -1938 +1937 @@
       &&((lt==rt)||(lt!=LIST_CMD)))
       {
-        b=jiAssign_1(l,r,toplevel,is_qring);
+        b=jiAssign_1(l,r,rt,toplevel,is_qring);
         if (l->rtyp==IDHDL)
         {
@@ -1963 +1962 @@
       )
       {
-        b=jiAssign_1(l,r,toplevel);
+        b=jiAssign_1(l,r,rt,toplevel);
         if((l->rtyp==IDHDL)&&(l->data!=NULL))
         {
@@ -2049 +2048 @@
       if ((hh->next==NULL)&&(hh->Typ()==IDEAL_CMD))
       {
-        b=jiAssign_1(l,hh,toplevel); /* map-assign: map f=r,i; */
+        b=jiAssign_1(l,hh,IDEAL_CMD,toplevel); /* map-assign: map f=r,i; */
         omFreeBin(hh,sleftv_bin);
         return b;