pytave: __py_struct_from_dict_

annotate __py_struct_from_dict__.cc @ 372:b20b8cf8ad07

Make an internal function to return the name of the builtins module * oct-py-util.cc (pytave::py_builtins_module_name): New function. (pytave::py_builtins_module): Use it.

author	Mike Miller <mtmiller@octave.org>
date	Fri, 26 Aug 2016 13:59:18 -0700
parents	4d54fb68de71
children	0e4097c66788

rev	line source
345 baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	1 /*
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	2
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	3 Copyright (C) 2016 Mike Miller
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	4
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	5 This file is part of Pytave.
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	6
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	7 Pytave is free software: you can redistribute it and/or modify it
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	9 Free Software Foundation, either version 3 of the License, or (at your
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	10 option) any later version.
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	11
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	12 Pytave is distributed in the hope that it will be useful, but WITHOUT
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	15 for more details.
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	16
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	18 along with Pytave; see the file COPYING. If not, see
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	20
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	21 */
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	22
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	23 #if defined (HAVE_CONFIG_H)
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	24 # include <config.h>
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	25 #endif
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	26
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	27 #include <Python.h>
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	28 #include <octave/oct.h>
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	29
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	30 #define PYTAVE_DO_DECLARE_SYMBOL
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	31 #include "arrayobjectdefs.h"
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	32 #include "exceptions.h"
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	33 #include "oct-py-types.h"
358 d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	34 #include "oct-py-util.h"
345 baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	35 #include "octave_to_python.h"
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	36
356 6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	37 DEFUN_DLD (__py_int64_scalar_value__, args, nargout,
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	38 "-- texinfo --\n\
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	39 @deftypefn {} {} __py_int64_scalar_value__ (@var{x})\n\
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	40 Extract a scalar int64 value from the Python integer @var{x}.\n\
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	41 \n\
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	42 This is a private internal function not intended for direct use.\n\
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	43 @end deftypefn")
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	44 {
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	45 octave_value_list retval;
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	46
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	47 int nargin = args.length ();
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	48 if (nargin != 1)
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	49 {
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	50 print_usage ();
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	51 return retval;
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	52 }
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	53
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	54 if (! (args(0).is_object () && args(0).class_name () == "pyobject"))
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	55 error ("pyobject.int64: argument must be a Python object");
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	56
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	57 Py_Initialize ();
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	58
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	59 try
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	60 {
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	61 // FIXME: PyObject *obj = look up stored pyobject reference (args(0));
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	62 boost::python::object arg;
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	63 pytave::octvalue_to_pyobj (arg, args(0));
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	64 PyObject *obj = arg.ptr ();
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	65
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	66 retval(0) = octave_int64 (pytave::extract_py_int64 (obj));
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	67 }
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	68 catch (pytave::object_convert_exception const &)
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	69 {
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	70 error ("pyobject.int64: error in return value type conversion");
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	71 }
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	72 catch (boost::python::error_already_set const &)
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	73 {
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	74 std::string message = pytave::fetch_exception_message ();
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	75 error ("pyobject.int64: %s", message.c_str ());
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	76 }
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	77
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	78 return retval;
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	79 }
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64 Mike Miller <mtmiller@octave.org> parents: 345 diff changeset	80
368 4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	81 DEFUN_DLD (__py_is_none__, args, nargout,
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	82 "-- texinfo --\n\
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	83 @deftypefn {} {} __py_is_none__ (@var{x})\n\
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	84 Check whether the Python object @var{obj} is the @code{None} object.\n\
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	85 \n\
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	86 This is a private internal function not intended for direct use.\n\
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	87 @end deftypefn")
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	88 {
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	89 if (args.length () != 1)
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	90 print_usage ();
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	91
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	92 Py_Initialize ();
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	93
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	94 PyObject *obj = pytave::pyobject_unwrap_object (args(0));
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	95
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	96 bool retval = (obj && (obj == Py_None));
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	97 Py_XDECREF (obj);
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	98
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	99 return ovl (retval);
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	100 }
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	101
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	102 /*
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	103 %!assert (__py_is_none__ (pyobject ()))
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	104 %!assert (__py_is_none__ (pyeval ("None")))
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	105 %!assert (! __py_is_none__ (1))
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	106 %!assert (! __py_is_none__ ("None"))
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	107 %!assert (! __py_is_none__ (pyobject (1)))
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	108 %!assert (! __py_is_none__ (pyobject ("None")))
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	109
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	110 %!error __py_is_none__ ()
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	111 %!error __py_is_none__ (1, 2)
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	112 */
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None Mike Miller <mtmiller@octave.org> parents: 365 diff changeset	113
358 d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	114 DEFUN_DLD (__py_isinstance__, args, nargout,
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	115 "-- texinfo --\n\
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	116 @deftypefn {} {} __py_isinstance__ (@var{x})\n\
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	117 Check whether the Python object @var{obj} is an instance of a Python type\n\
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	118 specified by the string @var{type}.\n\
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	119 \n\
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	120 This is a private internal function not intended for direct use.\n\
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	121 @end deftypefn")
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	122 {
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	123 octave_value_list retval;
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	124
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	125 int nargin = args.length ();
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	126 if (nargin != 2)
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	127 {
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	128 print_usage ();
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	129 return retval;
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	130 }
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	131
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	132 if (! (args(0).is_object () && args(0).class_name () == "pyobject"))
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	133 error ("pyobject.isa: OBJ must be a Python object");
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	134
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	135 if (! args(1).is_string ())
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	136 error ("pyobject.isa: TYPE must be a string naming a Python type (py.*)");
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	137
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	138 std::string typestr = args(1).string_value ();
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	139 if (! ((typestr.size () > 3) && (typestr.compare (0, 3, "py.") == 0)))
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	140 error ("pyobject.isa: TYPE must be a string naming a Python type (py.*)");
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	141
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	142 typestr = typestr.substr (3);
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	143
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	144 Py_Initialize ();
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	145
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	146 try
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	147 {
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	148 // FIXME: PyObject *obj = look up stored pyobject reference (args(0));
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	149 boost::python::object arg;
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	150 pytave::octvalue_to_pyobj (arg, args(0));
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	151 PyObject *obj = arg.ptr ();
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	152
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	153 PyObject *type = pytave::py_find_type (typestr);
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	154 retval(0) = pytave::py_isinstance (obj, type);
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	155 Py_XDECREF (type);
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	156 }
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	157 catch (pytave::object_convert_exception const &)
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	158 {
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	159 error ("pyobject.isa: error in return value type conversion");
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	160 }
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	161 catch (boost::python::error_already_set const &)
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	162 {
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	163 std::string message = pytave::fetch_exception_message ();
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	164 error ("pyobject.isa: %s", message.c_str ());
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	165 }
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	166
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	167 return retval;
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	168 }
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49) Mike Miller <mtmiller@octave.org> parents: 356 diff changeset	169
362 b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	170 DEFUN_DLD (__py_objstore_del__, args, nargout,
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	171 "-- texinfo --\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	172 @deftypefn {} {} __py_objstore_del__ (@var{key})\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	173 Delete the Python object stored under @var{key} from the object store.\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	174 \n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	175 This is a private internal function not intended for direct use.\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	176 @end deftypefn")
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	177 {
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	178 if (args.length () != 1)
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	179 print_usage ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	180
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	181 Py_Initialize ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	182 uint64_t key = args(0).xuint64_scalar_value ("__py_objstore_del__: KEY must be an integer");
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	183 pytave::py_objstore_del (key);
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	184
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	185 return ovl ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	186 }
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	187
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	188 DEFUN_DLD (__py_objstore_get__, args, nargout,
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	189 "-- texinfo --\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	190 @deftypefn {} {} __py_objstore_get__ (@var{key})\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	191 Get the Python object stored under @var{key} from the object store.\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	192 \n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	193 This is a private internal function not intended for direct use.\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	194 @end deftypefn")
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	195 {
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	196 if (args.length () != 1)
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	197 print_usage ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	198
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	199 Py_Initialize ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	200 uint64_t key = args(0).xuint64_scalar_value ("__py_objstore_get__: KEY must be an integer");
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	201 PyObject *obj = pytave::py_objstore_get (key);
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	202
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	203 if (! obj)
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	204 error ("__py_objstore_get__: no existing Python object found for key %ju", key);
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	205
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	206 octave_value retval = pytave::pyobject_wrap_object (obj);
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	207
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	208 return ovl (retval);
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	209 }
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	210
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	211 DEFUN_DLD (__py_objstore_put__, args, nargout,
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	212 "-- texinfo --\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	213 @deftypefn {} {} __py_objstore_put__ (@var{value})\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	214 Convert @var{value} to a Python value and store in the object store.\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	215 \n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	216 This is a private internal function not intended for direct use.\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	217 @end deftypefn")
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	218 {
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	219 if (args.length () != 1)
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	220 print_usage ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	221
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	222 Py_Initialize ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	223 boost::python::numeric::array::set_module_and_type ("numpy", "ndarray");
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	224 _import_array ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	225 // FIXME: PyObject *obj = convert argument to Python (args(0));
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	226 PyObject *obj = 0;
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	227 try
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	228 {
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	229 boost::python::object arg;
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	230 pytave::octvalue_to_pyobj (arg, args(0));
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	231 obj = arg.ptr ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	232 Py_INCREF (obj);
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	233 }
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	234 catch (pytave::value_convert_exception const &)
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	235 {
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	236 }
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	237
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	238 if (! obj)
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	239 error ("__py_objstore_put__: VALUE must be convertible to a Python value");
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	240
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	241 uint64_t key = pytave::py_objstore_put (obj);
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	242 Py_DECREF (obj);
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	243
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	244 return ovl (octave_uint64 (key));
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	245 }
b0677c492655 Overhaul Python object storage and wrapping in pyobject Mike Miller <mtmiller@octave.org> parents: 358 diff changeset	246
365 087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	247 DEFUN_DLD (__py_string_value__, args, nargout,
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	248 "-- texinfo --\n\
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	249 @deftypefn {} {} __py_string_value__ (@var{obj})\n\
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	250 Return the string value or representation of the Python object @var{obj}.\n\
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	251 \n\
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	252 This is a private internal function not intended for direct use.\n\
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	253 @end deftypefn")
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	254 {
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	255 if (args.length () != 1)
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	256 print_usage ();
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	257
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	258 if (! (args(0).is_object () && args(0).class_name () == "pyobject"))
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	259 error ("pyobject.char: argument must be a valid Python object");
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	260
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	261 Py_Initialize ();
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	262
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	263 PyObject *obj = pytave::pyobject_unwrap_object (args(0));
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	264 if (! obj)
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	265 error ("pyobject.char: argument must be a valid Python object");
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	266
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	267 std::string str;
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	268
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	269 if (PyBytes_Check (obj) \|\| PyUnicode_Check (obj))
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	270 str = pytave::extract_py_str (obj);
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	271 else if (Py_TYPE (obj)->tp_str != NULL)
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	272 {
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	273 PyObject *s = PyObject_Str (obj);
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	274 str = pytave::extract_py_str (s);
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	275 Py_DECREF (s);
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	276 }
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	277 else
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	278 {
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	279 Py_DECREF (obj);
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	280 error ("pyobject.char: cannot convert Python object to string");
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	281 }
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	282
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	283 Py_DECREF (obj);
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	284
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	285 return ovl (str);
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	286 }
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65) Mike Miller <mtmiller@octave.org> parents: 362 diff changeset	287
345 baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	288 DEFUN_DLD (__py_struct_from_dict__, args, nargout,
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	289 "-- texinfo --\n\
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	290 @deftypefn {} {} __py_struct_from_dict__ (@var{dict})\n\
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	291 Extract a scalar struct from the Python dict @var{dict}.\n\
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	292 \n\
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	293 This is a private internal function not intended for direct use.\n\
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	294 @end deftypefn")
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	295 {
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	296 octave_value_list retval;
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	297 std::string id;
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	298
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	299 int nargin = args.length ();
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	300
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	301 if (nargin != 1)
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	302 {
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	303 print_usage ();
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	304 return retval;
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	305 }
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	306
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	307 if (! (args(0).is_object () && args(0).class_name () == "pyobject"))
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	308 error ("pyobject.struct: argument must be a Python object");
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	309
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	310 Py_Initialize ();
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	311
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	312 try
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	313 {
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	314 // FIXME: PyObject *obj = look up stored pyobject reference (args(0));
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	315 boost::python::object arg;
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	316 pytave::octvalue_to_pyobj (arg, args(0));
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	317 PyObject *obj = arg.ptr ();
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	318
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	319 retval(0) = pytave::extract_py_scalar_map (obj);
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	320 }
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	321 catch (pytave::object_convert_exception const &)
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	322 {
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	323 error ("pyobject.struct: error in return value type conversion");
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	324 }
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	325 catch (boost::python::error_already_set const &)
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	326 {
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	327 std::string message = pytave::fetch_exception_message ();
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	328 error ("pyobject.struct: %s", message.c_str ());
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	329 }
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	330
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	331 return retval;
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	332 }
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	333
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	334 /*
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	335 ## No test needed for internal helper function.
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	336 %!assert (1)
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function Mike Miller <mtmiller@octave.org> parents: diff changeset	337 */

Mercurial > pytave

annotate __py_struct_from_dict__.cc @ 372:b20b8cf8ad07