Mercurial > octave
annotate src/ov.cc @ 9368:ff612fdaee95
properly unshare variable in subsasgn
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Sat, 20 Jun 2009 10:13:30 +0200 |
| parents | e2344f4af0cb |
| children | d9716e3ee0dd |
| 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 |
|
8982
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
380 case op_el_and_not: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
381 retval = "andnot"; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
382 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
383 |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
384 case op_el_or_not: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
385 retval = "ornot"; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
386 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
387 |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
388 case op_el_not_and: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
389 retval = "notand"; |
|
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_not_or: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
393 retval = "notor"; |
|
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 |
|
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
|
396 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
|
397 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
|
398 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
399 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
400 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
|
401 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
402 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
403 std::string |
| 2880 | 404 octave_value::assign_op_as_string (assign_op op) |
| 405 { | |
| 3523 | 406 std::string retval; |
| 2880 | 407 |
| 408 switch (op) | |
| 409 { | |
| 3533 | 410 case op_asn_eq: |
| 2880 | 411 retval = "="; |
| 412 break; | |
| 413 | |
| 3533 | 414 case op_add_eq: |
| 2880 | 415 retval = "+="; |
| 416 break; | |
| 417 | |
| 3533 | 418 case op_sub_eq: |
| 2880 | 419 retval = "-="; |
| 420 break; | |
| 421 | |
| 3533 | 422 case op_mul_eq: |
| 2880 | 423 retval = "*="; |
| 424 break; | |
| 425 | |
| 3533 | 426 case op_div_eq: |
| 2880 | 427 retval = "/="; |
| 428 break; | |
| 429 | |
| 3533 | 430 case op_ldiv_eq: |
| 3204 | 431 retval = "\\="; |
| 432 break; | |
| 433 | |
| 4018 | 434 case op_pow_eq: |
| 435 retval = "^="; | |
| 436 break; | |
| 437 | |
| 3533 | 438 case op_lshift_eq: |
| 2903 | 439 retval = "<<="; |
| 440 break; | |
| 441 | |
| 3533 | 442 case op_rshift_eq: |
| 2903 | 443 retval = ">>="; |
| 444 break; | |
| 445 | |
| 3533 | 446 case op_el_mul_eq: |
| 2880 | 447 retval = ".*="; |
| 448 break; | |
| 449 | |
| 3533 | 450 case op_el_div_eq: |
| 2880 | 451 retval = "./="; |
| 452 break; | |
| 453 | |
| 3533 | 454 case op_el_ldiv_eq: |
| 3204 | 455 retval = ".\\="; |
| 456 break; | |
| 457 | |
| 4018 | 458 case op_el_pow_eq: |
| 459 retval = ".^="; | |
| 460 break; | |
| 461 | |
| 3533 | 462 case op_el_and_eq: |
| 2880 | 463 retval = "&="; |
| 464 break; | |
| 465 | |
| 3533 | 466 case op_el_or_eq: |
| 2880 | 467 retval = "|="; |
| 468 break; | |
| 469 | |
| 470 default: | |
| 471 retval = "<unknown>"; | |
| 472 } | |
| 473 | |
| 474 return retval; | |
| 475 } | |
| 476 | |
| 4254 | 477 octave_value::octave_value (short int i) |
| 478 : rep (new octave_scalar (i)) | |
| 479 { | |
| 480 } | |
| 481 | |
| 482 octave_value::octave_value (unsigned short int i) | |
| 483 : rep (new octave_scalar (i)) | |
| 484 { | |
| 485 } | |
| 486 | |
| 4233 | 487 octave_value::octave_value (int i) |
| 488 : rep (new octave_scalar (i)) | |
| 489 { | |
| 490 } | |
| 491 | |
| 4254 | 492 octave_value::octave_value (unsigned int i) |
| 493 : rep (new octave_scalar (i)) | |
| 494 { | |
| 495 } | |
| 496 | |
| 497 octave_value::octave_value (long int i) | |
| 498 : rep (new octave_scalar (i)) | |
| 499 { | |
| 500 } | |
| 501 | |
| 502 octave_value::octave_value (unsigned long int i) | |
| 503 : rep (new octave_scalar (i)) | |
| 504 { | |
| 505 } | |
| 506 | |
| 4353 | 507 #if defined (HAVE_LONG_LONG_INT) |
| 508 octave_value::octave_value (long long int i) | |
| 509 : rep (new octave_scalar (i)) | |
| 510 { | |
| 511 } | |
| 512 #endif | |
| 513 | |
| 4355 | 514 #if defined (HAVE_UNSIGNED_LONG_LONG_INT) |
| 4353 | 515 octave_value::octave_value (unsigned long long int i) |
| 516 : rep (new octave_scalar (i)) | |
| 517 { | |
| 518 } | |
| 519 #endif | |
| 520 | |
| 4254 | 521 octave_value::octave_value (octave_time t) |
| 7065 | 522 : rep (new octave_scalar (t.double_value ())) |
| 4254 | 523 { |
| 524 } | |
| 525 | |
| 2376 | 526 octave_value::octave_value (double d) |
| 2825 | 527 : rep (new octave_scalar (d)) |
| 528 { | |
| 529 } | |
| 2376 | 530 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
531 octave_value::octave_value (float d) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
532 : rep (new octave_float_scalar (d)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
533 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
534 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
535 |
| 4587 | 536 octave_value::octave_value (const Cell& c, bool is_csl) |
| 5477 | 537 : rep (is_csl |
| 5759 | 538 ? dynamic_cast<octave_base_value *> (new octave_cs_list (c)) |
| 539 : dynamic_cast<octave_base_value *> (new octave_cell (c))) | |
| 3351 | 540 { |
| 541 } | |
| 542 | |
| 5147 | 543 octave_value::octave_value (const ArrayN<octave_value>& a, bool is_csl) |
| 5477 | 544 : rep (is_csl |
| 5759 | 545 ? dynamic_cast<octave_base_value *> (new octave_cs_list (Cell (a))) |
| 546 : dynamic_cast<octave_base_value *> (new octave_cell (Cell (a)))) | |
| 5147 | 547 { |
| 548 } | |
| 549 | |
| 5785 | 550 octave_value::octave_value (const Matrix& m, const MatrixType& t) |
| 551 : rep (new octave_matrix (m, t)) | |
| 2423 | 552 { |
| 553 maybe_mutate (); | |
| 554 } | |
| 2376 | 555 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
556 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
|
557 : rep (new octave_float_matrix (m, t)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
558 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
559 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
560 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
561 |
| 4507 | 562 octave_value::octave_value (const NDArray& a) |
| 4513 | 563 : rep (new octave_matrix (a)) |
| 4478 | 564 { |
| 565 maybe_mutate (); | |
| 566 } | |
| 567 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
568 octave_value::octave_value (const FloatNDArray& a) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
569 : rep (new octave_float_matrix (a)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
570 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
571 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
572 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
573 |
| 4911 | 574 octave_value::octave_value (const ArrayN<double>& a) |
| 575 : rep (new octave_matrix (a)) | |
| 576 { | |
| 577 maybe_mutate (); | |
| 578 } | |
| 579 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
580 octave_value::octave_value (const ArrayN<float>& a) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
581 : rep (new octave_float_matrix (a)) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
582 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
583 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
584 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
585 |
| 2376 | 586 octave_value::octave_value (const DiagMatrix& d) |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
587 : rep (new octave_diag_matrix (d)) |
| 2423 | 588 { |
| 589 maybe_mutate (); | |
| 590 } | |
| 2376 | 591 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
592 octave_value::octave_value (const FloatDiagMatrix& d) |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
593 : rep (new octave_float_diag_matrix (d)) |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
594 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
595 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
596 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
597 |
| 3418 | 598 octave_value::octave_value (const RowVector& v) |
| 599 : rep (new octave_matrix (v)) | |
| 2423 | 600 { |
| 601 maybe_mutate (); | |
| 602 } | |
| 2376 | 603 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
604 octave_value::octave_value (const FloatRowVector& v) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
605 : rep (new octave_float_matrix (v)) |
|
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 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
608 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
609 |
| 3418 | 610 octave_value::octave_value (const ColumnVector& v) |
| 611 : rep (new octave_matrix (v)) | |
| 2423 | 612 { |
| 613 maybe_mutate (); | |
| 614 } | |
| 2376 | 615 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
616 octave_value::octave_value (const FloatColumnVector& v) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
617 : rep (new octave_float_matrix (v)) |
|
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 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
620 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
621 |
| 2376 | 622 octave_value::octave_value (const Complex& C) |
| 2423 | 623 : rep (new octave_complex (C)) |
| 624 { | |
| 625 maybe_mutate (); | |
| 626 } | |
| 2376 | 627 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
628 octave_value::octave_value (const FloatComplex& C) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
629 : rep (new octave_float_complex (C)) |
|
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 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
632 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
633 |
| 5785 | 634 octave_value::octave_value (const ComplexMatrix& m, const MatrixType& t) |
| 635 : rep (new octave_complex_matrix (m, t)) | |
| 2423 | 636 { |
| 637 maybe_mutate (); | |
| 638 } | |
| 2376 | 639 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
640 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
|
641 : rep (new octave_float_complex_matrix (m, t)) |
|
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 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
644 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
645 |
| 4513 | 646 octave_value::octave_value (const ComplexNDArray& a) |
| 647 : rep (new octave_complex_matrix (a)) | |
| 4478 | 648 { |
| 649 maybe_mutate (); | |
| 650 } | |
| 651 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
652 octave_value::octave_value (const FloatComplexNDArray& a) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
653 : rep (new octave_float_complex_matrix (a)) |
|
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 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
656 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
657 |
| 4911 | 658 octave_value::octave_value (const ArrayN<Complex>& a) |
| 659 : rep (new octave_complex_matrix (a)) | |
| 660 { | |
| 661 maybe_mutate (); | |
| 662 } | |
| 663 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
664 octave_value::octave_value (const ArrayN<FloatComplex>& a) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
665 : rep (new octave_float_complex_matrix (a)) |
|
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 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
668 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
669 |
| 2376 | 670 octave_value::octave_value (const ComplexDiagMatrix& d) |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
671 : rep (new octave_complex_diag_matrix (d)) |
| 2423 | 672 { |
| 673 maybe_mutate (); | |
| 674 } | |
| 2376 | 675 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
676 octave_value::octave_value (const FloatComplexDiagMatrix& d) |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
677 : 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
|
678 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
679 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
680 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
681 |
| 3418 | 682 octave_value::octave_value (const ComplexRowVector& v) |
| 683 : rep (new octave_complex_matrix (v)) | |
| 2423 | 684 { |
| 685 maybe_mutate (); | |
| 686 } | |
| 2376 | 687 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
688 octave_value::octave_value (const FloatComplexRowVector& v) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
689 : rep (new octave_float_complex_matrix (v)) |
|
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 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
692 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
693 |
| 3418 | 694 octave_value::octave_value (const ComplexColumnVector& v) |
| 695 : rep (new octave_complex_matrix (v)) | |
| 2423 | 696 { |
| 697 maybe_mutate (); | |
| 698 } | |
| 2376 | 699 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
700 octave_value::octave_value (const FloatComplexColumnVector& v) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
701 : rep (new octave_float_complex_matrix (v)) |
|
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 maybe_mutate (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
704 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
705 |
|
8960
93f18f166aba
remove float perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
706 octave_value::octave_value (const PermMatrix& p) |
|
93f18f166aba
remove float perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
707 : rep (new octave_perm_matrix (p)) |
|
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
708 { |
|
8960
93f18f166aba
remove float perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
709 maybe_mutate (); |
|
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
710 } |
|
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
711 |
| 2825 | 712 octave_value::octave_value (bool b) |
| 713 : rep (new octave_bool (b)) | |
| 714 { | |
| 715 } | |
| 716 | |
| 5785 | 717 octave_value::octave_value (const boolMatrix& bm, const MatrixType& t) |
| 718 : rep (new octave_bool_matrix (bm, t)) | |
| 2825 | 719 { |
| 720 maybe_mutate (); | |
| 721 } | |
| 722 | |
| 4513 | 723 octave_value::octave_value (const boolNDArray& bnda) |
| 724 : rep (new octave_bool_matrix (bnda)) | |
| 725 { | |
| 726 maybe_mutate (); | |
| 727 } | |
| 728 | |
| 7433 | 729 octave_value::octave_value (const ArrayN<bool>& bnda) |
| 730 : rep (new octave_bool_matrix (bnda)) | |
| 731 { | |
| 732 maybe_mutate (); | |
| 733 } | |
| 734 | |
| 5279 | 735 octave_value::octave_value (char c, char type) |
| 736 : rep (type == '"' | |
| 737 ? new octave_char_matrix_dq_str (c) | |
| 738 : new octave_char_matrix_sq_str (c)) | |
| 3189 | 739 { |
| 740 maybe_mutate (); | |
| 741 } | |
| 742 | |
| 5279 | 743 octave_value::octave_value (const char *s, char type) |
| 744 : rep (type == '"' | |
| 745 ? new octave_char_matrix_dq_str (s) | |
| 746 : new octave_char_matrix_sq_str (s)) | |
| 2423 | 747 { |
| 748 maybe_mutate (); | |
| 749 } | |
| 2376 | 750 |
| 5279 | 751 octave_value::octave_value (const std::string& s, char type) |
| 752 : rep (type == '"' | |
| 753 ? new octave_char_matrix_dq_str (s) | |
| 754 : new octave_char_matrix_sq_str (s)) | |
| 2423 | 755 { |
| 756 maybe_mutate (); | |
| 757 } | |
| 2376 | 758 |
| 5279 | 759 octave_value::octave_value (const string_vector& s, char type) |
| 760 : rep (type == '"' | |
| 761 ? new octave_char_matrix_dq_str (s) | |
| 762 : new octave_char_matrix_sq_str (s)) | |
| 2423 | 763 { |
| 764 maybe_mutate (); | |
| 765 } | |
| 2376 | 766 |
| 5279 | 767 octave_value::octave_value (const charMatrix& chm, bool is_str, char type) |
| 4587 | 768 : rep (is_str |
| 5279 | 769 ? (type == '"' |
| 770 ? new octave_char_matrix_dq_str (chm) | |
| 771 : new octave_char_matrix_sq_str (chm)) | |
| 4513 | 772 : new octave_char_matrix (chm)) |
| 2409 | 773 { |
| 4513 | 774 maybe_mutate (); |
| 775 } | |
| 2376 | 776 |
| 5279 | 777 octave_value::octave_value (const charNDArray& chm, bool is_str, char type) |
| 4587 | 778 : rep (is_str |
| 5279 | 779 ? (type == '"' |
| 780 ? new octave_char_matrix_dq_str (chm) | |
| 781 : new octave_char_matrix_sq_str (chm)) | |
| 4513 | 782 : new octave_char_matrix (chm)) |
| 783 { | |
| 2423 | 784 maybe_mutate (); |
| 2409 | 785 } |
| 2376 | 786 |
| 5279 | 787 octave_value::octave_value (const ArrayN<char>& chm, bool is_str, char type) |
| 4997 | 788 : rep (is_str |
| 5279 | 789 ? (type == '"' |
| 790 ? new octave_char_matrix_dq_str (chm) | |
| 791 : new octave_char_matrix_sq_str (chm)) | |
| 4997 | 792 : new octave_char_matrix (chm)) |
| 793 { | |
| 794 maybe_mutate (); | |
| 795 } | |
| 796 | |
| 5785 | 797 octave_value::octave_value (const SparseMatrix& m, const MatrixType &t) |
| 5164 | 798 : rep (new octave_sparse_matrix (m, t)) |
| 799 { | |
| 800 maybe_mutate (); | |
| 801 } | |
| 802 | |
| 6863 | 803 octave_value::octave_value (const Sparse<double>& m, const MatrixType &t) |
| 804 : rep (new octave_sparse_matrix (m, t)) | |
| 805 { | |
| 806 maybe_mutate (); | |
| 807 } | |
| 808 | |
| 5785 | 809 octave_value::octave_value (const SparseComplexMatrix& m, const MatrixType &t) |
| 5164 | 810 : rep (new octave_sparse_complex_matrix (m, t)) |
| 811 { | |
| 812 maybe_mutate (); | |
| 813 } | |
| 814 | |
| 6863 | 815 octave_value::octave_value (const Sparse<Complex>& m, const MatrixType &t) |
| 816 : rep (new octave_sparse_complex_matrix (m, t)) | |
| 817 { | |
| 818 maybe_mutate (); | |
| 819 } | |
| 820 | |
| 5785 | 821 octave_value::octave_value (const SparseBoolMatrix& bm, const MatrixType &t) |
| 5164 | 822 : rep (new octave_sparse_bool_matrix (bm, t)) |
| 823 { | |
| 824 maybe_mutate (); | |
| 825 } | |
| 826 | |
| 7433 | 827 octave_value::octave_value (const Sparse<bool>& bm, const MatrixType &t) |
| 828 : rep (new octave_sparse_bool_matrix (bm, t)) | |
| 829 { | |
| 830 maybe_mutate (); | |
| 831 } | |
| 832 | |
| 4901 | 833 octave_value::octave_value (const octave_int8& i) |
| 834 : rep (new octave_int8_scalar (i)) | |
| 835 { | |
| 836 maybe_mutate (); | |
| 837 } | |
| 838 | |
| 839 octave_value::octave_value (const octave_uint8& i) | |
| 840 : rep (new octave_uint8_scalar (i)) | |
| 841 { | |
| 842 maybe_mutate (); | |
| 843 } | |
| 844 | |
| 845 octave_value::octave_value (const octave_int16& i) | |
| 846 : rep (new octave_int16_scalar (i)) | |
| 847 { | |
| 848 maybe_mutate (); | |
| 849 } | |
| 850 | |
| 851 octave_value::octave_value (const octave_uint16& i) | |
| 852 : rep (new octave_uint16_scalar (i)) | |
| 853 { | |
| 854 maybe_mutate (); | |
| 855 } | |
| 856 | |
| 857 octave_value::octave_value (const octave_int32& i) | |
| 858 : rep (new octave_int32_scalar (i)) | |
| 859 { | |
| 860 maybe_mutate (); | |
| 861 } | |
| 862 | |
| 863 octave_value::octave_value (const octave_uint32& i) | |
| 864 : rep (new octave_uint32_scalar (i)) | |
| 865 { | |
| 866 maybe_mutate (); | |
| 867 } | |
| 868 | |
| 869 octave_value::octave_value (const octave_int64& i) | |
| 870 : rep (new octave_int64_scalar (i)) | |
| 871 { | |
| 872 maybe_mutate (); | |
| 873 } | |
| 874 | |
| 875 octave_value::octave_value (const octave_uint64& i) | |
| 876 : rep (new octave_uint64_scalar (i)) | |
| 877 { | |
| 878 maybe_mutate (); | |
| 879 } | |
| 880 | |
| 881 octave_value::octave_value (const int8NDArray& inda) | |
| 882 : rep (new octave_int8_matrix (inda)) | |
| 883 { | |
| 884 maybe_mutate (); | |
| 885 } | |
| 886 | |
| 7064 | 887 octave_value::octave_value (const ArrayN<octave_int8>& inda) |
| 888 : rep (new octave_int8_matrix (inda)) | |
| 889 { | |
| 890 maybe_mutate (); | |
| 891 } | |
| 892 | |
| 4901 | 893 octave_value::octave_value (const uint8NDArray& inda) |
| 894 : rep (new octave_uint8_matrix (inda)) | |
| 895 { | |
| 896 maybe_mutate (); | |
| 897 } | |
| 898 | |
| 7064 | 899 octave_value::octave_value (const ArrayN<octave_uint8>& inda) |
| 900 : rep (new octave_uint8_matrix (inda)) | |
| 901 { | |
| 902 maybe_mutate (); | |
| 903 } | |
| 904 | |
| 4901 | 905 octave_value::octave_value (const int16NDArray& inda) |
| 906 : rep (new octave_int16_matrix (inda)) | |
| 907 { | |
| 908 maybe_mutate (); | |
| 909 } | |
| 910 | |
| 7064 | 911 octave_value::octave_value (const ArrayN<octave_int16>& inda) |
| 912 : rep (new octave_int16_matrix (inda)) | |
| 913 { | |
| 914 maybe_mutate (); | |
| 915 } | |
| 916 | |
| 4901 | 917 octave_value::octave_value (const uint16NDArray& inda) |
| 918 : rep (new octave_uint16_matrix (inda)) | |
| 919 { | |
| 920 maybe_mutate (); | |
| 921 } | |
| 922 | |
| 7064 | 923 octave_value::octave_value (const ArrayN<octave_uint16>& inda) |
| 924 : rep (new octave_uint16_matrix (inda)) | |
| 925 { | |
| 926 maybe_mutate (); | |
| 927 } | |
| 928 | |
| 4901 | 929 octave_value::octave_value (const int32NDArray& inda) |
| 930 : rep (new octave_int32_matrix (inda)) | |
| 931 { | |
| 932 maybe_mutate (); | |
| 933 } | |
| 934 | |
| 7064 | 935 octave_value::octave_value (const ArrayN<octave_int32>& inda) |
| 936 : rep (new octave_int32_matrix (inda)) | |
| 937 { | |
| 938 maybe_mutate (); | |
| 939 } | |
| 940 | |
| 4901 | 941 octave_value::octave_value (const uint32NDArray& inda) |
| 942 : rep (new octave_uint32_matrix (inda)) | |
| 943 { | |
| 944 maybe_mutate (); | |
| 945 } | |
| 946 | |
| 7064 | 947 octave_value::octave_value (const ArrayN<octave_uint32>& inda) |
| 948 : rep (new octave_uint32_matrix (inda)) | |
| 949 { | |
| 950 maybe_mutate (); | |
| 951 } | |
| 952 | |
| 4901 | 953 octave_value::octave_value (const int64NDArray& inda) |
| 954 : rep (new octave_int64_matrix (inda)) | |
| 955 { | |
| 956 maybe_mutate (); | |
| 957 } | |
| 958 | |
| 7064 | 959 octave_value::octave_value (const ArrayN<octave_int64>& inda) |
| 960 : rep (new octave_int64_matrix (inda)) | |
| 961 { | |
| 962 maybe_mutate (); | |
| 963 } | |
| 964 | |
| 4901 | 965 octave_value::octave_value (const uint64NDArray& inda) |
| 966 : rep (new octave_uint64_matrix (inda)) | |
| 967 { | |
| 968 maybe_mutate (); | |
| 969 } | |
| 970 | |
| 7064 | 971 octave_value::octave_value (const ArrayN<octave_uint64>& inda) |
| 972 : rep (new octave_uint64_matrix (inda)) | |
| 973 { | |
| 974 maybe_mutate (); | |
| 975 } | |
| 976 | |
|
9351
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
977 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
|
978 bool cache_index) |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
979 : 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
|
980 { |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
981 maybe_mutate (); |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
982 } |
|
e2344f4af0cb
autocache indices returned from find et al.
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
983 |
| 2376 | 984 octave_value::octave_value (double base, double limit, double inc) |
| 2423 | 985 : rep (new octave_range (base, limit, inc)) |
| 986 { | |
| 987 maybe_mutate (); | |
| 988 } | |
| 2376 | 989 |
| 990 octave_value::octave_value (const Range& r) | |
| 2423 | 991 : rep (new octave_range (r)) |
| 992 { | |
| 993 maybe_mutate (); | |
| 994 } | |
| 2376 | 995 |
| 996 octave_value::octave_value (const Octave_map& m) | |
| 2825 | 997 : rep (new octave_struct (m)) |
| 998 { | |
| 2880 | 999 } |
| 1000 | |
| 7336 | 1001 octave_value::octave_value (const Octave_map& m, const std::string& id) |
| 1002 : rep (new octave_class (m, id)) | |
| 1003 { | |
| 1004 } | |
| 1005 | |
| 4587 | 1006 octave_value::octave_value (const octave_value_list& l, bool is_csl) |
| 5477 | 1007 : rep (is_csl |
| 5759 | 1008 ? dynamic_cast<octave_base_value *> (new octave_cs_list (l)) |
| 1009 : dynamic_cast<octave_base_value *> (new octave_list (l))) | |
| 2880 | 1010 { |
| 1011 } | |
| 2376 | 1012 |
| 1013 octave_value::octave_value (octave_value::magic_colon) | |
| 2825 | 1014 : rep (new octave_magic_colon ()) |
| 1015 { | |
| 1016 } | |
| 2376 | 1017 |
| 5759 | 1018 octave_value::octave_value (octave_base_value *new_rep) |
| 2825 | 1019 : rep (new_rep) |
| 1020 { | |
| 1021 } | |
| 2376 | 1022 |
| 7336 | 1023 octave_value::octave_value (octave_base_value *new_rep, int xcount) |
| 1024 : rep (new_rep) | |
| 1025 { | |
| 1026 rep->count = xcount; | |
| 1027 } | |
| 1028 | |
| 5759 | 1029 octave_base_value * |
| 3933 | 1030 octave_value::clone (void) const |
| 2880 | 1031 { |
| 1032 panic_impossible (); | |
| 3546 | 1033 return 0; |
| 2880 | 1034 } |
| 1035 | |
| 2409 | 1036 void |
| 1037 octave_value::maybe_mutate (void) | |
| 1038 { | |
| 5759 | 1039 octave_base_value *tmp = rep->try_narrowing_conversion (); |
| 2409 | 1040 |
| 1041 if (tmp && tmp != rep) | |
| 1042 { | |
| 1043 if (--rep->count == 0) | |
| 1044 delete rep; | |
| 1045 | |
| 1046 rep = tmp; | |
| 1047 } | |
| 1048 } | |
| 1049 | |
| 4247 | 1050 octave_value |
| 4271 | 1051 octave_value::single_subsref (const std::string& type, |
| 1052 const octave_value_list& idx) | |
| 4247 | 1053 { |
| 1054 std::list<octave_value_list> i; | |
| 1055 | |
| 1056 i.push_back (idx); | |
| 1057 | |
| 1058 return rep->subsref (type, i); | |
| 1059 } | |
| 1060 | |
| 2974 | 1061 octave_value_list |
| 4247 | 1062 octave_value::subsref (const std::string& type, |
| 4219 | 1063 const std::list<octave_value_list>& idx, int nargout) |
| 3933 | 1064 { |
|
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7503
diff
changeset
|
1065 if (nargout == 1) |
| 3933 | 1066 return rep->subsref (type, idx); |
| 1067 else | |
| 1068 return rep->subsref (type, idx, nargout); | |
| 1069 } | |
| 1070 | |
| 1071 octave_value | |
| 4247 | 1072 octave_value::next_subsref (const std::string& type, |
| 4219 | 1073 const std::list<octave_value_list>& idx, |
| 4233 | 1074 size_t skip) |
| 3933 | 1075 { |
| 4582 | 1076 if (! error_state && idx.size () > skip) |
| 3933 | 1077 { |
| 4219 | 1078 std::list<octave_value_list> new_idx (idx); |
| 4233 | 1079 for (size_t i = 0; i < skip; i++) |
| 4219 | 1080 new_idx.erase (new_idx.begin ()); |
| 3933 | 1081 return subsref (type.substr (skip), new_idx); |
| 1082 } | |
| 1083 else | |
| 1084 return *this; | |
| 1085 } | |
| 1086 | |
| 1087 octave_value_list | |
| 4994 | 1088 octave_value::next_subsref (int nargout, const std::string& type, |
| 1089 const std::list<octave_value_list>& idx, | |
| 1090 size_t skip) | |
| 1091 { | |
| 1092 if (! error_state && idx.size () > skip) | |
| 1093 { | |
| 1094 std::list<octave_value_list> new_idx (idx); | |
| 1095 for (size_t i = 0; i < skip; i++) | |
| 1096 new_idx.erase (new_idx.begin ()); | |
| 1097 return subsref (type.substr (skip), new_idx, nargout); | |
| 1098 } | |
| 1099 else | |
| 1100 return *this; | |
| 1101 } | |
| 1102 | |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1103 octave_value |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1104 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
|
1105 const std::list<octave_value_list>& idx, |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1106 size_t skip) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1107 { |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1108 if (! error_state && idx.size () > skip) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1109 { |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1110 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
|
1111 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
|
1112 new_idx.erase (new_idx.begin ()); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1113 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
|
1114 } |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1115 else |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1116 return *this; |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1117 } |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8531
diff
changeset
|
1118 |
| 4994 | 1119 octave_value_list |
| 3544 | 1120 octave_value::do_multi_index_op (int nargout, const octave_value_list& idx) |
| 2974 | 1121 { |
| 3544 | 1122 return rep->do_multi_index_op (nargout, idx); |
| 2974 | 1123 } |
| 1124 | |
| 3933 | 1125 #if 0 |
| 3204 | 1126 static void |
| 3933 | 1127 gripe_assign_failed (const std::string& on, const std::string& tn1, |
| 1128 const std::string& tn2) | |
| 3204 | 1129 { |
| 1130 error ("assignment failed for `%s %s %s'", | |
| 1131 tn1.c_str (), on.c_str (), tn2.c_str ()); | |
| 1132 } | |
| 3933 | 1133 #endif |
| 3204 | 1134 |
| 1135 static void | |
| 3933 | 1136 gripe_assign_failed_or_no_method (const std::string& on, |
| 1137 const std::string& tn1, | |
| 3523 | 1138 const std::string& tn2) |
| 3204 | 1139 { |
| 1140 error ("assignment failed, or no method for `%s %s %s'", | |
| 1141 tn1.c_str (), on.c_str (), tn2.c_str ()); | |
| 1142 } | |
| 1143 | |
| 3933 | 1144 octave_value |
| 4247 | 1145 octave_value::subsasgn (const std::string& type, |
| 4219 | 1146 const std::list<octave_value_list>& idx, |
| 3933 | 1147 const octave_value& rhs) |
| 1148 { | |
| 1149 return rep->subsasgn (type, idx, rhs); | |
| 1150 } | |
| 1151 | |
| 1152 octave_value | |
| 4247 | 1153 octave_value::assign (assign_op op, const std::string& type, |
| 4219 | 1154 const std::list<octave_value_list>& idx, |
| 3933 | 1155 const octave_value& rhs) |
| 1156 { | |
| 1157 octave_value retval; | |
| 1158 | |
| 1159 make_unique (); | |
| 1160 | |
| 1161 octave_value t_rhs = rhs; | |
| 1162 | |
| 1163 if (op != op_asn_eq) | |
| 1164 { | |
| 5775 | 1165 // FIXME -- only do the following stuff if we can't find |
| 3933 | 1166 // a specific function to call to handle the op= operation for |
| 1167 // the types we have. | |
| 1168 | |
|
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7503
diff
changeset
|
1169 octave_value t = subsref (type, idx); |
| 3933 | 1170 |
| 1171 if (! error_state) | |
| 1172 { | |
| 1173 binary_op binop = op_eq_to_binary_op (op); | |
| 1174 | |
| 1175 if (! error_state) | |
| 1176 t_rhs = do_binary_op (binop, t, rhs); | |
| 1177 } | |
| 1178 } | |
| 1179 | |
| 1180 if (! error_state) | |
| 1181 { | |
| 7336 | 1182 if (type[0] == '.' && ! (is_map () || is_object ())) |
| 3933 | 1183 { |
| 1184 octave_value tmp = Octave_map (); | |
| 1185 retval = tmp.subsasgn (type, idx, t_rhs); | |
| 1186 } | |
| 1187 else | |
| 1188 retval = subsasgn (type, idx, t_rhs); | |
| 1189 } | |
| 1190 | |
| 1191 if (error_state) | |
| 1192 gripe_assign_failed_or_no_method (assign_op_as_string (op), | |
| 1193 type_name (), rhs.type_name ()); | |
| 1194 | |
| 1195 return retval; | |
| 1196 } | |
| 1197 | |
| 1198 const octave_value& | |
| 3203 | 1199 octave_value::assign (assign_op op, const octave_value& rhs) |
| 2880 | 1200 { |
| 3533 | 1201 if (op == op_asn_eq) |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1202 // 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
|
1203 operator = (rhs.storable_value ()); |
| 3203 | 1204 else |
| 1205 { | |
| 5775 | 1206 // FIXME -- only do the following stuff if we can't find |
| 3204 | 1207 // a specific function to call to handle the op= operation for |
| 1208 // the types we have. | |
| 1209 | |
| 1210 binary_op binop = op_eq_to_binary_op (op); | |
| 1211 | |
| 1212 if (! error_state) | |
| 1213 { | |
| 1214 octave_value t = do_binary_op (binop, *this, rhs); | |
| 1215 | |
| 1216 if (! error_state) | |
| 1217 operator = (t); | |
| 1218 } | |
| 1219 | |
| 1220 if (error_state) | |
| 1221 gripe_assign_failed_or_no_method (assign_op_as_string (op), | |
| 1222 type_name (), rhs.type_name ()); | |
| 1223 } | |
| 1224 | |
| 3933 | 1225 return *this; |
| 2376 | 1226 } |
| 1227 | |
| 5275 | 1228 octave_idx_type |
| 4563 | 1229 octave_value::length (void) const |
| 1230 { | |
| 1231 int retval = 0; | |
| 1232 | |
| 1233 dim_vector dv = dims (); | |
| 4584 | 1234 |
| 4563 | 1235 for (int i = 0; i < dv.length (); i++) |
| 1236 { | |
| 1237 if (dv(i) < 0) | |
| 1238 { | |
| 1239 retval = -1; | |
| 1240 break; | |
| 1241 } | |
| 1242 | |
| 4584 | 1243 if (dv(i) == 0) |
| 1244 { | |
| 1245 retval = 0; | |
| 1246 break; | |
| 1247 } | |
| 1248 | |
| 4563 | 1249 if (dv(i) > retval) |
| 1250 retval = dv(i); | |
| 1251 } | |
| 1252 | |
| 1253 return retval; | |
| 1254 } | |
| 1255 | |
|
8346
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1256 bool |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1257 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
|
1258 { |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1259 bool retval = false; |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1260 |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1261 // 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
|
1262 |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1263 if (rows () == test.rows () && columns () == test.columns ()) |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1264 { |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1265 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
|
1266 |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1267 // Empty array also means a match. |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1268 if (! error_state && tmp.is_defined ()) |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1269 retval = tmp.is_true () || tmp.is_empty (); |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1270 } |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1271 |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1272 return retval; |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1273 } |
|
8302788f09db
fix empty matrix handling in switch statement
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
1274 |
| 3351 | 1275 Cell |
| 1276 octave_value::cell_value (void) const | |
| 1277 { | |
| 1278 return rep->cell_value (); | |
| 1279 } | |
| 1280 | |
|
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
|
1281 // 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
|
1282 // 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
|
1283 |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1284 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
|
1285 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
|
1286 { |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1287 #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
|
1288 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
|
1289 #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
|
1290 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
|
1291 #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
|
1292 #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
|
1293 #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
|
1294 } |
|
260294a5520f
octave_value::idx_type_value: move definition to ov.cc from ov.h
John W. Eaton <jwe@octave.org>
parents:
8011
diff
changeset
|
1295 |
| 2376 | 1296 Octave_map |
| 1297 octave_value::map_value (void) const | |
| 1298 { | |
| 1299 return rep->map_value (); | |
| 1300 } | |
| 1301 | |
| 2974 | 1302 octave_function * |
| 1303 octave_value::function_value (bool silent) | |
| 1304 { | |
| 1305 return rep->function_value (silent); | |
| 1306 } | |
| 1307 | |
|
7761
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1308 const octave_function * |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1309 octave_value::function_value (bool silent) const |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1310 { |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1311 return rep->function_value (silent); |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1312 } |
|
5adeea5de26c
symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents:
7719
diff
changeset
|
1313 |
| 4700 | 1314 octave_user_function * |
| 1315 octave_value::user_function_value (bool silent) | |
| 1316 { | |
| 1317 return rep->user_function_value (silent); | |
| 1318 } | |
| 1319 | |
|
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
|
1320 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
|
1321 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
|
1322 { |
|
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
|
1323 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
|
1324 } |
|
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
|
1325 |
|
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
|
1326 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
|
1327 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
|
1328 { |
|
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
|
1329 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
|
1330 } |
|
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
|
1331 |
| 4346 | 1332 octave_fcn_handle * |
| 4343 | 1333 octave_value::fcn_handle_value (bool silent) |
| 1334 { | |
| 1335 return rep->fcn_handle_value (silent); | |
| 1336 } | |
| 1337 | |
| 4933 | 1338 octave_fcn_inline * |
| 1339 octave_value::fcn_inline_value (bool silent) | |
| 1340 { | |
| 1341 return rep->fcn_inline_value (silent); | |
| 1342 } | |
| 1343 | |
| 2880 | 1344 octave_value_list |
| 1345 octave_value::list_value (void) const | |
| 1346 { | |
| 1347 return rep->list_value (); | |
| 1348 } | |
| 1349 | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1350 static dim_vector |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1351 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
|
1352 const std::string& my_type, const std::string& wanted_type) |
| 3419 | 1353 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1354 dim_vector retval (dv); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1355 retval.chop_trailing_singletons (); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1356 octave_idx_type nel = dv.numel (); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1357 |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1358 if (retval.length () > 2 || (retval(0) != 1 && retval(1) != 1)) |
| 3419 | 1359 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1360 if (!force_vector_conversion) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1361 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
|
1362 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
|
1363 retval = dim_vector (nel); |
| 3419 | 1364 } |
| 1365 | |
| 1366 return retval; | |
| 1367 } | |
| 1368 | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1369 ColumnVector |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1370 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
|
1371 bool frc_vec_conv) const |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1372 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1373 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
|
1374 frc_vec_conv)); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1375 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1376 |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1377 ComplexColumnVector |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1378 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
|
1379 bool frc_vec_conv) const |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1380 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1381 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
|
1382 frc_vec_conv)); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1383 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1384 |
| 3419 | 1385 RowVector |
| 1386 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
|
1387 bool frc_vec_conv) const |
| 3419 | 1388 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1389 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
|
1390 frc_vec_conv)); |
| 3419 | 1391 } |
| 1392 | |
| 1393 ComplexRowVector | |
| 1394 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
|
1395 bool frc_vec_conv) const |
| 3419 | 1396 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1397 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
|
1398 frc_vec_conv)); |
| 3419 | 1399 } |
| 1400 | |
| 1401 Array<double> | |
| 2376 | 1402 octave_value::vector_value (bool force_string_conv, |
| 1403 bool force_vector_conversion) const | |
| 1404 { | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1405 Array<double> retval = array_value (force_string_conv); |
| 2376 | 1406 |
| 1407 if (error_state) | |
| 1408 return retval; | |
| 1409 else | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1410 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
|
1411 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1412 type_name (), "real vector")); |
| 2376 | 1413 } |
| 1414 | |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1415 template <class T> |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1416 static Array<int> |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1417 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
|
1418 { |
| 7999 | 1419 Array<int> retval (A.dims ()); |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1420 octave_idx_type n = A.numel (); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1421 |
|
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
|
1422 octave_int<int>::clear_conv_flag (); |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1423 for (octave_idx_type i = 0; i < n; i++) |
| 7999 | 1424 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
|
1425 |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1426 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
|
1427 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
|
1428 |
|
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
|
1429 octave_int<int>::clear_conv_flag (); |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1430 |
| 7999 | 1431 return retval; |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1432 } |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1433 |
| 4044 | 1434 Array<int> |
| 1435 octave_value::int_vector_value (bool force_string_conv, bool require_int, | |
| 1436 bool force_vector_conversion) const | |
| 1437 { | |
| 1438 Array<int> retval; | |
| 1439 | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1440 if (is_integer_type ()) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1441 { |
|
7997
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1442 if (is_int32_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1443 retval = convert_to_int_array (int32_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1444 else if (is_int64_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1445 retval = convert_to_int_array (int64_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1446 else if (is_int16_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1447 retval = convert_to_int_array (int16_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1448 else if (is_int8_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1449 retval = convert_to_int_array (int8_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1450 else if (is_uint32_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1451 retval = convert_to_int_array (uint32_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1452 else if (is_uint64_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1453 retval = convert_to_int_array (uint64_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1454 else if (is_uint16_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1455 retval = convert_to_int_array (uint16_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1456 else if (is_uint8_type ()) |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1457 retval = convert_to_int_array (uint8_array_value ()); |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1458 else |
|
2b8952e133c9
implement checked conversions between integers
Jaroslav Hajek <highegg@gmail.com>
parents:
7892
diff
changeset
|
1459 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
|
1460 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1461 else |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1462 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1463 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
|
1464 if (! error_state) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1465 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1466 if (require_int) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1467 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1468 retval.resize (a.dims ()); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1469 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
|
1470 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1471 double ai = a.elem (i); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1472 int v = static_cast<int> (ai); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1473 if (ai == v) |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1474 retval.xelem (i) = v; |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1475 else |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1476 { |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1477 error ("conversion to integer value failed"); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1478 break; |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1479 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1480 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1481 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1482 else |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1483 retval = Array<int> (a); |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1484 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1485 } |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1486 |
| 4044 | 1487 |
| 1488 if (error_state) | |
| 1489 return retval; | |
| 1490 else | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1491 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
|
1492 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1493 type_name (), "integer vector")); |
| 4044 | 1494 } |
| 1495 | |
| 8811 | 1496 template <class T> |
| 1497 static Array<octave_idx_type> | |
| 1498 convert_to_octave_idx_type_array (const Array<octave_int<T> >& A) | |
| 1499 { | |
| 1500 Array<octave_idx_type> retval (A.dims ()); | |
| 1501 octave_idx_type n = A.numel (); | |
| 1502 | |
| 1503 octave_int<int>::clear_conv_flag (); | |
| 1504 for (octave_idx_type i = 0; i < n; i++) | |
| 1505 retval.xelem (i) = octave_int<octave_idx_type> (A.xelem (i)); | |
| 1506 | |
| 1507 if (octave_int<int>::get_trunc_flag ()) | |
| 1508 gripe_truncated_conversion (octave_int<T>::type_name (), "int"); | |
| 1509 | |
| 1510 octave_int<int>::clear_conv_flag (); | |
| 1511 | |
| 1512 return retval; | |
| 1513 } | |
| 1514 | |
| 1515 Array<octave_idx_type> | |
| 1516 octave_value::octave_idx_type_vector_value (bool force_string_conv, | |
| 1517 bool require_int, | |
| 1518 bool force_vector_conversion) const | |
| 1519 { | |
| 1520 Array<octave_idx_type> retval; | |
| 1521 | |
| 1522 if (is_integer_type ()) | |
| 1523 { | |
| 1524 if (is_int32_type ()) | |
| 1525 retval = convert_to_octave_idx_type_array (int32_array_value ()); | |
| 1526 else if (is_int64_type ()) | |
| 1527 retval = convert_to_octave_idx_type_array (int64_array_value ()); | |
| 1528 else if (is_int16_type ()) | |
| 1529 retval = convert_to_octave_idx_type_array (int16_array_value ()); | |
| 1530 else if (is_int8_type ()) | |
| 1531 retval = convert_to_octave_idx_type_array (int8_array_value ()); | |
| 1532 else if (is_uint32_type ()) | |
| 1533 retval = convert_to_octave_idx_type_array (uint32_array_value ()); | |
| 1534 else if (is_uint64_type ()) | |
| 1535 retval = convert_to_octave_idx_type_array (uint64_array_value ()); | |
| 1536 else if (is_uint16_type ()) | |
| 1537 retval = convert_to_octave_idx_type_array (uint16_array_value ()); | |
| 1538 else if (is_uint8_type ()) | |
| 1539 retval = convert_to_octave_idx_type_array (uint8_array_value ()); | |
| 1540 else | |
| 1541 retval = array_value (force_string_conv); | |
| 1542 } | |
| 1543 else | |
| 1544 { | |
| 1545 const NDArray a = array_value (force_string_conv); | |
| 1546 if (! error_state) | |
| 1547 { | |
| 1548 if (require_int) | |
| 1549 { | |
| 1550 retval.resize (a.dims ()); | |
| 1551 for (octave_idx_type i = 0; i < a.numel (); i++) | |
| 1552 { | |
| 1553 double ai = a.elem (i); | |
| 1554 octave_idx_type v = static_cast<octave_idx_type> (ai); | |
| 1555 if (ai == v) | |
| 1556 retval.xelem (i) = v; | |
| 1557 else | |
| 1558 { | |
| 1559 error ("conversion to integer value failed"); | |
| 1560 break; | |
| 1561 } | |
| 1562 } | |
| 1563 } | |
| 1564 else | |
| 1565 retval = Array<octave_idx_type> (a); | |
| 1566 } | |
| 1567 } | |
| 1568 | |
| 1569 | |
| 1570 if (error_state) | |
| 1571 return retval; | |
| 1572 else | |
| 1573 return retval.reshape (make_vector_dims (retval.dims (), | |
| 1574 force_vector_conversion, | |
| 1575 type_name (), "integer vector")); | |
| 1576 } | |
| 1577 | |
| 3419 | 1578 Array<Complex> |
| 2376 | 1579 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
|
1580 bool force_vector_conversion) const |
| 2376 | 1581 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1582 Array<Complex> retval = complex_array_value (force_string_conv); |
| 2376 | 1583 |
| 1584 if (error_state) | |
| 1585 return retval; | |
| 1586 else | |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1587 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
|
1588 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1589 type_name (), "complex vector")); |
| 2376 | 1590 } |
| 1591 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1592 FloatColumnVector |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1593 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
|
1594 bool frc_vec_conv) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1595 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1596 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
|
1597 frc_vec_conv)); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1598 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1599 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1600 FloatComplexColumnVector |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1601 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
|
1602 bool frc_vec_conv) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1603 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1604 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
|
1605 frc_vec_conv)); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1606 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1607 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1608 FloatRowVector |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1609 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
|
1610 bool frc_vec_conv) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1611 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1612 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
|
1613 frc_vec_conv)); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1614 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1615 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1616 FloatComplexRowVector |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1617 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
|
1618 bool frc_vec_conv) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1619 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1620 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
|
1621 frc_vec_conv)); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1622 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1623 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1624 Array<float> |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1625 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
|
1626 bool force_vector_conversion) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1627 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1628 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
|
1629 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1630 if (error_state) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1631 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1632 else |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1633 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
|
1634 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1635 type_name (), "real vector")); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1636 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1637 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1638 Array<FloatComplex> |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1639 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
|
1640 bool force_vector_conversion) const |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1641 { |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1642 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
|
1643 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1644 if (error_state) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1645 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1646 else |
|
7892
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1647 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
|
1648 force_vector_conversion, |
|
7ca2735d74c2
simplify & cleanup octave_value::XXX_vector_value functions
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
1649 type_name (), "complex vector")); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1650 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1651 |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1652 octave_value |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1653 octave_value::storable_value (void) const |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1654 { |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1655 octave_value retval = *this; |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1656 if (is_null_value ()) |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1657 retval = octave_value (rep->empty_clone ()); |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1658 else |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1659 retval.maybe_economize (); |
|
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1660 |
|
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1661 return retval; |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1662 } |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1663 |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1664 void |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1665 octave_value::make_storable_value (void) |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1666 { |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1667 if (is_null_value ()) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1668 { |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1669 octave_base_value *rc = rep->empty_clone (); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1670 if (--rep->count == 0) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1671 delete rep; |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1672 rep = rc; |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1673 } |
|
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1674 else |
|
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8367
diff
changeset
|
1675 maybe_economize (); |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1676 } |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
1677 |
| 4944 | 1678 int |
| 1679 octave_value::write (octave_stream& os, int block_size, | |
| 1680 oct_data_conv::data_type output_type, int skip, | |
| 1681 oct_mach_info::float_format flt_fmt) const | |
| 1682 { | |
| 1683 return rep->write (os, block_size, output_type, skip, flt_fmt); | |
| 1684 } | |
| 1685 | |
| 2413 | 1686 static void |
| 3933 | 1687 gripe_binary_op (const std::string& on, const std::string& tn1, |
| 1688 const std::string& tn2) | |
| 2376 | 1689 { |
| 2903 | 1690 error ("binary operator `%s' not implemented for `%s' by `%s' operations", |
| 2376 | 1691 on.c_str (), tn1.c_str (), tn2.c_str ()); |
| 1692 } | |
| 1693 | |
| 3203 | 1694 static void |
| 3523 | 1695 gripe_binary_op_conv (const std::string& on) |
| 3203 | 1696 { |
| 1697 error ("type conversion failed for binary operator `%s'", on.c_str ()); | |
| 1698 } | |
| 1699 | |
| 2376 | 1700 octave_value |
| 3933 | 1701 do_binary_op (octave_value::binary_op op, |
| 1702 const octave_value& v1, const octave_value& v2) | |
| 2376 | 1703 { |
| 1704 octave_value retval; | |
| 1705 | |
| 1706 int t1 = v1.type_id (); | |
| 1707 int t2 = v2.type_id (); | |
| 1708 | |
| 7336 | 1709 if (t1 == octave_class::static_type_id () |
| 1710 || t2 == octave_class::static_type_id ()) | |
| 1711 { | |
| 1712 octave_value_typeinfo::binary_class_op_fcn f | |
| 1713 = octave_value_typeinfo::lookup_binary_class_op (op); | |
| 2376 | 1714 |
| 7336 | 1715 if (f) |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1716 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1717 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1718 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1719 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
|
1720 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1721 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
|
1722 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
1723 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
|
1724 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1725 } |
| 7336 | 1726 else |
| 1727 gripe_binary_op (octave_value::binary_op_as_string (op), | |
| 1728 v1.class_name (), v2.class_name ()); | |
| 1729 } | |
| 2376 | 1730 else |
| 1731 { | |
| 7336 | 1732 // FIXME -- we need to handle overloading operators for built-in |
| 1733 // classes (double, char, int8, etc.) | |
| 2376 | 1734 |
| 7336 | 1735 octave_value_typeinfo::binary_op_fcn f |
| 1736 = octave_value_typeinfo::lookup_binary_op (op, t1, t2); | |
| 1737 | |
| 1738 if (f) | |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1739 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1740 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1741 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1742 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
|
1743 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1744 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
|
1745 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
1746 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
|
1747 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
1748 } |
| 7336 | 1749 else |
| 2376 | 1750 { |
| 7336 | 1751 octave_value tv1; |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1752 octave_base_value::type_conv_info cf1 = v1.numeric_conversion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1753 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1754 octave_value tv2; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1755 octave_base_value::type_conv_info cf2 = v2.numeric_conversion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1756 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1757 // Try biased (one-sided) conversions first. |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1758 if (cf2.type_id () >= 0 && |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1759 octave_value_typeinfo::lookup_binary_op (op, t1, cf2.type_id ())) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1760 cf1 = 0; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1761 else if (cf1.type_id () >= 0 && |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1762 octave_value_typeinfo::lookup_binary_op (op, cf1.type_id (), t2)) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1763 cf2 = 0; |
| 7336 | 1764 |
| 1765 if (cf1) | |
| 1766 { | |
| 1767 octave_base_value *tmp = cf1 (*v1.rep); | |
| 3203 | 1768 |
| 7336 | 1769 if (tmp) |
| 1770 { | |
| 1771 tv1 = octave_value (tmp); | |
| 1772 t1 = tv1.type_id (); | |
| 1773 } | |
| 1774 else | |
| 1775 { | |
| 1776 gripe_binary_op_conv (octave_value::binary_op_as_string (op)); | |
| 1777 return retval; | |
| 1778 } | |
| 3203 | 1779 } |
| 1780 else | |
| 7336 | 1781 tv1 = v1; |
| 1782 | |
| 1783 if (cf2) | |
| 3203 | 1784 { |
| 7336 | 1785 octave_base_value *tmp = cf2 (*v2.rep); |
| 2376 | 1786 |
| 7336 | 1787 if (tmp) |
| 1788 { | |
| 1789 tv2 = octave_value (tmp); | |
| 1790 t2 = tv2.type_id (); | |
| 1791 } | |
| 1792 else | |
| 1793 { | |
| 1794 gripe_binary_op_conv (octave_value::binary_op_as_string (op)); | |
| 1795 return retval; | |
| 1796 } | |
| 3203 | 1797 } |
| 1798 else | |
| 7336 | 1799 tv2 = v2; |
| 1800 | |
| 1801 if (cf1 || cf2) | |
| 3203 | 1802 { |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1803 retval = do_binary_op (op, tv1, tv2); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1804 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1805 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1806 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1807 //demote double -> single and try again |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1808 cf1 = tv1.numeric_demotion_function (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1809 |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1810 cf2 = tv2.numeric_demotion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1811 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1812 // Try biased (one-sided) conversions first. |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1813 if (cf2.type_id () >= 0 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1814 && octave_value_typeinfo::lookup_binary_op (op, t1, cf2.type_id ())) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1815 cf1 = 0; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1816 else if (cf1.type_id () >= 0 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1817 && octave_value_typeinfo::lookup_binary_op (op, cf1.type_id (), t2)) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1818 cf2 = 0; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1819 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1820 if (cf1) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1821 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1822 octave_base_value *tmp = cf1 (*tv1.rep); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1823 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1824 if (tmp) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1825 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1826 tv1 = octave_value (tmp); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1827 t1 = tv1.type_id (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1828 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1829 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1830 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1831 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
|
1832 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1833 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1834 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1835 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1836 if (cf2) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1837 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1838 octave_base_value *tmp = cf2 (*tv2.rep); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1839 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1840 if (tmp) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1841 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1842 tv2 = octave_value (tmp); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1843 t2 = tv2.type_id (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1844 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1845 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1846 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1847 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
|
1848 return retval; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1849 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1850 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1851 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1852 if (cf1 || cf2) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1853 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1854 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
|
1855 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1856 if (f) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1857 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1858 try |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1859 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1860 retval = f (*tv1.rep, *tv2.rep); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1861 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1862 catch (octave_execution_exception) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1863 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
1864 gripe_library_execution_error (); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1865 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1866 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1867 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1868 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
|
1869 v1.type_name (), v2.type_name ()); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1870 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
1871 else |
| 7336 | 1872 gripe_binary_op (octave_value::binary_op_as_string (op), |
| 1873 v1.type_name (), v2.type_name ()); | |
| 3203 | 1874 } |
| 2376 | 1875 } |
| 1876 } | |
| 1877 | |
| 1878 return retval; | |
| 1879 } | |
| 1880 | |
|
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
|
1881 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
|
1882 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
|
1883 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
|
1884 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1885 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
|
1886 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1887 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
|
1888 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1889 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
|
1890 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
|
1891 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
|
1892 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
|
1893 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
|
1894 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
|
1895 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
|
1896 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
|
1897 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
|
1898 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
|
1899 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
|
1900 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
|
1901 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
|
1902 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
|
1903 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
|
1904 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
|
1905 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
|
1906 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
|
1907 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
|
1908 break; |
|
8982
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1909 case octave_value::op_el_not_and: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1910 retval = do_binary_op (octave_value::op_el_and, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1911 do_unary_op (octave_value::op_not, v1), |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1912 v2); |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1913 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1914 case octave_value::op_el_not_or: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1915 retval = do_binary_op (octave_value::op_el_or, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1916 do_unary_op (octave_value::op_not, v1), |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1917 v2); |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1918 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1919 case octave_value::op_el_and_not: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1920 retval = do_binary_op (octave_value::op_el_and, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1921 v1, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1922 do_unary_op (octave_value::op_not, v2)); |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1923 break; |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1924 case octave_value::op_el_or_not: |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1925 retval = do_binary_op (octave_value::op_el_or, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1926 v1, |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1927 do_unary_op (octave_value::op_not, v2)); |
|
dc6bda6f9994
implement compound logical ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8960
diff
changeset
|
1928 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
|
1929 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
|
1930 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
|
1931 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
|
1932 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1933 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1934 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
|
1935 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1936 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1937 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
|
1938 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
|
1939 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
|
1940 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1941 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
|
1942 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1943 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
|
1944 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
|
1945 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1946 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
|
1947 || 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
|
1948 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1949 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
|
1950 = 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
|
1951 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1952 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
|
1953 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1954 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
|
1955 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1956 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
|
1957 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1958 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
|
1959 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
1960 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
|
1961 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1962 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1963 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
|
1964 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
|
1965 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1966 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
|
1967 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1968 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
|
1969 = 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
|
1970 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1971 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
|
1972 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1973 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
|
1974 { |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1975 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
|
1976 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1977 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
|
1978 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
1979 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
|
1980 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1981 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1982 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
|
1983 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
|
1984 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1985 |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1986 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
|
1987 } |
|
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
1988 |
| 4915 | 1989 static void |
| 1990 gripe_cat_op (const std::string& tn1, const std::string& tn2) | |
| 1991 { | |
| 1992 error ("concatenation operator not implemented for `%s' by `%s' operations", | |
| 1993 tn1.c_str (), tn2.c_str ()); | |
| 1994 } | |
| 1995 | |
| 1996 static void | |
| 1997 gripe_cat_op_conv (void) | |
| 1998 { | |
| 1999 error ("type conversion failed for concatenation operator"); | |
| 2000 } | |
| 2001 | |
| 2002 octave_value | |
| 2003 do_cat_op (const octave_value& v1, const octave_value& v2, | |
| 6867 | 2004 const Array<octave_idx_type>& ra_idx) |
| 4915 | 2005 { |
| 2006 octave_value retval; | |
| 2007 | |
|
7814
87865ed7405f
Second set of single precision test code and fix of resulting bugs
David Bateman <dbateman@free.fr>
parents:
7800
diff
changeset
|
2008 // 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
|
2009 // something like cat(1,[],single([]) must return the correct type. |
| 5164 | 2010 |
| 4915 | 2011 int t1 = v1.type_id (); |
| 2012 int t2 = v2.type_id (); | |
| 2013 | |
| 5759 | 2014 octave_value_typeinfo::cat_op_fcn f |
| 2015 = octave_value_typeinfo::lookup_cat_op (t1, t2); | |
| 4915 | 2016 |
| 2017 if (f) | |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2018 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2019 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2020 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2021 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
|
2022 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2023 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
|
2024 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2025 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
|
2026 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2027 } |
| 4915 | 2028 else |
| 2029 { | |
| 2030 octave_value tv1; | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2031 octave_base_value::type_conv_info cf1 = v1.numeric_conversion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2032 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2033 octave_value tv2; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2034 octave_base_value::type_conv_info cf2 = v2.numeric_conversion_function (); |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2035 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2036 // Try biased (one-sided) conversions first. |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2037 if (cf2.type_id () >= 0 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2038 && octave_value_typeinfo::lookup_cat_op (t1, cf2.type_id ())) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2039 cf1 = 0; |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2040 else if (cf1.type_id () >= 0 |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2041 && octave_value_typeinfo::lookup_cat_op (cf1.type_id (), t2)) |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2042 cf2 = 0; |
| 4915 | 2043 |
| 2044 if (cf1) | |
| 2045 { | |
| 5759 | 2046 octave_base_value *tmp = cf1 (*v1.rep); |
| 4915 | 2047 |
| 2048 if (tmp) | |
| 2049 { | |
| 2050 tv1 = octave_value (tmp); | |
| 2051 t1 = tv1.type_id (); | |
| 2052 } | |
| 2053 else | |
| 2054 { | |
| 2055 gripe_cat_op_conv (); | |
| 2056 return retval; | |
| 2057 } | |
| 2058 } | |
| 2059 else | |
| 2060 tv1 = v1; | |
| 2061 | |
| 2062 if (cf2) | |
| 2063 { | |
| 5759 | 2064 octave_base_value *tmp = cf2 (*v2.rep); |
| 4915 | 2065 |
| 2066 if (tmp) | |
| 2067 { | |
| 2068 tv2 = octave_value (tmp); | |
| 2069 t2 = tv2.type_id (); | |
| 2070 } | |
| 2071 else | |
| 2072 { | |
| 2073 gripe_cat_op_conv (); | |
| 2074 return retval; | |
| 2075 } | |
| 2076 } | |
| 2077 else | |
| 2078 tv2 = v2; | |
| 2079 | |
| 2080 if (cf1 || cf2) | |
| 2081 { | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2082 retval = do_cat_op (tv1, tv2, ra_idx); |
| 4915 | 2083 } |
| 2084 else | |
| 2085 gripe_cat_op (v1.type_name (), v2.type_name ()); | |
| 2086 } | |
| 2087 | |
| 2088 return retval; | |
| 2089 } | |
| 2090 | |
| 3933 | 2091 void |
| 2092 octave_value::print_info (std::ostream& os, const std::string& prefix) const | |
| 2093 { | |
| 2094 os << prefix << "type_name: " << type_name () << "\n" | |
| 2095 << prefix << "count: " << get_count () << "\n" | |
| 2096 << prefix << "rep info: "; | |
| 2097 | |
| 2098 rep->print_info (os, prefix + " "); | |
| 2099 } | |
| 2100 | |
| 3203 | 2101 static void |
| 3523 | 2102 gripe_unary_op (const std::string& on, const std::string& tn) |
| 3203 | 2103 { |
| 2104 error ("unary operator `%s' not implemented for `%s' operands", | |
| 2105 on.c_str (), tn.c_str ()); | |
| 2106 } | |
| 2107 | |
| 2108 static void | |
| 3523 | 2109 gripe_unary_op_conv (const std::string& on) |
| 3203 | 2110 { |
| 2111 error ("type conversion failed for unary operator `%s'", on.c_str ()); | |
| 2112 } | |
| 2113 | |
| 2114 octave_value | |
| 2115 do_unary_op (octave_value::unary_op op, const octave_value& v) | |
| 2116 { | |
| 2117 octave_value retval; | |
| 2118 | |
| 2119 int t = v.type_id (); | |
| 2120 | |
| 7336 | 2121 if (t == octave_class::static_type_id ()) |
| 2122 { | |
| 2123 octave_value_typeinfo::unary_class_op_fcn f | |
| 2124 = octave_value_typeinfo::lookup_unary_class_op (op); | |
| 3203 | 2125 |
| 7336 | 2126 if (f) |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2127 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2128 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2129 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2130 retval = f (v); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2131 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2132 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
|
2133 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2134 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
|
2135 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2136 } |
| 7336 | 2137 else |
| 2138 gripe_unary_op (octave_value::unary_op_as_string (op), | |
| 2139 v.class_name ()); | |
| 2140 } | |
| 3203 | 2141 else |
| 2142 { | |
| 7336 | 2143 // FIXME -- we need to handle overloading operators for built-in |
| 2144 // classes (double, char, int8, etc.) | |
| 2145 | |
| 2146 octave_value_typeinfo::unary_op_fcn f | |
| 2147 = octave_value_typeinfo::lookup_unary_op (op, t); | |
| 3203 | 2148 |
| 7336 | 2149 if (f) |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2150 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2151 try |
|
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 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
|
2154 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2155 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
|
2156 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2157 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
|
2158 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2159 } |
| 7336 | 2160 else |
| 3203 | 2161 { |
| 7336 | 2162 octave_value tv; |
| 2163 octave_base_value::type_conv_fcn cf | |
| 2164 = v.numeric_conversion_function (); | |
| 3203 | 2165 |
| 7336 | 2166 if (cf) |
| 3203 | 2167 { |
| 7336 | 2168 octave_base_value *tmp = cf (*v.rep); |
| 3203 | 2169 |
| 7336 | 2170 if (tmp) |
| 2171 { | |
| 2172 tv = octave_value (tmp); | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
2173 retval = do_unary_op (op, tv); |
| 7336 | 2174 } |
| 3203 | 2175 else |
| 7336 | 2176 gripe_unary_op_conv (octave_value::unary_op_as_string (op)); |
| 3203 | 2177 } |
| 2178 else | |
| 7336 | 2179 gripe_unary_op (octave_value::unary_op_as_string (op), |
| 2180 v.type_name ()); | |
| 3203 | 2181 } |
| 2182 } | |
| 2183 | |
| 2184 return retval; | |
| 2185 } | |
| 2186 | |
| 2187 static void | |
| 3933 | 2188 gripe_unary_op_conversion_failed (const std::string& op, |
| 2189 const std::string& tn) | |
| 3203 | 2190 { |
| 2191 error ("operator %s: type conversion for `%s' failed", | |
| 2192 op.c_str (), tn.c_str ()); | |
| 2193 } | |
| 2194 | |
| 3933 | 2195 const octave_value& |
| 2196 octave_value::do_non_const_unary_op (unary_op op) | |
| 3203 | 2197 { |
| 2198 octave_value retval; | |
| 2199 | |
| 2200 int t = type_id (); | |
| 2201 | |
| 5759 | 2202 octave_value_typeinfo::non_const_unary_op_fcn f |
| 3203 | 2203 = octave_value_typeinfo::lookup_non_const_unary_op (op, t); |
| 2204 | |
| 2205 if (f) | |
| 2206 { | |
| 2207 make_unique (); | |
| 2208 | |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2209 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2210 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2211 f (*rep); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2212 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2213 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
|
2214 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2215 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
|
2216 } |
| 3203 | 2217 } |
| 2218 else | |
| 2219 { | |
| 5759 | 2220 octave_base_value::type_conv_fcn cf = numeric_conversion_function (); |
| 3203 | 2221 |
| 2222 if (cf) | |
| 2223 { | |
| 5759 | 2224 octave_base_value *tmp = cf (*rep); |
| 3203 | 2225 |
| 2226 if (tmp) | |
| 2227 { | |
| 5759 | 2228 octave_base_value *old_rep = rep; |
| 3203 | 2229 rep = tmp; |
| 2230 | |
| 2231 t = type_id (); | |
| 2232 | |
| 2233 f = octave_value_typeinfo::lookup_non_const_unary_op (op, t); | |
| 2234 | |
| 2235 if (f) | |
| 2236 { | |
|
7487
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2237 try |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2238 { |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2239 f (*rep); |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2240 } |
|
1e01db14700b
catch octave_execution_exception for built-in and mex functions
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
2241 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
|
2242 { |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7999
diff
changeset
|
2243 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
|
2244 } |
| 3203 | 2245 |
| 2246 if (old_rep && --old_rep->count == 0) | |
| 2247 delete old_rep; | |
| 2248 } | |
| 2249 else | |
| 2250 { | |
| 2251 if (old_rep) | |
| 2252 { | |
| 2253 if (--rep->count == 0) | |
| 2254 delete rep; | |
| 2255 | |
| 2256 rep = old_rep; | |
| 2257 } | |
| 2258 | |
| 2259 gripe_unary_op (octave_value::unary_op_as_string (op), | |
| 2260 type_name ()); | |
| 2261 } | |
| 2262 } | |
| 2263 else | |
| 2264 gripe_unary_op_conversion_failed | |
| 2265 (octave_value::unary_op_as_string (op), type_name ()); | |
| 2266 } | |
| 2267 else | |
| 2268 gripe_unary_op (octave_value::unary_op_as_string (op), type_name ()); | |
| 2269 } | |
| 3933 | 2270 |
| 2271 return *this; | |
| 3203 | 2272 } |
| 2273 | |
| 3933 | 2274 #if 0 |
| 3205 | 2275 static void |
| 3933 | 2276 gripe_unary_op_failed_or_no_method (const std::string& on, |
| 2277 const std::string& tn) | |
| 3205 | 2278 { |
| 2279 error ("operator %s: no method, or unable to evaluate for %s operand", | |
| 2280 on.c_str (), tn.c_str ()); | |
| 2281 } | |
| 3933 | 2282 #endif |
| 3205 | 2283 |
| 2284 void | |
| 4661 | 2285 octave_value::do_non_const_unary_op (unary_op, const octave_value_list&) |
| 3205 | 2286 { |
| 3933 | 2287 abort (); |
| 2288 } | |
| 2289 | |
| 2290 octave_value | |
| 4247 | 2291 octave_value::do_non_const_unary_op (unary_op op, const std::string& type, |
| 4219 | 2292 const std::list<octave_value_list>& idx) |
| 3933 | 2293 { |
| 2294 octave_value retval; | |
| 2295 | |
| 2296 if (idx.empty ()) | |
| 2297 { | |
| 2298 do_non_const_unary_op (op); | |
| 3205 | 2299 |
| 3933 | 2300 retval = *this; |
| 2301 } | |
| 2302 else | |
| 2303 { | |
| 5775 | 2304 // FIXME -- only do the following stuff if we can't find a |
| 3933 | 2305 // specific function to call to handle the op= operation for the |
| 2306 // types we have. | |
| 3205 | 2307 |
| 3933 | 2308 assign_op assop = unary_op_to_assign_op (op); |
| 2309 | |
| 2310 retval = assign (assop, type, idx, 1.0); | |
| 2311 } | |
| 2312 | |
| 2313 return retval; | |
| 3205 | 2314 } |
| 2315 | |
| 2316 octave_value::assign_op | |
| 2317 octave_value::unary_op_to_assign_op (unary_op op) | |
| 2318 { | |
| 2319 assign_op binop = unknown_assign_op; | |
| 2320 | |
| 2321 switch (op) | |
| 2322 { | |
| 3533 | 2323 case op_incr: |
| 2324 binop = op_add_eq; | |
| 3205 | 2325 break; |
| 2326 | |
| 3533 | 2327 case op_decr: |
| 2328 binop = op_sub_eq; | |
| 3205 | 2329 break; |
| 2330 | |
| 2331 default: | |
| 2332 { | |
| 3523 | 2333 std::string on = unary_op_as_string (op); |
| 3205 | 2334 error ("operator %s: no assign operator found", on.c_str ()); |
| 2335 } | |
| 2336 } | |
| 2337 | |
| 2338 return binop; | |
| 2339 } | |
| 2340 | |
| 3204 | 2341 octave_value::binary_op |
| 2342 octave_value::op_eq_to_binary_op (assign_op op) | |
| 2343 { | |
| 2344 binary_op binop = unknown_binary_op; | |
| 2345 | |
| 2346 switch (op) | |
| 2347 { | |
| 3533 | 2348 case op_add_eq: |
| 2349 binop = op_add; | |
| 3204 | 2350 break; |
| 2351 | |
| 3533 | 2352 case op_sub_eq: |
| 2353 binop = op_sub; | |
| 3204 | 2354 break; |
| 2355 | |
| 3533 | 2356 case op_mul_eq: |
| 2357 binop = op_mul; | |
| 3204 | 2358 break; |
| 2359 | |
| 3533 | 2360 case op_div_eq: |
| 2361 binop = op_div; | |
| 3204 | 2362 break; |
| 2363 | |
| 3533 | 2364 case op_ldiv_eq: |
| 2365 binop = op_ldiv; | |
| 3204 | 2366 break; |
| 2367 | |
| 4018 | 2368 case op_pow_eq: |
| 2369 binop = op_pow; | |
| 2370 break; | |
| 2371 | |
| 3533 | 2372 case op_lshift_eq: |
| 2373 binop = op_lshift; | |
| 3204 | 2374 break; |
| 2375 | |
| 3533 | 2376 case op_rshift_eq: |
| 2377 binop = op_rshift; | |
| 3204 | 2378 break; |
| 2379 | |
| 3533 | 2380 case op_el_mul_eq: |
| 2381 binop = op_el_mul; | |
| 3204 | 2382 break; |
| 2383 | |
| 3533 | 2384 case op_el_div_eq: |
| 2385 binop = op_el_div; | |
| 3204 | 2386 break; |
| 2387 | |
| 3533 | 2388 case op_el_ldiv_eq: |
| 2389 binop = op_el_ldiv; | |
| 3204 | 2390 break; |
| 2391 | |
| 4018 | 2392 case op_el_pow_eq: |
| 2393 binop = op_el_pow; | |
| 2394 break; | |
| 2395 | |
| 3533 | 2396 case op_el_and_eq: |
| 2397 binop = op_el_and; | |
| 3204 | 2398 break; |
| 2399 | |
| 3533 | 2400 case op_el_or_eq: |
| 2401 binop = op_el_or; | |
| 3204 | 2402 break; |
| 2403 | |
| 2404 default: | |
| 2405 { | |
| 3523 | 2406 std::string on = assign_op_as_string (op); |
| 3204 | 2407 error ("operator %s: no binary operator found", on.c_str ()); |
| 2408 } | |
| 2409 } | |
| 2410 | |
| 2411 return binop; | |
| 2412 } | |
| 2413 | |
| 3933 | 2414 octave_value |
| 2415 octave_value::empty_conv (const std::string& type, const octave_value& rhs) | |
| 2416 { | |
| 2417 octave_value retval; | |
| 2418 | |
| 2419 if (type.length () > 0) | |
| 2420 { | |
| 2421 switch (type[0]) | |
| 2422 { | |
| 2423 case '(': | |
| 2424 { | |
| 2425 if (type.length () > 1 && type[1] == '.') | |
| 2426 retval = Octave_map (); | |
| 2427 else | |
| 2428 retval = octave_value (rhs.empty_clone ()); | |
| 2429 } | |
| 2430 break; | |
| 2431 | |
| 2432 case '{': | |
| 2433 retval = Cell (); | |
| 2434 break; | |
| 2435 | |
| 2436 case '.': | |
| 2437 retval = Octave_map (); | |
| 2438 break; | |
| 2439 | |
| 2440 default: | |
| 2441 panic_impossible (); | |
| 2442 } | |
| 2443 } | |
| 2444 else | |
| 2445 retval = octave_value (rhs.empty_clone ()); | |
| 2446 | |
| 2447 return retval; | |
| 2448 } | |
| 2449 | |
| 2376 | 2450 void |
| 2451 install_types (void) | |
| 2452 { | |
| 2453 octave_base_value::register_type (); | |
| 3928 | 2454 octave_cell::register_type (); |
| 2376 | 2455 octave_scalar::register_type (); |
| 2456 octave_complex::register_type (); | |
| 2457 octave_matrix::register_type (); | |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
2458 octave_diag_matrix::register_type (); |
| 2376 | 2459 octave_complex_matrix::register_type (); |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
2460 octave_complex_diag_matrix::register_type (); |
| 2376 | 2461 octave_range::register_type (); |
| 2825 | 2462 octave_bool::register_type (); |
| 2463 octave_bool_matrix::register_type (); | |
| 2376 | 2464 octave_char_matrix::register_type (); |
| 2465 octave_char_matrix_str::register_type (); | |
| 5279 | 2466 octave_char_matrix_sq_str::register_type (); |
| 4901 | 2467 octave_int8_scalar::register_type (); |
| 2468 octave_int16_scalar::register_type (); | |
| 2469 octave_int32_scalar::register_type (); | |
| 2470 octave_int64_scalar::register_type (); | |
| 2471 octave_uint8_scalar::register_type (); | |
| 2472 octave_uint16_scalar::register_type (); | |
| 2473 octave_uint32_scalar::register_type (); | |
| 2474 octave_uint64_scalar::register_type (); | |
| 2475 octave_int8_matrix::register_type (); | |
| 2476 octave_int16_matrix::register_type (); | |
| 2477 octave_int32_matrix::register_type (); | |
| 2478 octave_int64_matrix::register_type (); | |
| 2479 octave_uint8_matrix::register_type (); | |
| 2480 octave_uint16_matrix::register_type (); | |
| 2481 octave_uint32_matrix::register_type (); | |
| 2482 octave_uint64_matrix::register_type (); | |
| 5164 | 2483 octave_sparse_bool_matrix::register_type (); |
| 2484 octave_sparse_matrix::register_type (); | |
| 2485 octave_sparse_complex_matrix::register_type (); | |
| 2376 | 2486 octave_struct::register_type (); |
| 7336 | 2487 octave_class::register_type (); |
| 2880 | 2488 octave_list::register_type (); |
| 3977 | 2489 octave_cs_list::register_type (); |
| 2376 | 2490 octave_magic_colon::register_type (); |
| 2974 | 2491 octave_builtin::register_type (); |
| 2492 octave_user_function::register_type (); | |
| 4649 | 2493 octave_dld_function::register_type (); |
| 4643 | 2494 octave_fcn_handle::register_type (); |
| 4966 | 2495 octave_fcn_inline::register_type (); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2496 octave_float_scalar::register_type (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2497 octave_float_complex::register_type (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2498 octave_float_matrix::register_type (); |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
2499 octave_float_diag_matrix::register_type (); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7761
diff
changeset
|
2500 octave_float_complex_matrix::register_type (); |
|
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8346
diff
changeset
|
2501 octave_float_complex_diag_matrix::register_type (); |
|
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
2502 octave_perm_matrix::register_type (); |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
2503 octave_null_matrix::register_type (); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
2504 octave_null_str::register_type (); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8039
diff
changeset
|
2505 octave_null_sq_str::register_type (); |
| 2376 | 2506 } |
| 2507 | |
| 4970 | 2508 #if 0 |
| 2509 DEFUN (cast, args, , | |
| 2510 "-*- texinfo -*-\n\ | |
| 2511 @deftypefn {Built-in Function} {} cast (@var{val}, @var{type})\n\ | |
| 2512 Convert @var{val} to the new data type @var{type}.\n\ | |
| 5642 | 2513 @seealso{class, typeinfo}\n\ |
| 2514 @end deftypefn") | |
| 4970 | 2515 { |
| 2516 octave_value retval; | |
| 2517 | |
| 2518 if (args.length () == 2) | |
| 2519 error ("cast: not implemented"); | |
| 2520 else | |
| 5823 | 2521 print_usage (); |
| 4970 | 2522 |
| 2523 return retval; | |
| 2524 } | |
| 2525 #endif | |
| 2526 | |
| 4791 | 2527 DEFUN (sizeof, args, , |
| 2528 "-*- texinfo -*-\n\ | |
| 2529 @deftypefn {Built-in Function} {} sizeof (@var{val})\n\ | |
| 2530 Return the size of @var{val} in bytes\n\ | |
| 2531 @end deftypefn") | |
| 2532 { | |
| 2533 octave_value retval; | |
| 2534 | |
| 2535 if (args.length () == 1) | |
| 2536 retval = args(0).byte_size (); | |
| 2537 else | |
| 5823 | 2538 print_usage (); |
| 4791 | 2539 |
| 2540 return retval; | |
| 2541 } | |
| 2542 | |
| 6153 | 2543 static void |
| 2544 decode_subscripts (const char* name, const octave_value& arg, | |
| 2545 std::string& type_string, | |
| 2546 std::list<octave_value_list>& idx) | |
| 2547 { | |
| 2548 Octave_map m = arg.map_value (); | |
| 2549 | |
| 2550 if (! error_state | |
| 6639 | 2551 && m.nfields () == 2 && m.contains ("type") && m.contains ("subs")) |
| 6153 | 2552 { |
| 2553 Cell& type = m.contents ("type"); | |
| 2554 Cell& subs = m.contents ("subs"); | |
| 2555 | |
| 2556 type_string = std::string (type.length(), '\0'); | |
| 2557 | |
| 2558 for (int k = 0; k < type.length (); k++) | |
| 2559 { | |
| 2560 std::string item = type(k).string_value (); | |
| 2561 | |
| 2562 if (! error_state) | |
| 2563 { | |
| 2564 if (item == "{}") | |
| 2565 type_string[k] = '{'; | |
| 2566 else if (item == "()") | |
| 2567 type_string[k] = '('; | |
| 2568 else if (item == ".") | |
| 2569 type_string[k] = '.'; | |
| 2570 else | |
| 2571 { | |
| 2572 error("%s: invalid indexing type `%s'", name, item.c_str ()); | |
| 2573 return; | |
| 2574 } | |
| 2575 } | |
| 2576 else | |
| 2577 { | |
| 2578 error ("%s: expecting type(%d) to be a character string", | |
| 2579 name, k+1); | |
| 2580 return; | |
| 2581 } | |
| 2582 | |
| 2583 octave_value_list idx_item; | |
| 2584 | |
| 2585 if (subs(k).is_string ()) | |
| 2586 idx_item(0) = subs(k); | |
| 2587 else if (subs(k).is_cell ()) | |
| 2588 { | |
| 2589 Cell subs_cell = subs(k).cell_value (); | |
| 2590 | |
| 2591 for (int n = 0; n < subs_cell.length (); n++) | |
| 2592 { | |
| 2593 if (subs_cell(n).is_string () | |
| 2594 && subs_cell(n).string_value () == ":") | |
| 2595 idx_item(n) = octave_value(octave_value::magic_colon_t); | |
| 2596 else | |
| 2597 idx_item(n) = subs_cell(n); | |
| 2598 } | |
| 2599 } | |
| 2600 else | |
| 2601 { | |
| 2602 error ("%s: expecting subs(%d) to be a character string or cell array", | |
| 2603 name, k+1); | |
| 2604 return; | |
| 2605 } | |
| 2606 | |
| 2607 idx.push_back (idx_item); | |
| 2608 } | |
| 2609 } | |
| 2610 else | |
| 2611 error ("%s: second argument must be a structure with fields `type' and `subs'", name); | |
| 2612 } | |
| 2613 | |
| 2614 DEFUN (subsref, args, nargout, | |
| 2615 "-*- texinfo -*-\n\ | |
| 2616 @deftypefn {Built-in Function} {} subsref (@var{val}, @var{idx})\n\ | |
| 2617 Perform the subscripted element selection operation according to\n\ | |
| 2618 the subscript specified by @var{idx}.\n\ | |
| 2619 \n\ | |
| 2620 The subscript @var{idx} is expected to be a structure array with\n\ | |
| 2621 fields @samp{type} and @samp{subs}. Valid values for @samp{type}\n\ | |
| 6550 | 2622 are @samp{\"()\"}, @samp{\"@{@}\"}, and @samp{\".\"}.\n\ |
| 6153 | 2623 The @samp{subs} field may be either @samp{\":\"} or a cell array\n\ |
| 2624 of index values.\n\ | |
| 6631 | 2625 \n\ |
| 2626 The following example shows how to extract the two first columns of\n\ | |
| 2627 a matrix\n\ | |
| 2628 \n\ | |
| 2629 @example\n\ | |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
8992
diff
changeset
|
2630 @group\n\ |
| 6631 | 2631 val = magic(3)\n\ |
| 2632 @result{} val = [ 8 1 6\n\ | |
| 2633 3 5 7\n\ | |
| 2634 4 9 2 ]\n\ | |
| 2635 idx.type = \"()\";\n\ | |
| 2636 idx.subs = @{\":\", 1:2@};\n\ | |
| 2637 subsref(val, idx)\n\ | |
| 2638 @result{} [ 8 1 \n\ | |
| 2639 3 5 \n\ | |
| 2640 4 9 ]\n\ | |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
8992
diff
changeset
|
2641 @end group\n\ |
| 6631 | 2642 @end example\n\ |
| 2643 \n\ | |
| 2644 @noindent\n\ | |
| 2645 Note that this is the same as writing @code{val(:,1:2)}.\n\ | |
| 6157 | 2646 @seealso{subsasgn, substruct}\n\ |
| 6153 | 2647 @end deftypefn") |
| 2648 { | |
| 2649 octave_value_list retval; | |
| 2650 | |
| 2651 if (args.length () == 2) | |
| 2652 { | |
| 2653 std::string type; | |
| 2654 std::list<octave_value_list> idx; | |
| 2655 | |
| 2656 decode_subscripts ("subsref", args(1), type, idx); | |
| 2657 | |
| 2658 if (! error_state) | |
| 2659 retval = args(0).subsref (type, idx, nargout); | |
| 2660 } | |
| 2661 else | |
| 2662 print_usage (); | |
| 2663 | |
| 2664 return retval; | |
| 2665 } | |
| 2666 | |
| 2667 DEFUN (subsasgn, args, , | |
| 2668 "-*- texinfo -*-\n\ | |
| 2669 @deftypefn {Built-in Function} {} subsasgn (@var{val}, @var{idx}, @var{rhs})\n\ | |
| 2670 Perform the subscripted assignment operation according to\n\ | |
| 2671 the subscript specified by @var{idx}.\n\ | |
| 2672 \n\ | |
| 2673 The subscript @var{idx} is expected to be a structure array with\n\ | |
| 2674 fields @samp{type} and @samp{subs}. Valid values for @samp{type}\n\ | |
| 6248 | 2675 are @samp{\"()\"}, @samp{\"@{@}\"}, and @samp{\".\"}.\n\ |
| 6153 | 2676 The @samp{subs} field may be either @samp{\":\"} or a cell array\n\ |
| 2677 of index values.\n\ | |
| 6631 | 2678 \n\ |
| 2679 The following example shows how to set the two first columns of a\n\ | |
| 2680 3-by-3 matrix to zero.\n\ | |
| 2681 \n\ | |
| 2682 @example\n\ | |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
8992
diff
changeset
|
2683 @group\n\ |
| 6631 | 2684 val = magic(3);\n\ |
| 2685 idx.type = \"()\";\n\ | |
| 2686 idx.subs = @{\":\", 1:2@};\n\ | |
| 2687 subsasgn (val, idx, 0)\n\ | |
| 2688 @result{} [ 0 0 6\n\ | |
| 2689 0 0 7\n\ | |
| 2690 0 0 2 ]\n\ | |
|
9064
7c02ec148a3c
Check grammar on all .cc files
Rik <rdrider0-list@yahoo.com>
parents:
8992
diff
changeset
|
2691 @end group\n\ |
| 6631 | 2692 @end example\n\ |
| 2693 \n\ | |
| 2694 Note that this is the same as writing @code{val(:,1:2) = 0}.\n\ | |
| 6157 | 2695 @seealso{subsref, substruct}\n\ |
| 6153 | 2696 @end deftypefn") |
| 2697 { | |
| 2698 octave_value retval; | |
| 2699 | |
| 2700 if (args.length () == 3) | |
| 2701 { | |
| 2702 std::string type; | |
| 2703 std::list<octave_value_list> idx; | |
| 2704 | |
| 2705 decode_subscripts ("subsasgn", args(1), type, idx); | |
| 2706 | |
|
9368
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2707 octave_value arg0 = args(0); |
|
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2708 |
|
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2709 arg0.make_unique (); |
|
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2710 |
| 6153 | 2711 if (! error_state) |
|
9368
ff612fdaee95
properly unshare variable in subsasgn
Jaroslav Hajek <highegg@gmail.com>
parents:
9351
diff
changeset
|
2712 retval = arg0.subsasgn (type, idx, args(2)); |
| 6153 | 2713 } |
| 2714 else | |
| 2715 print_usage (); | |
| 2716 | |
| 2717 return retval; | |
| 2718 } | |
| 2719 | |
| 2376 | 2720 /* |
| 2721 ;;; Local Variables: *** | |
| 2722 ;;; mode: C++ *** | |
| 2723 ;;; End: *** | |
| 2724 */ |