Changeset e25346 in git

Timestamp:

Sep 18, 2014, 3:02:40 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

6444d6389c28adc3ffe071f6db085827f420f358

Parents:

5b53cb58091cb3a67624dc9a430ac91504effa28

Message:

add: table interface for iiAddCproc: 1 arg.

Location:

Singular

Files:

• iparith.cc (modified) (3 diffs)
• ipshell.h (modified) (1 diff)

Singular/iparith.cc

@@ -7931 +7931 @@
  * then alphabetically */
 
-BOOLEAN iiExprArith1(leftv res, leftv a, int op)
+BOOLEAN iiExprArith1Tab(leftv res, leftv a, int op, struct sValCmd1* dArith1, int i)
 {
   memset(res,0,sizeof(sleftv));
@@ -7938 +7938 @@
   if (!errorreported)
   {
-#ifdef SIQ
-    if (siq>0)
-    {
-      //Print("siq:%d\n",siq);
-      command d=(command)omAlloc0Bin(sip_command_bin);
-      memcpy(&d->arg1,a,sizeof(sleftv));
-      //a->Init();
-      d->op=op;
-      d->argc=1;
-      res->data=(char *)d;
-      res->rtyp=COMMAND;
-      return FALSE;
-    }
-#endif
+    BOOLEAN failed=FALSE;
     int at=a->Typ();
-    // handling bb-objects ----------------------------------------------------
-    if (at>MAX_TOK)
-    {
-      blackbox *bb=getBlackboxStuff(at);
-      if (bb!=NULL)
-      {
-        if(!bb->blackbox_Op1(op,res,a)) return FALSE;
-        if (errorreported) return TRUE;
-        // else: no op defined
-      }
-      else          return TRUE;
-    }
-
-    BOOLEAN failed=FALSE;
     iiOp=op;
-    int i=iiTabIndex(dArithTab1,JJTAB1LEN,op);
     int ti = i;
     while (dArith1[i].cmd==op)
@@ -8068 +8040 @@
     }
     res->rtyp = UNKNOWN;
+  }
+  a->CleanUp();
+  return TRUE;
+}
+BOOLEAN iiExprArith1(leftv res, leftv a, int op)
+{
+  memset(res,0,sizeof(sleftv));
+  BOOLEAN call_failed=FALSE;
+
+  if (!errorreported)
+  {
+#ifdef SIQ
+    if (siq>0)
+    {
+      //Print("siq:%d\n",siq);
+      command d=(command)omAlloc0Bin(sip_command_bin);
+      memcpy(&d->arg1,a,sizeof(sleftv));
+      //a->Init();
+      d->op=op;
+      d->argc=1;
+      res->data=(char *)d;
+      res->rtyp=COMMAND;
+      return FALSE;
+    }
+#endif
+    int at=a->Typ();
+    // handling bb-objects ----------------------------------------------------
+    if (at>MAX_TOK)
+    {
+      blackbox *bb=getBlackboxStuff(at);
+      if (bb!=NULL)
+      {
+        if(!bb->blackbox_Op1(op,res,a)) return FALSE;
+        if (errorreported) return TRUE;
+        // else: no op defined
+      }
+      else          return TRUE;
+    }
+
+    BOOLEAN failed=FALSE;
+    iiOp=op;
+    int i=iiTabIndex(dArithTab1,JJTAB1LEN,op);
+    return iiExprArith1Tab(res,a,op, dArith1, i);
   }
   a->CleanUp();

Singular/ipshell.h

@@ -250 +250 @@
 
 BOOLEAN iiTestAssume(leftv a, leftv b);
-#endif
-
+
+/* table inteface for iiAddCproc */
+BOOLEAN iiExprArith1Tab(leftv res, leftv a, int op, struct sValCmd1* dArith1, int i);
+#endif
+