Changeset 188de86 in git for Singular/pyobject.cc

Timestamp:

Aug 2, 2012, 4:09:13 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

4f9652847609cefd5ff3b91d14f34611592ab699

Parents:

0419aba8292e7109329604d8ad03b70f8ef6542344a1c2199e33375a631289eaab7a81954c8383e2

Message:

Merge pull request #158 from alexanderdreyer/spielwiese

Transfering newstruct and pyobject fixes to Spielwiese

File:

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

Singular/pyobject.cc

@@ -16 +16 @@
 #include <kernel/mod2.h>
 #include <misc/auxiliary.h>
+#include "newstruct.h"
 
 #include <omalloc/omalloc.h>
 
 #include <kernel/febase.h>
-// #include <kernel/longrat.h>
+#include <kernel/intvec.h>
 
 #include "subexpr.h"
@@ -110 +111 @@
 
   PythonObject(): m_ptr(Py_None) { }
-  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 {
@@ -129 +132 @@
       return *this;
 
-    Werror("unary op %d not implemented for pyobject", op);
-    return self();
+    return self(NULL);
   }
 
@@ -149 +151 @@
       case '.': case COLONCOLON: case ATTRIB_CMD: return attr(arg);
     }
-    Werror("binary op %d not implemented for pyobject!", op);
-
-    return self();
+    return self(NULL);
   }
 
@@ -159 +159 @@
     switch(op)
     {
-      case ATTRIB_CMD: PyObject_SetAttr(*this, arg1, arg2); return self();
-    }
-
-    Werror("ternary op %d not implemented for pyobject!", op);
-    return self();
+      case ATTRIB_CMD: 
+        if(PyObject_SetAttr(*this, arg1, arg2) == -1) handle_exception();
+        return self();
+    }
+    return self(NULL);
   }
 
@@ -186 +186 @@
   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);
   }
 
@@ -229 +229 @@
   }
 
