Mercurial > forge

annotate main/database/src/error-helpers.cc @ 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 <octave/oct.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 #include "error-helpers.h"
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
23
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
24 // call verror
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
25 #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
26 void
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
27 c_verror (octave_execution_exception& e, const char *fmt, ...)
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 va_list args;
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
30 va_start (args, fmt);
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
31 verror (e, fmt, args);
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
32 va_end (args);
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
33 }
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
34 #else
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
35 void
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
36 c_verror (const octave_execution_exception&, const char *fmt, ...)
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
37 {
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
38 va_list args;
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
39 va_start (args, fmt);
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
40 verror (fmt, args);
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
41 va_end (args);
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
42 }
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
43 #endif
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
44
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
45 // call verror
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
46 void
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
47 c_verror (const char *fmt, ...)
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 va_list args;
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
50 va_start (args, fmt);
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
51 verror (fmt, args);
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
52 va_end (args);
1af86934c14e Make compatible with Octaves new exception-based error handling.
i7tiol
parents:
diff changeset
53 }