Mercurial > jwe > octave

comparison libinterp/octave-value/ov-ch-mat.cc @ 21118:3ac9f47fb04b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Invert pattern if/code/else/err_XXX to if !/err_XXX/code. * daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, load-save.cc, lsode.cc, quad.cc, xnorm.cc, xpow.cc, ov-base-diag.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-intx.h, ov-perm.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-struct.cc, ov.cc, pt-idx.cc, Array-util.cc, Array.cc, Sparse.cc, lo-specfun.cc, mx-inlines.cc, oct-binmap.h: Invert pattern if/code/else/err_XXX to if !/err_XXX/code.
author Rik <rik@octave.org>
date Wed, 20 Jan 2016 16:08:30 -0800
parents e39e05d90788
children fcac5dbbf9ed
comparison
equal deleted inserted replaced
21117:c1df36373272 21118:3ac9f47fb04b
54 double 54 double
55 octave_char_matrix::double_value (bool) const 55 octave_char_matrix::double_value (bool) const
56 { 56 {
57 double retval = lo_ieee_nan_value (); 57 double retval = lo_ieee_nan_value ();
58 58
59 if (rows () > 0 && columns () > 0) 59 if (rows () == 0 || columns () == 0)
60 {
61 warn_implicit_conversion ("Octave:array-to-scalar",
62 "character matrix", "real scalar");
63
64 retval = static_cast<unsigned char> (matrix (0, 0));
65 }
66 else
67 err_invalid_conversion ("character matrix", "real scalar"); 60 err_invalid_conversion ("character matrix", "real scalar");
61
62 warn_implicit_conversion ("Octave:array-to-scalar",
63 "character matrix", "real scalar");
64
65 retval = static_cast<unsigned char> (matrix(0, 0));
68 66
69 return retval; 67 return retval;
70 } 68 }
71 69
72 float 70 float
73 octave_char_matrix::float_value (bool) const 71 octave_char_matrix::float_value (bool) const
74 { 72 {
75 float retval = lo_ieee_float_nan_value (); 73 float retval = lo_ieee_float_nan_value ();
76 74
77 if (rows () > 0 && columns () > 0) 75 if (rows () == 0 && columns () == 0)
78 {
79 warn_implicit_conversion ("Octave:array-to-scalar",
80 "character matrix", "real scalar");
81
82 retval = static_cast<unsigned char> (matrix (0, 0));
83 }
84 else
85 err_invalid_conversion ("character matrix", "real scalar"); 76 err_invalid_conversion ("character matrix", "real scalar");
77
78 warn_implicit_conversion ("Octave:array-to-scalar",
79 "character matrix", "real scalar");
80
81 retval = static_cast<unsigned char> (matrix(0, 0));
86 82
87 return retval; 83 return retval;
88 } 84 }
89 85
90 octave_int64 86 octave_int64
91 octave_char_matrix::int64_scalar_value () const 87 octave_char_matrix::int64_scalar_value () const
92 { 88 {
93 octave_int64 retval = 0; 89 octave_int64 retval = 0;
94 90
95 if (rows () > 0 && columns () > 0) 91 if (rows () == 0 || columns () == 0)
96 {
97 warn_implicit_conversion ("Octave:array-to-scalar",
98 "character matrix", "int64 scalar");
99
100 retval = octave_int64 (matrix (0, 0));
101 }
102 else
103 err_invalid_conversion ("character matrix", "int64 scalar"); 92 err_invalid_conversion ("character matrix", "int64 scalar");
93
94 warn_implicit_conversion ("Octave:array-to-scalar",
95 "character matrix", "int64 scalar");
96
97 retval = octave_int64 (matrix(0, 0));
104 98
105 return retval; 99 return retval;
106 } 100 }
107 101
108 octave_uint64 102 octave_uint64
109 octave_char_matrix::uint64_scalar_value () const 103 octave_char_matrix::uint64_scalar_value () const
110 { 104 {
111 octave_uint64 retval = 0; 105 octave_uint64 retval = 0;
112 106
113 if (rows () > 0 && columns () > 0) 107 if (rows () == 0 || columns () == 0)
114 {
115 warn_implicit_conversion ("Octave:array-to-scalar",
116 "character matrix", "uint64 scalar");
117
118 retval = octave_uint64 (matrix (0, 0));
119 }
120 else
121 err_invalid_conversion ("character matrix", "uint64 scalar"); 108 err_invalid_conversion ("character matrix", "uint64 scalar");
109
110 warn_implicit_conversion ("Octave:array-to-scalar",
111 "character matrix", "uint64 scalar");
112
113 retval = octave_uint64 (matrix(0, 0));
122 114
123 return retval; 115 return retval;
124 } 116 }
125 117
126 Complex 118 Complex
128 { 120 {
129 double tmp = lo_ieee_nan_value (); 121 double tmp = lo_ieee_nan_value ();
130 122
131 Complex retval (tmp, tmp); 123 Complex retval (tmp, tmp);
132 124
133 if (rows () > 0 && columns () > 0) 125 if (rows () == 0 && columns () == 0)
134 {
135 warn_implicit_conversion ("Octave:array-to-scalar",
136 "character matrix", "complex scalar");
137
138 retval = static_cast<unsigned char> (matrix (0, 0));
139 }
140 else
141 err_invalid_conversion ("character matrix", "complex scalar"); 126 err_invalid_conversion ("character matrix", "complex scalar");
127
128 warn_implicit_conversion ("Octave:array-to-scalar",
129 "character matrix", "complex scalar");
130
131 retval = static_cast<unsigned char> (matrix(0, 0));
142 132
143 return retval; 133 return retval;
144 } 134 }
145 135
146 FloatComplex 136 FloatComplex
148 { 138 {
149 float tmp = lo_ieee_float_nan_value (); 139 float tmp = lo_ieee_float_nan_value ();
150 140
151 FloatComplex retval (tmp, tmp); 141 FloatComplex retval (tmp, tmp);
152 142
153 if (rows () > 0 && columns () > 0) 143 if (rows () == 0 || columns () == 0)
154 {
155 warn_implicit_conversion ("Octave:array-to-scalar",
156 "character matrix", "complex scalar");
157
158 retval = static_cast<unsigned char> (matrix (0, 0));
159 }
160 else
161 err_invalid_conversion ("character matrix", "complex scalar"); 144 err_invalid_conversion ("character matrix", "complex scalar");
145
146 warn_implicit_conversion ("Octave:array-to-scalar",
147 "character matrix", "complex scalar");
148
149 retval = static_cast<unsigned char> (matrix(0, 0));
162 150
163 return retval; 151 return retval;
164 } 152 }
165 153
166 void 154 void