Changeset 2e2558 in git for Singular

Timestamp:

Aug 19, 2022, 2:35:35 PM (20 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7a5c8937ee945bc61b1570ceab79f2ad2125740a

Parents:

020575b408baddf459bbf4b2c233904f198de039

Message:

simplify blackbox_op (tst:New/VecField.tst)

File:

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

Singular/iparith.cc

@@ -8932 +8932 @@
       if (bb!=NULL)
       {
-        return bb->blackbox_Op2(op,res,a,b);
+        if(!bb->blackbox_Op2(op,res,a,b)) return FALSE;
+        // if not defined, try generic (attrib, ..)
       }
       else
@@ -8943 +8944 @@
       {
         if(!bb->blackbox_Op2(op,res,a,b)) return FALSE;
-        // else: no op defined
+        // if not defined, try generic (attrib, ..)
       }
       else
@@ -9118 +9119 @@
         res->rtyp=op;
         res->data=bb->blackbox_Init(bb);
-        if(!bb->blackbox_Assign(res,a)) return FALSE;
+        return bb->blackbox_Assign(res,a);
       }
       else
@@ -9128 +9129 @@
       if (bb!=NULL)
       {
-        return bb->blackbox_Op1(op,res,a);
+        if(!bb->blackbox_Op1(op,res,a)) return FALSE;
+        // if not defined, try generic routines (attrib, defined,..)
       }
       else
@@ -9330 +9332 @@
       if (bb!=NULL)
       {
-        return bb->blackbox_Op3(op,res,a,b,c);
+        if(!bb->blackbox_Op3(op,res,a,b,c)) return FALSE;
+        // otherwise, try defaul (attrib,..)
       }
       else
@@ -9441 +9444 @@
       if (bb!=NULL)
       {
-        return bb->blackbox_OpM(op,res,a);
+        if(!bb->blackbox_OpM(op,res,a)) return FALSE;
+        // otherwise, try default
       }
       else