Mercurial > pytave
view pyeval.cc @ 202:3fa99babc7b5
pyeval: preliminary support for returning pyobj
Introduces static method `pyobj.fromPythonVarName(s)`, whereas the
constructor itself now no longer deals with `__InOct__` itself.
* pyeval.cc: return the id() instead for now
* @pyobj/pyobj.m: change constructor, add method
* @pyobj/dummy.m: add doctests
author | Colin Macdonald <cbm@m.fsf.org> |
---|---|
date | Fri, 20 May 2016 00:20:03 -0700 |
parents | 28dc607532c2 |
children | 61df785bd8b0 |
line wrap: on
line source
/* Copyright (C) 2016 Colin B. Macdonald This file is part of Pytave. Pytave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Pytave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Pytave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if defined (HAVE_CONFIG_H) # include <config.h> #endif #include <dlfcn.h> #include <boost/python.hpp> #include <boost/python/numeric.hpp> #include <oct.h> #define PYTAVE_DO_DECLARE_SYMBOL #include "arrayobjectdefs.h" #include "exceptions.h" #include "python_to_octave.h" using namespace boost::python; DEFUN_DLD (pyeval, args, nargout, "-*- texinfo -*-\n\ @deftypefn {} {} pyeval (@var{expr})\n\ @deftypefnx {} {@var{x} =} pyeval (@var{expr})\n\ Evaluate a Python expression and return the result.\n\ \n\ Examples:\n\ @example\n\ @group\n\ pyeval (\"sys.version\")\n\ @result{} ...\n\ pyeval (\"dict(one=1, two=2)\")\n\ @result{} scalar structure containing the fields:\n\ two = 2\n\ one = 1\n\ @end group\n\ @end example\n\ @seealso{pycall, pyexec}\n\ @end deftypefn") { octave_value_list retval; int nargin = args.length (); std::string code = args(0).string_value (); std::string id; object res; Py_Initialize (); object main_module = import ("__main__"); object main_namespace = main_module.attr ("__dict__"); try { res = eval (code.c_str (), main_namespace, main_namespace); object builtins = main_module.attr ("__builtins__"); // hex(id(res)) object idtmp = builtins.attr("hex")(builtins.attr("id")(res)); id = extract<std::string> (idtmp); //std::cerr << "got it: " << id << std::endl; // FIXME: currently, we cannot return the raw object to octave... if (! res.is_none ()) { octave_value val; pytave::pyobj_to_octvalue (val, res); retval(0) = val; } } catch (pytave::object_convert_exception const &) { printf ("pyeval: could not convert return value to Octave-native object, making pyobj...\n"); // Ensure we have a __InOct__ dict, and then put `res` into it exec ("if not (\"__InOct__\" in vars() or \"__InOct__\" in globals()):\n" " __InOct__ = dict()\n", main_namespace, main_namespace); main_namespace["__InOct__"][id] = res; //retval(0) = pyobj(id); // FIXME: how to do the above? For now, just return the string retval(0) = id; } catch (error_already_set const &) { PyObject *ptype, *pvalue, *ptraceback; PyErr_Fetch (&ptype, &pvalue, &ptraceback); try { std::string message = extract<std::string> (pvalue); error ("pyeval: %s", message.c_str ()); } catch (error_already_set const &) { PyErr_Restore (ptype, pvalue, ptraceback); PyErr_Print (); } } return retval; }