Changeset 91ef34 in git for Singular

Timestamp:

Nov 30, 2011, 8:09:42 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1f2d3b43da540e3165c73bc71f9dd23f9ec5170f

Parents:

fa90aa36e4c6456322929d91d473198525dbf299

Message:

fix(from master): sleftv::Eval needs to know CMD_M/CMD_1/ etc.

Location:

Singular

Files:

• iparith.cc (modified) (1 diff)
• ipshell.h (modified) (1 diff)
• subexpr.cc (modified) (1 diff)

Singular/iparith.cc

@@ -228 +228 @@
   return pHead(p);
 } 
+
+int iiTokType(int op)
+{
+  for (int i=0;i<sArithBase.nCmdUsed;i++)
+  {
+    if (sArithBase.sCmds[i].tokval==op)
+      return sArithBase.sCmds[i].toktype;
+  }
+  return 0;
+}
 
 /*=================== operations with 2 args.: static proc =================*/

Singular/ipshell.h

@@ -183 +183 @@
 BOOLEAN iiParameter(leftv p);
 BOOLEAN iiAlias(leftv p);
+
+int iiTokType(int op);
 /* ================================================================== */
 int     iiDeclCommand(leftv sy, leftv name, int lev, int t, idhdl* root,

Singular/subexpr.cc

@@ -1643 +1643 @@
       else nok=TRUE;
     }
-    else if (d->argc==1)
-    {
-      nok=d->arg1.Eval();
-      nok=nok||iiExprArith1(this,&d->arg1,d->op);
-    }
-    else if(d->argc==2)
-    {
-      nok=d->arg1.Eval();
-      nok=nok||d->arg2.Eval();
-      nok=nok||iiExprArith2(this,&d->arg1,d->op,&d->arg2);
-    }
-    else if(d->argc==3)
-    {
-      nok=d->arg1.Eval();
-      nok=nok||d->arg2.Eval();
-      nok=nok||d->arg3.Eval();
-      nok=nok||iiExprArith3(this,d->op,&d->arg1,&d->arg2,&d->arg3);
-    }
-    else if(d->argc!=0)
-    {
-      nok=d->arg1.Eval();
-      nok=nok||iiExprArithM(this,&d->arg1,d->op);
-    }
-    else // d->argc == 0
-    {
-      nok = iiExprArithM(this, NULL, d->op);
+    else
+    {
+      int toktype=iiTokType(d->op);
+      if ((toktype==CMD_M)
+      ||( toktype==ROOT_DECL_LIST)
+      ||( toktype==IDEAL_CMD)
+      ||( toktype==MODUL_CMD))
+      {
+        if (d->argc <=3)
+        {
+          if (d->argc>=1) nok=d->arg1.Eval();
+          if ((!nok) && (d->argc>=2))
+          { nok=d->arg2.Eval(); d->arg1.next=&d->arg2; }
+          if ((!nok) && (d->argc==3))
+          { nok=d->arg3.Eval(); d->arg2.next=&d->arg3; }
+          if (d->argc==0)
+            nok=nok||iiExprArithM(this,NULL,d->op);
+          else
+            nok=nok||iiExprArithM(this,&d->arg1,d->op);
+          d->arg1.next=NULL;
+          d->arg2.next=NULL;
+          d->arg3.next=NULL;
+        }
+        else
+        {
+          nok=d->arg1.Eval();
+          nok=nok||iiExprArithM(this,&d->arg1,d->op);
+        }
+      }
+      else if (d->argc==1)
+      {
+        nok=d->arg1.Eval();
+        nok=nok||iiExprArith1(this,&d->arg1,d->op);
+      }
+      else if(d->argc==2)
+      {
+        nok=d->arg1.Eval();
+        nok=nok||d->arg2.Eval();
+        nok=nok||iiExprArith2(this,&d->arg1,d->op,&d->arg2);
+      }
+      else if(d->argc==3)
+      {
+        nok=d->arg1.Eval();
+        nok=nok||d->arg2.Eval();
+        nok=nok||d->arg3.Eval();
+        nok=nok||iiExprArith3(this,d->op,&d->arg1,&d->arg2,&d->arg3);
+      }
+      else if(d->argc!=0)
+      {
+        nok=d->arg1.Eval();
+        nok=nok||iiExprArithM(this,&d->arg1,d->op);
+      }
+      else // d->argc == 0
+      {
+        nok = iiExprArithM(this, NULL, d->op);
+      }
     }
   }