Mercurial > pytave
comparison @pyobject/subsref.m @ 411:3613ffbd52b2
Overhaul implicit conversion of arguments and return values
* oct-py-types.cc, oct-py-types.h (pytave::py_implicitly_convert_argument,
pytave::py_implicitly_convert_return_value): New functions.
* __py_struct_from_dict__.cc, oct-py-eval.cc, pycall.cc, pyeval.cc, pyexec.cc:
Use them instead of legacy conversion functions. Add necessary #includes,
remove #includes of legacy header files.
* @pyobject/subsasgn.m, @pyobject/subsref.m: Change %!tests that depend on
NumPy implicit conversion into %!xtests.
* octave_to_python.cc, octave_to_python.h, python_to_octave.cc,
python_to_octave.h: Delete, no longer used.
* Makefile.am (COMMON_SOURCE_FILES, PYTAVE_HEADER_FILES): Remove the files.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Wed, 03 May 2017 16:30:45 -0700 |
parents | a8102b1a57a1 |
children |
comparison
equal
deleted
inserted
replaced
410:95c6ad0be828 | 411:3613ffbd52b2 |
---|---|
150 %! [a, b, c] = L{:}; | 150 %! [a, b, c] = L{:}; |
151 %! assert (a, 1) | 151 %! assert (a, 1) |
152 %! assert (b, 2) | 152 %! assert (b, 2) |
153 %! assert (char (c), "Octave") | 153 %! assert (char (c), "Octave") |
154 | 154 |
155 %!test | 155 ## Test that depends on implicit creation of NumPy arrays, do we want this? |
156 %!xtest | |
156 %! % 2D array indexing | 157 %! % 2D array indexing |
157 %! A = pyobject ([1. 2.; 3. 4.]); | 158 %! A = pyobject ([1. 2.; 3. 4.]); |
158 %! assert (A{1, 1}, 1) | 159 %! assert (A{1, 1}, 1) |
159 %! assert (A{2, 1}, 3) | 160 %! assert (A{2, 1}, 3) |
160 %! assert (A{1, 2}, 2) | 161 %! assert (A{1, 2}, 2) |