pytave: pyeval.cc annotate

annotate pyeval.cc @ 190:ac377ace2ee4

More unit tests of pycall and pyeval * pycall.cc, pyeval.cc: More unit tests of type translation, including some conversions not yet working correctly.

author	Mike Miller <mtmiller@octave.org>
date	Thu, 09 Jun 2016 14:52:06 -0700
parents	2b03585d4ddd
children	0c6f7ae8a95b 6fffa6219b2c

rev	line source
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	1 /*
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	2
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	3 Copyright (C) 2016 Colin B. Macdonald
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	4
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	5 This file is part of Pytave.
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	6
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	7 Pytave is free software; you can redistribute it and/or modify it
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	10 option) any later version.
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	11
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	12 Pytave is distributed in the hope that it will be useful, but WITHOUT
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	15 for more details.
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	16
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	18 along with Pytave; see the file COPYING. If not, see
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	20
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	21 */
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	22
162 df7b4a5ab542 Apply recent project changes to pyeval/pyexec, clean up Mike Miller <mtmiller@octave.org> parents: 161 diff changeset	23 #if defined (HAVE_CONFIG_H)
df7b4a5ab542 Apply recent project changes to pyeval/pyexec, clean up Mike Miller <mtmiller@octave.org> parents: 161 diff changeset	24 # include <config.h>
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	25 #endif
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	26
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	27 #include <dlfcn.h>
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	28 #include <boost/python.hpp>
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	29 #include <boost/python/numeric.hpp>
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	30
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	31 #include <oct.h>
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	32
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	33 #define PYTAVE_DO_DECLARE_SYMBOL
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	34 #include "arrayobjectdefs.h"
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	35 #include "exceptions.h"
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	36 #include "python_to_octave.h"
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	37
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	38 using namespace boost::python;
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	39
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	40 DEFUN_DLD (pyeval, args, nargout,
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	41 "-- texinfo --\n\
173 28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	42 @deftypefn {} {} pyeval (@var{expr})\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	43 @deftypefnx {} {@var{x} =} pyeval (@var{expr})\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	44 Evaluate a Python expression and return the result.\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	45 \n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	46 Examples:\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	47 @example\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	48 @group\n\
176 72fa08eb9681 Fix pyeval doctest Colin Macdonald <cbm@m.fsf.org> parents: 173 diff changeset	49 pyexec (\"import sys\")\n\
173 28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	50 pyeval (\"sys.version\")\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	51 @result{} ...\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	52 pyeval (\"dict(one=1, two=2)\")\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	53 @result{} scalar structure containing the fields:\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	54 two = 2\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	55 one = 1\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	56 @end group\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	57 @end example\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	58 @seealso{pycall, pyexec}\n\
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	59 @end deftypefn")
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	60 {
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	61 octave_value_list retval;
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	62
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	63 int nargin = args.length ();
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	64
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	65 std::string code = args(0).string_value ();
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	66
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	67 Py_Initialize ();
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	68
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	69 try
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	70 {
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	71 object main_module = import ("__main__");
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	72 object main_namespace = main_module.attr ("__dict__");
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	73 object res = eval (code.c_str (), main_namespace, main_namespace);
162 df7b4a5ab542 Apply recent project changes to pyeval/pyexec, clean up Mike Miller <mtmiller@octave.org> parents: 161 diff changeset	74
df7b4a5ab542 Apply recent project changes to pyeval/pyexec, clean up Mike Miller <mtmiller@octave.org> parents: 161 diff changeset	75 // FIXME: currently, we cannot return the raw object to octave...
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	76 if (! res.is_none ())
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	77 {
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	78 octave_value val;
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	79 pytave::pyobj_to_octvalue (val, res);
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	80 retval(0) = val;
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	81 }
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	82 }
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	83 catch (pytave::object_convert_exception const &)
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	84 {
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	85 error ("pyeval: error in return value type conversion");
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	86 }
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	87 catch (error_already_set const &)
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	88 {
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	89 PyObject ptype, pvalue, *ptraceback;
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	90 PyErr_Fetch (&ptype, &pvalue, &ptraceback);
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	91
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	92 try
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	93 {
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	94 std::string message = extract<std::string> (pvalue);
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	95 error ("pyeval: %s", message.c_str ());
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	96 }
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	97 catch (error_already_set const &)
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	98 {
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	99 PyErr_Restore (ptype, pvalue, ptraceback);
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	100 PyErr_Print ();
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	101 }
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	102 }
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	103
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	104 return retval;
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	105 }
180 5f0d94afebe2 Added some basic tests Abhinav Tripathi <genuinelucifer@gmail.com> parents: 176 diff changeset	106
5f0d94afebe2 Added some basic tests Abhinav Tripathi <genuinelucifer@gmail.com> parents: 176 diff changeset	107 /*
190 ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	108 %!assert (isnumeric (pyeval ("0")))
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	109 %!assert (isreal (pyeval ("0")))
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	110 %!assert (pyeval ("0"), 0)
180 5f0d94afebe2 Added some basic tests Abhinav Tripathi <genuinelucifer@gmail.com> parents: 176 diff changeset	111
190 ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	112 %!assert (isnumeric (pyeval ("10.1")))
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	113 %!assert (isreal (pyeval ("10.1")))
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	114 %!assert (pyeval ("10.1"), 10.1)
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	115
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	116 %!assert (isnumeric (pyeval ("2j")))
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	117 %!assert (iscomplex (pyeval ("2j")))
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	118 %!assert (pyeval ("2j"), 2j)
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	119
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	120 %!assert (ischar (pyeval ("\"I <3 Octave\"")))
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	121 %!assert (pyeval ("\"I <3 Octave\""), "I <3 Octave")
180 5f0d94afebe2 Added some basic tests Abhinav Tripathi <genuinelucifer@gmail.com> parents: 176 diff changeset	122
183 2b03585d4ddd Add proper conversion of booleans between octave and python. (fixes issue #6) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 182 diff changeset	123 %!assert (islogical (pyeval ("True")))
2b03585d4ddd Add proper conversion of booleans between octave and python. (fixes issue #6) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 182 diff changeset	124 %!assert (islogical (pyeval ("False")))
190 ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	125 %!assert (pyeval ("True"), true)
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	126 %!assert (pyeval ("False"), false)
183 2b03585d4ddd Add proper conversion of booleans between octave and python. (fixes issue #6) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 182 diff changeset	127 %!assert (class (pyeval ("True")), "logical")
2b03585d4ddd Add proper conversion of booleans between octave and python. (fixes issue #6) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 182 diff changeset	128 %!assert (class (pyeval ("False")), "logical")
2b03585d4ddd Add proper conversion of booleans between octave and python. (fixes issue #6) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 182 diff changeset	129
190 ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	130 ## FIXME: these will change when dict, list, and tuple are not converted
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	131 %!assert (pyeval ("{'x': 1, 'y': 2}"), struct ("x", 1, "y", 2))
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	132 %!assert (pyeval ("[1, 2, 3]"), {1, 2, 3})
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	133 %!assert (pyeval ("(4, 5, 6)"), {4, 5, 6})
ac377ace2ee4 More unit tests of pycall and pyeval Mike Miller <mtmiller@octave.org> parents: 183 diff changeset	134
180 5f0d94afebe2 Added some basic tests Abhinav Tripathi <genuinelucifer@gmail.com> parents: 176 diff changeset	135 %!test
182 0bf4b7cf16ee maint: Use Octave coding style conventions for unit tests Mike Miller <mtmiller@octave.org> parents: 180 diff changeset	136 %! % FIXME: this will change when we stop converting lists
0bf4b7cf16ee maint: Use Octave coding style conventions for unit tests Mike Miller <mtmiller@octave.org> parents: 180 diff changeset	137 %! z = pyeval ("[1, [21, 22], 3, [41, [421, 422], 43]]");
0bf4b7cf16ee maint: Use Octave coding style conventions for unit tests Mike Miller <mtmiller@octave.org> parents: 180 diff changeset	138 %! assert (z{2}{1}, 21)
0bf4b7cf16ee maint: Use Octave coding style conventions for unit tests Mike Miller <mtmiller@octave.org> parents: 180 diff changeset	139 %! assert (z{2}{2}, 22)
0bf4b7cf16ee maint: Use Octave coding style conventions for unit tests Mike Miller <mtmiller@octave.org> parents: 180 diff changeset	140 %! assert (z{4}{2}{1}, 421)
0bf4b7cf16ee maint: Use Octave coding style conventions for unit tests Mike Miller <mtmiller@octave.org> parents: 180 diff changeset	141 %! assert (z{4}{2}{2}, 422)
180 5f0d94afebe2 Added some basic tests Abhinav Tripathi <genuinelucifer@gmail.com> parents: 176 diff changeset	142 */

Mercurial > pytave

annotate pyeval.cc @ 190:ac377ace2ee4