Changeset 1161a61 in git

Timestamp:

Jun 21, 2012, 11:21:06 PM (11 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')

Children:

7b156fb13a72b542c9e1172929270ebd7d365b14

Parents:

b2aa08657343fc20d230f035de4ac9ae5543a988

git-author:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-06-21 23:21:06+02:00

git-committer:

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

Message:

fix: pyobject handles ternary operations acordingly

Location:

Singular

Files:

• blackbox.h (modified) (1 diff)
• pyobject.cc (modified) (3 diffs)

Singular/blackbox.h

@@ -57 +57 @@
 BOOLEAN blackboxDefaultOp2(int op,leftv l, leftv r1, leftv r2);
 
+/// default procedure blackboxDefaultOp3, to be called as "default:" branch
+BOOLEAN blackboxDefaultOp3(int op,leftv l, leftv r1,leftv r2, leftv r3);
+
 /// default procedure blackboxDefaultOpM, to be called as "default:" branch
 BOOLEAN blackbox_default_OpM(int op,leftv l, leftv r);

Singular/pyobject.cc

@@ -158 +158 @@
     switch(op)
     {
-      case ATTRIB_CMD: PyObject_SetAttr(*this, arg1, arg2); return self();
-    }
-    Werror("ternary operation %s not implemented for 'pyobject`", iiTwoOps(op));
+      case ATTRIB_CMD: 
+        if(PyObject_SetAttr(*this, arg1, arg2) == -1) handle_exception();
+        return self();
+    }
     return self(null_tag());
   }
@@ -227 +228 @@
   }
 
-  void handle_exception() {
+  void handle_exception() const {
     
     PyObject *pType, *pMessage, *pTraceback;
@@ -557 +558 @@
   PythonCastDynamic rhs2(arg3);
 
-  return lhs(op, rhs1, rhs2).assign_to(res);
+  if (!lhs(op, rhs1, rhs2).assign_to(res))
+    return blackboxDefaultOp3(op, res, arg1, arg2, arg3);
 }