Changeset b2aa08 in git for Singular/pyobject.cc

Timestamp:

Aug 1, 2012, 11:07:23 PM (11 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

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

Children:

1161a6145a6ca3b9034865b05528815c65f55cfb

Parents:

632c3a619d605d6b049c3f7f82a323ea8113e34b

Message:

fix: pyobject falls back to newstruct operations

File:

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

Singular/pyobject.cc

@@ -16 +16 @@
 #include <kernel/mod2.h>
 #include <misc/auxiliary.h>
+#include "newstruct.h"
 
 #include <omalloc/omalloc.h>
@@ -107 +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();}
 
@@ -128 +131 @@
       return *this;
 
-    Werror("unary operation '%s` not implemented for 'pyobject`", iiTwoOps(op));
-    return self();
+    return self(null_tag());
   }
 
@@ -148 +150 @@
       case '.': case COLONCOLON: case ATTRIB_CMD: return attr(arg);
     }
-    Werror("binary operation '%d` not implemented for 'pyobject`", iiTwoOps(op));
-
-    return self();
+    return self(null_tag());
   }
 
@@ -160 +160 @@
       case ATTRIB_CMD: PyObject_SetAttr(*this, arg1, arg2); return self();
     }
-
     Werror("ternary operation %s not implemented for 'pyobject`", iiTwoOps(op));
-    return self();
+    return self(null_tag());
   }
 
@@ -185 +184 @@
   BOOLEAN assign_to(leftv result)
   {
-    return (m_ptr == Py_None? none_to(result): python_to(result));
+    return (m_ptr? (m_ptr == Py_None? none_to(result): python_to(result)): TRUE);
   }
 
@@ -515 +514 @@
       res->rtyp = STRING_CMD;  
       return FALSE; 
-
-  case LIST_CMD:
+  }
+
+  if (!PythonCastStatic<>(head)(op).assign_to(res))
     return FALSE;
 
-  }
-
-  if (op > MAX_TOK)       // custom types
-  {
-    BOOLEAN newstruct_Op1(int, leftv, leftv);
-    if (! newstruct_Op1(op, res, head) ) return FALSE;
-  }
-
-  return PythonCastStatic<>(head)(op).assign_to(res);
+  BOOLEAN newstruct_Op1(int, leftv, leftv); // forward declaration
+  return newstruct_Op1(op, res, head);
 }
 
@@ -547 +540 @@
       return lhs.attr(get_attrib_name(arg2)).assign_to(res);
   }
+
   PythonCastDynamic rhs(arg2);
-  return lhs(op, rhs).assign_to(res);
+  if (!lhs(op, rhs).assign_to(res))
+    return FALSE;
+
+  BOOLEAN newstruct_Op2(int, leftv, leftv, leftv); // forward declaration
+  return newstruct_Op2(op, res, arg1, arg2);
+
 }
 
@@ -579 +578 @@
 
   typedef PythonCastStatic<PythonObject::sequence_tag> seq_type;
-  return PythonCastStatic<>(args)(op, seq_type(args->next)).assign_to(res);
+  if (! PythonCastStatic<>(args)(op, seq_type(args->next)).assign_to(res))
+    return FALSE;
+
+  BOOLEAN newstruct_OpM(int, leftv, leftv); // forward declaration
+  return newstruct_OpM(op, res, args);
 }
 
@@ -652 +655 @@
   b->blackbox_Op3     = pyobject_Op3;
   b->blackbox_OpM     = pyobject_OpM;
+  b->data             = omAlloc0(newstruct_desc_size());
 
   PythonInterpreter::init(setBlackboxStuff(b,"pyobject"));