Mercurial > pytave
view exceptions.h @ 362:b0677c492655
Overhaul Python object storage and wrapping in pyobject
* oct-py-util.cc, oct-py-util.h (pytave::py_objstore_del,
pytave::py_objstore_get, pytave::py_objstore_put, pytave::pyobject_wrap_object,
pytave::pyobject_unwrap_object): New functions.
(pytave::get_object_from_python): Use pyobject_unwrap_object.
* octave_to_python.cc (pytave::octvalue_to_pyobj): Use pyobject_unwrap_object.
* python_to_octave.cc (pytave::pyobj_to_octvalue): Use pyobject_wrap_object.
(pytave::pyobj_to_oct_pyobject): Delete.
* __py_struct_from_dict__.cc (F__py_objstore_del__, F__py_objstore_get__,
F__py_objstore_put__): New functions.
* @pyobject/pyobject.m (pyobject.m_id): Rename from id.
(pyobject.pyobject): Use __py_objstore_put__, simplify conditional logic.
(pyobject.delete): Use __py_objstore_del__. (pyobject.id): Rename from getid.
* @pyobject/display.m: Use pyobject.id method name, format as hex.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Thu, 25 Aug 2016 09:51:58 -0700 |
parents | 6fffa6219b2c |
children | 09a1acb81d8b |
line wrap: on
line source
/* Copyright (C) 2015-2016 Mike Miller Copyright (C) 2008 David Grundberg, HÃ¥kan Fors Nilsson 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_exceptions_h) #define pytave_exceptions_h #include <Python.h> #include <string> namespace pytave { class pytave_exception { public: static void translate_exception (const pytave_exception& py_ex) { PyErr_SetString (PyExc_Exception, py_ex.error.c_str ()); } pytave_exception (const std::string& err) { error = err; }; private: std::string error; }; class octave_error_exception { public: static bool init () { excclass = PyErr_NewException (const_cast<char*> ("pytave.OctaveError"), PyExc_RuntimeError, 0); return (excclass != 0); }; static void translate_exception (const octave_error_exception& py_ex) { PyErr_SetString (excclass, py_ex.error.c_str ()); } static PyObject *excclass; octave_error_exception (const std::string& err) { error = err; }; private: std::string error; }; class octave_parse_exception { public: static bool init () { excclass = PyErr_NewException (const_cast<char*> ("pytave.ParseError"), PyExc_RuntimeError, 0); return (excclass != 0); }; static void translate_exception (const octave_parse_exception& py_ex) { PyErr_SetString (excclass, py_ex.error.c_str ()); } static PyObject *excclass; octave_parse_exception (const std::string& err) { error = err; }; private: std::string error; }; class value_convert_exception { public: static bool init () { excclass = PyErr_NewException (const_cast<char*> ("pytave.ValueConvertError"), PyExc_TypeError, 0); return (excclass != 0); }; static void translate_exception (const value_convert_exception& py_ex) { PyErr_SetString (excclass, py_ex.error.c_str ()); } static PyObject *excclass; value_convert_exception (const std::string& err) { error = err; }; private: std::string error; }; class object_convert_exception { public: static bool init () { excclass = PyErr_NewException (const_cast<char*> ("pytave.ObjectConvertError"), PyExc_TypeError, 0); return (excclass != 0); }; static void translate_exception (const object_convert_exception& py_ex) { PyErr_SetString (excclass, py_ex.error.c_str ()); } static PyObject *excclass; object_convert_exception (const std::string& err) { error = err; }; private: std::string error; }; class variable_name_exception { public: static bool init () { excclass = PyErr_NewException (const_cast<char*> ("pytave.VarNameError"), PyExc_RuntimeError, 0); return (excclass != 0); }; static void translate_exception (const variable_name_exception& py_ex) { PyErr_SetString (excclass, py_ex.error.c_str ()); } static PyObject *excclass; variable_name_exception (const std::string& err) { error = err; }; private: std::string error; }; bool init_exceptions (void); std::string fetch_exception_message (void); } #endif