Changeset 32545c in git for Singular/iparith.cc

Timestamp:

Apr 2, 2015, 4:52:44 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

cec9b007f86b234905874a3be5ad6ff7d0661ae4

Parents:

92a50b83d0933aab94cc832bf585c02a0dce9d3d

Message:

add: use bb types for type conversion (via bb_Assign)

File:

• Singular/iparith.cc (modified) (1 diff)

Singular/iparith.cc

@@ -8315 +8315 @@
     int at=a->Typ();
     // handling bb-objects ----------------------------------------------------
-    if (at>MAX_TOK)
+    if(op>MAX_TOK) // explicit type conversion to bb
+    {
+      blackbox *bb=getBlackboxStuff(op);
+      if (bb!=NULL)
+      {
+        res->rtyp=op;
+        res->data=bb->blackbox_Init(bb);
+        if(!bb->blackbox_Assign(res,a)) return FALSE;
+        if (errorreported) return TRUE;
+      }
+      else          return TRUE;
+    }
+    else if (at>MAX_TOK) // argument is of bb-type
     {
       blackbox *bb=getBlackboxStuff(at);