Mercurial > hg > octave-lyh
view src/ov-dld-fcn.cc @ 13294:7dce7e110511
make concatenation of class objects work
* data.h: New file.
* src/Makefile.am (octinclude_HEADERS): Add it to the list.
* data.cc (attempt_type_conversion): New static function.
(do_class_concat): New function.
(do_cat): Use it if any elements of the list are objects.
Check whether any elements of the list are objects or cells.
Check whether all elements of the list are complex.
Check whether the first element of the list is a struct.
Maybe convert elements of the list to cells.
New tests for horzcat and vertcat.
* data.h (do_class_concat): Provide decl.
* ov-class.h (octave_class::octave_class): Allow optional parent
list.
* ov.h, ov.h (octave_value::octave_value (const Octave_map&,
const std::string&)): Likewise.
* pt-mat.cc (do_class_concat): New static function.
(tree_matrix::rvalue1): Use it to concatenate objects.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 07 Oct 2011 22:16:07 -0400 |
parents | fd0a3ac60b0e |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 1996-2011 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 "oct-shlib.h" #include <defaults.h> #include "dynamic-ld.h" #include "error.h" #include "oct-obj.h" #include "ov-dld-fcn.h" #include "ov.h" DEFINE_OCTAVE_ALLOCATOR (octave_dld_function); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_dld_function, "dynamically-linked function", "dynamically-linked function"); octave_dld_function::octave_dld_function (octave_builtin::fcn ff, const octave_shlib& shl, const std::string& nm, const std::string& ds) : octave_builtin (ff, nm, ds), sh_lib (shl) { mark_fcn_file_up_to_date (time_parsed ()); std::string file_name = fcn_file_name (); system_fcn_file = (! file_name.empty () && Voct_file_dir == file_name.substr (0, Voct_file_dir.length ())); } octave_dld_function::~octave_dld_function (void) { octave_dynamic_loader::remove_oct (my_name, sh_lib); } std::string octave_dld_function::fcn_file_name (void) const { return sh_lib.file_name (); } octave_time octave_dld_function::time_parsed (void) const { return sh_lib.time_loaded (); } // Note: this wrapper around the octave_dld_function constructor is // necessary to work around a MSVC limitation handling in // virtual destructors that prevents unloading a dynamic module // before *all* objects (of class using a virtual dtor) have // been fully deleted; indeed, MSVC attaches auto-generated code // (scalar deleting destructor) to objects created in a dynamic // module, and this code will be executed in the dynamic module // context at object deletion; unloading the dynamic module // before objects have been deleted will make the "delete" code // of objects to point to an invalid code segment. octave_dld_function* octave_dld_function::create (octave_builtin::fcn ff, const octave_shlib& shl, const std::string& nm, const std::string& ds) { return new octave_dld_function (ff, shl, nm, ds); }