Mercurial > pytave
view oct-py-object.h @ 422:8247f298fd16
Raise Octave errors instead of exceptions for conversion errors
* Makefile.am (COMMON_SOURCE_FILES): Include oct-py-error.cc in the list.
(PYTAVE_HEADER_FILES): Include oct-py-error.h in the list.
* oct-py-error.cc, oct-py-error.h: New files defining error conditions.
* oct-py-types.cc (pytave::extract_py_bool, pytave::extract_py_complex,
pytave::extract_py_float, pytave::make_py_array, pytave::extract_py_scalar_map,
pytave::extract_py_int64, pytave::extract_py_uint64, pytave::extract_py_str):
Use new error condition functions instead of throwing exceptions.
(pytave::make_py_array, pytave::make_py_numeric_value, pytave::make_py_tuple):
Raise Octave error instead of throwing exceptions.
* __py_struct_from_dict__.cc (F__py_int64_scalar_value__,
F__py_uint64_scalar_value__): Remove exception handling logic.
* pycall.cc (Fpycall): Remove conversion exception handlers.
* pyeval.cc (Fpyeval): Likewise.
* pyexec.cc (Fpyexec): Likewise.
* exceptions.h (pytave::pytave_exception, pytave::octave_error_exception,
pytave::octave_parse_exception, pytave::value_convert_exception,
pytave::object_convert_exception, pytave::variable_name_exception): Delete
no longer used exception types.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Thu, 04 May 2017 17:13:38 -0700 |
parents | 3644df6564bc |
children |
line wrap: on
line source
/* Copyright (C) 2017 Abhinav Tripathi 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 (pytave_oct_py_object_h) #define pytave_oct_py_object_h 1 #include <Python.h> namespace pytave { class python_object { public: python_object (PyObject *obj = nullptr) { pyobj = obj; isowned = pyobj != nullptr; } python_object (const python_object& oth) { pyobj = oth.pyobj; isowned = oth.isowned; if (isowned) Py_INCREF (pyobj); } ~python_object () { if (isowned) Py_DECREF (pyobj); } python_object& operator = (const python_object& oth) { if (isowned) Py_DECREF (pyobj); pyobj = oth.pyobj; isowned = oth.isowned; if (isowned) Py_INCREF (pyobj); return *this; } python_object& operator = (PyObject *obj) { if (isowned) Py_DECREF (pyobj); pyobj = obj; isowned = pyobj != nullptr; if (isowned) Py_INCREF (pyobj); return *this; } operator bool () const { return isowned; } operator PyObject * () { return pyobj; } bool is_none () const { return pyobj && pyobj == Py_None; } PyObject * release () { isowned = false; PyObject *ret = pyobj; pyobj = nullptr; return ret; } private: PyObject *pyobj; bool isowned; }; } #endif