Mercurial > hg > octave-lyh
view src/pt-cbinop.h @ 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 | f4689107dd8c |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 2008-2011 Jaroslav Hajek 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_tree_cbinop_h) #define octave_tree_cbinop_h 1 #include <string> class tree_walker; class octave_value; class octave_value_list; class octave_lvalue; #include "ov.h" #include "pt-binop.h" #include "symtab.h" // Binary expressions that can be reduced to compound operations class tree_compound_binary_expression : public tree_binary_expression { public: tree_compound_binary_expression (tree_expression *a, tree_expression *b, int l, int c, octave_value::binary_op t, tree_expression *ca, tree_expression *cb, octave_value::compound_binary_op ct) : tree_binary_expression (a, b, l, c, t), op_lhs (ca), op_rhs (cb), etype (ct) { } octave_value rvalue1 (int nargout = 1); octave_value::compound_binary_op cop_type (void) const { return etype; } private: tree_expression *op_lhs; tree_expression *op_rhs; octave_value::compound_binary_op etype; // No copying! tree_compound_binary_expression (const tree_compound_binary_expression&); tree_compound_binary_expression& operator = (const tree_compound_binary_expression&); }; // a "virtual constructor" tree_binary_expression * maybe_compound_binary_expression (tree_expression *a, tree_expression *b, int l = -1, int c = -1, octave_value::binary_op t = octave_value::unknown_binary_op); #endif