Mercurial > hg > octave-lyh
annotate src/ov.cc @ 9690:f42f0d707e8e
don't register octave_char_matrix as a separate type
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Mon, 05 Oct 2009 07:53:29 +0200 |
| parents | 34d6f005db4b |
| children | 1c19877799d3 |
| rev | line source |
|---|---|
| 2376 | 1 /* |
| 2 | |
| 7017 | 3 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, |
| 8920 | 4 2006, 2007, 2008, 2009 John W. Eaton |
| 2376 | 5 |
| 6 This file is part of Octave. | |
| 7 | |
| 8 Octave is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
| 11 option) any later version. | |
| 2376 | 12 |
| 13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 7016 | 19 along with Octave; see the file COPYING. If not, see |
| 20 <http://www.gnu.org/licenses/>. | |
| 2376 | 21 |
| 22 */ | |
| 23 | |
| 24 #ifdef HAVE_CONFIG_H | |
| 25 #include <config.h> | |
| 26 #endif | |
| 27 | |
| 4970 | 28 #include "data-conv.h" |
| 29 #include "quit.h" | |
| 2942 | 30 #include "str-vec.h" |
| 2376 | 31 |
| 2974 | 32 #include "oct-obj.h" |
| 4944 | 33 #include "oct-stream.h" |
| 2376 | 34 #include "ov.h" |
| 35 #include "ov-base.h" | |
| 2825 | 36 #include "ov-bool.h" |
| 37 #include "ov-bool-mat.h" | |
| 3351 | 38 #include "ov-cell.h" |
| 2376 | 39 #include "ov-scalar.h" |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
40 #include "ov-float.h" |
| 2376 | 41 #include "ov-re-mat.h" |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
42 #include "ov-flt-re-mat.h" |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
43 #include "ov-re-diag.h" |
|
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
44 #include "ov-flt-re-diag.h" |
|
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
45 #include "ov-perm.h" |
| 5164 | 46 #include "ov-bool-sparse.h" |
| 47 #include "ov-cx-sparse.h" | |
| 48 #include "ov-re-sparse.h" | |
| 4901 | 49 #include "ov-int8.h" |
| 50 #include "ov-int16.h" | |
| 51 #include "ov-int32.h" | |
| 52 #include "ov-int64.h" | |
| 53 #include "ov-uint8.h" | |
| 54 #include "ov-uint16.h" | |
| 55 #include "ov-uint32.h" | |
| 56 #include "ov-uint64.h" | |
| 2376 | 57 #include "ov-complex.h" |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
58 #include "ov-flt-complex.h" |
| 2376 | 59 #include "ov-cx-mat.h" |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
60 #include "ov-flt-cx-mat.h" |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
61 #include "ov-cx-diag.h" |
|
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
62 #include "ov-flt-cx-diag.h" |
| 2376 | 63 #include "ov-ch-mat.h" |
| 64 #include "ov-str-mat.h" | |
| 65 #include "ov-range.h" | |
| 66 #include "ov-struct.h" | |
| 7336 | 67 #include "ov-class.h" |
| 2880 | 68 #include "ov-list.h" |
| 3977 | 69 #include "ov-cs-list.h" |
| 2376 | 70 #include "ov-colon.h" |
| 2974 | 71 #include "ov-builtin.h" |
| 4649 | 72 #include "ov-dld-fcn.h" |
| 2974 | 73 #include "ov-usr-fcn.h" |
| 4342 | 74 #include "ov-fcn-handle.h" |
| 4966 | 75 #include "ov-fcn-inline.h" |
| 2376 | 76 #include "ov-typeinfo.h" |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
77 #include "ov-null-mat.h" |
| 2376 | 78 |
| 79 #include "defun.h" | |
| 2880 | 80 #include "error.h" |
| 2376 | 81 #include "gripes.h" |
| 82 #include "pager.h" | |
| 4005 | 83 #include "parse.h" |
| 2376 | 84 #include "pr-output.h" |
| 7336 | 85 #include "symtab.h" |
| 2376 | 86 #include "utils.h" |
| 87 #include "variables.h" | |
| 88 | |
| 2477 | 89 // We are likely to have a lot of octave_value objects to allocate, so |
| 90 // make the grow_size large. | |
| 3219 | 91 DEFINE_OCTAVE_ALLOCATOR2(octave_value, 1024); |
| 2477 | 92 |
| 5775 | 93 // FIXME |
| 2880 | 94 |
| 2376 | 95 // Octave's value type. |
| 96 | |
| 3536 | 97 std::string |
| 3203 | 98 octave_value::unary_op_as_string (unary_op op) |
| 99 { | |
| 3523 | 100 std::string retval; |
| 3203 | 101 |
| 102 switch (op) | |
| 103 { | |
| 3533 | 104 case op_not: |
| 3203 | 105 retval = "!"; |
| 106 break; | |
| 107 | |
| 4965 | 108 case op_uplus: |
| 109 retval = "+"; | |
| 110 break; | |
| 111 | |
| 3533 | 112 case op_uminus: |
| 3203 | 113 retval = "-"; |
| 114 break; | |
| 115 | |
| 3533 | 116 case op_transpose: |
| 3203 | 117 retval = ".'"; |
| 118 break; | |
| 119 | |
| 3533 | 120 case op_hermitian: |
| 3203 | 121 retval = "'"; |
| 122 break; | |
| 123 | |
| 3533 | 124 case op_incr: |
| 3203 | 125 retval = "++"; |
| 126 break; | |
| 127 | |
| 3533 | 128 case op_decr: |
| 3203 | 129 retval = "--"; |
| 130 break; | |
| 131 | |
| 132 default: | |
| 133 retval = "<unknown>"; | |
| 134 } | |
| 135 | |
| 136 return retval; | |
| 137 } | |
| 138 | |
| 3536 | 139 std::string |
| 7336 | 140 octave_value::unary_op_fcn_name (unary_op op) |
| 141 { | |
| 142 std::string retval; | |
| 143 | |
| 144 switch (op) | |
| 145 { | |
| 146 case op_not: | |
| 147 retval = "not"; | |
| 148 break; | |
| 149 | |
| 150 case op_uplus: | |
| 151 retval = "uplus"; | |
| 152 break; | |
| 153 | |
| 154 case op_uminus: | |
| 155 retval = "uminus"; | |
| 156 break; | |
| 157 | |
| 158 case op_transpose: | |
| 159 retval = "transpose"; | |
| 160 break; | |
| 161 | |
| 162 case op_hermitian: | |
| 163 retval = "ctranspose"; | |
| 164 break; | |
| 165 | |
| 166 default: | |
| 167 break; | |
| 168 } | |
| 169 | |
| 170 return retval; | |
| 171 } | |
| 172 | |
| 173 std::string | |
| 2376 | 174 octave_value::binary_op_as_string (binary_op op) |
| 175 { | |
| 3523 | 176 std::string retval; |
| 2376 | 177 |
| 178 switch (op) | |
| 179 { | |
| 3533 | 180 case op_add: |
| 2376 | 181 retval = "+"; |
| 182 break; | |
| 183 | |
| 3533 | 184 case op_sub: |
| 2376 | 185 retval = "-"; |
| 186 break; | |
| 187 | |
| 3533 | 188 case op_mul: |
| 2376 | 189 retval = "*"; |
| 190 break; | |
| 191 | |
| 3533 | 192 case op_div: |
| 2376 | 193 retval = "/"; |
| 194 break; | |
| 195 | |
| 3533 | 196 case op_pow: |
| 2376 | 197 retval = "^"; |
| 198 break; | |
| 199 | |
| 3533 | 200 case op_ldiv: |
| 2376 | 201 retval = "\\"; |
| 202 break; | |
| 203 | |
| 3533 | 204 case op_lshift: |
| 2903 | 205 retval = "<<"; |
| 206 break; | |
| 207 | |
| 3533 | 208 case op_rshift: |
| 2903 | 209 retval = ">>"; |
| 210 break; | |
| 211 | |
| 3533 | 212 case op_lt: |
| 2376 | 213 retval = "<"; |
| 214 break; | |
| 215 | |
| 3533 | 216 case op_le: |
| 2376 | 217 retval = "<="; |
| 218 break; | |
| 219 | |
| 3533 | 220 case op_eq: |
| 2376 | 221 retval = "=="; |
| 222 break; | |
| 223 | |
| 3533 | 224 case op_ge: |
| 2376 | 225 retval = ">="; |
| 226 break; | |
| 227 | |
| 3533 | 228 case op_gt: |
| 2376 | 229 retval = ">"; |
| 230 break; | |
| 231 | |
| 3533 | 232 case op_ne: |
| 2376 | 233 retval = "!="; |
| 234 break; | |
| 235 | |
| 3533 | 236 case op_el_mul: |
| 2376 | 237 retval = ".*"; |
| 238 break; | |
| 239 | |
| 3533 | 240 case op_el_div: |
| 2376 | 241 retval = "./"; |
| 242 break; | |
| 243 | |
| 3533 | 244 case op_el_pow: |
| 2376 | 245 retval = ".^"; |
| 246 break; | |
| 247 | |
| 3533 | 248 case op_el_ldiv: |
| 2376 | 249 retval = ".\\"; |
| 250 break; | |
| 251 | |
| 3533 | 252 case op_el_and: |
| 2376 | 253 retval = "&"; |
| 254 break; | |
| 255 | |
| 3533 | 256 case op_el_or: |
| 2376 | 257 retval = "|"; |
| 258 break; | |
| 259 | |
| 3533 | 260 case op_struct_ref: |
| 2376 | 261 retval = "."; |
| 262 break; | |
| 263 | |
| 264 default: | |
| 265 retval = "<unknown>"; | |
| 266 } | |
| 267 | |
| 268 return retval; | |
| 269 } | |
| 270 | |
| 3536 | 271 std::string |
| 7336 | 272 octave_value::binary_op_fcn_name (binary_op op) |
| 273 { | |
| 274 std::string retval; | |
| 275 | |
| 276 switch (op) | |
| 277 { | |
| 278 case op_add: | |
| 279 retval = "plus"; | |
| 280 break; | |
| 281 | |
| 282 case op_sub: | |
| 283 retval = "minus"; | |
| 284 break; | |
| 285 | |
| 286 case op_mul: | |
| 287 retval = "mtimes"; | |
| 288 break; | |
| 289 | |
| 290 case op_div: | |
| 291 retval = "mrdivide"; | |
| 292 break; | |
| 293 | |
| 294 case op_pow: | |
| 295 retval = "mpower"; | |
| 296 break; | |
| 297 | |
| 298 case op_ldiv: | |
| 299 retval = "mldivide"; | |
| 300 break; | |
| 301 | |
| 302 case op_lt: | |
| 303 retval = "lt"; | |
| 304 break; | |
| 305 | |
| 306 case op_le: | |
| 307 retval = "le"; | |
| 308 break; | |
| 309 | |
| 310 case op_eq: | |
| 311 retval = "eq"; | |
| 312 break; | |
| 313 | |
| 314 case op_ge: | |
| 315 retval = "ge"; | |
| 316 break; | |
| 317 | |
| 318 case op_gt: | |
| 319 retval = "gt"; | |
| 320 break; | |
| 321 | |
| 322 case op_ne: | |
| 323 retval = "ne"; | |
| 324 break; | |
| 325 | |
| 326 case op_el_mul: | |
| 327 retval = "times"; | |
| 328 break; | |
| 329 | |
| 330 case op_el_div: | |
| 331 retval = "rdivide"; | |
| 332 break; | |
| 333 | |
| 334 case op_el_pow: | |
| 335 retval = "power"; | |
| 336 break; | |
| 337 | |
| 338 case op_el_ldiv: | |
| 339 retval = "ldivide"; | |
| 340 break; | |
| 341 | |
| 342 case op_el_and: | |
| 343 retval = "and"; | |
| 344 break; | |
| 345 | |
| 346 case op_el_or: | |
| 347 retval = "or"; | |
| 348 break; | |
| 349 | |
| 350 default: | |
| 351 break; | |
| 352 } | |
| 353 | |
| 354 return retval; | |
| 355 } | |
| 356 | |
| 357 std::string | |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
358 octave_value::binary_op_fcn_name (compound_binary_op op) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
359 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
360 std::string retval; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
361 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
362 switch (op) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
363 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
364 case op_trans_mul: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
365 retval = "transtimes"; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
366 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
367 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
368 case op_mul_trans: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
369 retval = "timestrans"; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
370 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
371 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
372 case op_herm_mul: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
373 retval = "hermtimes"; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
374 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
375 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
376 case op_mul_herm: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
377 retval = "timesherm"; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
378 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
379 |
|
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
380 case op_trans_ldiv: |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
381 retval = "transldiv"; |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
382 break; |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
383 |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
384 case op_herm_ldiv: |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
385 retval = "hermldiv"; |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
386 break; |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
387 |
|
8982
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
388 case op_el_and_not: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
389 retval = "andnot"; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
390 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
391 |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
392 case op_el_or_not: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
393 retval = "ornot"; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
394 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
395 |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
396 case op_el_not_and: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
397 retval = "notand"; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
398 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
399 |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
400 case op_el_not_or: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
401 retval = "notor"; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
402 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
403 |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
404 default: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
405 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
406 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
407 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
408 return retval; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
409 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
410 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
411 std::string |
| 2880 | 412 octave_value::assign_op_as_string (assign_op op) |
| 413 { | |
| 3523 | 414 std::string retval; |
| 2880 | 415 |
| 416 switch (op) | |
| 417 { | |
| 3533 | 418 case op_asn_eq: |
| 2880 | 419 retval = "="; |
| 420 break; | |
| 421 | |
| 3533 | 422 case op_add_eq: |
| 2880 | 423 retval = "+="; |
| 424 break; | |
| 425 | |
| 3533 | 426 case op_sub_eq: |
| 2880 | 427 retval = "-="; |
| 428 break; | |
| 429 | |
| 3533 | 430 case op_mul_eq: |
| 2880 | 431 retval = "*="; |
| 432 break; | |
| 433 | |
| 3533 | 434 case op_div_eq: |
| 2880 | 435 retval = "/="; |
| 436 break; | |
| 437 | |
| 3533 | 438 case op_ldiv_eq: |
| 3204 | 439 retval = "\\="; |
| 440 break; | |
| 441 | |
| 4018 | 442 case op_pow_eq: |
| 443 retval = "^="; | |
| 444 break; | |
| 445 | |
| 3533 | 446 case op_lshift_eq: |
| 2903 | 447 retval = "<<="; |
| 448 break; | |
| 449 | |
| 3533 | 450 case op_rshift_eq: |
| 2903 | 451 retval = ">>="; |
| 452 break; | |
| 453 | |
| 3533 | 454 case op_el_mul_eq: |
| 2880 | 455 retval = ".*="; |
| 456 break; | |
| 457 | |
| 3533 | 458 case op_el_div_eq: |
| 2880 | 459 retval = "./="; |
| 460 break; | |
| 461 | |
| 3533 | 462 case op_el_ldiv_eq: |
| 3204 | 463 retval = ".\\="; |
| 464 break; | |
| 465 | |
| 4018 | 466 case op_el_pow_eq: |
| 467 retval = ".^="; | |
| 468 break; | |
| 469 | |
| 3533 | 470 case op_el_and_eq: |
| 2880 | 471 retval = "&="; |
| 472 break; | |
| 473 | |
| 3533 | 474 case op_el_or_eq: |
| 2880 | 475 retval = "|="; |
| 476 break; | |
| 477 | |
| 478 default: | |
| 479 retval = "<unknown>"; | |
| 480 } | |
| 481 | |
| 482 return retval; | |
| 483 } | |
| 484 | |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
485 octave_value::assign_op |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
486 octave_value::binary_op_to_assign_op (binary_op op) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
487 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
488 assign_op retval; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
489 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
490 switch (op) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
491 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
492 case op_add: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
493 retval = op_add_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
494 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
495 case op_sub: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
496 retval = op_sub_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
497 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
498 case op_mul: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
499 retval = op_mul_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
500 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
501 case op_div: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
502 retval = op_div_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
503 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
504 case op_el_mul: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
505 retval = op_el_mul_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
506 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
507 case op_el_div: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
508 retval = op_el_div_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
509 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
510 case op_el_and: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
511 retval = op_el_and_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
512 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
513 case op_el_or: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
514 retval = op_el_or_eq; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
515 break; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
516 default: |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
517 retval = unknown_assign_op; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
518 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
519 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
520 return retval; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
521 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
522 |
| 4254 | 523 octave_value::octave_value (short int i) |
| 524 : rep (new octave_scalar (i)) | |
| 525 { | |
| 526 } | |
| 527 | |
| 528 octave_value::octave_value (unsigned short int i) | |
| 529 : rep (new octave_scalar (i)) | |
| 530 { | |
| 531 } | |
| 532 | |
| 4233 | 533 octave_value::octave_value (int i) |
| 534 : rep (new octave_scalar (i)) | |
| 535 { | |
| 536 } | |
| 537 | |
| 4254 | 538 octave_value::octave_value (unsigned int i) |
| 539 : rep (new octave_scalar (i)) | |
| 540 { | |
| 541 } | |
| 542 | |
| 543 octave_value::octave_value (long int i) | |
| 544 : rep (new octave_scalar (i)) | |
| 545 { | |
| 546 } | |
| 547 | |
| 548 octave_value::octave_value (unsigned long int i) | |
| 549 : rep (new octave_scalar (i)) | |
| 550 { | |
| 551 } | |
| 552 | |
| 4353 | 553 #if defined (HAVE_LONG_LONG_INT) |
| 554 octave_value::octave_value (long long int i) | |
| 555 : rep (new octave_scalar (i)) | |
| 556 { | |
| 557 } | |
| 558 #endif | |
| 559 | |
| 4355 | 560 #if defined (HAVE_UNSIGNED_LONG_LONG_INT) |
| 4353 | 561 octave_value::octave_value (unsigned long long int i) |
| 562 : rep (new octave_scalar (i)) | |
| 563 { | |
| 564 } | |
| 565 #endif | |
| 566 | |
| 4254 | 567 octave_value::octave_value (octave_time t) |
| 7065 | 568 : rep (new octave_scalar (t.double_value ())) |
| 4254 | 569 { |
| 570 } | |
| 571 | |
| 2376 | 572 octave_value::octave_value (double d) |
| 2825 | 573 : rep (new octave_scalar (d)) |
| 574 { | |
| 575 } | |
| 2376 | 576 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
577 octave_value::octave_value (float d) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
578 : rep (new octave_float_scalar (d)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
579 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
580 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
581 |
| 4587 | 582 octave_value::octave_value (const Cell& c, bool is_csl) |
| 5477 | 583 : rep (is_csl |
| 5759 | 584 ? dynamic_cast<octave_base_value *> (new octave_cs_list (c)) |
| 585 : dynamic_cast<octave_base_value *> (new octave_cell (c))) | |
| 3351 | 586 { |
| 587 } | |
| 588 | |
| 5147 | 589 octave_value::octave_value (const ArrayN<octave_value>& a, bool is_csl) |
| 5477 | 590 : rep (is_csl |
| 5759 | 591 ? dynamic_cast<octave_base_value *> (new octave_cs_list (Cell (a))) |
| 592 : dynamic_cast<octave_base_value *> (new octave_cell (Cell (a)))) | |
| 5147 | 593 { |
| 594 } | |
| 595 | |
| 5785 | 596 octave_value::octave_value (const Matrix& m, const MatrixType& t) |
| 597 : rep (new octave_matrix (m, t)) | |
| 2423 | 598 { |
| 599 maybe_mutate (); | |
| 600 } | |
| 2376 | 601 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
602 octave_value::octave_value (const FloatMatrix& m, const MatrixType& t) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
603 : rep (new octave_float_matrix (m, t)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
604 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
605 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
606 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
607 |
| 4507 | 608 octave_value::octave_value (const NDArray& a) |
| 4513 | 609 : rep (new octave_matrix (a)) |
| 4478 | 610 { |
| 611 maybe_mutate (); | |
| 612 } | |
| 613 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
614 octave_value::octave_value (const FloatNDArray& a) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
615 : rep (new octave_float_matrix (a)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
616 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
617 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
618 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
619 |
| 4911 | 620 octave_value::octave_value (const ArrayN<double>& a) |
| 621 : rep (new octave_matrix (a)) | |
| 622 { | |
| 623 maybe_mutate (); | |
| 624 } | |
| 625 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
626 octave_value::octave_value (const ArrayN<float>& a) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
627 : rep (new octave_float_matrix (a)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
628 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
629 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
630 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
631 |
| 2376 | 632 octave_value::octave_value (const DiagMatrix& d) |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
633 : rep (new octave_diag_matrix (d)) |
| 2423 | 634 { |
| 635 maybe_mutate (); | |
| 636 } | |
| 2376 | 637 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
638 octave_value::octave_value (const FloatDiagMatrix& d) |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
639 : rep (new octave_float_diag_matrix (d)) |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
640 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
641 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
642 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
643 |
| 3418 | 644 octave_value::octave_value (const RowVector& v) |
| 645 : rep (new octave_matrix (v)) | |
| 2423 | 646 { |
| 647 maybe_mutate (); | |
| 648 } | |
| 2376 | 649 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
650 octave_value::octave_value (const FloatRowVector& v) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
651 : rep (new octave_float_matrix (v)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
652 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
653 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
654 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
655 |
| 3418 | 656 octave_value::octave_value (const ColumnVector& v) |
| 657 : rep (new octave_matrix (v)) | |
| 2423 | 658 { |
| 659 maybe_mutate (); | |
| 660 } | |
| 2376 | 661 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
662 octave_value::octave_value (const FloatColumnVector& v) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
663 : rep (new octave_float_matrix (v)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
664 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
665 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
666 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
667 |
| 2376 | 668 octave_value::octave_value (const Complex& C) |
| 2423 | 669 : rep (new octave_complex (C)) |
| 670 { | |
| 671 maybe_mutate (); | |
| 672 } | |
| 2376 | 673 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
674 octave_value::octave_value (const FloatComplex& C) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
675 : rep (new octave_float_complex (C)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
676 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
677 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
678 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
679 |
| 5785 | 680 octave_value::octave_value (const ComplexMatrix& m, const MatrixType& t) |
| 681 : rep (new octave_complex_matrix (m, t)) | |
| 2423 | 682 { |
| 683 maybe_mutate (); | |
| 684 } | |
| 2376 | 685 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
686 octave_value::octave_value (const FloatComplexMatrix& m, const MatrixType& t) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
687 : rep (new octave_float_complex_matrix (m, t)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
688 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
689 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
690 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
691 |
| 4513 | 692 octave_value::octave_value (const ComplexNDArray& a) |
| 693 : rep (new octave_complex_matrix (a)) | |
| 4478 | 694 { |
| 695 maybe_mutate (); | |
| 696 } | |
| 697 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
698 octave_value::octave_value (const FloatComplexNDArray& a) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
699 : rep (new octave_float_complex_matrix (a)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
700 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
701 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
702 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
703 |
| 4911 | 704 octave_value::octave_value (const ArrayN<Complex>& a) |
| 705 : rep (new octave_complex_matrix (a)) | |
| 706 { | |
| 707 maybe_mutate (); | |
| 708 } | |
| 709 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
710 octave_value::octave_value (const ArrayN<FloatComplex>& a) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
711 : rep (new octave_float_complex_matrix (a)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
712 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
713 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
714 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
715 |
| 2376 | 716 octave_value::octave_value (const ComplexDiagMatrix& d) |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
717 : rep (new octave_complex_diag_matrix (d)) |
| 2423 | 718 { |
| 719 maybe_mutate (); | |
| 720 } | |
| 2376 | 721 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
722 octave_value::octave_value (const FloatComplexDiagMatrix& d) |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
723 : rep (new octave_float_complex_diag_matrix (d)) |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
724 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
725 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
726 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
727 |
| 3418 | 728 octave_value::octave_value (const ComplexRowVector& v) |
| 729 : rep (new octave_complex_matrix (v)) | |
| 2423 | 730 { |
| 731 maybe_mutate (); | |
| 732 } | |
| 2376 | 733 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
734 octave_value::octave_value (const FloatComplexRowVector& v) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
735 : rep (new octave_float_complex_matrix (v)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
736 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
737 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
738 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
739 |
| 3418 | 740 octave_value::octave_value (const ComplexColumnVector& v) |
| 741 : rep (new octave_complex_matrix (v)) | |
| 2423 | 742 { |
| 743 maybe_mutate (); | |
| 744 } | |
| 2376 | 745 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
746 octave_value::octave_value (const FloatComplexColumnVector& v) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
747 : rep (new octave_float_complex_matrix (v)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
748 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
749 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
750 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
751 |
|
8960
93f18f166aba
remove float perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
752 octave_value::octave_value (const PermMatrix& p) |
|
93f18f166aba
remove float perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
753 : rep (new octave_perm_matrix (p)) |
|
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
754 { |
|
8960
93f18f166aba
remove float perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
755 maybe_mutate (); |
|
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
756 } |
|
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
757 |
| 2825 | 758 octave_value::octave_value (bool b) |
| 759 : rep (new octave_bool (b)) | |
| 760 { | |
| 761 } | |
| 762 | |
| 5785 | 763 octave_value::octave_value (const boolMatrix& bm, const MatrixType& t) |
| 764 : rep (new octave_bool_matrix (bm, t)) | |
| 2825 | 765 { |
| 766 maybe_mutate (); | |
| 767 } | |
| 768 | |
| 4513 | 769 octave_value::octave_value (const boolNDArray& bnda) |
| 770 : rep (new octave_bool_matrix (bnda)) | |
| 771 { | |
| 772 maybe_mutate (); | |
| 773 } | |
| 774 | |
| 7433 | 775 octave_value::octave_value (const ArrayN<bool>& bnda) |
| 776 : rep (new octave_bool_matrix (bnda)) | |
| 777 { | |
| 778 maybe_mutate (); | |
| 779 } | |
| 780 | |
| 5279 | 781 octave_value::octave_value (char c, char type) |
| 782 : rep (type == '"' | |
| 783 ? new octave_char_matrix_dq_str (c) | |
| 784 : new octave_char_matrix_sq_str (c)) | |
| 3189 | 785 { |
| 786 maybe_mutate (); | |
| 787 } | |
| 788 | |
| 5279 | 789 octave_value::octave_value (const char *s, char type) |
| 790 : rep (type == '"' | |
| 791 ? new octave_char_matrix_dq_str (s) | |
| 792 : new octave_char_matrix_sq_str (s)) | |
| 2423 | 793 { |
| 794 maybe_mutate (); | |
| 795 } | |
| 2376 | 796 |
| 5279 | 797 octave_value::octave_value (const std::string& s, char type) |
| 798 : rep (type == '"' | |
| 799 ? new octave_char_matrix_dq_str (s) | |
| 800 : new octave_char_matrix_sq_str (s)) | |
| 2423 | 801 { |
| 802 maybe_mutate (); | |
| 803 } | |
| 2376 | 804 |
| 5279 | 805 octave_value::octave_value (const string_vector& s, char type) |
| 806 : rep (type == '"' | |
| 807 ? new octave_char_matrix_dq_str (s) | |
| 808 : new octave_char_matrix_sq_str (s)) | |
| 2423 | 809 { |
| 810 maybe_mutate (); | |
| 811 } | |
| 2376 | 812 |
|
9689
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
813 octave_value::octave_value (const charMatrix& chm, char type) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
814 : rep (type == '"' |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
815 ? new octave_char_matrix_dq_str (chm) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
816 : new octave_char_matrix_sq_str (chm)) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
817 { |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
818 maybe_mutate (); |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
819 } |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
820 |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
821 octave_value::octave_value (const charNDArray& chm, char type) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
822 : rep (type == '"' |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
823 ? new octave_char_matrix_dq_str (chm) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
824 : new octave_char_matrix_sq_str (chm)) |
| 2409 | 825 { |
| 4513 | 826 maybe_mutate (); |
| 827 } | |
| 2376 | 828 |
|
9689
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
829 octave_value::octave_value (const ArrayN<char>& chm, char type) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
830 : rep (type == '"' |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
831 ? new octave_char_matrix_dq_str (chm) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
832 : new octave_char_matrix_sq_str (chm)) |
| 4513 | 833 { |
| 2423 | 834 maybe_mutate (); |
| 2409 | 835 } |
| 2376 | 836 |
|
9689
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
837 octave_value::octave_value (const charMatrix& chm, bool, char type) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
838 : rep (type == '"' |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
839 ? new octave_char_matrix_dq_str (chm) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
840 : new octave_char_matrix_sq_str (chm)) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
841 { |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
842 maybe_mutate (); |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
843 } |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
844 |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
845 octave_value::octave_value (const charNDArray& chm, bool, char type) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
846 : rep (type == '"' |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
847 ? new octave_char_matrix_dq_str (chm) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
848 : new octave_char_matrix_sq_str (chm)) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
849 { |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
850 maybe_mutate (); |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
851 } |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
852 |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
853 octave_value::octave_value (const ArrayN<char>& chm, bool, char type) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
854 : rep (type == '"' |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
855 ? new octave_char_matrix_dq_str (chm) |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9661
diff
changeset
|
856 : new octave_char_matrix_sq_str (chm)) |
| 4997 | 857 { |
| 858 maybe_mutate (); | |
| 859 } | |
| 860 | |
| 5785 | 861 octave_value::octave_value (const SparseMatrix& m, const MatrixType &t) |
| 5164 | 862 : rep (new octave_sparse_matrix (m, t)) |
| 863 { | |
| 864 maybe_mutate (); | |
| 865 } | |
| 866 | |
| 6863 | 867 octave_value::octave_value (const Sparse<double>& m, const MatrixType &t) |
| 868 : rep (new octave_sparse_matrix (m, t)) | |
| 869 { | |
| 870 maybe_mutate (); | |
| 871 } | |
| 872 | |
| 5785 | 873 octave_value::octave_value (const SparseComplexMatrix& m, const MatrixType &t) |
| 5164 | 874 : rep (new octave_sparse_complex_matrix (m, t)) |
| 875 { | |
| 876 maybe_mutate (); | |
| 877 } | |
| 878 | |
| 6863 | 879 octave_value::octave_value (const Sparse<Complex>& m, const MatrixType &t) |
| 880 : rep (new octave_sparse_complex_matrix (m, t)) | |
| 881 { | |
| 882 maybe_mutate (); | |
| 883 } | |
| 884 | |
| 5785 | 885 octave_value::octave_value (const SparseBoolMatrix& bm, const MatrixType &t) |
| 5164 | 886 : rep (new octave_sparse_bool_matrix (bm, t)) |
| 887 { | |
| 888 maybe_mutate (); | |
| 889 } | |
| 890 | |
| 7433 | 891 octave_value::octave_value (const Sparse<bool>& bm, const MatrixType &t) |
| 892 : rep (new octave_sparse_bool_matrix (bm, t)) | |
| 893 { | |
| 894 maybe_mutate (); | |
| 895 } | |
| 896 | |
| 4901 | 897 octave_value::octave_value (const octave_int8& i) |
| 898 : rep (new octave_int8_scalar (i)) | |
| 899 { | |
| 900 maybe_mutate (); | |
| 901 } | |
| 902 | |
| 903 octave_value::octave_value (const octave_uint8& i) | |
| 904 : rep (new octave_uint8_scalar (i)) | |
| 905 { | |
| 906 maybe_mutate (); | |
| 907 } | |
| 908 | |
| 909 octave_value::octave_value (const octave_int16& i) | |
| 910 : rep (new octave_int16_scalar (i)) | |
| 911 { | |
| 912 maybe_mutate (); | |
| 913 } | |
| 914 | |
| 915 octave_value::octave_value (const octave_uint16& i) | |
| 916 : rep (new octave_uint16_scalar (i)) | |
| 917 { | |
| 918 maybe_mutate (); | |
| 919 } | |
| 920 | |
| 921 octave_value::octave_value (const octave_int32& i) | |
| 922 : rep (new octave_int32_scalar (i)) | |
| 923 { | |
| 924 maybe_mutate (); | |
| 925 } | |
| 926 | |
| 927 octave_value::octave_value (const octave_uint32& i) | |
| 928 : rep (new octave_uint32_scalar (i)) | |
| 929 { | |
| 930 maybe_mutate (); | |
| 931 } | |
| 932 | |
| 933 octave_value::octave_value (const octave_int64& i) | |
| 934 : rep (new octave_int64_scalar (i)) | |
| 935 { | |
| 936 maybe_mutate (); | |
| 937 } | |
| 938 | |
| 939 octave_value::octave_value (const octave_uint64& i) | |
| 940 : rep (new octave_uint64_scalar (i)) | |
| 941 { | |
| 942 maybe_mutate (); | |
| 943 } | |
| 944 | |
| 945 octave_value::octave_value (const int8NDArray& inda) | |
| 946 : rep (new octave_int8_matrix (inda)) | |
| 947 { | |
| 948 maybe_mutate (); | |
| 949 } | |
| 950 | |
| 7064 | 951 octave_value::octave_value (const ArrayN<octave_int8>& inda) |
| 952 : rep (new octave_int8_matrix (inda)) | |
| 953 { | |
| 954 maybe_mutate (); | |
| 955 } | |
| 956 | |
| 4901 | 957 octave_value::octave_value (const uint8NDArray& inda) |
| 958 : rep (new octave_uint8_matrix (inda)) | |
| 959 { | |
| 960 maybe_mutate (); | |
| 961 } | |
| 962 | |
| 7064 | 963 octave_value::octave_value (const ArrayN<octave_uint8>& inda) |
| 964 : rep (new octave_uint8_matrix (inda)) | |
| 965 { | |
| 966 maybe_mutate (); | |
| 967 } | |
| 968 | |
| 4901 | 969 octave_value::octave_value (const int16NDArray& inda) |
| 970 : rep (new octave_int16_matrix (inda)) | |
| 971 { | |
| 972 maybe_mutate (); | |
| 973 } | |
| 974 | |
| 7064 | 975 octave_value::octave_value (const ArrayN<octave_int16>& inda) |
| 976 : rep (new octave_int16_matrix (inda)) | |
| 977 { | |
| 978 maybe_mutate (); | |
| 979 } | |
| 980 | |
| 4901 | 981 octave_value::octave_value (const uint16NDArray& inda) |
| 982 : rep (new octave_uint16_matrix (inda)) | |
| 983 { | |
| 984 maybe_mutate (); | |
| 985 } | |
| 986 | |
| 7064 | 987 octave_value::octave_value (const ArrayN<octave_uint16>& inda) |
| 988 : rep (new octave_uint16_matrix (inda)) | |
| 989 { | |
| 990 maybe_mutate (); | |
| 991 } | |
| 992 | |
| 4901 | 993 octave_value::octave_value (const int32NDArray& inda) |
| 994 : rep (new octave_int32_matrix (inda)) | |
| 995 { | |
| 996 maybe_mutate (); | |
| 997 } | |
| 998 | |
| 7064 | 999 octave_value::octave_value (const ArrayN<octave_int32>& inda) |
| 1000 : rep (new octave_int32_matrix (inda)) | |
| 1001 { | |
| 1002 maybe_mutate (); | |
| 1003 } | |
| 1004 | |
| 4901 | 1005 octave_value::octave_value (const uint32NDArray& inda) |
| 1006 : rep (new octave_uint32_matrix (inda)) | |
| 1007 { | |
| 1008 maybe_mutate (); | |
| 1009 } | |
| 1010 | |
| 7064 | 1011 octave_value::octave_value (const ArrayN<octave_uint32>& inda) |
| 1012 : rep (new octave_uint32_matrix (inda)) | |
| 1013 { | |
| 1014 maybe_mutate (); | |
| 1015 } | |
| 1016 | |
| 4901 | 1017 octave_value::octave_value (const int64NDArray& inda) |
| 1018 : rep (new octave_int64_matrix (inda)) | |
| 1019 { | |
| 1020 maybe_mutate (); | |
| 1021 } | |
| 1022 | |
| 7064 | 1023 octave_value::octave_value (const ArrayN<octave_int64>& inda) |
| 1024 : rep (new octave_int64_matrix (inda)) | |
| 1025 { | |
| 1026 maybe_mutate (); | |
| 1027 } | |
| 1028 | |
| 4901 | 1029 octave_value::octave_value (const uint64NDArray& inda) |
| 1030 : rep (new octave_uint64_matrix (inda)) | |
| 1031 { | |
| 1032 maybe_mutate (); | |
| 1033 } | |
| 1034 | |
| 7064 | 1035 octave_value::octave_value (const ArrayN<octave_uint64>& inda) |
| 1036 : rep (new octave_uint64_matrix (inda)) | |
| 1037 { | |
| 1038 maybe_mutate (); | |
| 1039 } | |
| 1040 | |
|
9351
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1041 octave_value::octave_value (const Array<octave_idx_type>& inda, bool zero_based, |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1042 bool cache_index) |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1043 : rep (new octave_matrix (inda, zero_based, cache_index)) |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1044 { |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1045 maybe_mutate (); |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1046 } |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
1047 |
|
9479
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1048 octave_value::octave_value (const idx_vector& idx) |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1049 : rep () |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1050 { |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1051 double scalar; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1052 Range range; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1053 NDArray array; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1054 idx_vector::idx_class_type idx_class; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1055 |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1056 idx.unconvert (idx_class, scalar, range, array); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1057 |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1058 switch (idx_class) |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1059 { |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1060 case idx_vector::class_colon: |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1061 rep = new octave_magic_colon (); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1062 break; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1063 case idx_vector::class_range: |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1064 rep = new octave_range (range, idx); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1065 break; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1066 case idx_vector::class_scalar: |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1067 rep = new octave_scalar (scalar); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1068 break; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1069 case idx_vector::class_vector: |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1070 rep = new octave_matrix (array, idx); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1071 break; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1072 default: |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1073 assert (false); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1074 break; |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1075 } |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1076 |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1077 // FIXME: needed? |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1078 maybe_mutate (); |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1079 } |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1080 |
| 2376 | 1081 octave_value::octave_value (double base, double limit, double inc) |
| 2423 | 1082 : rep (new octave_range (base, limit, inc)) |
| 1083 { | |
| 1084 maybe_mutate (); | |
| 1085 } | |
| 2376 | 1086 |
| 1087 octave_value::octave_value (const Range& r) | |
| 2423 | 1088 : rep (new octave_range (r)) |
| 1089 { | |
| 1090 maybe_mutate (); | |
| 1091 } | |
| 2376 | 1092 |
| 1093 octave_value::octave_value (const Octave_map& m) | |
| 2825 | 1094 : rep (new octave_struct (m)) |
| 1095 { | |
| 2880 | 1096 } |
| 1097 | |
| 7336 | 1098 octave_value::octave_value (const Octave_map& m, const std::string& id) |
| 1099 : rep (new octave_class (m, id)) | |
| 1100 { | |
| 1101 } | |
| 1102 | |
| 4587 | 1103 octave_value::octave_value (const octave_value_list& l, bool is_csl) |
| 5477 | 1104 : rep (is_csl |
| 5759 | 1105 ? dynamic_cast<octave_base_value *> (new octave_cs_list (l)) |
| 1106 : dynamic_cast<octave_base_value *> (new octave_list (l))) | |
| 2880 | 1107 { |
| 1108 } | |
| 2376 | 1109 |
| 1110 octave_value::octave_value (octave_value::magic_colon) | |
| 2825 | 1111 : rep (new octave_magic_colon ()) |
| 1112 { | |
| 1113 } | |
| 2376 | 1114 |
| 5759 | 1115 octave_value::octave_value (octave_base_value *new_rep) |
| 2825 | 1116 : rep (new_rep) |
| 1117 { | |
| 1118 } | |
| 2376 | 1119 |
| 7336 | 1120 octave_value::octave_value (octave_base_value *new_rep, int xcount) |
| 1121 : rep (new_rep) | |
| 1122 { | |
| 1123 rep->count = xcount; | |
| 1124 } | |
| 1125 | |
| 5759 | 1126 octave_base_value * |
| 3933 | 1127 octave_value::clone (void) const |
| 2880 | 1128 { |
| 1129 panic_impossible (); | |
| 3546 | 1130 return 0; |
| 2880 | 1131 } |
| 1132 | |
| 2409 | 1133 void |
| 1134 octave_value::maybe_mutate (void) | |
| 1135 { | |
| 5759 | 1136 octave_base_value *tmp = rep->try_narrowing_conversion (); |
| 2409 | 1137 |
| 1138 if (tmp && tmp != rep) | |
| 1139 { | |
| 1140 if (--rep->count == 0) | |
| 1141 delete rep; | |
| 1142 | |
| 1143 rep = tmp; | |
| 1144 } | |
| 1145 } | |
| 1146 | |
| 4247 | 1147 octave_value |
| 4271 | 1148 octave_value::single_subsref (const std::string& type, |
| 1149 const octave_value_list& idx) | |
| 4247 | 1150 { |
| 1151 std::list<octave_value_list> i; | |
| 1152 | |
| 1153 i.push_back (idx); | |
| 1154 | |
| 1155 return rep->subsref (type, i); | |
| 1156 } | |
| 1157 | |
| 2974 | 1158 octave_value_list |
| 4247 | 1159 octave_value::subsref (const std::string& type, |
| 4219 | 1160 const std::list<octave_value_list>& idx, int nargout) |
| 3933 | 1161 { |
|
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7503
diff
changeset
|
1162 if (nargout == 1) |
| 3933 | 1163 return rep->subsref (type, idx); |
| 1164 else | |
| 1165 return rep->subsref (type, idx, nargout); | |
| 1166 } | |
| 1167 | |
| 1168 octave_value | |
| 4247 | 1169 octave_value::next_subsref (const std::string& type, |
| 4219 | 1170 const std::list<octave_value_list>& idx, |
| 4233 | 1171 size_t skip) |
| 3933 | 1172 { |
| 4582 | 1173 if (! error_state && idx.size () > skip) |
| 3933 | 1174 { |
| 4219 | 1175 std::list<octave_value_list> new_idx (idx); |
| 4233 | 1176 for (size_t i = 0; i < skip; i++) |
| 4219 | 1177 new_idx.erase (new_idx.begin ()); |
| 3933 | 1178 return subsref (type.substr (skip), new_idx); |
| 1179 } | |
| 1180 else | |
| 1181 return *this; | |
| 1182 } | |
| 1183 | |
| 1184 octave_value_list | |
| 4994 | 1185 octave_value::next_subsref (int nargout, const std::string& type, |
| 1186 const std::list<octave_value_list>& idx, | |
| 1187 size_t skip) | |
| 1188 { | |
| 1189 if (! error_state && idx.size () > skip) | |
| 1190 { | |
| 1191 std::list<octave_value_list> new_idx (idx); | |
| 1192 for (size_t i = 0; i < skip; i++) | |
| 1193 new_idx.erase (new_idx.begin ()); | |
| 1194 return subsref (type.substr (skip), new_idx, nargout); | |
| 1195 } | |
| 1196 else | |
| 1197 return *this; | |
| 1198 } | |
| 1199 | |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1200 octave_value |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1201 octave_value::next_subsref (bool auto_add, const std::string& type, |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1202 const std::list<octave_value_list>& idx, |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1203 size_t skip) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1204 { |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1205 if (! error_state && idx.size () > skip) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1206 { |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1207 std::list<octave_value_list> new_idx (idx); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1208 for (size_t i = 0; i < skip; i++) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1209 new_idx.erase (new_idx.begin ()); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1210 return subsref (type.substr (skip), new_idx, auto_add); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1211 } |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1212 else |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1213 return *this; |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1214 } |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1215 |
| 4994 | 1216 octave_value_list |
| 3544 | 1217 octave_value::do_multi_index_op (int nargout, const octave_value_list& idx) |
| 2974 | 1218 { |
| 3544 | 1219 return rep->do_multi_index_op (nargout, idx); |
| 2974 | 1220 } |
| 1221 | |
| 3933 | 1222 #if 0 |
| 3204 | 1223 static void |
| 3933 | 1224 gripe_assign_failed (const std::string& on, const std::string& tn1, |
| 1225 const std::string& tn2) | |
| 3204 | 1226 { |
| 1227 error ("assignment failed for `%s %s %s'", | |
| 1228 tn1.c_str (), on.c_str (), tn2.c_str ()); | |
| 1229 } | |
| 3933 | 1230 #endif |
| 3204 | 1231 |
| 1232 static void | |
| 3933 | 1233 gripe_assign_failed_or_no_method (const std::string& on, |
| 1234 const std::string& tn1, | |
| 3523 | 1235 const std::string& tn2) |
| 3204 | 1236 { |
| 1237 error ("assignment failed, or no method for `%s %s %s'", | |
| 1238 tn1.c_str (), on.c_str (), tn2.c_str ()); | |
| 1239 } | |
| 1240 | |
| 3933 | 1241 octave_value |
| 4247 | 1242 octave_value::subsasgn (const std::string& type, |
| 4219 | 1243 const std::list<octave_value_list>& idx, |
| 3933 | 1244 const octave_value& rhs) |
| 1245 { | |
| 1246 return rep->subsasgn (type, idx, rhs); | |
| 1247 } | |
| 1248 | |
| 1249 octave_value | |
| 4247 | 1250 octave_value::assign (assign_op op, const std::string& type, |
| 4219 | 1251 const std::list<octave_value_list>& idx, |
| 3933 | 1252 const octave_value& rhs) |
| 1253 { | |
| 1254 octave_value retval; | |
| 1255 | |
| 1256 make_unique (); | |
| 1257 | |
| 1258 octave_value t_rhs = rhs; | |
| 1259 | |
| 1260 if (op != op_asn_eq) | |
| 1261 { | |
|
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7503
diff
changeset
|
1262 octave_value t = subsref (type, idx); |
| 3933 | 1263 |
| 1264 if (! error_state) | |
| 1265 { | |
| 1266 binary_op binop = op_eq_to_binary_op (op); | |
| 1267 | |
| 1268 if (! error_state) | |
| 1269 t_rhs = do_binary_op (binop, t, rhs); | |
| 1270 } | |
| 1271 } | |
| 1272 | |
| 1273 if (! error_state) | |
| 1274 { | |
| 7336 | 1275 if (type[0] == '.' && ! (is_map () || is_object ())) |
| 3933 | 1276 { |
| 1277 octave_value tmp = Octave_map (); | |
| 1278 retval = tmp.subsasgn (type, idx, t_rhs); | |
| 1279 } | |
| 1280 else | |
| 1281 retval = subsasgn (type, idx, t_rhs); | |
| 1282 } | |
| 1283 | |
| 1284 if (error_state) | |
| 1285 gripe_assign_failed_or_no_method (assign_op_as_string (op), | |
| 1286 type_name (), rhs.type_name ()); | |
| 1287 | |
| 1288 return retval; | |
| 1289 } | |
| 1290 | |
| 1291 const octave_value& | |
| 3203 | 1292 octave_value::assign (assign_op op, const octave_value& rhs) |
| 2880 | 1293 { |
| 3533 | 1294 if (op == op_asn_eq) |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1295 // Regularize a null matrix if stored into a variable. |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1296 operator = (rhs.storable_value ()); |
| 3203 | 1297 else |
| 1298 { | |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1299 octave_value_typeinfo::assign_op_fcn f = 0; |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1300 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1301 // Only attempt to operate in-place if this variable is unshared. |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1302 if (rep->count == 1) |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1303 { |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1304 int tthis = this->type_id (); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1305 int trhs = rhs.type_id (); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1306 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1307 f = octave_value_typeinfo::lookup_assign_op (op, tthis, trhs); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1308 } |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1309 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1310 if (f) |
| 3204 | 1311 { |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1312 try |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1313 { |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1314 f (*rep, octave_value_list (), *rhs.rep); |
|
9608
1c76e806c2a7
possibly mutate after in-place computed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
9607
diff
changeset
|
1315 maybe_mutate (); // Usually unnecessary, but may be needed (complex arrays). |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1316 } |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1317 catch (octave_execution_exception) |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1318 { |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1319 gripe_library_execution_error (); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1320 } |
| 3204 | 1321 } |
|
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1322 else |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1323 { |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1324 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1325 binary_op binop = op_eq_to_binary_op (op); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1326 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1327 if (! error_state) |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1328 { |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1329 octave_value t = do_binary_op (binop, *this, rhs); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1330 |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1331 if (! error_state) |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1332 operator = (t); |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1333 } |
|
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
9479
diff
changeset
|
1334 } |
| 3204 | 1335 |
| 1336 if (error_state) | |
| 1337 gripe_assign_failed_or_no_method (assign_op_as_string (op), | |
| 1338 type_name (), rhs.type_name ()); | |
| 1339 } | |
| 1340 | |
| 3933 | 1341 return *this; |
| 2376 | 1342 } |
| 1343 | |
| 5275 | 1344 octave_idx_type |
| 4563 | 1345 octave_value::length (void) const |
| 1346 { | |
| 1347 int retval = 0; | |
| 1348 | |
| 1349 dim_vector dv = dims (); | |
| 4584 | 1350 |
| 4563 | 1351 for (int i = 0; i < dv.length (); i++) |
| 1352 { | |
| 1353 if (dv(i) < 0) | |
| 1354 { | |
| 1355 retval = -1; | |
| 1356 break; | |
| 1357 } | |
| 1358 | |
| 4584 | 1359 if (dv(i) == 0) |
| 1360 { | |
| 1361 retval = 0; | |
| 1362 break; | |
| 1363 } | |
| 1364 | |
| 4563 | 1365 if (dv(i) > retval) |
| 1366 retval = dv(i); | |
| 1367 } | |
| 1368 | |
| 1369 return retval; | |
| 1370 } | |
| 1371 | |
|
8346
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1372 bool |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1373 octave_value::is_equal (const octave_value& test) const |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1374 { |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1375 bool retval = false; |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1376 |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1377 // If there is no op_eq for these types, we can't compare values. |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1378 |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1379 if (rows () == test.rows () && columns () == test.columns ()) |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1380 { |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1381 octave_value tmp = do_binary_op (octave_value::op_eq, *this, test); |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1382 |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1383 // Empty array also means a match. |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1384 if (! error_state && tmp.is_defined ()) |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1385 retval = tmp.is_true () || tmp.is_empty (); |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1386 } |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1387 |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1388 return retval; |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1389 } |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1390 |
| 3351 | 1391 Cell |
| 1392 octave_value::cell_value (void) const | |
| 1393 { | |
| 1394 return rep->cell_value (); | |
| 1395 } | |
| 1396 | |
|
8017
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1397 // Define the idx_type_value function here instead of in ov.h to avoid |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1398 // needing definitions for the SIZEOF_X macros in ov.h. |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1399 |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1400 octave_idx_type |
|
8024
dc36eb214129
ov.cc (octave_value::idx_type_value): don't include default argument value in definition
John W. Eaton <jwe@octave.org>
parents:
8017
diff
changeset
|
1401 octave_value::idx_type_value (bool req_int, bool frc_str_conv) const |
|
8017
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1402 { |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1403 #if SIZEOF_OCTAVE_IDX_TYPE == SIZEOF_LONG |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1404 return long_value (req_int, frc_str_conv); |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1405 #elif SIZEOF_OCTAVE_IDX_TYPE == SIZEOF_INT |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1406 return int_value (req_int, frc_str_conv); |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1407 #else |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1408 #error "no octave_value extractor for octave_idx_type" |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1409 #endif |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1410 } |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1411 |
| 2376 | 1412 Octave_map |
| 1413 octave_value::map_value (void) const | |
| 1414 { | |
| 1415 return rep->map_value (); | |
| 1416 } | |
| 1417 | |
| 2974 | 1418 octave_function * |
| 1419 octave_value::function_value (bool silent) | |
| 1420 { | |
| 1421 return rep->function_value (silent); | |
| 1422 } | |
| 1423 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1424 const octave_function * |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1425 octave_value::function_value (bool silent) const |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1426 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1427 return rep->function_value (silent); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1428 } |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1429 |
| 4700 | 1430 octave_user_function * |
| 1431 octave_value::user_function_value (bool silent) | |
| 1432 { | |
| 1433 return rep->user_function_value (silent); | |
| 1434 } | |
| 1435 | |
|
7719
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1436 octave_user_script * |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1437 octave_value::user_script_value (bool silent) |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1438 { |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1439 return rep->user_script_value (silent); |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1440 } |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1441 |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1442 octave_user_code * |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1443 octave_value::user_code_value (bool silent) |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1444 { |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1445 return rep->user_code_value (silent); |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1446 } |
|
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1447 |
| 4346 | 1448 octave_fcn_handle * |
| 4343 | 1449 octave_value::fcn_handle_value (bool silent) |
| 1450 { | |
| 1451 return rep->fcn_handle_value (silent); | |
| 1452 } | |
| 1453 | |
| 4933 | 1454 octave_fcn_inline * |
| 1455 octave_value::fcn_inline_value (bool silent) | |
| 1456 { | |
| 1457 return rep->fcn_inline_value (silent); | |
| 1458 } | |
| 1459 | |
| 2880 | 1460 octave_value_list |
| 1461 octave_value::list_value (void) const | |
| 1462 { | |
| 1463 return rep->list_value (); | |
| 1464 } | |
| 1465 | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1466 static dim_vector |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1467 make_vector_dims (const dim_vector& dv, bool force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1468 const std::string& my_type, const std::string& wanted_type) |
| 3419 | 1469 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1470 dim_vector retval (dv); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1471 retval.chop_trailing_singletons (); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1472 octave_idx_type nel = dv.numel (); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1473 |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1474 if (retval.length () > 2 || (retval(0) != 1 && retval(1) != 1)) |
| 3419 | 1475 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1476 if (!force_vector_conversion) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1477 gripe_implicit_conversion ("Octave:array-as-vector", |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1478 my_type.c_str (), wanted_type.c_str ()); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1479 retval = dim_vector (nel); |
| 3419 | 1480 } |
| 1481 | |
| 1482 return retval; | |
| 1483 } | |
| 1484 | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1485 ColumnVector |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1486 octave_value::column_vector_value (bool force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1487 bool frc_vec_conv) const |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1488 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1489 return ColumnVector (vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1490 frc_vec_conv)); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1491 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1492 |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1493 ComplexColumnVector |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1494 octave_value::complex_column_vector_value (bool force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1495 bool frc_vec_conv) const |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1496 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1497 return ComplexColumnVector (complex_vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1498 frc_vec_conv)); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1499 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1500 |
| 3419 | 1501 RowVector |
| 1502 octave_value::row_vector_value (bool force_string_conv, | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1503 bool frc_vec_conv) const |
| 3419 | 1504 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1505 return RowVector (vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1506 frc_vec_conv)); |
| 3419 | 1507 } |
| 1508 | |
| 1509 ComplexRowVector | |
| 1510 octave_value::complex_row_vector_value (bool force_string_conv, | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1511 bool frc_vec_conv) const |
| 3419 | 1512 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1513 return ComplexRowVector (complex_vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1514 frc_vec_conv)); |
| 3419 | 1515 } |
| 1516 | |
| 1517 Array<double> | |
| 2376 | 1518 octave_value::vector_value (bool force_string_conv, |
| 1519 bool force_vector_conversion) const | |
| 1520 { | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1521 Array<double> retval = array_value (force_string_conv); |
| 2376 | 1522 |
| 1523 if (error_state) | |
| 1524 return retval; | |
| 1525 else | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1526 return retval.reshape (make_vector_dims (retval.dims (), |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1527 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1528 type_name (), "real vector")); |
| 2376 | 1529 } |
| 1530 | |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1531 template <class T> |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1532 static Array<int> |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1533 convert_to_int_array (const Array<octave_int<T> >& A) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1534 { |
| 7999 | 1535 Array<int> retval (A.dims ()); |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1536 octave_idx_type n = A.numel (); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1537 |
|
8039
cd90e2842080
Add additional integer math and conversion warnings, set their default state to be off and add the intwarning function
David Bateman <dbateman@free.fr>
parents:
8024
diff
changeset
|
1538 octave_int<int>::clear_conv_flag (); |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1539 for (octave_idx_type i = 0; i < n; i++) |
| 7999 | 1540 retval.xelem (i) = octave_int<int> (A.xelem (i)); |
|
8039
cd90e2842080
Add additional integer math and conversion warnings, set their default state to be off and add the intwarning function
David Bateman <dbateman@free.fr>
parents:
8024
diff
changeset
|
1541 |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1542 if (octave_int<int>::get_trunc_flag ()) |
|
8039
cd90e2842080
Add additional integer math and conversion warnings, set their default state to be off and add the intwarning function
David Bateman <dbateman@free.fr>
parents:
8024
diff
changeset
|
1543 gripe_truncated_conversion (octave_int<T>::type_name (), "int"); |
|
cd90e2842080
Add additional integer math and conversion warnings, set their default state to be off and add the intwarning function
David Bateman <dbateman@free.fr>
parents:
8024
diff
changeset
|
1544 |
|
cd90e2842080
Add additional integer math and conversion warnings, set their default state to be off and add the intwarning function
David Bateman <dbateman@free.fr>
parents:
8024
diff
changeset
|
1545 octave_int<int>::clear_conv_flag (); |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1546 |
| 7999 | 1547 return retval; |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1548 } |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1549 |
| 4044 | 1550 Array<int> |
| 1551 octave_value::int_vector_value (bool force_string_conv, bool require_int, | |
| 1552 bool force_vector_conversion) const | |
| 1553 { | |
| 1554 Array<int> retval; | |
| 1555 | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1556 if (is_integer_type ()) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1557 { |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1558 if (is_int32_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1559 retval = convert_to_int_array (int32_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1560 else if (is_int64_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1561 retval = convert_to_int_array (int64_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1562 else if (is_int16_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1563 retval = convert_to_int_array (int16_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1564 else if (is_int8_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1565 retval = convert_to_int_array (int8_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1566 else if (is_uint32_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1567 retval = convert_to_int_array (uint32_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1568 else if (is_uint64_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1569 retval = convert_to_int_array (uint64_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1570 else if (is_uint16_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1571 retval = convert_to_int_array (uint16_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1572 else if (is_uint8_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1573 retval = convert_to_int_array (uint8_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1574 else |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1575 retval = array_value (force_string_conv); |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1576 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1577 else |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1578 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1579 const NDArray a = array_value (force_string_conv); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1580 if (! error_state) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1581 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1582 if (require_int) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1583 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1584 retval.resize (a.dims ()); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1585 for (octave_idx_type i = 0; i < a.numel (); i++) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1586 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1587 double ai = a.elem (i); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1588 int v = static_cast<int> (ai); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1589 if (ai == v) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1590 retval.xelem (i) = v; |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1591 else |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1592 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1593 error ("conversion to integer value failed"); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1594 break; |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1595 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1596 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1597 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1598 else |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1599 retval = Array<int> (a); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1600 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1601 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1602 |
| 4044 | 1603 |
| 1604 if (error_state) | |
| 1605 return retval; | |
| 1606 else | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1607 return retval.reshape (make_vector_dims (retval.dims (), |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1608 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1609 type_name (), "integer vector")); |
| 4044 | 1610 } |
| 1611 | |
| 8811 | 1612 template <class T> |
| 1613 static Array<octave_idx_type> | |
| 1614 convert_to_octave_idx_type_array (const Array<octave_int<T> >& A) | |
| 1615 { | |
| 1616 Array<octave_idx_type> retval (A.dims ()); | |
| 1617 octave_idx_type n = A.numel (); | |
| 1618 | |
| 1619 octave_int<int>::clear_conv_flag (); | |
| 1620 for (octave_idx_type i = 0; i < n; i++) | |
| 1621 retval.xelem (i) = octave_int<octave_idx_type> (A.xelem (i)); | |
| 1622 | |
| 1623 if (octave_int<int>::get_trunc_flag ()) | |
| 1624 gripe_truncated_conversion (octave_int<T>::type_name (), "int"); | |
| 1625 | |
| 1626 octave_int<int>::clear_conv_flag (); | |
| 1627 | |
| 1628 return retval; | |
| 1629 } | |
| 1630 | |
| 1631 Array<octave_idx_type> | |
|
9479
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1632 octave_value::octave_idx_type_vector_value (bool require_int, |
|
d9716e3ee0dd
supply optimized compiled sub2ind & ind2sub
Jaroslav Hajek <highegg@gmail.com>
parents:
9368
diff
changeset
|
1633 bool force_string_conv, |
| 8811 | 1634 bool force_vector_conversion) const |
| 1635 { | |
| 1636 Array<octave_idx_type> retval; | |
| 1637 | |
| 1638 if (is_integer_type ()) | |
| 1639 { | |
| 1640 if (is_int32_type ()) | |
| 1641 retval = convert_to_octave_idx_type_array (int32_array_value ()); | |
| 1642 else if (is_int64_type ()) | |
| 1643 retval = convert_to_octave_idx_type_array (int64_array_value ()); | |
| 1644 else if (is_int16_type ()) | |
| 1645 retval = convert_to_octave_idx_type_array (int16_array_value ()); | |
| 1646 else if (is_int8_type ()) | |
| 1647 retval = convert_to_octave_idx_type_array (int8_array_value ()); | |
| 1648 else if (is_uint32_type ()) | |
| 1649 retval = convert_to_octave_idx_type_array (uint32_array_value ()); | |
| 1650 else if (is_uint64_type ()) | |
| 1651 retval = convert_to_octave_idx_type_array (uint64_array_value ()); | |
| 1652 else if (is_uint16_type ()) | |
| 1653 retval = convert_to_octave_idx_type_array (uint16_array_value ()); | |
| 1654 else if (is_uint8_type ()) | |
| 1655 retval = convert_to_octave_idx_type_array (uint8_array_value ()); | |
| 1656 else | |
| 1657 retval = array_value (force_string_conv); | |
| 1658 } | |
| 1659 else | |
| 1660 { | |
| 1661 const NDArray a = array_value (force_string_conv); | |
| 1662 if (! error_state) | |
| 1663 { | |
| 1664 if (require_int) | |
| 1665 { | |
| 1666 retval.resize (a.dims ()); | |
| 1667 for (octave_idx_type i = 0; i < a.numel (); i++) | |
| 1668 { | |
| 1669 double ai = a.elem (i); | |
| 1670 octave_idx_type v = static_cast<octave_idx_type> (ai); | |
| 1671 if (ai == v) | |
| 1672 retval.xelem (i) = v; | |
| 1673 else | |
| 1674 { | |
| 1675 error ("conversion to integer value failed"); | |
| 1676 break; | |
| 1677 } | |
| 1678 } | |
| 1679 } | |
| 1680 else | |
| 1681 retval = Array<octave_idx_type> (a); | |
| 1682 } | |
| 1683 } | |
| 1684 | |
| 1685 | |
| 1686 if (error_state) | |
| 1687 return retval; | |
| 1688 else | |
| 1689 return retval.reshape (make_vector_dims (retval.dims (), | |
| 1690 force_vector_conversion, | |
| 1691 type_name (), "integer vector")); | |
| 1692 } | |
| 1693 | |
| 3419 | 1694 Array<Complex> |
| 2376 | 1695 octave_value::complex_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1696 bool force_vector_conversion) const |
| 2376 | 1697 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1698 Array<Complex> retval = complex_array_value (force_string_conv); |
| 2376 | 1699 |
| 1700 if (error_state) | |
| 1701 return retval; | |
| 1702 else | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1703 return retval.reshape (make_vector_dims (retval.dims (), |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1704 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1705 type_name (), "complex vector")); |
| 2376 | 1706 } |
| 1707 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1708 FloatColumnVector |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1709 octave_value::float_column_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1710 bool frc_vec_conv) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1711 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1712 return FloatColumnVector (float_vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1713 frc_vec_conv)); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1714 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1715 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1716 FloatComplexColumnVector |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1717 octave_value::float_complex_column_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1718 bool frc_vec_conv) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1719 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1720 return FloatComplexColumnVector (float_complex_vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1721 frc_vec_conv)); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1722 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1723 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1724 FloatRowVector |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1725 octave_value::float_row_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1726 bool frc_vec_conv) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1727 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1728 return FloatRowVector (float_vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1729 frc_vec_conv)); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1730 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1731 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1732 FloatComplexRowVector |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1733 octave_value::float_complex_row_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1734 bool frc_vec_conv) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1735 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1736 return FloatComplexRowVector (float_complex_vector_value (force_string_conv, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1737 frc_vec_conv)); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1738 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1739 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1740 Array<float> |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1741 octave_value::float_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1742 bool force_vector_conversion) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1743 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1744 Array<float> retval = float_array_value (force_string_conv); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1745 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1746 if (error_state) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1747 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1748 else |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1749 return retval.reshape (make_vector_dims (retval.dims (), |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1750 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1751 type_name (), "real vector")); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1752 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1753 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1754 Array<FloatComplex> |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1755 octave_value::float_complex_vector_value (bool force_string_conv, |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1756 bool force_vector_conversion) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1757 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1758 Array<FloatComplex> retval = float_complex_array_value (force_string_conv); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1759 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1760 if (error_state) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1761 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1762 else |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1763 return retval.reshape (make_vector_dims (retval.dims (), |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1764 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1765 type_name (), "complex vector")); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1766 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1767 |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1768 octave_value |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1769 octave_value::storable_value (void) const |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1770 { |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1771 octave_value retval = *this; |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1772 if (is_null_value ()) |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1773 retval = octave_value (rep->empty_clone ()); |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1774 else |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1775 retval.maybe_economize (); |
|
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1776 |
|
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1777 return retval; |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1778 } |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1779 |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1780 void |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1781 octave_value::make_storable_value (void) |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1782 { |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1783 if (is_null_value ()) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1784 { |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1785 octave_base_value *rc = rep->empty_clone (); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1786 if (--rep->count == 0) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1787 delete rep; |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1788 rep = rc; |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1789 } |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1790 else |
|
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1791 maybe_economize (); |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1792 } |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1793 |
| 4944 | 1794 int |
| 1795 octave_value::write (octave_stream& os, int block_size, | |
| 1796 oct_data_conv::data_type output_type, int skip, | |
| 1797 oct_mach_info::float_format flt_fmt) const | |
| 1798 { | |
| 1799 return rep->write (os, block_size, output_type, skip, flt_fmt); | |
| 1800 } | |
| 1801 | |
| 2413 | 1802 static void |
| 3933 | 1803 gripe_binary_op (const std::string& on, const std::string& tn1, |
| 1804 const std::string& tn2) | |
| 2376 | 1805 { |
| 2903 | 1806 error ("binary operator `%s' not implemented for `%s' by `%s' operations", |
| 2376 | 1807 on.c_str (), tn1.c_str (), tn2.c_str ()); |
| 1808 } | |
| 1809 | |
| 3203 | 1810 static void |
| 3523 | 1811 gripe_binary_op_conv (const std::string& on) |
| 3203 | 1812 { |
| 1813 error ("type conversion failed for binary operator `%s'", on.c_str ()); | |
| 1814 } | |
| 1815 | |
| 2376 | 1816 octave_value |
| 3933 | 1817 do_binary_op (octave_value::binary_op op, |
| 1818 const octave_value& v1, const octave_value& v2) | |
| 2376 | 1819 { |
| 1820 octave_value retval; | |
| 1821 | |
| 1822 int t1 = v1.type_id (); | |
| 1823 int t2 = v2.type_id (); | |
| 1824 | |
| 7336 | 1825 if (t1 == octave_class::static_type_id () |
| 1826 || t2 == octave_class::static_type_id ()) | |
| 1827 { | |
| 1828 octave_value_typeinfo::binary_class_op_fcn f | |
| 1829 = octave_value_typeinfo::lookup_binary_class_op (op); | |
| 2376 | 1830 |
| 7336 | 1831 if (f) |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1832 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1833 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1834 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1835 retval = f (v1, v2); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1836 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1837 catch (octave_execution_exception) |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1838 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
1839 gripe_library_execution_error (); |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1840 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1841 } |
| 7336 | 1842 else |
| 1843 gripe_binary_op (octave_value::binary_op_as_string (op), | |
| 1844 v1.class_name (), v2.class_name ()); | |
| 1845 } | |
| 2376 | 1846 else |
| 1847 { | |
| 7336 | 1848 // FIXME -- we need to handle overloading operators for built-in |
| 1849 // classes (double, char, int8, etc.) | |
| 2376 | 1850 |
| 7336 | 1851 octave_value_typeinfo::binary_op_fcn f |
| 1852 = octave_value_typeinfo::lookup_binary_op (op, t1, t2); | |
| 1853 | |
| 1854 if (f) | |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1855 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1856 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1857 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1858 retval = f (*v1.rep, *v2.rep); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1859 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1860 catch (octave_execution_exception) |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1861 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
1862 gripe_library_execution_error (); |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1863 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1864 } |
| 7336 | 1865 else |
| 2376 | 1866 { |
| 7336 | 1867 octave_value tv1; |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1868 octave_base_value::type_conv_info cf1 = v1.numeric_conversion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1869 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1870 octave_value tv2; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1871 octave_base_value::type_conv_info cf2 = v2.numeric_conversion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1872 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1873 // Try biased (one-sided) conversions first. |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1874 if (cf2.type_id () >= 0 && |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1875 octave_value_typeinfo::lookup_binary_op (op, t1, cf2.type_id ())) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1876 cf1 = 0; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1877 else if (cf1.type_id () >= 0 && |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1878 octave_value_typeinfo::lookup_binary_op (op, cf1.type_id (), t2)) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1879 cf2 = 0; |
| 7336 | 1880 |
| 1881 if (cf1) | |
| 1882 { | |
| 1883 octave_base_value *tmp = cf1 (*v1.rep); | |
| 3203 | 1884 |
| 7336 | 1885 if (tmp) |
| 1886 { | |
| 1887 tv1 = octave_value (tmp); | |
| 1888 t1 = tv1.type_id (); | |
| 1889 } | |
| 1890 else | |
| 1891 { | |
| 1892 gripe_binary_op_conv (octave_value::binary_op_as_string (op)); | |
| 1893 return retval; | |
| 1894 } | |
| 3203 | 1895 } |
| 1896 else | |
| 7336 | 1897 tv1 = v1; |
| 1898 | |
| 1899 if (cf2) | |
| 3203 | 1900 { |
| 7336 | 1901 octave_base_value *tmp = cf2 (*v2.rep); |
| 2376 | 1902 |
| 7336 | 1903 if (tmp) |
| 1904 { | |
| 1905 tv2 = octave_value (tmp); | |
| 1906 t2 = tv2.type_id (); | |
| 1907 } | |
| 1908 else | |
| 1909 { | |
| 1910 gripe_binary_op_conv (octave_value::binary_op_as_string (op)); | |
| 1911 return retval; | |
| 1912 } | |
| 3203 | 1913 } |
| 1914 else | |
| 7336 | 1915 tv2 = v2; |
| 1916 | |
| 1917 if (cf1 || cf2) | |
| 3203 | 1918 { |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1919 retval = do_binary_op (op, tv1, tv2); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1920 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1921 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1922 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1923 //demote double -> single and try again |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1924 cf1 = tv1.numeric_demotion_function (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1925 |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1926 cf2 = tv2.numeric_demotion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1927 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1928 // Try biased (one-sided) conversions first. |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1929 if (cf2.type_id () >= 0 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1930 && octave_value_typeinfo::lookup_binary_op (op, t1, cf2.type_id ())) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1931 cf1 = 0; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1932 else if (cf1.type_id () >= 0 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1933 && octave_value_typeinfo::lookup_binary_op (op, cf1.type_id (), t2)) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1934 cf2 = 0; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1935 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1936 if (cf1) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1937 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1938 octave_base_value *tmp = cf1 (*tv1.rep); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1939 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1940 if (tmp) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1941 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1942 tv1 = octave_value (tmp); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1943 t1 = tv1.type_id (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1944 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1945 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1946 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1947 gripe_binary_op_conv (octave_value::binary_op_as_string (op)); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1948 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1949 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1950 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1951 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1952 if (cf2) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1953 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1954 octave_base_value *tmp = cf2 (*tv2.rep); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1955 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1956 if (tmp) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1957 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1958 tv2 = octave_value (tmp); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1959 t2 = tv2.type_id (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1960 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1961 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1962 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1963 gripe_binary_op_conv (octave_value::binary_op_as_string (op)); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1964 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1965 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1966 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1967 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1968 if (cf1 || cf2) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1969 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1970 f = octave_value_typeinfo::lookup_binary_op (op, t1, t2); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1971 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1972 if (f) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1973 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1974 try |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1975 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1976 retval = f (*tv1.rep, *tv2.rep); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1977 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1978 catch (octave_execution_exception) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1979 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
1980 gripe_library_execution_error (); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1981 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1982 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1983 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1984 gripe_binary_op (octave_value::binary_op_as_string (op), |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1985 v1.type_name (), v2.type_name ()); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1986 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1987 else |
| 7336 | 1988 gripe_binary_op (octave_value::binary_op_as_string (op), |
| 1989 v1.type_name (), v2.type_name ()); | |
| 3203 | 1990 } |
| 2376 | 1991 } |
| 1992 } | |
| 1993 | |
| 1994 return retval; | |
| 1995 } | |
| 1996 | |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1997 static octave_value |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1998 decompose_binary_op (octave_value::compound_binary_op op, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1999 const octave_value& v1, const octave_value& v2) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2000 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2001 octave_value retval; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2002 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2003 switch (op) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2004 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2005 case octave_value::op_trans_mul: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2006 retval = do_binary_op (octave_value::op_mul, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2007 do_unary_op (octave_value::op_transpose, v1), |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2008 v2); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2009 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2010 case octave_value::op_mul_trans: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2011 retval = do_binary_op (octave_value::op_mul, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2012 v1, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2013 do_unary_op (octave_value::op_transpose, v2)); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2014 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2015 case octave_value::op_herm_mul: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2016 retval = do_binary_op (octave_value::op_mul, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2017 do_unary_op (octave_value::op_hermitian, v1), |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2018 v2); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2019 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2020 case octave_value::op_mul_herm: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2021 retval = do_binary_op (octave_value::op_mul, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2022 v1, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2023 do_unary_op (octave_value::op_hermitian, v2)); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2024 break; |
|
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2025 case octave_value::op_trans_ldiv: |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2026 retval = do_binary_op (octave_value::op_ldiv, |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2027 do_unary_op (octave_value::op_transpose, v1), |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2028 v2); |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2029 break; |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2030 case octave_value::op_herm_ldiv: |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2031 retval = do_binary_op (octave_value::op_ldiv, |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2032 do_unary_op (octave_value::op_hermitian, v1), |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2033 v2); |
|
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9608
diff
changeset
|
2034 break; |
|
8982
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2035 case octave_value::op_el_not_and: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2036 retval = do_binary_op (octave_value::op_el_and, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2037 do_unary_op (octave_value::op_not, v1), |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2038 v2); |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2039 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2040 case octave_value::op_el_not_or: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2041 retval = do_binary_op (octave_value::op_el_or, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2042 do_unary_op (octave_value::op_not, v1), |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2043 v2); |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2044 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2045 case octave_value::op_el_and_not: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2046 retval = do_binary_op (octave_value::op_el_and, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2047 v1, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2048 do_unary_op (octave_value::op_not, v2)); |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2049 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2050 case octave_value::op_el_or_not: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2051 retval = do_binary_op (octave_value::op_el_or, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2052 v1, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2053 do_unary_op (octave_value::op_not, v2)); |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
2054 break; |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2055 default: |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2056 error ("invalid compound operator"); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2057 break; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2058 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2059 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2060 return retval; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2061 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2062 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2063 octave_value |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2064 do_binary_op (octave_value::compound_binary_op op, |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2065 const octave_value& v1, const octave_value& v2) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2066 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2067 octave_value retval; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2068 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2069 int t1 = v1.type_id (); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2070 int t2 = v2.type_id (); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2071 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2072 if (t1 == octave_class::static_type_id () |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2073 || t2 == octave_class::static_type_id ()) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2074 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2075 octave_value_typeinfo::binary_class_op_fcn f |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2076 = octave_value_typeinfo::lookup_binary_class_op (op); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2077 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2078 if (f) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2079 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2080 try |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2081 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2082 retval = f (v1, v2); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2083 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2084 catch (octave_execution_exception) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2085 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2086 gripe_library_execution_error (); |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2087 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2088 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2089 else |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2090 retval = decompose_binary_op (op, v1, v2); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2091 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2092 else |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2093 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2094 octave_value_typeinfo::binary_op_fcn f |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2095 = octave_value_typeinfo::lookup_binary_op (op, t1, t2); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2096 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2097 if (f) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2098 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2099 try |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2100 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2101 retval = f (*v1.rep, *v2.rep); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2102 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2103 catch (octave_execution_exception) |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2104 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2105 gripe_library_execution_error (); |
|
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2106 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2107 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2108 else |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2109 retval = decompose_binary_op (op, v1, v2); |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2110 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2111 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2112 return retval; |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2113 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
2114 |
| 4915 | 2115 static void |
| 2116 gripe_cat_op (const std::string& tn1, const std::string& tn2) | |
| 2117 { | |
| 2118 error ("concatenation operator not implemented for `%s' by `%s' operations", | |
| 2119 tn1.c_str (), tn2.c_str ()); | |
| 2120 } | |
| 2121 | |
| 2122 static void | |
| 2123 gripe_cat_op_conv (void) | |
| 2124 { | |
| 2125 error ("type conversion failed for concatenation operator"); | |
| 2126 } | |
| 2127 | |
| 2128 octave_value | |
| 2129 do_cat_op (const octave_value& v1, const octave_value& v2, | |
| 6867 | 2130 const Array<octave_idx_type>& ra_idx) |
| 4915 | 2131 { |
| 2132 octave_value retval; | |
| 2133 | |
|
7814
87865ed7405f
Second set of single precision test code and fix of resulting bugs
David Bateman <dbateman@free.fr>
parents:
7800
diff
changeset
|
2134 // Can't rapid return for concatenation with an empty object here as |
|
87865ed7405f
Second set of single precision test code and fix of resulting bugs
David Bateman <dbateman@free.fr>
parents:
7800
diff
changeset
|
2135 // something like cat(1,[],single([]) must return the correct type. |
| 5164 | 2136 |
| 4915 | 2137 int t1 = v1.type_id (); |
| 2138 int t2 = v2.type_id (); | |
| 2139 | |
| 5759 | 2140 octave_value_typeinfo::cat_op_fcn f |
| 2141 = octave_value_typeinfo::lookup_cat_op (t1, t2); | |
| 4915 | 2142 |
| 2143 if (f) | |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2144 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2145 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2146 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2147 retval = f (*v1.rep, *v2.rep, ra_idx); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2148 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2149 catch (octave_execution_exception) |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2150 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2151 gripe_library_execution_error (); |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2152 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2153 } |
| 4915 | 2154 else |
| 2155 { | |
| 2156 octave_value tv1; | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2157 octave_base_value::type_conv_info cf1 = v1.numeric_conversion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2158 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2159 octave_value tv2; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2160 octave_base_value::type_conv_info cf2 = v2.numeric_conversion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2161 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2162 // Try biased (one-sided) conversions first. |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2163 if (cf2.type_id () >= 0 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2164 && octave_value_typeinfo::lookup_cat_op (t1, cf2.type_id ())) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2165 cf1 = 0; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2166 else if (cf1.type_id () >= 0 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2167 && octave_value_typeinfo::lookup_cat_op (cf1.type_id (), t2)) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2168 cf2 = 0; |
| 4915 | 2169 |
| 2170 if (cf1) | |
| 2171 { | |
| 5759 | 2172 octave_base_value *tmp = cf1 (*v1.rep); |
| 4915 | 2173 |
| 2174 if (tmp) | |
| 2175 { | |
| 2176 tv1 = octave_value (tmp); | |
| 2177 t1 = tv1.type_id (); | |
| 2178 } | |
| 2179 else | |
| 2180 { | |
| 2181 gripe_cat_op_conv (); | |
| 2182 return retval; | |
| 2183 } | |
| 2184 } | |
| 2185 else | |
| 2186 tv1 = v1; | |
| 2187 | |
| 2188 if (cf2) | |
| 2189 { | |
| 5759 | 2190 octave_base_value *tmp = cf2 (*v2.rep); |
| 4915 | 2191 |
| 2192 if (tmp) | |
| 2193 { | |
| 2194 tv2 = octave_value (tmp); | |
| 2195 t2 = tv2.type_id (); | |
| 2196 } | |
| 2197 else | |
| 2198 { | |
| 2199 gripe_cat_op_conv (); | |
| 2200 return retval; | |
| 2201 } | |
| 2202 } | |
| 2203 else | |
| 2204 tv2 = v2; | |
| 2205 | |
| 2206 if (cf1 || cf2) | |
| 2207 { | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2208 retval = do_cat_op (tv1, tv2, ra_idx); |
| 4915 | 2209 } |
| 2210 else | |
| 2211 gripe_cat_op (v1.type_name (), v2.type_name ()); | |
| 2212 } | |
| 2213 | |
| 2214 return retval; | |
| 2215 } | |
| 2216 | |
| 3933 | 2217 void |
| 2218 octave_value::print_info (std::ostream& os, const std::string& prefix) const | |
| 2219 { | |
| 2220 os << prefix << "type_name: " << type_name () << "\n" | |
| 2221 << prefix << "count: " << get_count () << "\n" | |
| 2222 << prefix << "rep info: "; | |
| 2223 | |
| 2224 rep->print_info (os, prefix + " "); | |
| 2225 } | |
| 2226 | |
| 3203 | 2227 static void |
| 3523 | 2228 gripe_unary_op (const std::string& on, const std::string& tn) |
| 3203 | 2229 { |
| 2230 error ("unary operator `%s' not implemented for `%s' operands", | |
| 2231 on.c_str (), tn.c_str ()); | |
| 2232 } | |
| 2233 | |
| 2234 static void | |
| 3523 | 2235 gripe_unary_op_conv (const std::string& on) |
| 3203 | 2236 { |
| 2237 error ("type conversion failed for unary operator `%s'", on.c_str ()); | |
| 2238 } | |
| 2239 | |
| 2240 octave_value | |
| 2241 do_unary_op (octave_value::unary_op op, const octave_value& v) | |
| 2242 { | |
| 2243 octave_value retval; | |
| 2244 | |
| 2245 int t = v.type_id (); | |
| 2246 | |
| 7336 | 2247 if (t == octave_class::static_type_id ()) |
| 2248 { | |
| 2249 octave_value_typeinfo::unary_class_op_fcn f | |
| 2250 = octave_value_typeinfo::lookup_unary_class_op (op); | |
| 3203 | 2251 |
| 7336 | 2252 if (f) |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2253 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2254 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2255 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2256 retval = f (v); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2257 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2258 catch (octave_execution_exception) |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2259 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2260 gripe_library_execution_error (); |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2261 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2262 } |
| 7336 | 2263 else |
| 2264 gripe_unary_op (octave_value::unary_op_as_string (op), | |
| 2265 v.class_name ()); | |
| 2266 } | |
| 3203 | 2267 else |
| 2268 { | |
| 7336 | 2269 // FIXME -- we need to handle overloading operators for built-in |
| 2270 // classes (double, char, int8, etc.) | |
| 2271 | |
| 2272 octave_value_typeinfo::unary_op_fcn f | |
| 2273 = octave_value_typeinfo::lookup_unary_op (op, t); | |
| 3203 | 2274 |
| 7336 | 2275 if (f) |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2276 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2277 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2278 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2279 retval = f (*v.rep); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2280 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2281 catch (octave_execution_exception) |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2282 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2283 gripe_library_execution_error (); |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2284 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2285 } |
| 7336 | 2286 else |
| 3203 | 2287 { |
| 7336 | 2288 octave_value tv; |
| 2289 octave_base_value::type_conv_fcn cf | |
| 2290 = v.numeric_conversion_function (); | |
| 3203 | 2291 |
| 7336 | 2292 if (cf) |
| 3203 | 2293 { |
| 7336 | 2294 octave_base_value *tmp = cf (*v.rep); |
| 3203 | 2295 |
| 7336 | 2296 if (tmp) |
| 2297 { | |
| 2298 tv = octave_value (tmp); | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2299 retval = do_unary_op (op, tv); |
| 7336 | 2300 } |
| 3203 | 2301 else |
| 7336 | 2302 gripe_unary_op_conv (octave_value::unary_op_as_string (op)); |
| 3203 | 2303 } |
| 2304 else | |
| 7336 | 2305 gripe_unary_op (octave_value::unary_op_as_string (op), |
| 2306 v.type_name ()); | |
| 3203 | 2307 } |
| 2308 } | |
| 2309 | |
| 2310 return retval; | |
| 2311 } | |
| 2312 | |
| 2313 static void | |
| 3933 | 2314 gripe_unary_op_conversion_failed (const std::string& op, |
| 2315 const std::string& tn) | |
| 3203 | 2316 { |
| 2317 error ("operator %s: type conversion for `%s' failed", | |
| 2318 op.c_str (), tn.c_str ()); | |
| 2319 } | |
| 2320 | |
| 3933 | 2321 const octave_value& |
| 2322 octave_value::do_non_const_unary_op (unary_op op) | |
| 3203 | 2323 { |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2324 if (op == op_incr || op == op_decr) |
| 3203 | 2325 { |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2326 // Genuine. |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2327 int t = type_id (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2328 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2329 octave_value_typeinfo::non_const_unary_op_fcn f |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2330 = octave_value_typeinfo::lookup_non_const_unary_op (op, t); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2331 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2332 if (f) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2333 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2334 make_unique (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2335 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2336 try |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2337 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2338 f (*rep); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2339 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2340 catch (octave_execution_exception) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2341 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2342 gripe_library_execution_error (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2343 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2344 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2345 else |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2346 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2347 octave_base_value::type_conv_fcn cf = numeric_conversion_function (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2348 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2349 if (cf) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2350 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2351 octave_base_value *tmp = cf (*rep); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2352 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2353 if (tmp) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2354 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2355 octave_base_value *old_rep = rep; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2356 rep = tmp; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2357 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2358 t = type_id (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2359 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2360 f = octave_value_typeinfo::lookup_non_const_unary_op (op, t); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2361 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2362 if (f) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2363 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2364 try |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2365 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2366 f (*rep); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2367 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2368 catch (octave_execution_exception) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2369 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2370 gripe_library_execution_error (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2371 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2372 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2373 if (old_rep && --old_rep->count == 0) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2374 delete old_rep; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2375 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2376 else |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2377 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2378 if (old_rep) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2379 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2380 if (--rep->count == 0) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2381 delete rep; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2382 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2383 rep = old_rep; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2384 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2385 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2386 gripe_unary_op (octave_value::unary_op_as_string (op), |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2387 type_name ()); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2388 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2389 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2390 else |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2391 gripe_unary_op_conversion_failed |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2392 (octave_value::unary_op_as_string (op), type_name ()); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2393 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2394 else |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2395 gripe_unary_op (octave_value::unary_op_as_string (op), type_name ()); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2396 } |
| 3203 | 2397 } |
| 2398 else | |
| 2399 { | |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2400 // Non-genuine. |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2401 int t = type_id (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2402 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2403 octave_value_typeinfo::non_const_unary_op_fcn f = 0; |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2404 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2405 // Only attempt to operate in-place if this variable is unshared. |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2406 if (rep->count == 1) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2407 f = octave_value_typeinfo::lookup_non_const_unary_op (op, t); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2408 |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2409 if (f) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2410 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2411 try |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2412 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2413 f (*rep); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2414 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2415 catch (octave_execution_exception) |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2416 { |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2417 gripe_library_execution_error (); |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2418 } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2419 } |
| 3203 | 2420 else |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9546
diff
changeset
|
2421 *this = do_unary_op (op, *this); |
| 3203 | 2422 } |
| 3933 | 2423 |
| 2424 return *this; | |
| 3203 | 2425 } |
| 2426 | |
| 3933 | 2427 #if 0 |
| 3205 | 2428 static void |
| 3933 | 2429 gripe_unary_op_failed_or_no_method (const std::string& on, |
| 2430 const std::string& tn) | |
| 3205 | 2431 { |
| 2432 error ("operator %s: no method, or unable to evaluate for %s operand", | |
| 2433 on.c_str (), tn.c_str ()); | |
| 2434 } | |
| 3933 | 2435 #endif |
| 3205 | 2436 |
| 2437 void | |
| 4661 | 2438 octave_value::do_non_const_unary_op (unary_op, const octave_value_list&) |
| 3205 | 2439 { |
| 3933 | 2440 abort (); |
| 2441 } | |
| 2442 | |
| 2443 octave_value | |
| 4247 | 2444 octave_value::do_non_const_unary_op (unary_op op, const std::string& type, |
| 4219 | 2445 const std::list<octave_value_list>& idx) |
| 3933 | 2446 { |
| 2447 octave_value retval; | |
| 2448 | |
| 2449 if (idx.empty ()) | |
| 2450 { | |
| 2451 do_non_const_unary_op (op); | |
| 3205 | 2452 |
| 3933 | 2453 retval = *this; |
| 2454 } | |
| 2455 else | |
| 2456 { | |
| 5775 | 2457 // FIXME -- only do the following stuff if we can't find a |
| 3933 | 2458 // specific function to call to handle the op= operation for the |
| 2459 // types we have. | |
| 3205 | 2460 |
| 3933 | 2461 assign_op assop = unary_op_to_assign_op (op); |
| 2462 | |
| 2463 retval = assign (assop, type, idx, 1.0); | |
| 2464 } | |
| 2465 | |
| 2466 return retval; | |
| 3205 | 2467 } |
| 2468 | |
| 2469 octave_value::assign_op | |
| 2470 octave_value::unary_op_to_assign_op (unary_op op) | |
| 2471 { | |
| 2472 assign_op binop = unknown_assign_op; | |
| 2473 | |
| 2474 switch (op) | |
| 2475 { | |
| 3533 | 2476 case op_incr: |
| 2477 binop = op_add_eq; | |
| 3205 | 2478 break; |
| 2479 | |
| 3533 | 2480 case op_decr: |
| 2481 binop = op_sub_eq; | |
| 3205 | 2482 break; |
| 2483 | |
| 2484 default: | |
| 2485 { | |
| 3523 | 2486 std::string on = unary_op_as_string (op); |
| 3205 | 2487 error ("operator %s: no assign operator found", on.c_str ()); |
| 2488 } | |
| 2489 } | |
| 2490 | |
| 2491 return binop; | |
| 2492 } | |
| 2493 | |
| 3204 | 2494 octave_value::binary_op |
| 2495 octave_value::op_eq_to_binary_op (assign_op op) | |
| 2496 { | |
| 2497 binary_op binop = unknown_binary_op; | |
| 2498 | |
| 2499 switch (op) | |
| 2500 { | |
| 3533 | 2501 case op_add_eq: |
| 2502 binop = op_add; | |
| 3204 | 2503 break; |
| 2504 | |
| 3533 | 2505 case op_sub_eq: |
| 2506 binop = op_sub; | |
| 3204 | 2507 break; |
| 2508 | |
| 3533 | 2509 case op_mul_eq: |
| 2510 binop = op_mul; | |
| 3204 | 2511 break; |
| 2512 | |
| 3533 | 2513 case op_div_eq: |
| 2514 binop = op_div; | |
| 3204 | 2515 break; |
| 2516 | |
| 3533 | 2517 case op_ldiv_eq: |
| 2518 binop = op_ldiv; | |
| 3204 | 2519 break; |
| 2520 | |
| 4018 | 2521 case op_pow_eq: |
| 2522 binop = op_pow; | |
| 2523 break; | |
| 2524 | |
| 3533 | 2525 case op_lshift_eq: |
| 2526 binop = op_lshift; | |
| 3204 | 2527 break; |
| 2528 | |
| 3533 | 2529 case op_rshift_eq: |
| 2530 binop = op_rshift; | |
| 3204 | 2531 break; |
| 2532 | |
| 3533 | 2533 case op_el_mul_eq: |
| 2534 binop = op_el_mul; | |
| 3204 | 2535 break; |
| 2536 | |
| 3533 | 2537 case op_el_div_eq: |
| 2538 binop = op_el_div; | |
| 3204 | 2539 break; |
| 2540 | |
| 3533 | 2541 case op_el_ldiv_eq: |
| 2542 binop = op_el_ldiv; | |
| 3204 | 2543 break; |
| 2544 | |
| 4018 | 2545 case op_el_pow_eq: |
| 2546 binop = op_el_pow; | |
| 2547 break; | |
| 2548 | |
| 3533 | 2549 case op_el_and_eq: |
| 2550 binop = op_el_and; | |
| 3204 | 2551 break; |
| 2552 | |
| 3533 | 2553 case op_el_or_eq: |
| 2554 binop = op_el_or; | |
| 3204 | 2555 break; |
| 2556 | |
| 2557 default: | |
| 2558 { | |
| 3523 | 2559 std::string on = assign_op_as_string (op); |
| 3204 | 2560 error ("operator %s: no binary operator found", on.c_str ()); |
| 2561 } | |
| 2562 } | |
| 2563 | |
| 2564 return binop; | |
| 2565 } | |
| 2566 | |
| 3933 | 2567 octave_value |
| 2568 octave_value::empty_conv (const std::string& type, const octave_value& rhs) | |
| 2569 { | |
| 2570 octave_value retval; | |
| 2571 | |
| 2572 if (type.length () > 0) | |
| 2573 { | |
| 2574 switch (type[0]) | |
| 2575 { | |
| 2576 case '(': | |
| 2577 { | |
| 2578 if (type.length () > 1 && type[1] == '.') | |
| 2579 retval = Octave_map (); | |
| 2580 else | |
| 2581 retval = octave_value (rhs.empty_clone ()); | |
| 2582 } | |
| 2583 break; | |
| 2584 | |
| 2585 case '{': | |
| 2586 retval = Cell (); | |
| 2587 break; | |
| 2588 | |
| 2589 case '.': | |
| 2590 retval = Octave_map (); | |
| 2591 break; | |
| 2592 | |
| 2593 default: | |
| 2594 panic_impossible (); | |
| 2595 } | |
| 2596 } | |
| 2597 else | |
| 2598 retval = octave_value (rhs.empty_clone ()); | |
| 2599 | |
| 2600 return retval; | |
| 2601 } | |
| 2602 | |
| 2376 | 2603 void |
| 2604 install_types (void) | |
| 2605 { | |
| 2606 octave_base_value::register_type (); | |
| 3928 | 2607 octave_cell::register_type (); |
| 2376 | 2608 octave_scalar::register_type (); |
| 2609 octave_complex::register_type (); | |
| 2610 octave_matrix::register_type (); | |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
2611 octave_diag_matrix::register_type (); |
| 2376 | 2612 octave_complex_matrix::register_type (); |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
2613 octave_complex_diag_matrix::register_type (); |
| 2376 | 2614 octave_range::register_type (); |
| 2825 | 2615 octave_bool::register_type (); |
| 2616 octave_bool_matrix::register_type (); | |
| 2376 | 2617 octave_char_matrix_str::register_type (); |
| 5279 | 2618 octave_char_matrix_sq_str::register_type (); |
| 4901 | 2619 octave_int8_scalar::register_type (); |
| 2620 octave_int16_scalar::register_type (); | |
| 2621 octave_int32_scalar::register_type (); | |
| 2622 octave_int64_scalar::register_type (); | |
| 2623 octave_uint8_scalar::register_type (); | |
| 2624 octave_uint16_scalar::register_type (); | |
| 2625 octave_uint32_scalar::register_type (); | |
| 2626 octave_uint64_scalar::register_type (); | |
| 2627 octave_int8_matrix::register_type (); | |
| 2628 octave_int16_matrix::register_type (); | |
| 2629 octave_int32_matrix::register_type (); | |
| 2630 octave_int64_matrix::register_type (); | |
| 2631 octave_uint8_matrix::register_type (); | |
| 2632 octave_uint16_matrix::register_type (); | |
| 2633 octave_uint32_matrix::register_type (); | |
| 2634 octave_uint64_matrix::register_type (); | |
| 5164 | 2635 octave_sparse_bool_matrix::register_type (); |
| 2636 octave_sparse_matrix::register_type (); | |
| 2637 octave_sparse_complex_matrix::register_type (); | |
| 2376 | 2638 octave_struct::register_type (); |
| 7336 | 2639 octave_class::register_type (); |
| 2880 | 2640 octave_list::register_type (); |
| 3977 | 2641 octave_cs_list::register_type (); |
| 2376 | 2642 octave_magic_colon::register_type (); |
| 2974 | 2643 octave_builtin::register_type (); |
| 2644 octave_user_function::register_type (); | |
| 4649 | 2645 octave_dld_function::register_type (); |
| 4643 | 2646 octave_fcn_handle::register_type (); |
| 4966 | 2647 octave_fcn_inline::register_type (); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2648 octave_float_scalar::register_type (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2649 octave_float_complex::register_type (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2650 octave_float_matrix::register_type (); |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
2651 octave_float_diag_matrix::register_type (); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2652 octave_float_complex_matrix::register_type (); |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
2653 octave_float_complex_diag_matrix::register_type (); |
|
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
2654 octave_perm_matrix::register_type (); |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
2655 octave_null_matrix::register_type (); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
2656 octave_null_str::register_type (); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
2657 octave_null_sq_str::register_type (); |
| 2376 | 2658 } |
| 2659 | |
| 4970 | 2660 #if 0 |
| 2661 DEFUN (cast, args, , | |
| 2662 "-*- texinfo -*-\n\ | |
| 2663 @deftypefn {Built-in Function} {} cast (@var{val}, @var{type})\n\ | |
| 2664 Convert @var{val} to the new data type @var{type}.\n\ | |
| 5642 | 2665 @seealso{class, typeinfo}\n\ |
| 2666 @end deftypefn") | |
| 4970 | 2667 { |
| 2668 octave_value retval; | |
| 2669 | |
| 2670 if (args.length () == 2) | |
| 2671 error ("cast: not implemented"); | |
| 2672 else | |
| 5823 | 2673 print_usage (); |
| 4970 | 2674 |
| 2675 return retval; | |
| 2676 } | |
| 2677 #endif | |
| 2678 | |
| 4791 | 2679 DEFUN (sizeof, args, , |
| 2680 "-*- texinfo -*-\n\ | |
| 2681 @deftypefn {Built-in Function} {} sizeof (@var{val})\n\ | |
| 2682 Return the size of @var{val} in bytes\n\ | |
| 2683 @end deftypefn") | |
| 2684 { | |
| 2685 octave_value retval; | |
| 2686 | |
| 2687 if (args.length () == 1) | |
| 2688 retval = args(0).byte_size (); | |
| 2689 else | |
| 5823 | 2690 print_usage (); |
| 4791 | 2691 |
| 2692 return retval; | |
| 2693 } | |
| 2694 | |
| 6153 | 2695 static void |
| 2696 decode_subscripts (const char* name, const octave_value& arg, | |
| 2697 std::string& type_string, | |
| 2698 std::list<octave_value_list>& idx) | |
| 2699 { | |
| 2700 Octave_map m = arg.map_value (); | |
| 2701 | |
| 2702 if (! error_state | |
| 6639 | 2703 && m.nfields () == 2 && m.contains ("type") && m.contains ("subs")) |
| 6153 | 2704 { |
| 2705 Cell& type = m.contents ("type"); | |
| 2706 Cell& subs = m.contents ("subs"); | |
| 2707 | |
| 2708 type_string = std::string (type.length(), '\0'); | |
| 2709 | |
| 2710 for (int k = 0; k < type.length (); k++) | |
| 2711 { | |
| 2712 std::string item = type(k).string_value (); | |
| 2713 | |
| 2714 if (! error_state) | |
| 2715 { | |
| 2716 if (item == "{}") | |
| 2717 type_string[k] = '{'; | |
| 2718 else if (item == "()") | |
| 2719 type_string[k] = '('; | |
| 2720 else if (item == ".") | |
| 2721 type_string[k] = '.'; | |
| 2722 else | |
| 2723 { | |
| 2724 error("%s: invalid indexing type `%s'", name, item.c_str ()); | |
| 2725 return; | |
| 2726 } | |
| 2727 } | |
| 2728 else | |
| 2729 { | |
| 2730 error ("%s: expecting type(%d) to be a character string", | |
| 2731 name, k+1); | |
| 2732 return; | |
| 2733 } | |
| 2734 | |
| 2735 octave_value_list idx_item; | |
| 2736 | |
| 2737 if (subs(k).is_string ()) | |
| 2738 idx_item(0) = subs(k); | |
| 2739 else if (subs(k).is_cell ()) | |
| 2740 { | |
| 2741 Cell subs_cell = subs(k).cell_value (); | |
| 2742 | |
| 2743 for (int n = 0; n < subs_cell.length (); n++) | |
| 2744 { | |
| 2745 if (subs_cell(n).is_string () | |
| 2746 && subs_cell(n).string_value () == ":") | |
| 2747 idx_item(n) = octave_value(octave_value::magic_colon_t); | |
| 2748 else | |
| 2749 idx_item(n) = subs_cell(n); | |
| 2750 } | |
| 2751 } | |
| 2752 else | |
| 2753 { | |
| 2754 error ("%s: expecting subs(%d) to be a character string or cell array", | |
| 2755 name, k+1); | |
| 2756 return; | |
| 2757 } | |
| 2758 | |
| 2759 idx.push_back (idx_item); | |
| 2760 } | |
| 2761 } | |
| 2762 else | |
| 2763 error ("%s: second argument must be a structure with fields `type' and `subs'", name); | |
| 2764 } | |
| 2765 | |
| 2766 DEFUN (subsref, args, nargout, | |
| 2767 "-*- texinfo -*-\n\ | |
| 2768 @deftypefn {Built-in Function} {} subsref (@var{val}, @var{idx})\n\ | |
| 2769 Perform the subscripted element selection operation according to\n\ | |
| 2770 the subscript specified by @var{idx}.\n\ | |
| 2771 \n\ | |
| 2772 The subscript @var{idx} is expected to be a structure array with\n\ | |
| 2773 fields @samp{type} and @samp{subs}. Valid values for @samp{type}\n\ | |
| 6550 | 2774 are @samp{\"()\"}, @samp{\"@{@}\"}, and @samp{\".\"}.\n\ |
| 6153 | 2775 The @samp{subs} field may be either @samp{\":\"} or a cell array\n\ |
| 2776 of index values.\n\ | |
| 6631 | 2777 \n\ |
| 2778 The following example shows how to extract the two first columns of\n\ | |
| 2779 a matrix\n\ | |
| 2780 \n\ | |
| 2781 @example\n\ | |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
8992
diff
changeset
|
2782 @group\n\ |
| 6631 | 2783 val = magic(3)\n\ |
| 2784 @result{} val = [ 8 1 6\n\ | |
| 2785 3 5 7\n\ | |
| 2786 4 9 2 ]\n\ | |
| 2787 idx.type = \"()\";\n\ | |
| 2788 idx.subs = @{\":\", 1:2@};\n\ | |
| 2789 subsref(val, idx)\n\ | |
| 2790 @result{} [ 8 1 \n\ | |
| 2791 3 5 \n\ | |
| 2792 4 9 ]\n\ | |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
8992
diff
changeset
|
2793 @end group\n\ |
| 6631 | 2794 @end example\n\ |
| 2795 \n\ | |
| 2796 @noindent\n\ | |
| 2797 Note that this is the same as writing @code{val(:,1:2)}.\n\ | |
| 6157 | 2798 @seealso{subsasgn, substruct}\n\ |
| 6153 | 2799 @end deftypefn") |
| 2800 { | |
| 2801 octave_value_list retval; | |
| 2802 | |
| 2803 if (args.length () == 2) | |
| 2804 { | |
| 2805 std::string type; | |
| 2806 std::list<octave_value_list> idx; | |
| 2807 | |
| 2808 decode_subscripts ("subsref", args(1), type, idx); | |
| 2809 | |
| 2810 if (! error_state) | |
| 2811 retval = args(0).subsref (type, idx, nargout); | |
| 2812 } | |
| 2813 else | |
| 2814 print_usage (); | |
| 2815 | |
| 2816 return retval; | |
| 2817 } | |
| 2818 | |
| 2819 DEFUN (subsasgn, args, , | |
| 2820 "-*- texinfo -*-\n\ | |
| 2821 @deftypefn {Built-in Function} {} subsasgn (@var{val}, @var{idx}, @var{rhs})\n\ | |
| 2822 Perform the subscripted assignment operation according to\n\ | |
| 2823 the subscript specified by @var{idx}.\n\ | |
| 2824 \n\ | |
| 2825 The subscript @var{idx} is expected to be a structure array with\n\ | |
| 2826 fields @samp{type} and @samp{subs}. Valid values for @samp{type}\n\ | |
| 6248 | 2827 are @samp{\"()\"}, @samp{\"@{@}\"}, and @samp{\".\"}.\n\ |
| 6153 | 2828 The @samp{subs} field may be either @samp{\":\"} or a cell array\n\ |
| 2829 of index values.\n\ | |
| 6631 | 2830 \n\ |
| 2831 The following example shows how to set the two first columns of a\n\ | |
| 2832 3-by-3 matrix to zero.\n\ | |
| 2833 \n\ | |
| 2834 @example\n\ | |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
8992
diff
changeset
|
2835 @group\n\ |
| 6631 | 2836 val = magic(3);\n\ |
| 2837 idx.type = \"()\";\n\ | |
| 2838 idx.subs = @{\":\", 1:2@};\n\ | |
| 2839 subsasgn (val, idx, 0)\n\ | |
| 2840 @result{} [ 0 0 6\n\ | |
| 2841 0 0 7\n\ | |
| 2842 0 0 2 ]\n\ | |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
8992
diff
changeset
|
2843 @end group\n\ |
| 6631 | 2844 @end example\n\ |
| 2845 \n\ | |
| 2846 Note that this is the same as writing @code{val(:,1:2) = 0}.\n\ | |
| 6157 | 2847 @seealso{subsref, substruct}\n\ |
| 6153 | 2848 @end deftypefn") |
| 2849 { | |
| 2850 octave_value retval; | |
| 2851 | |
| 2852 if (args.length () == 3) | |
| 2853 { | |
| 2854 std::string type; | |
| 2855 std::list<octave_value_list> idx; | |
| 2856 | |
| 2857 decode_subscripts ("subsasgn", args(1), type, idx); | |
| 2858 | |
|
9368
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2859 octave_value arg0 = args(0); |
|
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2860 |
|
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2861 arg0.make_unique (); |
|
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2862 |
| 6153 | 2863 if (! error_state) |
|
9368
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2864 retval = arg0.subsasgn (type, idx, args(2)); |
| 6153 | 2865 } |
| 2866 else | |
| 2867 print_usage (); | |
| 2868 | |
| 2869 return retval; | |
| 2870 } | |
| 2871 | |
| 2376 | 2872 /* |
| 2873 ;;; Local Variables: *** | |
| 2874 ;;; mode: C++ *** | |
| 2875 ;;; End: *** | |
| 2876 */ |