-  void handle_exception() {
+  BOOLEAN handle_exception() const {
+
+    if(!PyErr_Occurred()) return FALSE;
     
     PyObject *pType, *pMessage, *pTraceback;
@@ -242 +244 @@
     
     PyErr_Clear();
+    return TRUE;
   }
 
@@ -268 +271 @@
   BOOLEAN none_to(leftv result) const
   {
+    Py_XDECREF(m_ptr);
     result->data = NULL;
     result->rtyp = NONE;
@@ -276 +280 @@
   {
     result->data = m_ptr;
+    Py_XINCREF(m_ptr);
     result->rtyp = PythonInterpreter::id();
     return !m_ptr;
@@ -295 +300 @@
 class PythonCastStatic:
   public PythonObject {
+  typedef PythonCastStatic self;
 public:
 
@@ -306 +312 @@
   ptr_type get(ptr_type value)       { return value; }
   ptr_type get(long value)           { return PyInt_FromLong(value); }
+  ptr_type get(int value)            { return PyInt_FromLong((long)value); }
   ptr_type get(const char* value)    { return PyString_FromString(value); }
   ptr_type get(char* value) { return get(const_cast<const char*>(value)); }
+  ptr_type get(intvec* value);       // inlined below
   ptr_type get(lists value);         // inlined after PythonObjectDynamic
 };
 
-
+template <class CastType>
+inline PythonObject::ptr_type
+PythonCastStatic<CastType>::get(intvec* value)
+{
+  ptr_type pylist(PyList_New(0));
+  for (int idx = 0; idx < value->length(); ++idx)
+    PyList_Append(pylist, self::get((*value)[idx]));
+
+  return pylist;
+}
 
 /** @class PythonCastDynamic
@@ -334 +351 @@
     case STRING_CMD: return PythonCastStatic<const char*>(value);
     case LIST_CMD:   return PythonCastStatic<lists>(value);
-      //    case UNKNOWN:    return PythonCastStatic<const char*>((void*)value->Name());
-    }
-    
-    Werror("type # %d incompatible with pyobject", typeId);
+    case INTVEC_CMD: return PythonCastStatic<intvec*>(value);
+    }
+
+    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);
+      assume(bbx != NULL);
+      if (! bbx->blackbox_Op1(PythonInterpreter::id(), &tmp, value))
+        return PythonCastStatic<>(&tmp);        
+    }
+
+    Werror("type '%s` incompatible with 'pyobject`", iiTwoOps(typeId));
     return PythonObject();
   }
@@ -347 +377 @@
 {
   ptr_type pylist(PyList_New(0));
-  for (size_t i = 0; i <= value->nr; ++i)
+  for (int i = 0; i <= value->nr; ++i)
     PyList_Append(pylist, PythonCastDynamic((value->m) + i));
 
@@ -416 +446 @@
   PyRun_SimpleString(reinterpret_cast<const char*>(arg->Data()));
   sync_contexts();
+
+  Py_XINCREF(Py_None);
   return PythonCastStatic<>(Py_None).assign_to(result);
 }
@@ -448 +480 @@
   sync_contexts();
 
+  Py_XINCREF(Py_None);
   return PythonCastStatic<>(Py_None).assign_to(result);
 }
@@ -454 +487 @@
 void* pyobject_Init(blackbox*)
 {
+  Py_XINCREF(Py_None);
   return Py_None;
 }
@@ -495 +529 @@
       long value = PyInt_AsLong(PythonCastStatic<>(head));
       if( (value == -1) &&  PyErr_Occurred() ) {
-        Werror("pyobject cannot be converted to integer");
+        Werror("'pyobject` cannot be converted to integer");
         PyErr_Clear();
         return TRUE;
@@ -506 +540 @@
       res->data = (void*) omStrDup("pyobject");
       res->rtyp = STRING_CMD;  
-      return FALSE; 
-
-  case LIST_CMD:
+      return FALSE;
+  }
+
+  if (!PythonCastStatic<>(head)(op).assign_to(res))
     return FALSE;
 
-  }
-  return PythonCastStatic<>(head)(op).assign_to(res);
+  BOOLEAN newstruct_Op1(int, leftv, leftv); // forward declaration
+  return newstruct_Op1(op, res, head);
 }
 
@@ -532 +567 @@
       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);
+
 }
 
@@ -543 +584 @@
   PythonCastDynamic rhs2(arg3);
 
-  return lhs(op, rhs1, rhs2).assign_to(res);
+  if (!lhs(op, rhs1, rhs2).assign_to(res))
+    return FALSE;
+
+  return blackboxDefaultOp3(op, res, arg1, arg2, arg3);
 }
 
@@ -550 +594 @@
 BOOLEAN pyobject_OpM(int op, leftv res, leftv args)
 {
-  typedef PythonCastStatic<PythonObject::sequence_tag> seq_type;
-
   switch(op)                    // built-in return types first
   {
@@ -561 +603 @@
       return FALSE;
     }
-  }
-
+
+    case INTVEC_CMD:
+      PythonObject obj = PythonCastStatic<>(args->Data());
+      unsigned long len = obj.size();
+
+      intvec* vec = new intvec(len);
+      for(unsigned long idx = 0; idx != len; ++idx) {
+        long value = PyInt_AsLong(obj[idx]);
+        (*vec)[idx] = static_cast<int>(value);
+
+        if ((value == -1) &&  PyErr_Occurred()) {
+          value = 0;
+          PyErr_Clear();
+        }
+        if (value != long((*vec)[idx])) {
+          delete vec;
+          Werror("'pyobject` cannot be converted to intvec");
+          return TRUE;
+        }
+      }
+      res->data = (void *)vec;
+      res->rtyp = op;
+      return FALSE;
+  }
   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);
 }
 
@@ -637 +705 @@
   b->blackbox_Op3     = pyobject_Op3;
   b->blackbox_OpM     = pyobject_OpM;
+  b->data             = omAlloc0(newstruct_desc_size());
 
   PythonInterpreter::init(setBlackboxStuff(b,"pyobject"));