Mercurial > octave
annotate libinterp/operators/op-s-cs.cc @ 33636:3ec6fcce7715 default tip @
gui: Avoid using HAVE_QSCINTILLA in more header files.
* gui-settings.h, settings-dialog.h: Don't include QScintilla header.
Forward-declare QSciLexer class instead if necessary. Declare all member
functions unconditionally.
* gui-settings.cc (gui_settings::get_valid_lexer_styles,
gui_settings::read_lexer_settings),
settings-dialog.cc (settings_dialog::update_lexer,
settings_dialog::get_lexer_settings, settings_dialog::write_lexer_settings):
Define functions unconditionally.
* gui-preferences-ed.h: Don't include QScintilla header. Remove definition of
local variable os_eol_mode from header.
* gui-preferences-ed.cc (os_eol_mode): Move definition of local variable here.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Tue, 28 May 2024 14:54:58 +0200 |
parents | 2e484f9f1f18 |
children |
rev | line source |
---|---|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
1 //////////////////////////////////////////////////////////////////////// |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
2 // |
32632
2e484f9f1f18
maint: update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
31867
diff
changeset
|
3 // Copyright (C) 1996-2024 The Octave Project Developers |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
4 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
5 // See the file COPYRIGHT.md in the top-level directory of this |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
6 // distribution or <https://octave.org/copyright/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
7 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
8 // This file is part of Octave. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
9 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
10 // Octave is free software: you can redistribute it and/or modify it |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
11 // under the terms of the GNU General Public License as published by |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
12 // the Free Software Foundation, either version 3 of the License, or |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
13 // (at your option) any later version. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
14 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
15 // Octave is distributed in the hope that it will be useful, but |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
16 // WITHOUT ANY WARRANTY; without even the implied warranty of |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
18 // GNU General Public License for more details. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
19 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
20 // You should have received a copy of the GNU General Public License |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
21 // along with Octave; see the file COPYING. If not, see |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
22 // <https://www.gnu.org/licenses/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 //////////////////////////////////////////////////////////////////////// |
2928 | 25 |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21647
diff
changeset
|
26 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
27 # include "config.h" |
2928 | 28 #endif |
29 | |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
30 #include "ovl.h" |
2928 | 31 #include "ov.h" |
32 #include "ov-scalar.h" | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
33 #include "ov-float.h" |
2928 | 34 #include "ov-complex.h" |
35 #include "ov-cx-mat.h" | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
36 #include "ov-flt-cx-mat.h" |
2928 | 37 #include "ov-typeinfo.h" |
38 #include "ops.h" | |
39 #include "xdiv.h" | |
40 #include "xpow.h" | |
41 | |
31605
e88a07dec498
maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents:
30564
diff
changeset
|
42 OCTAVE_BEGIN_NAMESPACE(octave) |
29989
b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29358
diff
changeset
|
43 |
2928 | 44 // scalar by complex scalar ops. |
45 | |
46 DEFBINOP_OP (add, scalar, complex, +) | |
47 DEFBINOP_OP (sub, scalar, complex, -) | |
48 DEFBINOP_OP (mul, scalar, complex, *) | |
49 | |
50 DEFBINOP (div, scalar, complex) | |
51 { | |
31867
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
52 OCTAVE_CAST_BASE_VALUE (const octave_scalar&, v1, a1); |
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
53 OCTAVE_CAST_BASE_VALUE (const octave_complex&, v2, a2); |
2928 | 54 |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
55 return octave_value (v1.double_value () / v2.complex_value ()); |
2928 | 56 } |
57 | |
58 DEFBINOP_FN (pow, scalar, complex, xpow) | |
59 | |
60 DEFBINOP (ldiv, scalar, complex) | |
61 { | |
31867
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
62 OCTAVE_CAST_BASE_VALUE (const octave_scalar&, v1, a1); |
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
63 OCTAVE_CAST_BASE_VALUE (const octave_complex&, v2, a2); |
2928 | 64 |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
65 return octave_value (v2.complex_value () / v1.double_value ()); |
2928 | 66 } |
67 | |
9621
3ee9029931b3
fix scalar complex-real comparisons
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
68 DEFCMPLXCMPOP_OP (lt, scalar, complex, <) |
3ee9029931b3
fix scalar complex-real comparisons
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
69 DEFCMPLXCMPOP_OP (le, scalar, complex, <=) |
3ee9029931b3
fix scalar complex-real comparisons
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
70 DEFCMPLXCMPOP_OP (eq, scalar, complex, ==) |
3ee9029931b3
fix scalar complex-real comparisons
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
71 DEFCMPLXCMPOP_OP (ge, scalar, complex, >=) |
3ee9029931b3
fix scalar complex-real comparisons
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
72 DEFCMPLXCMPOP_OP (gt, scalar, complex, >) |
3ee9029931b3
fix scalar complex-real comparisons
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
73 DEFCMPLXCMPOP_OP (ne, scalar, complex, !=) |
2928 | 74 |
75 DEFBINOP_OP (el_mul, scalar, complex, *) | |
76 | |
77 DEFBINOP (el_div, scalar, complex) | |
78 { | |
31867
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
79 OCTAVE_CAST_BASE_VALUE (const octave_scalar&, v1, a1); |
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
80 OCTAVE_CAST_BASE_VALUE (const octave_complex&, v2, a2); |
2928 | 81 |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
82 return octave_value (v1.double_value () / v2.complex_value ()); |
2928 | 83 } |
84 | |
85 DEFBINOP_FN (el_pow, scalar, complex, xpow) | |
86 | |
87 DEFBINOP (el_ldiv, scalar, complex) | |
88 { | |
31867
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
89 OCTAVE_CAST_BASE_VALUE (const octave_scalar&, v1, a1); |
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
90 OCTAVE_CAST_BASE_VALUE (const octave_complex&, v2, a2); |
2928 | 91 |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
92 return octave_value (v2.complex_value () / v1.double_value ()); |
2928 | 93 } |
94 | |
95 DEFBINOP (el_and, scalar, complex) | |
96 { | |
31867
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
97 OCTAVE_CAST_BASE_VALUE (const octave_scalar&, v1, a1); |
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
98 OCTAVE_CAST_BASE_VALUE (const octave_complex&, v2, a2); |
2928 | 99 |
100 return octave_value (v1.double_value () && (v2.complex_value () != 0.0)); | |
101 } | |
102 | |
103 DEFBINOP (el_or, scalar, complex) | |
104 { | |
31867
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
105 OCTAVE_CAST_BASE_VALUE (const octave_scalar&, v1, a1); |
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
106 OCTAVE_CAST_BASE_VALUE (const octave_complex&, v2, a2); |
2928 | 107 |
108 return octave_value (v1.double_value () || (v2.complex_value () != 0.0)); | |
109 } | |
110 | |
4915 | 111 DEFNDCATOP_FN (s_cs, scalar, complex, array, complex_array, concat) |
112 | |
2928 | 113 void |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
114 install_s_cs_ops (octave::type_info& ti) |
2928 | 115 { |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
116 INSTALL_BINOP_TI (ti, op_add, octave_scalar, octave_complex, add); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
117 INSTALL_BINOP_TI (ti, op_sub, octave_scalar, octave_complex, sub); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
118 INSTALL_BINOP_TI (ti, op_mul, octave_scalar, octave_complex, mul); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
119 INSTALL_BINOP_TI (ti, op_div, octave_scalar, octave_complex, div); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
120 INSTALL_BINOP_TI (ti, op_pow, octave_scalar, octave_complex, pow); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
121 INSTALL_BINOP_TI (ti, op_ldiv, octave_scalar, octave_complex, ldiv); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
122 INSTALL_BINOP_TI (ti, op_lt, octave_scalar, octave_complex, lt); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
123 INSTALL_BINOP_TI (ti, op_le, octave_scalar, octave_complex, le); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
124 INSTALL_BINOP_TI (ti, op_eq, octave_scalar, octave_complex, eq); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
125 INSTALL_BINOP_TI (ti, op_ge, octave_scalar, octave_complex, ge); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
126 INSTALL_BINOP_TI (ti, op_gt, octave_scalar, octave_complex, gt); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
127 INSTALL_BINOP_TI (ti, op_ne, octave_scalar, octave_complex, ne); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
128 INSTALL_BINOP_TI (ti, op_el_mul, octave_scalar, octave_complex, el_mul); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
129 INSTALL_BINOP_TI (ti, op_el_div, octave_scalar, octave_complex, el_div); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
130 INSTALL_BINOP_TI (ti, op_el_pow, octave_scalar, octave_complex, el_pow); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
131 INSTALL_BINOP_TI (ti, op_el_ldiv, octave_scalar, octave_complex, el_ldiv); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
132 INSTALL_BINOP_TI (ti, op_el_and, octave_scalar, octave_complex, el_and); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
133 INSTALL_BINOP_TI (ti, op_el_or, octave_scalar, octave_complex, el_or); |
2928 | 134 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
135 INSTALL_CATOP_TI (ti, octave_scalar, octave_complex, s_cs); |
4915 | 136 |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
137 INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_complex, |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
138 octave_complex_matrix); |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
139 INSTALL_ASSIGNCONV_TI (ti, octave_float_scalar, octave_complex, |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
140 octave_float_complex_matrix); |
2928 | 141 } |
29989
b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29358
diff
changeset
|
142 |
31605
e88a07dec498
maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents:
30564
diff
changeset
|
143 OCTAVE_END_NAMESPACE(octave) |