Mercurial > hg > octave-lyh
view src/pt-const.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 | fd0a3ac60b0e |
children | 3b5afcec526b |
line wrap: on
line source
/* Copyright (C) 1993-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/>. */ #if !defined (octave_tree_const_h) #define octave_tree_const_h 1 #include <iosfwd> #include <string> #include "oct-alloc.h" class octave_value_list; class tree_walker; #include "ov.h" #include "pt-bp.h" #include "pt-exp.h" #include "symtab.h" class tree_constant : public tree_expression { public: tree_constant (int l = -1, int c = -1) : tree_expression (l, c), val (), orig_text () { } tree_constant (const octave_value& v, int l = -1, int c = -1) : tree_expression (l, c), val (v), orig_text () { } tree_constant (const octave_value& v, const std::string& ot, int l = -1, int c = -1) : tree_expression (l, c), val (v), orig_text (ot) { } ~tree_constant (void) { } bool has_magic_end (void) const { return false; } void *operator new (size_t size) { return allocator.alloc (size); } void operator delete (void *p, size_t size) { allocator.free (p, size); } // Type. It would be nice to eliminate the need for this. bool is_constant (void) const { return true; } void maybe_mutate (void) { val.maybe_mutate (); } void print (std::ostream& os, bool pr_as_read_syntax = false, bool pr_orig_txt = true); void print_raw (std::ostream& os, bool pr_as_read_syntax = false, bool pr_orig_txt = true); bool rvalue_ok (void) const { return true; } octave_value rvalue1 (int = 1) { return val; } octave_value_list rvalue (int nargout); tree_expression *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); // Store the original text corresponding to this constant for later // pretty printing. void stash_original_text (const std::string& s) { orig_text = s; } std::string original_text (void) const { return orig_text; } private: // For custom memory management. static octave_allocator allocator; // The actual value that this constant refers to. octave_value val; // The original text form of this constant. std::string orig_text; // No copying! tree_constant (const tree_constant&); tree_constant& operator = (const tree_constant&); }; #endif