Mercurial > octave
changeset 10232:0efd486813fe
remove deprecated list datatype
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Sat, 30 Jan 2010 22:35:27 +0100 |
| parents | f63ee6a20f57 |
| children | cb7d1b220f1c |
| files | src/ChangeLog src/Makefile.am src/OPERATORS/module.mk src/OPERATORS/op-list.cc src/debug.cc src/ov-base.cc src/ov-cs-list.h src/ov-list.cc src/ov-list.h src/ov-struct.cc src/ov.cc src/pt-bp.cc |
| diffstat | 12 files changed, 16 insertions(+), 937 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Jan 30 21:51:59 2010 +0100 +++ b/src/ChangeLog Sat Jan 30 22:35:27 2010 +0100 @@ -1,3 +1,17 @@ +2010-01-30 Jaroslav Hajek <highegg@gmail.com> + + * ov-list.h, ov-list.cc, OPERATORS/op-list.cc: Remove. + + * Makefile.am, OPERATORS/module.mk: Update. + * debug.cc: Remove #include. + * ov-base.cc: Ditto. + * ov-cs-list.h: Ditto. + * ov-struct.cc: Ditto. + * pt-bp.cc: Ditto. + * ov.cc (octave_value::octave_value (const octave_value_list&)): + Simplify. + (install_types): Omit octave_list. + 2010-01-30 Thorsten Meyer <thorsten.meyier@gmx.de> * DLD-FUNCTIONS/time.cc: Replace struct_contains by isfield.
--- a/src/Makefile.am Sat Jan 30 21:51:59 2010 +0100 +++ b/src/Makefile.am Sat Jan 30 22:35:27 2010 +0100 @@ -165,7 +165,6 @@ ov-flt-cx-mat.h \ ov-flt-re-diag.h \ ov-flt-re-mat.h \ - ov-list.h \ ov-mex-fcn.h \ ov-null-mat.h \ ov-perm.h \ @@ -338,7 +337,6 @@ ov-flt-cx-mat.cc \ ov-flt-re-diag.cc \ ov-flt-re-mat.cc \ - ov-list.cc \ ov-mex-fcn.cc \ ov-null-mat.cc \ ov-perm.cc \
--- a/src/OPERATORS/module.mk Sat Jan 30 21:51:59 2010 +0100 +++ b/src/OPERATORS/module.mk Sat Jan 30 22:35:27 2010 +0100 @@ -81,7 +81,6 @@ OPERATORS/op-i8-i8.cc \ OPERATORS/op-int-concat.cc \ OPERATORS/op-int-conv.cc \ - OPERATORS/op-list.cc \ OPERATORS/op-m-cdm.cc \ OPERATORS/op-m-cm.cc \ OPERATORS/op-m-cs.cc \
--- a/src/OPERATORS/op-list.cc Sat Jan 30 21:51:59 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* - -Copyright (C) 1996, 1997, 1998, 2000, 2002, 2004, 2005, 2007 - John W. Eaton - -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 -<http://www.gnu.org/licenses/>. - -*/ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "gripes.h" -#include "oct-obj.h" -#include "ov.h" -#include "ov-list.h" -#include "ov-typeinfo.h" -#include "ops.h" - -// list ops. - -DEFASSIGNANYOP_FN (assign, list, assign); - -void -install_list_ops (void) -{ - INSTALL_ASSIGNANYOP (op_asn_eq, octave_list, assign); -}
--- a/src/debug.cc Sat Jan 30 21:51:59 2010 +0100 +++ b/src/debug.cc Sat Jan 30 22:35:27 2010 +0100 @@ -45,7 +45,6 @@ #include "ov.h" #include "ov-usr-fcn.h" #include "ov-fcn.h" -#include "ov-list.h" #include "ov-struct.h" #include "pt-pr-code.h" #include "pt-bp.h"
--- a/src/ov-base.cc Sat Jan 30 21:51:59 2010 +0100 +++ b/src/ov-base.cc Sat Jan 30 22:35:27 2010 +0100 @@ -44,7 +44,6 @@ #include "ov-ch-mat.h" #include "ov-complex.h" #include "ov-cx-mat.h" -#include "ov-list.h" #include "ov-range.h" #include "ov-re-mat.h" #include "ov-scalar.h"
--- a/src/ov-cs-list.h Sat Jan 30 21:51:59 2010 +0100 +++ b/src/ov-cs-list.h Sat Jan 30 22:35:27 2010 +0100 @@ -35,7 +35,6 @@ #include "error.h" #include "oct-alloc.h" #include "oct-obj.h" -#include "ov-list.h" #include "ov-typeinfo.h" class tree_walker;
--- a/src/ov-list.cc Sat Jan 30 21:51:59 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,751 +0,0 @@ -/* - -Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009 John W. Eaton - -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 -<http://www.gnu.org/licenses/>. - -*/ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <iostream> -#include <sstream> - -#include "lo-utils.h" - -#include "Cell.h" -#include "defun.h" -#include "error.h" -#include "ov.h" -#include "ov-list.h" -#include "unwind-prot.h" - -#include "byte-swap.h" -#include "ls-oct-ascii.h" -#include "ls-oct-binary.h" -#include "ls-hdf5.h" -#include "ls-utils.h" - -DEFINE_OCTAVE_ALLOCATOR (octave_list); - -DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_list, "list", "list"); - -octave_list::octave_list (const Cell& c) - : octave_base_value (), data () -{ - octave_idx_type n = c.length (); - - data.resize (dim_vector (1, n)); - - for (octave_idx_type i = 0; i < n; i++) - data(i) = c(i); -} - -octave_value_list -octave_list::subsref (const std::string& type, - const std::list<octave_value_list>& idx, int nargout) -{ - octave_value_list retval; - - switch (type[0]) - { - case '(': - { - octave_value_list tmp_idx = idx.front (); - - if (tmp_idx.length () == 1) - { - Cell tmp = data.index (tmp_idx (0)); - - retval(0) = octave_value (new octave_list (tmp)); - } - else - error ("only one index allowed for lists"); - } - break; - - case '{': - { - octave_value_list tmp_idx = idx.front (); - - if (tmp_idx.length () == 1) - { - Cell tmp = data.index (tmp_idx (0)); - - if (tmp.length () == 1) - retval(0) = tmp(0); - else - retval(0) = octave_value (tmp, true); - } - else - error ("only one index allowed for lists"); - } - break; - - case '.': - { - std::string nm = type_name (); - error ("%s cannot be indexed with %c", nm.c_str (), type[0]); - } - break; - - default: - panic_impossible (); - } - - // FIXME -- perhaps there should be an - // octave_value_list::next_subsref member function? See also - // octave_user_function::subsref. - - if (idx.size () > 1) - retval = retval(0).next_subsref (nargout, type, idx); - - return retval; -} - -octave_value -octave_list::do_index_op (const octave_value_list& idx, bool resize_ok) -{ - octave_value retval; - - if (idx.length () == 1) - { - Cell tcell = data.index (idx (0), resize_ok); - - octave_value_list result; - - octave_idx_type n = tcell.numel (); - - result.resize (n); - - for (octave_idx_type i = 0; i < n; i++) - result(i) = tcell(i); - - retval = result; - } - else - error ("only one index allowed for lists"); - - return retval; -} - -octave_value -octave_list::subsasgn (const std::string& type, - const std::list<octave_value_list>& idx, - const octave_value& rhs) -{ - octave_value retval; - - octave_idx_type n = type.length (); - - octave_value t_rhs = rhs; - - if (idx.front ().empty ()) - { - error ("missing index in indexed assignment"); - return retval; - } - - if (n > 1) - { - switch (type[0]) - { - case '(': - { - octave_value tmp = do_index_op (idx.front (), true); - - if (! tmp.is_defined ()) - tmp = octave_value::empty_conv (type.substr (1), rhs); - - if (! error_state) - { - std::list<octave_value_list> next_idx (idx); - - next_idx.erase (next_idx.begin ()); - - t_rhs = tmp.subsasgn (type.substr (1), next_idx, rhs); - } - } - break; - - case '{': - case '.': - { - std::string nm = type_name (); - error ("%s cannot be indexed with %c", nm.c_str (), type[0]); - } - break; - - default: - panic_impossible (); - } - } - - if (! error_state) - { - switch (type[0]) - { - case '(': - { - octave_value_list i = idx.front (); - - data.assign (i, Cell (t_rhs), Cell::resize_fill_value ()); - - count++; - retval = octave_value (this); - } - break; - - case '{': - case '.': - { - std::string nm = type_name (); - error ("%s cannot be indexed with %c", nm.c_str (), type[0]); - } - break; - - default: - panic_impossible (); - } - } - - return retval; -} - -void -octave_list::assign (const octave_value_list& idx, const octave_value& rhs) -{ - if (idx.length () == 1) - { - int i = idx(0).int_value (true); - - if (! error_state) - { - octave_idx_type n = data.length (); - - if (i > 0) - { - if (i > n) - warning_with_id ("Octave:resize-on-range-error", - "list index = %d out of range", i); - - data(i-1) = rhs; - } - else - error ("list index = %d out of range", i); - } - else - error ("list index must be an integer"); - } - else - error ("lists may only be indexed by a single scalar"); -} - -size_t -octave_list::byte_size (void) const -{ - size_t retval = 0; - - for (octave_idx_type i = 0; i < numel (); i++) - retval += data(i).byte_size (); - - return retval; -} - -octave_value_list -octave_list::list_value (void) const -{ - octave_value_list retval; - - octave_idx_type n = data.length (); - - retval.resize (n); - - for (octave_idx_type i = 0; i < n; i++) - retval(i) = data(i); - - return retval; -} - -void -octave_list::print (std::ostream& os, bool) const -{ - print_raw (os); -} - -void -octave_list::print_raw (std::ostream& os, bool) const -{ - unwind_protect frame; - - octave_idx_type n = data.length (); - - if (n > 0) - { - indent (os); - os << "("; - newline (os); - - increment_indent_level (); - - for (octave_idx_type i = 0; i < n; i++) - { - std::ostringstream buf; - - buf << "[" << i+1 << "]"; - - octave_value val = data(i); - - val.print_with_name (os, buf.str ()); - } - - decrement_indent_level (); - - indent (os); - os << ")"; - } - else - os << "()"; - - newline (os); -} - -bool -octave_list::print_name_tag (std::ostream& os, const std::string& name) const -{ - indent (os); - if (data.length () == 0) - os << name << " = "; - else - { - os << name << " ="; - newline (os); - } - return false; -} - -DEFUN (list, args, , - "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} list (@var{a1}, @var{a2}, @dots{})\n\ -Create a new list with elements given by the arguments @var{a1},\n\ -@var{a2}, @dots{}.\n\ -@end deftypefn") -{ - static bool warned = false; - - if (! warned) - { - warning ("list objects are deprecated; use cell arrays instead"); - warned = true; - } - - return octave_value (args); -} - -DEFUN (nth, args, , - "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} nth (@var{list}, @var{n})\n\ -Return the @var{n}-th element of @var{list}.\n\ -@end deftypefn") -{ - octave_value retval; - - if (args.length () == 2) - { - octave_value_list lst = args(0).list_value (); - - if (! error_state) - { - int n = args(1).int_value (true); - - if (! error_state) - { - if (n > 0 && n <= lst.length ()) - retval = lst(n-1); - else - error ("nth: index = %d out of range", n); - } - else - error ("nth: second argument must be an integer"); - } - else - error ("nth: first argument must be a list"); - } - else - print_usage (); - - return retval; -} - -DEFUN (append, args, , - "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} append (@var{list}, @var{a1}, @var{a2}, @dots{})\n\ -Return a new list created by appending @var{a1}, @var{a2}, @dots{}, to\n\ -@var{list}. If any of the arguments to be appended is a list, its\n\ -elements are appended individually. For example,\n\ -\n\ -@example\n\ -@group\n\ -x = list (1, 2);\n\ -y = list (3, 4);\n\ -append (x, y);\n\ -@end group\n\ -@end example\n\ -\n\ -@noindent\n\ -results in the list containing the four elements @samp{(1 2 3 4)}, not\n\ -a list containing the three elements @samp{(1 2 (3 4))}.\n\ -@end deftypefn") -{ - octave_value retval; - - int nargin = args.length (); - - if (nargin > 1) - { - octave_value_list tmp = args(0).list_value (); - - if (! error_state) - { - for (int i = 1; i < nargin; i++) - { - octave_value ov = args(i); - - if (ov.is_list ()) - tmp.append (ov.list_value ()); - else - tmp.append (ov); - } - - retval = octave_value (tmp); - } - } - else - print_usage (); - - return retval; -} - -DEFUN (reverse, args, , - "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} reverse (@var{list})\n\ -Return a new list created by reversing the elements of @var{list}.\n\ -@end deftypefn") -{ - octave_value retval; - - int nargin = args.length (); - - if (nargin == 1) - { - octave_value_list tmp = args(0).list_value (); - - if (! error_state) - retval = octave_value (tmp.reverse ()); - } - else - print_usage (); - - return retval; -} - -DEFUN (splice, args, , - "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} splice (@var{list_1}, @var{offset}, @var{length}, @var{list_2})\n\ -Replace @var{length} elements of @var{list_1} beginning at\n\ -@var{offset} with the contents of @var{list_2} (if any). If\n\ -@var{length} is omitted, all elements from @var{offset} to the end of\n\ -@var{list_1} are replaced. As a special case, if @var{offset} is one\n\ -greater than the length of @var{list_1} and @var{length} is 0, splice\n\ -is equivalent to @code{append (@var{list_1}, @var{list_2})}.\n\ -@end deftypefn") -{ - octave_value retval; - - int nargin = args.length (); - - if (nargin > 1 && nargin < 5) - { - octave_value_list list_1 = args(0).list_value (); - - if (! error_state) - { - int offset = args(1).int_value (true); - - if (! error_state) - { - offset--; - - int length = 0; - - octave_value_list list_2; - - if (nargin < 3) - length = list_1.length () - offset; - else - { - length = args(2).int_value (true); - - if (! error_state) - { - if (nargin == 4) - { - list_2 = args(3).list_value (); - - if (error_state) - error ("splice: fourth argument must be a list"); - } - } - else - error ("splice: LENGTH must be an integer"); - } - - if (! error_state) - retval = octave_value (list_1.splice (offset, length, list_2)); - } - else - error ("splice: OFFSET must be an integer"); - } - else - error ("splice: first argument must be a list"); - } - else - print_usage (); - - return retval; -} - -bool -octave_list::save_ascii (std::ostream& os) -{ - octave_value_list lst = list_value (); - os << "# length: " << lst.length () << "\n"; - - for (int i = 0; i < lst.length (); ++i) - { - // should we use lst.name_tags () to label the elements? - - std::ostringstream buf; - buf << "_" << i; - std::string s = buf.str (); - - bool b = save_ascii_data (os, lst (i), s.c_str (), false, 0); - - if (! b) - return false; - } - - return true; -} - -bool -octave_list::load_ascii (std::istream& is) -{ - int len = 0; - bool success = true; - - if (extract_keyword (is, "length", len) && len >= 0) - { - if (len > 0) - { - octave_value_list lst; - - for (int j = 0; j < len; j++) - { - octave_value t2; - bool dummy; - - // recurse to read list elements - std::string nm - = read_ascii_data (is, std::string (), dummy, t2, j); - - if (!is) - break; - - lst.append (t2); - } - - if (is) - data = lst; - else - { - error ("load: failed to load list"); - success = false; - } - } - else if (len == 0 ) - data = Cell (0, 0); - else - panic_impossible (); - } - else { - error ("load: failed to extract number of elements in list"); - success = false; - } - - return success; -} - -bool -octave_list::save_binary (std::ostream& os, bool& save_as_floats) -{ - octave_value_list lst = list_value (); - - int32_t len = lst.length(); - os.write (reinterpret_cast<char *> (&len), 4); - - for (int i = 0; i < lst.length (); i++) - { - // should we use lst.name_tags () to label the elements? - - std::ostringstream buf; - buf << "_" << i; - std::string s = buf.str (); - - // Recurse to print sub-value. - bool b = save_binary_data (os, lst(i), s.c_str (), "", 0, - save_as_floats); - - if (! b) - return false; - } - - return true; -} - -bool -octave_list::load_binary (std::istream& is, bool swap, - oct_mach_info::float_format fmt) -{ - int32_t len; - if (! is.read (reinterpret_cast<char *> (&len), 4)) - return false; - if (swap) - swap_bytes<4> (&len); - - if (len > 0) - { - octave_value_list lst; - - for (octave_idx_type i = 0; i < len; i++) - { - octave_value t2; - bool dummy; - std::string doc; - - // recurse to read list elements - std::string nm = read_binary_data (is, swap, fmt, std::string (), - dummy, t2, doc); - - if (!is) - return false; - - lst.append(t2); - } - - if (is) - data = lst; - else - { - error ("load: failed to load list"); - return false; - } - - } - else if (len == 0 ) - data = Cell (0, 0); - else - return false; - - return true; -} - -#if defined (HAVE_HDF5) - -bool -octave_list::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) -{ - hid_t data_hid = -1; - -#if HAVE_HDF5_18 - data_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); -#else - data_hid = H5Gcreate (loc_id, name, 0); -#endif - if (data_hid < 0) return false; - - // recursively add each element of the list to this group - octave_value_list lst = list_value (); - - for (octave_idx_type i = 0; i < lst.length (); ++i) - { - // should we use lst.name_tags () to label the elements? - - std::ostringstream buf; - buf << "_" << i; - std::string s = buf.str (); - - bool retval2 = add_hdf5_data (data_hid, lst (i), s.c_str (), "", - false, save_as_floats); - if (! retval2) - break; - } - - H5Gclose (data_hid); - - return true; -} - -bool -octave_list::load_hdf5 (hid_t loc_id, const char *name) -{ - bool retval = false; - - hdf5_callback_data dsub; - - herr_t retval2 = -1; - octave_value_list lst; - int current_item = 0; - hsize_t num_obj = 0; -#if HAVE_HDF5_18 - hid_t group_id = H5Gopen (loc_id, name, H5P_DEFAULT); -#else - hid_t group_id = H5Gopen (loc_id, name); -#endif - H5Gget_num_objs (group_id, &num_obj); - H5Gclose (group_id); - - while (current_item < static_cast<int> (num_obj) - && (retval2 = H5Giterate (loc_id, name, ¤t_item, - hdf5_read_next_data, &dsub)) > 0) - { - lst.append (dsub.tc); - } - - if (retval2 >= 0) - { - data = lst; - retval = true; - } - - return retval; -} - -#endif
--- a/src/ov-list.h Sat Jan 30 21:51:59 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,129 +0,0 @@ -/* - -Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 John W. Eaton - -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 -<http://www.gnu.org/licenses/>. - -*/ - -#if !defined (octave_list_h) -#define octave_list_h 1 - -#include <cstdlib> - -#include <iosfwd> -#include <string> - -#include "mx-base.h" -#include "str-vec.h" - -#include "Cell.h" -#include "error.h" -#include "oct-alloc.h" -#include "ov-base.h" -#include "ov-typeinfo.h" - -class tree_walker; - -// Lists. - -class -octave_list : public octave_base_value -{ -public: - - octave_list (void) - : octave_base_value () { } - - octave_list (const octave_value_list& l) - : octave_base_value (), data (l) { } - - octave_list (const Cell& c); - - octave_list (const octave_list& l) - : octave_base_value (), data (l.data) { } - - ~octave_list (void) { } - - octave_base_value *clone (void) const { return new octave_list (*this); } - octave_base_value *empty_clone (void) const { return new octave_list (); } - - octave_value subsref (const std::string& type, - const std::list<octave_value_list>& idx) - { - octave_value_list tmp = subsref (type, idx, 1); - return tmp.length () > 0 ? tmp(0) : octave_value (); - } - - octave_value_list subsref (const std::string& type, - const std::list<octave_value_list>& idx, - int nargout); - - octave_value do_index_op (const octave_value_list& idx, - bool resize_ok = false); - - octave_value subsasgn (const std::string& type, - const std::list<octave_value_list>& idx, - const octave_value& rhs); - - void assign (const octave_value_list& idx, const octave_value& rhs); - - dim_vector dims (void) const { return dim_vector (1, data.length ()); } - - size_t byte_size (void) const; - - bool is_defined (void) const { return true; } - - bool is_list (void) const { return true; } - - octave_value_list list_value (void) const; - - void print (std::ostream& os, bool pr_as_read_syntax = false) const; - - void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; - - bool print_name_tag (std::ostream& os, const std::string& name) const; - - bool save_ascii (std::ostream& os); - - bool load_ascii (std::istream& is); - - bool save_binary (std::ostream& os, bool& save_as_floats); - - bool load_binary (std::istream& is, bool swap, - oct_mach_info::float_format fmt); - -#if defined (HAVE_HDF5) - bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); - - bool load_hdf5 (hid_t loc_id, const char *name); -#endif - -protected: - - // The list of Octave values. - Cell data; - -private: - - DECLARE_OCTAVE_ALLOCATOR - - DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA -}; - -#endif
--- a/src/ov-struct.cc Sat Jan 30 21:51:59 2010 +0100 +++ b/src/ov-struct.cc Sat Jan 30 22:35:27 2010 +0100 @@ -32,7 +32,6 @@ #include "error.h" #include "gripes.h" #include "oct-lvalue.h" -#include "ov-list.h" #include "ov-struct.h" #include "unwind-prot.h" #include "utils.h"
--- a/src/ov.cc Sat Jan 30 21:51:59 2010 +0100 +++ b/src/ov.cc Sat Jan 30 22:35:27 2010 +0100 @@ -65,7 +65,6 @@ #include "ov-range.h" #include "ov-struct.h" #include "ov-class.h" -#include "ov-list.h" #include "ov-cs-list.h" #include "ov-colon.h" #include "ov-builtin.h" @@ -1110,10 +1109,8 @@ { } -octave_value::octave_value (const octave_value_list& l, bool is_csl) - : rep (is_csl - ? dynamic_cast<octave_base_value *> (new octave_cs_list (l)) - : dynamic_cast<octave_base_value *> (new octave_list (l))) +octave_value::octave_value (const octave_value_list& l, bool) + : rep (new octave_cs_list (l)) { } @@ -2639,7 +2636,6 @@ octave_sparse_complex_matrix::register_type (); octave_struct::register_type (); octave_class::register_type (); - octave_list::register_type (); octave_cs_list::register_type (); octave_magic_colon::register_type (); octave_builtin::register_type ();