Mercurial > pytave

comparison exceptions.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 9bf8ba050122
children
comparison
equal deleted inserted replaced
421:24555fba9964 422:8247f298fd16
27 #include <Python.h> 27 #include <Python.h>
28 #include <string> 28 #include <string>
29 29
30 namespace pytave 30 namespace pytave
31 { 31 {
32 class pytave_exception
33 {
34 public:
35 pytave_exception (const std::string& err) { error = err; };
36
37 private:
38 std::string error;
39 };
40
41 class octave_error_exception
42 {
43 public:
44 octave_error_exception (const std::string& err) { error = err; };
45
46 private:
47 std::string error;
48 };
49
50 class octave_parse_exception
51 {
52 public:
53 octave_parse_exception (const std::string& err) { error = err; };
54
55 private:
56 std::string error;
57 };
58
59 class value_convert_exception
60 {
61 public:
62 value_convert_exception (const std::string& err) { error = err; };
63
64 private:
65 std::string error;
66 };
67
68 class object_convert_exception
69 {
70 public:
71 object_convert_exception (const std::string& err) { error = err; };
72
73 private:
74 std::string error;
75 };
76
77 class variable_name_exception
78 {
79 public:
80 variable_name_exception (const std::string& err) { error = err; };
81
82 private:
83 std::string error;
84 };
85
86 class error_already_set 32 class error_already_set
87 { 33 {
88 }; 34 };
89 35
90 std::string fetch_exception_message (void); 36 std::string fetch_exception_message (void);