Mercurial > jwe > octave

comparison libinterp/octave-value/ov-bool-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 dfcb9d74b253
children 95f8c8cdbffe
comparison
equal deleted inserted replaced
21117:c1df36373272 21118:3ac9f47fb04b
94 double 94 double
95 octave_bool_matrix::double_value (bool) const 95 octave_bool_matrix::double_value (bool) const
96 { 96 {
97 double retval = lo_ieee_nan_value (); 97 double retval = lo_ieee_nan_value ();
98 98
99 if (rows () > 0 && columns () > 0) 99 if (rows () == 0 || columns () == 0)
100 {
101 warn_implicit_conversion ("Octave:array-to-scalar",
102 "bool matrix", "real scalar");
103
104 retval = matrix (0, 0);
105 }
106 else
107 err_invalid_conversion ("bool matrix", "real scalar"); 100 err_invalid_conversion ("bool matrix", "real scalar");
101
102 warn_implicit_conversion ("Octave:array-to-scalar",
103 "bool matrix", "real scalar");
104
105 retval = matrix(0, 0);
108 106
109 return retval; 107 return retval;
110 } 108 }
111 109
112 float 110 float
113 octave_bool_matrix::float_value (bool) const 111 octave_bool_matrix::float_value (bool) const
114 { 112 {
115 float retval = lo_ieee_float_nan_value (); 113 float retval = lo_ieee_float_nan_value ();
116 114
117 if (rows () > 0 && columns () > 0) 115 if (rows () == 0 || columns () == 0)
118 {
119 warn_implicit_conversion ("Octave:array-to-scalar",
120 "bool matrix", "real scalar");
121
122 retval = matrix (0, 0);
123 }
124 else
125 err_invalid_conversion ("bool matrix", "real scalar"); 116 err_invalid_conversion ("bool matrix", "real scalar");
117
118 warn_implicit_conversion ("Octave:array-to-scalar",
119 "bool matrix", "real scalar");
120
121 retval = matrix(0, 0);
126 122
127 return retval; 123 return retval;
128 } 124 }
129 125
130 Complex 126 Complex
132 { 128 {
133 double tmp = lo_ieee_nan_value (); 129 double tmp = lo_ieee_nan_value ();
134 130
135 Complex retval (tmp, tmp); 131 Complex retval (tmp, tmp);
136 132
137 if (rows () > 0 && columns () > 0) 133 if (rows () == 0 || columns () == 0)
138 {
139 warn_implicit_conversion ("Octave:array-to-scalar",
140 "bool matrix", "complex scalar");
141
142 retval = matrix (0, 0);
143 }
144 else
145 err_invalid_conversion ("bool matrix", "complex scalar"); 134 err_invalid_conversion ("bool matrix", "complex scalar");
135
136 warn_implicit_conversion ("Octave:array-to-scalar",
137 "bool matrix", "complex scalar");
138
139 retval = matrix(0, 0);
146 140
147 return retval; 141 return retval;
148 } 142 }
149 143
150 FloatComplex 144 FloatComplex
152 { 146 {
153 float tmp = lo_ieee_float_nan_value (); 147 float tmp = lo_ieee_float_nan_value ();
154 148
155 FloatComplex retval (tmp, tmp); 149 FloatComplex retval (tmp, tmp);
156 150
157 if (rows () > 0 && columns () > 0) 151 if (rows () == 0 || columns () == 0)
158 {
159 warn_implicit_conversion ("Octave:array-to-scalar",
160 "bool matrix", "complex scalar");
161
162 retval = matrix (0, 0);
163 }
164 else
165 err_invalid_conversion ("bool matrix", "complex scalar"); 152 err_invalid_conversion ("bool matrix", "complex scalar");
153
154 warn_implicit_conversion ("Octave:array-to-scalar",
155 "bool matrix", "complex scalar");
156
157 retval = matrix(0, 0);
166 158
167 return retval; 159 return retval;
168 } 160 }
169 161
170 octave_value 162 octave_value