Changeset 29fc843 in git for Singular/pyobject.cc

Timestamp:

Aug 1, 2012, 11:31:30 PM (11 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

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

Children:

4e59df46c64bb033f20a2ce6b6f131f03b06e6eb

Parents:

a04a05cbf86469aad8cb230b8c9418b1b96c2925

git-author:

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

git-committer:

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

Message:

new: convert pyobject <-> intvec

File:

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

Singular/pyobject.cc

@@ -21 +21 @@
 
 #include <kernel/febase.h>
+#include <kernel/intvec.h>
 
 #include "subexpr.h"
@@ -298 +299 @@
 class PythonCastStatic:
   public PythonObject {
+  typedef PythonCastStatic self;
 public:
 
@@ -309 +311 @@
   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
@@ -337 +350 @@
     case STRING_CMD: return PythonCastStatic<const char*>(value);
     case LIST_CMD:   return PythonCastStatic<lists>(value);
+    case INTVEC_CMD: return PythonCastStatic<intvec*>(value);
     }
 
@@ -521 +535 @@
       res->data = (void*) omStrDup("pyobject");
       res->rtyp = STRING_CMD;  
-      return FALSE; 
+      return FALSE;
   }
 
@@ -575 +589 @@
 BOOLEAN pyobject_OpM(int op, leftv res, leftv args)
 {
-  typedef PythonCastStatic<PythonObject::sequence_tag> seq_type;
-
   switch(op)                    // built-in return types first
   {
@@ -586 +598 @@
       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;
   if (! PythonCastStatic<>(args)(op, seq_type(args->next)).assign_to(res))