Changeset 0227d1 in git for Singular/pyobject.cc

Timestamp:

Jun 27, 2012, 12:01:18 AM (12 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5ebd4bcf7ead1b205b12afeec0793f8bc29e16ec

Parents:

107b5b2cfe97c55cbe5e7bd558048a83c3b62705

git-author:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-06-27 00:01:18+02:00

git-committer:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-08-01 23:15:47+02:00

Message:

fix: pyobject's ternary operation

File:

• Singular/pyobject.cc (modified) (7 diffs)

Singular/pyobject.cc

@@ -108 +108 @@
   typedef PyObject* ptr_type;
   struct sequence_tag{};
-  struct null_tag {};
 
   PythonObject(): m_ptr(Py_None) { }
-  PythonObject(null_tag): m_ptr(NULL) { }
-  PythonObject(ptr_type ptr): m_ptr(ptr) {if (!ptr) handle_exception();}
+  PythonObject(ptr_type ptr): m_ptr(ptr) { 
+    if (!ptr && handle_exception()) m_ptr = Py_None;
+  }
 
   ptr_type check_context(ptr_type ptr) const {
@@ -131 +131 @@
       return *this;
 
-    return self(null_tag());
+    return self(NULL);
   }
 
@@ -150 +150 @@
       case '.': case COLONCOLON: case ATTRIB_CMD: return attr(arg);
     }
-    return self(null_tag());
+    return self(NULL);
   }
 
@@ -162 +162 @@
         return self();
     }
-    return self(null_tag());
+    return self(NULL);
   }
 
@@ -228 +228 @@
   }
 
-  void handle_exception() const {
+  BOOLEAN handle_exception() const {
+
+    if(!PyErr_Occurred()) return FALSE;
     
     PyObject *pType, *pMessage, *pTraceback;
@@ -241 +243 @@
     
     PyErr_Clear();
+    return TRUE;
   }
 
@@ -559 +562 @@
 
   if (!lhs(op, rhs1, rhs2).assign_to(res))
-    return blackboxDefaultOp3(op, res, arg1, arg2, arg3);
+    return FALSE;
+
+  return blackboxDefaultOp3(op, res, arg1, arg2, arg3);
 }