Mercurial > octave

annotate src/data.h @ 13294:7dce7e110511

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
children 72c96de7a403
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13294
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 /*
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 Copyright (C) 2011 John W. Eaton
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 This file is part of Octave.
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 option) any later version.
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 for more details.
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 along with Octave; see the file COPYING. If not, see
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 <http://www.gnu.org/licenses/>.
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 */
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 #if !defined (octave_data_h)
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 #define octave_data_h 1
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 #include <string>
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 class octave_value;
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 class octave_value_list;
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 extern OCTINTERP_API octave_value
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 do_class_concat (const octave_value_list& ovl, std::string cattype, int dim);
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 #endif