Mercurial > pytave

comparison oct-py-error.h @ 422:8247f298fd16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
children 6b9de18b4bdd
comparison
equal deleted inserted replaced
421:24555fba9964 422:8247f298fd16
1 /*
2
3 Copyright (C) 2017 Mike Miller
4
5 This file is part of Pytave.
6
7 Pytave is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the
9 Free Software Foundation; either version 3 of the License, or (at your
10 option) any later version.
11
12 Pytave is distributed in the hope that it will be useful, but WITHOUT
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 for more details.
16
17 You should have received a copy of the GNU General Public License
18 along with Pytave; see the file COPYING. If not, see
19 <http://www.gnu.org/licenses/>.
20
21 */
22
23 #if ! defined (pytave_oct_py_error_h)
24 #define pytave_oct_py_error_h 1
25
26 #include <string>
27
28 #if defined (__GNUC__)
29 # define PYTAVE_ATTR_NORETURN __attribute__((__noreturn__))
30 #else
31 # define PYTAVE_ATTR_NORETURN
32 #endif
33
34 namespace pytave
35 {
36
37 void
38 error_conversion_invalid_python_object (const std::string& to)
39 PYTAVE_ATTR_NORETURN;
40
41 void
42 error_conversion_mismatch_python_type (const std::string& to,
43 const std::string& must)
44 PYTAVE_ATTR_NORETURN;
45
46 }
47
48 #undef PYTAVE_ATTR_NORETURN
49
50 #endif