Mercurial > octave-nkf
view libinterp/corefcn/oct-obj.cc @ 19632:76478d2da117
unconditionally disable the octave_allocator class
* configure.ac: Delete the --enable-octave-allocator option.
* oct-alloc.h: Delete octave_allocator class. Warn if file is
included. Unconditionally define macros to be empty.
* NEWS: Make note of these changes.
* oct-alloc.cc: Delete.
* liboctave/util/module.mk (UTIL_SRC): Remove it from the list.
* make_int.cc, Cell.h, oct-obj.cc, oct-obj.h, audiodevinfo.cc,
ov-base-int.h, ov-base-scalar.h, ov-bool-mat.cc, ov-bool-mat.h,
ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h,
ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.h,
ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc,
ov-complex.h, ov-cs-list.cc, ov-cs-list.h, ov-cx-diag.cc,
ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc,
ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc,
ov-fcn-handle.h, ov-fcn-inline.cc, ov-fcn-inline.h, ov-fcn.cc,
ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc,
ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h,
ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc,
ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-java.cc,
ov-java.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-perm.cc, ov-perm.h,
ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc,
ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc,
ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, ov.h, pt-const.cc, pt-const.h, idx-vector.cc,
idx-vector.h: Delete uses of oct-alloc.h and OCTAVE_ALLOCATOR macros.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 20 Jan 2015 13:43:29 -0500 |
parents | 6a71e5030df5 |
children | 4197fc428c7d |
line wrap: on
line source
/* Copyright (C) 1994-2013 John W. Eaton Copyright (C) 2009 VZLU Prague 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 "error.h" #include "oct-obj.h" #include "Cell.h" // We are likely to have a lot of octave_value_list objects to allocate, // so make the grow_size large. octave_value_list::octave_value_list (const std::list<octave_value_list>& lst) { octave_idx_type n = 0; octave_idx_type nel = 0; // Determine number. for (std::list<octave_value_list>::const_iterator p = lst.begin (); p != lst.end (); p++) { n++; nel += p->length (); } // Optimize single-element case if (n == 1) data = lst.front ().data; else if (nel > 0) { data.resize (dim_vector (1, nel)); octave_idx_type k = 0; for (std::list<octave_value_list>::const_iterator p = lst.begin (); p != lst.end (); p++) { data.assign (idx_vector (k, k + p->length ()), p->data); k += p->length (); } assert (k == nel); } } octave_value_list& octave_value_list::prepend (const octave_value& val) { octave_idx_type n = length (); resize (n + 1); while (n > 0) { elem (n) = elem (n - 1); n--; } elem (0) = val; return *this; } octave_value_list& octave_value_list::append (const octave_value& val) { octave_idx_type n = length (); resize (n + 1); elem (n) = val; return *this; } octave_value_list& octave_value_list::append (const octave_value_list& lst) { octave_idx_type len = length (); octave_idx_type lst_len = lst.length (); resize (len + lst_len); for (octave_idx_type i = 0; i < lst_len; i++) elem (len + i) = lst (i); return *this; } octave_value_list& octave_value_list::reverse (void) { octave_idx_type n = length (); for (octave_idx_type i = 0; i < n / 2; i++) { octave_value tmp = elem (i); elem (i) = elem (n - i - 1); elem (n - i - 1) = tmp; } return *this; } octave_value_list octave_value_list::splice (octave_idx_type offset, octave_idx_type rep_length, const octave_value_list& lst) const { octave_value_list retval; octave_idx_type len = length (); if (offset < 0 || offset >= len) { if (! (rep_length == 0 && offset == len)) { error ("octave_value_list::splice: invalid OFFSET"); return retval; } } if (rep_length < 0 || rep_length + offset > len) { error ("octave_value_list::splice: invalid LENGTH"); return retval; } octave_idx_type lst_len = lst.length (); octave_idx_type new_len = len - rep_length + lst_len; retval.resize (new_len); octave_idx_type k = 0; for (octave_idx_type i = 0; i < offset; i++) retval(k++) = elem (i); for (octave_idx_type i = 0; i < lst_len; i++) retval(k++) = lst (i); for (octave_idx_type i = offset + rep_length; i < len; i++) retval(k++) = elem (i); return retval; } bool octave_value_list::all_strings_p (void) const { octave_idx_type n = length (); for (octave_idx_type i = 0; i < n; i++) if (! elem(i).is_string ()) return false; return true; } bool octave_value_list::all_scalars (void) const { octave_idx_type n = length (); for (octave_idx_type i = 0; i < n; i++) { dim_vector dv = elem(i).dims (); if (! dv.all_ones ()) return false; } return true; } bool octave_value_list::any_cell (void) const { octave_idx_type n = length (); for (octave_idx_type i = 0; i < n; i++) if (elem (i).is_cell ()) return true; return false; } bool octave_value_list::has_magic_colon (void) const { octave_idx_type n = length (); for (octave_idx_type i = 0; i < n; i++) if (elem(i).is_magic_colon ()) return true; return false; } string_vector octave_value_list::make_argv (const std::string& fcn_name) const { string_vector argv; if (all_strings_p ()) { octave_idx_type len = length (); octave_idx_type total_nr = 0; for (octave_idx_type i = 0; i < len; i++) { // An empty std::string ("") has zero columns and zero rows (a // change that was made for Matlab contemptibility. octave_idx_type n = elem(i).rows (); total_nr += n ? n : 1; } octave_idx_type k = 0; if (! fcn_name.empty ()) { argv.resize (total_nr+1); argv[0] = fcn_name; k = 1; } else argv.resize (total_nr); for (octave_idx_type i = 0; i < len; i++) { octave_idx_type nr = elem(i).rows (); if (nr < 2) argv[k++] = elem(i).string_value (); else { string_vector tmp = elem(i).all_strings (); for (octave_idx_type j = 0; j < nr; j++) argv[k++] = tmp[j]; } } } else error ("%s: expecting all arguments to be strings", fcn_name.c_str ()); return argv; } void octave_value_list::make_storable_values (void) { octave_idx_type len = length (); const Array<octave_value>& cdata = data; for (octave_idx_type i = 0; i < len; i++) { // This is optimized so that we don't force a copy unless necessary. octave_value tmp = cdata(i).storable_value (); if (! tmp.is_copy_of (cdata (i))) data(i) = tmp; } }