annotate libinterp/octave-value/ov-base-scalar.cc @ 21139:538b57866b90

consistently use "typename" intead of "class" in template declarations * Object.h, QtHandlesUtils.cc, QtHandlesUtils.h, ToolBarButton.cc, ToolBarButton.h, Cell.h, __lin_interpn__.cc, bitfcns.cc, bsxfun.cc, cellfun.cc, data.cc, filter.cc, gcd.cc, graphics.cc, help.cc, kron.cc, lookup.cc, ls-mat5.cc, ls-oct-text.h, lu.cc, max.cc, mgorth.cc, oct-map.cc, oct-map.h, oct-stream.cc, oct-stream.h, octave-link.h, pr-output.cc, profiler.h, schur.cc, sparse-xdiv.cc, sparse-xpow.cc, sqrtm.cc, symtab.h, tril.cc, typecast.cc, variables.cc, xdiv.cc, zfstream.h, __init_fltk__.cc, __magick_read__.cc, chol.cc, qr.cc, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.h, ov-classdef.cc, ov-int-traits.h, ov-java.h, ov-usr-fcn.h, ov.cc, ov.h, op-dms-template.cc, oct-parse.in.yy, parse.h, pt-mat.cc, Array-b.cc, Array.cc, Array.h, CDiagMatrix.h, CMatrix.h, CNDArray.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.cc, MDiagArray2.h, MSparse.cc, MSparse.h, MatrixType.cc, Sparse.cc, Sparse.h, dDiagMatrix.h, dMatrix.h, dNDArray.h, fCDiagMatrix.h, fCMatrix.h, fCNDArray.h, fDiagMatrix.h, fMatrix.h, fNDArray.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, DET.h, base-aepbal.h, base-lu.cc, base-lu.h, base-qr.cc, base-qr.h, bsxfun-defs.cc, eigs-base.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, oct-convn.cc, oct-fftw.cc, oct-norm.cc, sparse-base-chol.cc, sparse-base-chol.h, sparse-base-lu.cc, sparse-base-lu.h, sparse-dmsolve.cc, mx-inlines.cc, action-container.h, base-list.h, lo-traits.h, lo-utils.h, oct-base64.h, oct-binmap.h, oct-cmplx.h, oct-inttypes.cc, oct-inttypes.h, oct-locbuf.h, oct-refcount.h, oct-sort.cc, oct-sort.h: Use "typename" instead of "class" in template declarations.
author John W. Eaton <jwe@octave.org>
date Sun, 24 Jan 2016 13:50:04 -0500
parents 3ac9f47fb04b
children fcac5dbbf9ed
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
1 /*
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
2
19697
4197fc428c7d maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents: 19220
diff changeset
3 Copyright (C) 1996-2015 John W. Eaton
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
4
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
5 This file is part of Octave.
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
6
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5307
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5307
diff changeset
10 option) any later version.
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
11
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
15 for more details.
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
16
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5307
diff changeset
18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5307
diff changeset
19 <http://www.gnu.org/licenses/>.
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
20
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
21 */
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
22
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
23 #ifdef HAVE_CONFIG_H
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
24 #include <config.h>
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
25 #endif
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
26
3503
d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe]
jwe
parents: 3277
diff changeset
27 #include <iostream>
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
28
20940
48b2ad5ee801 maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents: 19697
diff changeset
29 #include "ovl.h"
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
30 #include "ov-base.h"
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
31 #include "ov-cx-mat.h"
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
32 #include "ov-re-mat.h"
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
33 #include "ov-base-scalar.h"
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
34 #include "pr-output.h"
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
35
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
36 template <typename ST>
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
37 octave_value
4247
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe]
jwe
parents: 4219
diff changeset
38 octave_base_scalar<ST>::subsref (const std::string& type,
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
39 const std::list<octave_value_list>& idx)
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
40 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
41 octave_value retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
42
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
43 switch (type[0])
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
44 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
45 case '(':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
46 retval = do_index_op (idx.front ());
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
47 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
48
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
49 case '{':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
50 case '.':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
51 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
52 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
53 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
54 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
55 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
56
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
57 default:
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
58 panic_impossible ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
59 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
60
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
61 return retval.next_subsref (type, idx);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
62 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
63
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
64 template <typename ST>
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
65 octave_value
4247
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe]
jwe
parents: 4219
diff changeset
66 octave_base_scalar<ST>::subsasgn (const std::string& type,
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
67 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
68 const octave_value& rhs)
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
69 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
70 octave_value retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
71
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
72 switch (type[0])
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
73 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
74 case '(':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
75 {
20978
a5b500efca9f maint: invert if/else/error instances.
John W. Eaton <jwe@octave.org>
parents: 20940
diff changeset
76 if (type.length () != 1)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
77 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
78 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
79 error ("in indexed assignment of %s, last rhs index must be ()",
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
80 nm.c_str ());
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
81 }
20978
a5b500efca9f maint: invert if/else/error instances.
John W. Eaton <jwe@octave.org>
parents: 20940
diff changeset
82
a5b500efca9f maint: invert if/else/error instances.
John W. Eaton <jwe@octave.org>
parents: 20940
diff changeset
83 retval = numeric_assign (type, idx, rhs);
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
84 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
85 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
86
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
87 case '{':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
88 case '.':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
89 {
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
90 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
91 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
92 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
93 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
94
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
95 default:
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
96 panic_impossible ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
97 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
98
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
99 return retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
100 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
101
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
102 template <typename ST>
10545
ffe28cdc6fe2 fix reshape() and permute() for scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
103 octave_value
ffe28cdc6fe2 fix reshape() and permute() for scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
104 octave_base_scalar<ST>::permute (const Array<int>& vec, bool inv) const
ffe28cdc6fe2 fix reshape() and permute() for scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
105 {
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
106 return Array<ST> (dim_vector (1, 1), scalar).permute (vec, inv);
10545
ffe28cdc6fe2 fix reshape() and permute() for scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
107 }
ffe28cdc6fe2 fix reshape() and permute() for scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
108
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
109 template <typename ST>
10545
ffe28cdc6fe2 fix reshape() and permute() for scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
110 octave_value
ffe28cdc6fe2 fix reshape() and permute() for scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
111 octave_base_scalar<ST>::reshape (const dim_vector& new_dims) const
ffe28cdc6fe2 fix reshape() and permute() for scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
112 {
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
113 return Array<ST> (dim_vector (1, 1), scalar).reshape (new_dims);
10545
ffe28cdc6fe2 fix reshape() and permute() for scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
114 }
ffe28cdc6fe2 fix reshape() and permute() for scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
115
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
116 template <typename ST>
10816
7fa044155982 fix diag() with complex scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10670
diff changeset
117 octave_value
7fa044155982 fix diag() with complex scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10670
diff changeset
118 octave_base_scalar<ST>::diag (octave_idx_type k) const
7fa044155982 fix diag() with complex scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10670
diff changeset
119 {
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
120 return Array<ST> (dim_vector (1, 1), scalar).diag (k);
10816
7fa044155982 fix diag() with complex scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10670
diff changeset
121 }
7fa044155982 fix diag() with complex scalars
Jaroslav Hajek <highegg@gmail.com>
parents: 10670
diff changeset
122
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
123 template <typename ST>
14557
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
124 octave_value
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
125 octave_base_scalar<ST>::diag (octave_idx_type m, octave_idx_type n) const
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
126 {
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
127 return Array<ST> (dim_vector (1, 1), scalar).diag (m, n);
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
128 }
e8e86ae3abbc make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
129
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
130 template <typename ST>
8626
1dce30ab0e72 don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents: 8437
diff changeset
131 bool
1dce30ab0e72 don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents: 8437
diff changeset
132 octave_base_scalar<ST>::is_true (void) const
1dce30ab0e72 don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents: 8437
diff changeset
133 {
1dce30ab0e72 don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents: 8437
diff changeset
134 if (xisnan (scalar))
21100
e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents: 20978
diff changeset
135 err_nan_to_logical_conversion ();
8626
1dce30ab0e72 don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents: 8437
diff changeset
136
21118
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code.
Rik <rik@octave.org>
parents: 21100
diff changeset
137 return (scalar != ST ());
8626
1dce30ab0e72 don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents: 8437
diff changeset
138 }
1dce30ab0e72 don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents: 8437
diff changeset
139
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
140 template <typename ST>
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
141 void
18416
bcd71a2531d3 Support disp/display overloading in classdef
Michael Goffioul <michael.goffioul@gmail.com>
parents: 17870
diff changeset
142 octave_base_scalar<ST>::print (std::ostream& os, bool pr_as_read_syntax)
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
143 {
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
144 print_raw (os, pr_as_read_syntax);
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
145 newline (os);
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
146 }
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
147
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
148 template <typename ST>
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
149 void
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
150 octave_base_scalar<ST>::print_raw (std::ostream& os,
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
151 bool pr_as_read_syntax) const
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
152 {
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
153 indent (os);
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
154 octave_print_internal (os, scalar, pr_as_read_syntax);
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
155 }
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
156
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
157 template <typename ST>
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
158 bool
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3523
diff changeset
159 octave_base_scalar<ST>::print_name_tag (std::ostream& os,
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
160 const std::string& name) const
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
161 {
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
162 indent (os);
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
163 os << name << " = ";
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
164 return false;
3277
9a1ac83591c0 [project @ 1999-10-12 06:03:19 by jwe]
jwe
parents:
diff changeset
165 }
10670
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
166
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
167 template <typename ST>
17870
1d2e709bbbda rework short_disp methods
John W. Eaton <jwe@octave.org>
parents: 17867
diff changeset
168 void
1d2e709bbbda rework short_disp methods
John W. Eaton <jwe@octave.org>
parents: 17867
diff changeset
169 octave_base_scalar<ST>::short_disp (std::ostream& os) const
16468
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 15195
diff changeset
170 {
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 15195
diff changeset
171 std::ostringstream buf;
17870
1d2e709bbbda rework short_disp methods
John W. Eaton <jwe@octave.org>
parents: 17867
diff changeset
172 octave_print_internal (buf, scalar);
1d2e709bbbda rework short_disp methods
John W. Eaton <jwe@octave.org>
parents: 17867
diff changeset
173 std::string tmp = buf.str ();
1d2e709bbbda rework short_disp methods
John W. Eaton <jwe@octave.org>
parents: 17867
diff changeset
174 size_t pos = tmp.find_first_not_of (" ");
19216
4b6f87c6739f Fix out_of_range from substr in short_disp for GUI symtab (bug #43351)
Andreas Weber <andy.weber.aw@gmail.com>
parents: 17870
diff changeset
175 if (pos != std::string::npos)
4b6f87c6739f Fix out_of_range from substr in short_disp for GUI symtab (bug #43351)
Andreas Weber <andy.weber.aw@gmail.com>
parents: 17870
diff changeset
176 os << tmp.substr (pos);
4b6f87c6739f Fix out_of_range from substr in short_disp for GUI symtab (bug #43351)
Andreas Weber <andy.weber.aw@gmail.com>
parents: 17870
diff changeset
177 else if (! tmp.empty ())
4b6f87c6739f Fix out_of_range from substr in short_disp for GUI symtab (bug #43351)
Andreas Weber <andy.weber.aw@gmail.com>
parents: 17870
diff changeset
178 os << tmp[0];
16468
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 15195
diff changeset
179 }
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 15195
diff changeset
180
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
181 template <typename ST>
18650
491b0adfec95 compatibility fixes for printf integer format specifiers
John W. Eaton <jwe@octave.org>
parents: 18416
diff changeset
182 octave_value
491b0adfec95 compatibility fixes for printf integer format specifiers
John W. Eaton <jwe@octave.org>
parents: 18416
diff changeset
183 octave_base_scalar<ST>::fast_elem_extract (octave_idx_type n) const
491b0adfec95 compatibility fixes for printf integer format specifiers
John W. Eaton <jwe@octave.org>
parents: 18416
diff changeset
184 {
491b0adfec95 compatibility fixes for printf integer format specifiers
John W. Eaton <jwe@octave.org>
parents: 18416
diff changeset
185 return (n == 0) ? octave_value (scalar) : octave_value ();
491b0adfec95 compatibility fixes for printf integer format specifiers
John W. Eaton <jwe@octave.org>
parents: 18416
diff changeset
186 }
491b0adfec95 compatibility fixes for printf integer format specifiers
John W. Eaton <jwe@octave.org>
parents: 18416
diff changeset
187
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21118
diff changeset
188 template <typename ST>
10670
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
189 bool
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
190 octave_base_scalar<ST>::fast_elem_insert_self (void *where,
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
191 builtin_type_t btyp) const
10670
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
192 {
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
193
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
194 // Don't use builtin_type () here to avoid an extra VM call.
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
195 if (btyp == class_to_btyp<ST>::btyp)
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
196 {
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
197 *(reinterpret_cast<ST *>(where)) = scalar;
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
198 return true;
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
199 }
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
200 else
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
201 return false;
654fbde5dceb make cellfun's fast scalar collection mechanism public
Jaroslav Hajek <highegg@gmail.com>
parents: 10545
diff changeset
202 }