Changeset a04a05 in git for Singular/pyobject.cc

Timestamp:

Aug 1, 2012, 11:29:10 PM (11 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '1d362c315e551a5b527ab0759f8839cf0e94f3a5')

Children:

29fc84389b9713cdf07cc538bad5becf4758553e

Parents:

5ebd4bcf7ead1b205b12afeec0793f8bc29e16ec

Message:

chg: encapsulating newstruct's overloaded '=' and use in pyobject

File:

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

Singular/pyobject.cc

@@ -339 +339 @@
     }
 
+    sleftv tmp;
+    BOOLEAN newstruct_equal(int, leftv, leftv); // declaring overloaded '='
+    if (!newstruct_equal(PythonInterpreter::id(), &tmp, value))  
+      return PythonCastStatic<>(&tmp);        
+
     if (typeId > MAX_TOK)       // custom types
     {
       blackbox *bbx = getBlackboxStuff(typeId);
-      sleftv tmp;
-      if (! bbx->blackbox_Op1(PythonInterpreter::id(), &tmp, value) )
-        return PythonCastStatic<>(&tmp);
-    }
-    else
-      Werror("type '%s` incompatible with 'pyobject`", iiTwoOps(typeId));
-
+      assume(bbx != NULL);
+      if (! bbx->blackbox_Op1(PythonInterpreter::id(), &tmp, value))
+        return PythonCastStatic<>(&tmp);        
+    }
+
+    Werror("type '%s` incompatible with 'pyobject`", iiTwoOps(typeId));
     return PythonObject();
   }