Mercurial > octave
diff libinterp/octave-value/ov-legacy-range.h @ 30852:95725e6ad9c1 stable
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 | 98aa66e8f729 597f3ee61a48 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libinterp/octave-value/ov-legacy-range.h Mon Mar 21 23:58:35 2022 -0400 @@ -0,0 +1,110 @@ +//////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 1996-2022 The Octave Project Developers +// +// See the file COPYRIGHT.md in the top-level directory of this +// distribution or <https://octave.org/copyright/>. +// +// This file is part of Octave. +// +// Octave is free software: you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Octave is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Octave; see the file COPYING. If not, see +// <https://www.gnu.org/licenses/>. +// +//////////////////////////////////////////////////////////////////////// + +#if ! defined (octave_ov_legacy_range_h) +#define octave_ov_legacy_range_h 1 + +#include "octave-config.h" + +#include <cstdlib> + +#include <iosfwd> +#include <string> + +#include "Range.h" + +#include "lo-mappers.h" +#include "lo-utils.h" +#include "mx-base.h" + +#include "error.h" +#include "oct-stream.h" +#include "ov-base.h" +#include "ov-re-mat.h" +#include "ov-typeinfo.h" + +class octave_value_list; + +// Legacy Range values. + +// Provide enough of the old octave_range class to allow Range objects +// to be loaded from files. After loading, they are converted to some +// other type by a call to octave_value::maybe_mutate in +// load_save_system::load_vars so there should no longer be any values +// of this type used by the interpreter. The action of maybe_mutate is +// performed by octave_legacy_range::try_narrowing_conversion. + +class +octave_legacy_range : public octave_base_value +{ +public: + + octave_legacy_range (void); + + octave_legacy_range (const Range& r); + + octave_legacy_range (const octave_legacy_range& r) = default; + + // No assignment. + + octave_legacy_range& operator = (const octave_legacy_range&) = delete; + + ~octave_legacy_range (void) { } + + octave_base_value * clone (void) const + { + return new octave_legacy_range (*this); + } + + // A range is really just a special kind of real matrix object. In + // the places where we need to call empty_clone, it makes more sense + // to create an empty matrix (0x0) instead of an empty range (1x0). + octave_base_value * empty_clone (void) const { return new octave_matrix (); } + + type_conv_info numeric_conversion_function (void) const; + + octave_base_value * try_narrowing_conversion (void); + + bool is_defined (void) const { return true; } + + bool is_legacy_object (void) const { return true; } + + bool is_constant (void) const { return true; } + + bool load_ascii (std::istream& is); + + bool load_binary (std::istream& is, bool swap, + octave::mach_info::float_format fmt); + + bool load_hdf5 (octave_hdf5_id loc_id, const char *name); + +private: + + Range range; + + DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA +}; + +#endif