Mercurial > forge

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12718
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
1 /*
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
2
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
3 Copyright (C) 2016 Olaf Till <i7tiol@t-online.de>
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
4
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
5 This program is free software; you can redistribute it and/or modify
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
6 it under the terms of the GNU General Public License as published by
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
7 the Free Software Foundation; either version 2 of the License, or
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
8 (at your option) any later version.
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
9
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
10 This program is distributed in the hope that it will be useful,
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
13 GNU General Public License for more details.
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
14
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
15 You should have received a copy of the GNU General Public License
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
16 along with this program; If not, see <http://www.gnu.org/licenses/>.
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
17
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
18 */
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
19
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
20 #include "config.h"
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
21
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
22 // call verror
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
23 #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
24 void c_verror (octave_execution_exception&, const char *, ...);
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
25 #else
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
26 void c_verror (const octave_execution_exception&, const char *, ...);
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
27 #endif
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
28
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
29 // call verror
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
30 void c_verror (const char *fmt, ...);
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
31
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
32 // Print a message if 'code' causes an error and raise an error again,
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
33 // both if Octave uses exceptions for errors and if it still uses
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
34 // error_state. In the latter case return 'retval'.
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
35 #ifdef HAVE_OCTAVE_ERROR_STATE
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
36 // can throw octave_execution_exception despite of this
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
37 #define CHECK_ERROR(code, retval, ...) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
38 try \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
39 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
40 code ; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
41 \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
42 if (error_state) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
43 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
44 error (__VA_ARGS__); \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
45 \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
46 return retval; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
47 } \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
48 } \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
49 catch (octave_execution_exception& e) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
50 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
51 c_verror (e, __VA_ARGS__); \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
52 \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
53 throw e; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
54 }
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
55 #else
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
56 #define CHECK_ERROR(code, retval, ...) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
57 try \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
58 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
59 code ; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
60 } \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
61 catch (octave_execution_exception& e) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
62 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
63 c_verror (e, __VA_ARGS__); \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
64 \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
65 throw e; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
66 }
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
67 #endif
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
68
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
69 // If 'code' causes an error, print a message and call exit(1) if
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
70 // Octave doesn't throw exceptions for errors but still uses
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
71 // error_state.
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
72 #ifdef HAVE_OCTAVE_ERROR_STATE
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
73 // can throw octave_execution_exception despite of this
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
74 #define CHECK_ERROR_EXIT1(code, ...) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
75 try \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
76 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
77 code ; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
78 \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
79 if (error_state) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
80 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
81 c_verror (__VA_ARGS__); \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
82 \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
83 exit (1); \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
84 } \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
85 } \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
86 catch (octave_execution_exception& e) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
87 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
88 c_verror (e, __VA_ARGS__); \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
89 \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
90 exit (1); \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
91 }
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
92 #else
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
93 #define CHECK_ERROR_EXIT1(code, ...) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
94 try \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
95 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
96 code ; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
97 } \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
98 catch (octave_execution_exception& e) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
99 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
100 c_verror (e, __VA_ARGS__); \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
101 \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
102 exit (1); \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
103 }
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
104 #endif
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
105
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
106 // Set 'err' to true if 'code' causes an error, else to false; both if
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
107 // Octave uses exceptions for errors and if it still uses
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
108 // error_state. In the latter case reset error_state to 0.
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
109 #ifdef HAVE_OCTAVE_ERROR_STATE
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
110 // can throw octave_execution_exception despite of this
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
111 #define SET_ERR(code, err) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
112 err = false; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
113 \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
114 try \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
115 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
116 code ; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
117 if (error_state) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
118 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
119 error_state = 0; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
120 err = true; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
121 } \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
122 } \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
123 catch (octave_execution_exception&) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
124 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
125 err = true; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
126 }
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
127 #else
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
128 #define SET_ERR(code, err) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
129 try \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
130 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
131 code ; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
132 } \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
133 catch (octave_execution_exception&) \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
134 { \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
135 err = true; \
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
136 }
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
137 #endif