view oct-py-error.h @ 423:6b9de18b4bdd

Eliminate remaining custom exception handling in favor of Octave errors * oct-py-error.cc, oct-py-error.h (pytave::error_python_exception): New function to generate an Octave error from an active Python error condition, based on pytave::fetch_exception_message. * oct-py-eval.cc (pytave::py_call_function, pytave::py_run_string_safe): Use it. * oct-py-types.cc (pytave::make_py_dict): Likewise. * oct-py-util.cc (pytave::py_objstore): Likewise. * pycall.cc (Fpycall): Remove exception handling logic. * pyeval.cc (Fpyeval): Likewise. * pyexec.cc (Fpyexec): Likewise. * exceptions.cc, exceptions.h: Delete. * Makefile.am (COMMON_SOURCE_FILES, PYTAVE_HEADER_FILES): Remove them.
author Mike Miller <mtmiller@octave.org>
date Thu, 04 May 2017 21:15:07 -0700
parents 8247f298fd16
children
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 (pytave_oct_py_error_h)
#define pytave_oct_py_error_h 1

#include <string>

#if defined (__GNUC__)
#  define PYTAVE_ATTR_NORETURN __attribute__((__noreturn__))
#else
#  define PYTAVE_ATTR_NORETURN
#endif

namespace pytave
{

  void
  error_conversion_invalid_python_object (const std::string& to)
  PYTAVE_ATTR_NORETURN;

  void
  error_conversion_mismatch_python_type (const std::string& to,
                                         const std::string& must)
  PYTAVE_ATTR_NORETURN;

  void
  error_python_exception ()
  PYTAVE_ATTR_NORETURN;

}

#undef PYTAVE_ATTR_NORETURN

#endif