Mercurial > forge

comparison main/database/src/error-helpers.h @ 12718:1af86934c14e octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make compatible with Octaves new exception-based error handling. Retain compatibility with Octaves old error handling based on error_state. * src/error_helpers.[h,cc]: Added. * src/Makefile.in: Integrate error-helpers.[h,cc]. * src/config.h.in: Added. * configure.ac, src/config.h.in: Test presence of 'error_state' and presence of 'verror (octave_execution_exception&, const char *, va_list)'. * src/__pq_connect__.cc, src/command.cc, src/command.h, src/converters.cc, src/converters_arr_comp.cc, src/pq_connection.cc, src/pq_conninfo.cc, src/pq_exec.cc, src/pq_lo.cc, src/pq_update_types.cc: If necessary, include error-helpers.h, replace error() with c_verror(), set and check a different error indicator than error_state, use CHECK_ERROR or SET_ERR, explicitely check for errors instead of relying on Octave checking error_state when returning to the prompt.
author i7tiol
date Sat, 27 Feb 2016 11:11:04 +0000
parents
children
comparison
equal deleted inserted replaced
12717:87989220360f 12718:1af86934c14e
1 /*
2
3 Copyright (C) 2016 Olaf Till <i7tiol@t-online.de>
4
5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version.
9
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details.
14
15 You should have received a copy of the GNU General Public License
16 along with this program; If not, see <http://www.gnu.org/licenses/>.
17
18 */
19
20 #include "config.h"
21
22 // call verror
23 #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
24 void c_verror (octave_execution_exception&, const char *, ...);
25 #else
26 void c_verror (const octave_execution_exception&, const char *, ...);
27 #endif
28
29 // call verror
30 void c_verror (const char *fmt, ...);
31
32 // Print a message if 'code' causes an error and raise an error again,
33 // both if Octave uses exceptions for errors and if it still uses
34 // error_state. In the latter case return 'retval'.
35 #ifdef HAVE_OCTAVE_ERROR_STATE
36 // can throw octave_execution_exception despite of this
37 #define CHECK_ERROR(code, retval, ...) \
38 try \
39 { \
40 code ; \
41 \
42 if (error_state) \
43 { \
44 error (__VA_ARGS__); \
45 \
46 return retval; \
47 } \
48 } \
49 catch (octave_execution_exception& e) \
50 { \
51 c_verror (e, __VA_ARGS__); \
52 \
53 throw e; \
54 }
55 #else
56 #define CHECK_ERROR(code, retval, ...) \
57 try \
58 { \
59 code ; \
60 } \
61 catch (octave_execution_exception& e) \
62 { \
63 c_verror (e, __VA_ARGS__); \
64 \
65 throw e; \
66 }
67 #endif
68
69 // If 'code' causes an error, print a message and call exit(1) if
70 // Octave doesn't throw exceptions for errors but still uses
71 // error_state.
72 #ifdef HAVE_OCTAVE_ERROR_STATE
73 // can throw octave_execution_exception despite of this
74 #define CHECK_ERROR_EXIT1(code, ...) \
75 try \
76 { \
77 code ; \
78 \
79 if (error_state) \
80 { \
81 c_verror (__VA_ARGS__); \
82 \
83 exit (1); \
84 } \
85 } \
86 catch (octave_execution_exception& e) \
87 { \
88 c_verror (e, __VA_ARGS__); \
89 \
90 exit (1); \
91 }
92 #else
93 #define CHECK_ERROR_EXIT1(code, ...) \
94 try \
95 { \
96 code ; \
97 } \
98 catch (octave_execution_exception& e) \
99 { \
100 c_verror (e, __VA_ARGS__); \
101 \
102 exit (1); \
103 }
104 #endif
105
106 // Set 'err' to true if 'code' causes an error, else to false; both if
107 // Octave uses exceptions for errors and if it still uses
108 // error_state. In the latter case reset error_state to 0.
109 #ifdef HAVE_OCTAVE_ERROR_STATE
110 // can throw octave_execution_exception despite of this
111 #define SET_ERR(code, err) \
112 err = false; \
113 \
114 try \
115 { \
116 code ; \
117 if (error_state) \
118 { \
119 error_state = 0; \
120 err = true; \
121 } \
122 } \
123 catch (octave_execution_exception&) \
124 { \
125 err = true; \
126 }
127 #else
128 #define SET_ERR(code, err) \
129 try \
130 { \
131 code ; \
132 } \
133 catch (octave_execution_exception&) \
134 { \
135 err = true; \
136 }
137 #endif