Mercurial > hg > octave-nkf
annotate libinterp/octave-value/ov-colon.h @ 18129:e473c4853afc gui-release
enable non-integer ranges as indices by default and deprecate preference
* octave.cc (maximum_braindamage): Don't call
Fdo_brainded_shortcircuit_evaluation.
* error.cc (initialize_default_warning_state): Don't set
Octave:noninteger-range-as-index to "error".
* octave.cc (maximum_braindamage): Don't call
Fallow_noninteger_range_as_index. Don't set
Octave:noninteger-range-as-index to "on".
* ov-range.h, ov-range.cc (Vallow_noninteger_range_as_index):
Now static. Set default value to true.
* ov.h (octave_value::index_vector): New arg, require_integers.
* ov-base.cc, ov-base.h (octave_value::index_vector): Likewise.
* ov-base-diag.cc, ov-base-diag.h, ov-bool-mat.h, ov-bool-sparse.h,
ov-bool.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h,
ov-colon.h, ov-complex.h, ov-float.h, ov-flt-re-mat.h, ov-intx.h,
ov-lazy-idx.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h,
ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.h:
Make corresponding changes in all derived methods.
* ov-range.cc (octave_range::index_vector): If new require_integers
argument is true, also require integer arguments regardless of the
setting of Vallow_noninteger_range_as_index.
* utils.cc (Fisindex): Don't temporarily set
Vallow_noninteger_range_as_index. Call index_vector with argument of
true.
* NEWS: Mention change in default value, warning state and deprecated
function.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 11 Dec 2013 23:35:34 -0500 |
| parents | ebb3ef964372 |
| children | bcd71a2531d3 |
| rev | line source |
|---|---|
| 2376 | 1 /* |
| 2 | |
|
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
15467
diff
changeset
|
3 Copyright (C) 1996-2013 John W. Eaton |
| 2376 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 2376 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 2376 | 20 |
| 21 */ | |
| 22 | |
|
17822
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
23 #if !defined (octave_ov_colon_h) |
|
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
24 #define octave_ov_colon_h 1 |
| 2376 | 25 |
| 26 #include <cstdlib> | |
| 27 | |
|
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
28 #include <iosfwd> |
| 2376 | 29 #include <string> |
| 30 | |
| 31 #include "mx-base.h" | |
| 32 #include "str-vec.h" | |
| 33 | |
| 34 #include "error.h" | |
| 35 #include "ov-base.h" | |
| 36 #include "ov-typeinfo.h" | |
| 37 | |
| 38 class octave_value_list; | |
| 39 | |
| 40 class tree_walker; | |
| 41 | |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
42 // A type to represent ':' as used for indexing. |
| 2376 | 43 |
| 44 class | |
| 45 octave_magic_colon : public octave_base_value | |
| 46 { | |
| 47 public: | |
| 48 | |
| 49 octave_magic_colon (void) | |
| 50 : octave_base_value () { } | |
| 51 | |
| 52 octave_magic_colon (const octave_magic_colon&) | |
| 53 : octave_base_value () { } | |
| 54 | |
| 55 ~octave_magic_colon (void) { } | |
| 56 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
57 octave_base_value *clone (void) const |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
58 { return new octave_magic_colon (*this); } |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
59 octave_base_value *empty_clone (void) const |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
60 { return new octave_magic_colon (); } |
| 2376 | 61 |
|
18129
e473c4853afc
enable non-integer ranges as indices by default and deprecate preference
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
62 idx_vector index_vector (bool /* require_integers */ = false) const { return idx_vector (':'); } |
| 2376 | 63 |
| 64 bool is_defined (void) const { return true; } | |
| 65 | |
| 2974 | 66 bool is_constant (void) const { return true; } |
| 67 | |
| 2376 | 68 bool is_magic_colon (void) const { return true; } |
| 69 | |
| 3523 | 70 void print (std::ostream& os, bool pr_as_read_syntax = false) const; |
| 2901 | 71 |
| 3523 | 72 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; |
| 2466 | 73 |
| 2376 | 74 private: |
| 75 | |
| 3219 | 76 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA |
| 2376 | 77 }; |
| 78 | |
| 79 #endif |