Changeset 33337c in git

Timestamp:

Aug 1, 2012, 10:55:45 PM (12 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

90707fe7a3c0c2873e22571154750fc1c113345a

Parents:

0a64d508717f0b937487db90cbd170908343cb3b

git-author:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-08-01 22:55:45+02:00

git-committer:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-08-01 22:57:39+02:00

Message:

new: pyobject can be converted to newstruct, if defined

File:

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

Singular/pyobject.cc

@@ -20 +20 @@
 
 #include <kernel/febase.h>
-// #include <kernel/longrat.h>
 
 #include "subexpr.h"
@@ -129 +128 @@
       return *this;
 
-    Werror("unary op %d not implemented for pyobject", op);
+    Werror("unary operation '%s` not implemented for 'pyobject`", iiTwoOps(op));
     return self();
   }
@@ -149 +148 @@
       case '.': case COLONCOLON: case ATTRIB_CMD: return attr(arg);
     }
-    Werror("binary op %d not implemented for pyobject!", op);
+    Werror("binary operation '%d` not implemented for 'pyobject`", iiTwoOps(op));
 
     return self();
@@ -162 +161 @@
     }
 
-    Werror("ternary op %d not implemented for pyobject!", op);
+    Werror("ternary operation %s not implemented for 'pyobject`", iiTwoOps(op));
     return self();
   }
@@ -335 +334 @@
     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);
+    }
+
+    if (typeId > MAX_TOK)       // custom types
+    {
+      blackbox *bbx = getBlackboxStuff(typeId);
+      sleftv tmp;
+      if (! bbx->blackbox_Op1(PythonInterpreter::id(), &tmp, value) )
+        return PythonCastStatic<>(&tmp);
+    }
+    else
+      Werror("type '%s` incompatible with 'pyobject`", iiTwoOps(typeId));
+
     return PythonObject();
   }
@@ -496 +503 @@
       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;
@@ -513 +520 @@
 
   }
+
   return PythonCastStatic<>(head)(op).assign_to(res);
 }