Mercurial > pytave
view oct-py-init.cc @ 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 | 95c6ad0be828 |
children | db29823a8919 |
line wrap: on
line source
/* Copyright (C) 2017 Mike Miller 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 <Python.h> #include "oct-py-init.h" // FIXME: the following are only needed for Boost.Python library and NumPy // library initialization #define PYTAVE_DO_DECLARE_SYMBOL #include <boost/python.hpp> #include "arrayobjectdefs.h" namespace pytave { #if PY_VERSION_HEX >= 0x03000000 wchar_t *sys_argv[] { L"", nullptr }; #else char *sys_argv[] { "", nullptr }; #endif void py_init () { bool is_initialized = Py_IsInitialized (); Py_Initialize (); if (! is_initialized) PySys_SetArgvEx (1, sys_argv, 0); // FIXME: this is needed for use of NumPy array object C API _import_array (); } }