Mercurial > octave-nkf
comparison src/Makefile.am @ 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 | e81ddf9cacd5 |
children | 155e9c625761 |
comparison
equal
deleted
inserted
replaced
13293:007ebc128ab5 | 13294:7dce7e110511 |
---|---|
233 base-list.h \ | 233 base-list.h \ |
234 builtins.h \ | 234 builtins.h \ |
235 c-file-ptr-stream.h \ | 235 c-file-ptr-stream.h \ |
236 comment-list.h \ | 236 comment-list.h \ |
237 cutils.h \ | 237 cutils.h \ |
238 data.h \ | |
238 debug.h \ | 239 debug.h \ |
239 defun-dld.h \ | 240 defun-dld.h \ |
240 defun-int.h \ | 241 defun-int.h \ |
241 defun.h \ | 242 defun.h \ |
242 dirfns.h \ | 243 dirfns.h \ |