Mercurial > jwe > octave

annotate libinterp/octave-value/ov-legacy-range.h @ 30857:95725e6ad9c1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
restore part of the old octave_range class as octave_legacy_range This change allows old range objects to be loaded from data files and then converted to the new range type or other numeric types. * libinterp/octave-value/ov-legacy-range.h, libinterp/octave-value/ov-legacy-range.cc: New files restored from old versions of ov-range.h and ov-range.cc. Only provide enough support to load "range" objects from data files. * libinterp/octave-value/module.mk: Update. * ov.h, ov.cc: Update tests. (octave_value::is_legacy_object): New function. (octave_value::load_ascii, octave_value::load_binary, octave_value::load_hdf5): If loaded value is a legacy object, call maybe_mutate to allow conversion to a currently supported data type. (install_types): Register octave_legacy_range objects. (octave_value::make_range_rep_deprecated): Convert to Don't allow (const Range& r, bool force_range) (octave_value::make_range_rep_deprecated): Use Range constructor. Allow mutation to handle conversion to new range object or other numeric types. * ov-base.h (octave_base_value::is_legacy_object): New function * ov-range.cc: Rename ov_range<double> data type from "range" to "double_range". * Range.h (Range::Range): Always provide deprecated Range constructors. * ov-typeinfo.cc: Update test. * mk-conv-tst.sh: Update tests.
author John W. Eaton <jwe@octave.org>
date Mon, 21 Mar 2022 23:58:35 -0400
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30857
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 ////////////////////////////////////////////////////////////////////////
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 //
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 // Copyright (C) 1996-2022 The Octave Project Developers
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 //
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 // distribution or <https://octave.org/copyright/>.
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 //
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 // This file is part of Octave.
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 //
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 // under the terms of the GNU General Public License as published by
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 // (at your option) any later version.
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 //
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 // GNU General Public License for more details.
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 //
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 // You should have received a copy of the GNU General Public License
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 // along with Octave; see the file COPYING. If not, see
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 // <https://www.gnu.org/licenses/>.
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 //
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 ////////////////////////////////////////////////////////////////////////
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 #if ! defined (octave_ov_legacy_range_h)
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 #define octave_ov_legacy_range_h 1
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 #include "octave-config.h"
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 #include <cstdlib>
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 #include <iosfwd>
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 #include <string>
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 #include "Range.h"
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 #include "lo-mappers.h"
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 #include "lo-utils.h"
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 #include "mx-base.h"
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 #include "error.h"
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 #include "oct-stream.h"
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 #include "ov-base.h"
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 #include "ov-re-mat.h"
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 #include "ov-typeinfo.h"
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 class octave_value_list;
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 // Legacy Range values.
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52 // Provide enough of the old octave_range class to allow Range objects
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53 // to be loaded from files. After loading, they are converted to some
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
54 // other type by a call to octave_value::maybe_mutate in
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
55 // load_save_system::load_vars so there should no longer be any values
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
56 // of this type used by the interpreter. The action of maybe_mutate is
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
57 // performed by octave_legacy_range::try_narrowing_conversion.
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
58
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59 class
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
60 octave_legacy_range : public octave_base_value
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 {
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
62 public:
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64 octave_legacy_range (void);
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
65
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66 octave_legacy_range (const Range& r);
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 octave_legacy_range (const octave_legacy_range& r) = default;
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
69
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
70 // No assignment.
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72 octave_legacy_range& operator = (const octave_legacy_range&) = delete;
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
73
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
74 ~octave_legacy_range (void) { }
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76 octave_base_value * clone (void) const
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77 {
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
78 return new octave_legacy_range (*this);
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79 }
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
80
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
81 // A range is really just a special kind of real matrix object. In
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82 // the places where we need to call empty_clone, it makes more sense
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
83 // to create an empty matrix (0x0) instead of an empty range (1x0).
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
84 octave_base_value * empty_clone (void) const { return new octave_matrix (); }
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
85
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
86 type_conv_info numeric_conversion_function (void) const;
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
87
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
88 octave_base_value * try_narrowing_conversion (void);
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
89
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
90 bool is_defined (void) const { return true; }
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
91
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
92 bool is_legacy_object (void) const { return true; }
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
93
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
94 bool is_constant (void) const { return true; }
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
95
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
96 bool load_ascii (std::istream& is);
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
97
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
98 bool load_binary (std::istream& is, bool swap,
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
99 octave::mach_info::float_format fmt);
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
100
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
101 bool load_hdf5 (octave_hdf5_id loc_id, const char *name);
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
102
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
103 private:
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
104
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
105 Range range;
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
106
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
107 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
108 };
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
109
95725e6ad9c1 restore part of the old octave_range class as octave_legacy_range
John W. Eaton <jwe@octave.org>
parents:
diff changeset
110 #endif