Changeset 73f3ca7 in git for Singular/iparith.cc

Timestamp:

Sep 19, 2014, 5:36:59 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

0e8dab27bf2f0f78deb06b2627bb3f13ab41e7c5768faf941b632918f43fb7b4b3300abff92ddd97

Parents:

1c5671bf0ac80d11a9c67730f239e645e50482de

Message:

chg: table interface for iiAddCproc: 1 arg

File:

• Singular/iparith.cc (modified) (5 diffs)

Singular/iparith.cc

@@ -7931 +7931 @@
  * then alphabetically */
 
-BOOLEAN iiExprArith1Tab(leftv res, leftv a, int op, struct sValCmd1* dArith1, int i)
+BOOLEAN iiExprArith1Tab(leftv res, leftv a, int op, struct sValCmd1* dArith1, int i, int at, struct sConvertTypes *dConvertTypes)
 {
   memset(res,0,sizeof(sleftv));
@@ -7939 +7939 @@
   {
     BOOLEAN failed=FALSE;
-    int at=a->Typ();
     iiOp=op;
     int ti = i;
@@ -7977 +7976 @@
         int ai;
         //Print("test %s\n",Tok2Cmdname(dArith1[i].arg));
-        if ((ai=iiTestConvert(at,dArith1[i].arg))!=0)
+        if ((ai=iiTestConvert(at,dArith1[i].arg,dConvertTypes))!=0)
         {
           if (currRing!=NULL)
@@ -7986 +7985 @@
             Print("call %s(%s)\n",iiTwoOps(op),Tok2Cmdname(dArith1[i].arg));
           res->rtyp=dArith1[i].res;
-          failed= ((iiConvert(at,dArith1[i].arg,ai,a,an))
+          failed= ((iiConvert(at,dArith1[i].arg,ai,a,an,dConvertTypes))
           || (call_failed=dArith1[i].p(res,an)));
           // everything done, clean up temp. variables
@@ -8082 +8081 @@
     iiOp=op;
     int i=iiTabIndex(dArithTab1,JJTAB1LEN,op);
-    return iiExprArith1Tab(res,a,op, dArith1, i);
+    return iiExprArith1Tab(res,a,op, dArith1, i,at,dConvertTypes);
   }
   a->CleanUp();