[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

Bernhard R. Link brlink at debian.org
Tue Apr 24 15:54:31 UTC 2012


The following commit has been merged in the cleanedupstream branch:
commit d961cccec19944a0cf657acca9516129e219854d
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Thu Mar 29 15:31:22 2012 +0200

    chg: look up <arg1> <op> <arg2> also in arg2 bb table

diff --git a/Singular/iparith.cc b/Singular/iparith.cc
index 03d7a56..77fe328 100644
--- a/Singular/iparith.cc
+++ b/Singular/iparith.cc
@@ -7471,13 +7471,19 @@ BOOLEAN iiExprArith2(leftv res, leftv a, int op, leftv b, BOOLEAN proccall)
     }
 #endif
     int at=a->Typ();
+    int bt=b->Typ();
     if (at>MAX_TOK)
     {
       blackbox *bb=getBlackboxStuff(at);
       if (bb!=NULL) return bb->blackbox_Op2(op,res,a,b);
       else          return TRUE;
     }
-    int bt=b->Typ();
+    else if (bt>MAX_TOK)
+    {
+      blackbox *bb=getBlackboxStuff(bt);
+      if (bb!=NULL) return bb->blackbox_Op2(op,res,a,b);
+      else          return TRUE;
+    }
     int i=iiTabIndex(dArithTab2,JJTAB2LEN,op);
     int index=i;
 

-- 
an open source computer algebra system



More information about the debian-science-commits mailing list