octave: libinterp/octave-value/cdef-class.cc annotate

annotate libinterp/octave-value/cdef-class.cc @ 26773:a95887edd55e

style fixes for classdef classes * cdef-class.cc, cdef-class.h, cdef-method.h, cdef-package.cc, cdef-package.h, cdef-property.h: Style fixes.

author	John W. Eaton <jwe@octave.org>
date	Fri, 22 Feb 2019 15:40:15 +0000
parents	d1419ac09564
children	568c2ab2782d

rev	line source
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	2
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	3 Copyright (C) 2012-2019 Michael Goffioul
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	4
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	5 This file is part of Octave.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	6
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	7 Octave is free software: you can redistribute it and/or modify it
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	8 under the terms of the GNU General Public License as published by
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	9 the Free Software Foundation, either version 3 of the License, or
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	10 (at your option) any later version.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	11
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	15 GNU General Public License for more details.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	16
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	19 <https://www.gnu.org/licenses/>.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	20
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	21 */
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	22
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	23 #if defined (HAVE_CONFIG_H)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	24 # include "config.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	25 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	26
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	27 #include <algorithm>
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	28 #include <iomanip>
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	29
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	30 #include "cdef-class.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include "cdef-manager.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include "cdef-utils.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	33 #include "errwarn.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include "interpreter-private.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	35 #include "interpreter.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include "load-path.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include "ov-builtin.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include "ov-classdef.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include "ov-fcn-handle.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	40 #include "ov-usr-fcn.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include "parse.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include "pt-assign.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	43 #include "pt-classdef.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	44 #include "pt-eval.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	45 #include "pt-idx.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	46 #include "pt-misc.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	47 #include "pt-stmt.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	48 #include "pt-walk.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	49
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	50 // Define to 1 to enable debugging statements.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	51 #define DEBUG_TRACE 0
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	52
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	53 static octave_value
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	54 make_fcn_handle (const octave_value& fcn, const std::string& nm)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	55 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	56 octave_value retval;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	57
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	58 if (fcn.is_defined ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	59 retval = octave_value (new octave_fcn_handle (fcn, nm));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	60
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	61 return retval;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	62 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	63
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	64 cdef_class::cdef_class_rep::cdef_class_rep (const std::list<cdef_class>& superclasses)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	65 : cdef_meta_object_rep (), member_count (0), handle_class (false),
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	66 object_count (0), meta (false)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	67 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	68 put ("SuperClasses", to_ov (superclasses));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	69 implicit_ctor_list = superclasses;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	70 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	71
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	72 cdef_method
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	73 cdef_class::cdef_class_rep::find_method (const std::string& nm, bool local)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	74 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	75 auto it = method_map.find (nm);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	76
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	77 if (it == method_map.end ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	78 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	79 // FIXME: look into class directory
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	80 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	81 else
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	82 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	83 cdef_method& meth = it->second;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	84
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	85 // FIXME: check if method reload needed
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	86
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	87 if (meth.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	88 return meth;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	89 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	90
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	91 if (! local)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	92 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	93 // Look into superclasses
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	94
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	95 Cell super_classes = get ("SuperClasses").cell_value ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	96
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	97 for (int i = 0; i < super_classes.numel (); i++)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	98 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	99 cdef_class cls = lookup_class (super_classes(i));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	100
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	101 cdef_method meth = cls.find_method (nm);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	102
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	103 if (meth.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	104 return meth;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	105 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	106 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	107
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	108 return cdef_method ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	109 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	110
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	111 class ctor_analyzer : public octave::tree_walker
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	112 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	113 public:
26773 a95887edd55e style fixes for classdef classes John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	114
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	115 ctor_analyzer (void) = delete;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	116
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	117 ctor_analyzer (const std::string& ctor, const std::string& obj)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	118 : octave::tree_walker (), who (ctor), obj_name (obj) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	119
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	120 ctor_analyzer (const ctor_analyzer&) = delete;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	121
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	122 ctor_analyzer& operator = (const ctor_analyzer&) = delete;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	123
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	124 ~ctor_analyzer (void) = default;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	125
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	126 void visit_statement_list (octave::tree_statement_list& t)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	127 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	128 for (const auto& stmt_p : t)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	129 stmt_p->accept (*this);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	130 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	131
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	132 void visit_statement (octave::tree_statement& t)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	133 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	134 if (t.is_expression ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	135 t.expression ()->accept (*this);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	136 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	137
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	138 void visit_simple_assignment (octave::tree_simple_assignment& t)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	139 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	140 t.right_hand_side ()->accept (*this);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	141 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	142
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	143 void visit_multi_assignment (octave::tree_multi_assignment& t)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	144 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	145 t.right_hand_side ()->accept (*this);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	146 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	147
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	148 void visit_index_expression (octave::tree_index_expression& t)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	149 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	150 t.expression ()->accept (*this);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	151 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	152
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	153 std::list<cdef_class> get_constructor_list (void) const
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	154 { return ctor_list; }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	155
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	156 // NO-OP
26773 a95887edd55e style fixes for classdef classes John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	157
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	158 void visit_anon_fcn_handle (octave::tree_anon_fcn_handle&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	159 void visit_argument_list (octave::tree_argument_list&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	160 void visit_binary_expression (octave::tree_binary_expression&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	161 void visit_break_command (octave::tree_break_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	162 void visit_colon_expression (octave::tree_colon_expression&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	163 void visit_continue_command (octave::tree_continue_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	164 void visit_decl_command (octave::tree_decl_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	165 void visit_decl_init_list (octave::tree_decl_init_list&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	166 void visit_decl_elt (octave::tree_decl_elt&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	167 void visit_simple_for_command (octave::tree_simple_for_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	168 void visit_complex_for_command (octave::tree_complex_for_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	169 void visit_octave_user_script (octave_user_script&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	170 void visit_octave_user_function (octave_user_function&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	171 void visit_function_def (octave::tree_function_def&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	172 void visit_identifier (octave::tree_identifier&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	173 void visit_if_clause (octave::tree_if_clause&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	174 void visit_if_command (octave::tree_if_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	175 void visit_if_command_list (octave::tree_if_command_list&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	176 void visit_switch_case (octave::tree_switch_case&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	177 void visit_switch_case_list (octave::tree_switch_case_list&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	178 void visit_switch_command (octave::tree_switch_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	179 void visit_matrix (octave::tree_matrix&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	180 void visit_cell (octave::tree_cell&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	181 void visit_no_op_command (octave::tree_no_op_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	182 void visit_constant (octave::tree_constant&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	183 void visit_fcn_handle (octave::tree_fcn_handle&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	184 void visit_parameter_list (octave::tree_parameter_list&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	185 void visit_postfix_expression (octave::tree_postfix_expression&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	186 void visit_prefix_expression (octave::tree_prefix_expression&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	187 void visit_return_command (octave::tree_return_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	188 void visit_return_list (octave::tree_return_list&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	189 void visit_try_catch_command (octave::tree_try_catch_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	190 void visit_unwind_protect_command (octave::tree_unwind_protect_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	191 void visit_while_command (octave::tree_while_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	192 void visit_do_until_command (octave::tree_do_until_command&) { }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	193
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	194 void visit_superclass_ref (octave::tree_superclass_ref& t)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	195 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	196 if (t.method_name () == obj_name)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	197 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	198 std::string class_name = t.class_name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	199
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	200 cdef_class cls = lookup_class (class_name, false);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	201
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	202 if (cls.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	203 ctor_list.push_back (cls);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	204 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	205 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	206
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	207 private:
26773 a95887edd55e style fixes for classdef classes John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	208
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	209 // The name of the constructor being analyzed.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	210 std::string who;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	211
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	212 // The name of the first output argument of the constructor.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	213 std::string obj_name;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	214
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	215 // The list of superclass constructors that are explicitly called.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	216 std::list<cdef_class> ctor_list;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	217 };
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	218
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	219 void
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	220 cdef_class::cdef_class_rep::install_method (const cdef_method& meth)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	221 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	222 method_map[meth.get_name ()] = meth;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	223
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	224 member_count++;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	225
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	226 if (meth.is_constructor ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	227 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	228 // Analyze the constructor code to determine what superclass
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	229 // constructors are called explicitly.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	230
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	231 octave_function *of = meth.get_function ().function_value (true);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	232
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	233 if (of)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	234 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	235 octave_user_function *uf = of->user_function_value (true);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	236
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	237 if (uf)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	238 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	239 octave::tree_parameter_list *ret_list = uf->return_list ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	240 octave::tree_statement_list *body = uf->body ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	241
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	242 if (! ret_list \|\| ret_list->size () != 1)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	243 error ("%s: invalid constructor output arguments",
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	244 meth.get_name ().c_str ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	245
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	246 std::string obj_name = ret_list->front ()->name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	247 ctor_analyzer a (meth.get_name (), obj_name);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	248
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	249 body->accept (a);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	250
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	251 std::list<cdef_class> explicit_ctor_list
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	252 = a.get_constructor_list ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	253
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	254 for (const auto& cdef_cls : explicit_ctor_list)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	255 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	256 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	257 std::cerr << "explicit superclass constructor: "
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	258 << cdef_cls.get_name () << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	259 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	260
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	261 implicit_ctor_list.remove (cdef_cls);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	262 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	263 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	264 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	265 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	266 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	267
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	268 void
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	269 cdef_class::cdef_class_rep::load_all_methods (void)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	270 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	271 // FIXME: re-scan class directory
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	272 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	273
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	274 Cell
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	275 cdef_class::cdef_class_rep::get_methods (void)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	276 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	277 std::map<std::string,cdef_method> meths;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	278
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	279 find_methods (meths, false);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	280
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	281 Cell c (meths.size (), 1);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	282
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	283 int idx = 0;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	284
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	285 for (const auto& nm_mthd : meths)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	286 c(idx++, 0) = to_ov (nm_mthd.second);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	287
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	288 return c;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	289 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	290
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	291 std::map<std::string, cdef_method>
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	292 cdef_class::cdef_class_rep::get_method_map (bool only_inherited)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	293 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	294 std::map<std::string, cdef_method> methods;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	295
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	296 find_methods (methods, only_inherited);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	297
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	298 return methods;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	299 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	300
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	301 void
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	302 cdef_class::cdef_class_rep::find_methods (std::map<std::string,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	303 cdef_method>& meths,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	304 bool only_inherited)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	305 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	306 load_all_methods ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	307
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	308 method_const_iterator it;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	309
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	310 for (it = method_map.begin (); it != method_map.end (); ++it)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	311 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	312 if (! it->second.is_constructor ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	313 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	314 std::string nm = it->second.get_name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	315
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	316 if (meths.find (nm) == meths.end ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	317 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	318 if (only_inherited)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	319 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	320 octave_value acc = it->second.get ("Access");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	321
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	322 if (! acc.is_string ()
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	323 \|\| acc.string_value () == "private")
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	324 continue;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	325 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	326
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	327 meths[nm] = it->second;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	328 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	329 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	330 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	331
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	332 // Look into superclasses
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	333
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	334 Cell super_classes = get ("SuperClasses").cell_value ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	335
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	336 for (int i = 0; i < super_classes.numel (); i++)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	337 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	338 cdef_class cls = lookup_class (super_classes(i));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	339
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	340 cls.get_rep ()->find_methods (meths, true);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	341 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	342 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	343
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	344 cdef_property
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	345 cdef_class::cdef_class_rep::find_property (const std::string& nm)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	346 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	347 auto it = property_map.find (nm);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	348
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	349 if (it != property_map.end ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	350 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	351 cdef_property& prop = it->second;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	352
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	353 if (prop.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	354 return prop;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	355 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	356
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	357 // Look into superclasses
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	358
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	359 Cell super_classes = get ("SuperClasses").cell_value ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	360
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	361 for (int i = 0; i < super_classes.numel (); i++)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	362 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	363 cdef_class cls = lookup_class (super_classes(i));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	364
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	365 cdef_property prop = cls.find_property (nm);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	366
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	367 if (prop.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	368 return prop;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	369 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	370
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	371 return cdef_property ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	372 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	373
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	374 void
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	375 cdef_class::cdef_class_rep::install_property (const cdef_property& prop)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	376 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	377 property_map[prop.get_name ()] = prop;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	378
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	379 member_count++;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	380 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	381
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	382 Cell
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	383 cdef_class::cdef_class_rep::get_properties (int mode)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	384 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	385 std::map<std::string,cdef_property> props;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	386
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	387 props = get_property_map (mode);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	388
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	389 Cell c (props.size (), 1);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	390
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	391 int idx = 0;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	392
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	393 for (const auto& pname_prop : props)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	394 c(idx++, 0) = to_ov (pname_prop.second);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	395
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	396 return c;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	397 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	398
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	399 std::map<std::string, cdef_property>
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	400 cdef_class::cdef_class_rep::get_property_map (int mode)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	401 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	402 std::map<std::string,cdef_property> props;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	403
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	404 find_properties (props, mode);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	405
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	406 return props;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	407 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	408
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	409 void
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	410 cdef_class::cdef_class_rep::find_properties (std::map<std::string,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	411 cdef_property>& props,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	412 int mode)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	413 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	414 property_const_iterator it;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	415
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	416 for (it = property_map.begin (); it != property_map.end (); ++it)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	417 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	418 std::string nm = it->second.get_name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	419
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	420 if (props.find (nm) == props.end ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	421 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	422 if (mode == property_inherited)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	423 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	424 octave_value acc = it->second.get ("GetAccess");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	425
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	426 if (! acc.is_string ()
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	427 \|\| acc.string_value () == "private")
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	428 continue;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	429 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	430
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	431 props[nm] = it->second;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	432 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	433 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	434
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	435 // Look into superclasses
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	436
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	437 Cell super_classes = get ("SuperClasses").cell_value ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	438
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	439 for (int i = 0; i < super_classes.numel (); i++)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	440 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	441 cdef_class cls = lookup_class (super_classes(i));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	442
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	443 cls.get_rep ()->find_properties (props,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	444 (mode == property_all
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	445 ? property_all
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	446 : property_inherited));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	447 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	448 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	449
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	450 void
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	451 cdef_class::cdef_class_rep::find_names (std::set<std::string>& names,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	452 bool all)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	453 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	454 load_all_methods ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	455
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	456 for (const auto& cls_fnmap : method_map)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	457 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	458 if (! cls_fnmap.second.is_constructor ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	459 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	460 std::string nm = cls_fnmap.second.get_name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	461
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	462 if (! all)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	463 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	464 octave_value acc = cls_fnmap.second.get ("Access");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	465
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	466 if (! acc.is_string()
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	467 \|\| acc.string_value () != "public")
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	468 continue;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	469 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	470
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	471 names.insert (nm);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	472 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	473 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	474
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	475 for (const auto& pname_prop : property_map)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	476 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	477 std::string nm = pname_prop.second.get_name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	478
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	479 if (! all)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	480 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	481 octave_value acc = pname_prop.second.get ("GetAccess");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	482
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	483 if (! acc.is_string()
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	484 \|\| acc.string_value () != "public")
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	485 continue;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	486 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	487
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	488 names.insert (nm);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	489 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	490
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	491 // Look into superclasses
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	492
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	493 Cell super_classes = get ("SuperClasses").cell_value ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	494
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	495 for (int i = 0; i < super_classes.numel (); i++)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	496 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	497 cdef_class cls = lookup_class (super_classes(i));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	498
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	499 cls.get_rep ()->find_names (names, all);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	500 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	501 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	502
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	503 string_vector
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	504 cdef_class::cdef_class_rep::get_names (void)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	505 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	506 std::set<std::string> names;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	507
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	508 find_names (names, false);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	509
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	510 string_vector v (names);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	511
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	512 return v.sort (true);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	513 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	514
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	515 void
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	516 cdef_class::cdef_class_rep::delete_object (const cdef_object& obj)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	517 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	518 cdef_method dtor = find_method ("delete");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	519
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	520 if (dtor.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	521 dtor.execute (obj, octave_value_list (), 0, true, "destructor");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	522
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	523 // FIXME: should we destroy corresponding properties here?
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	524
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	525 // Call "delete" in super classes
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	526
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	527 Cell super_classes = get ("SuperClasses").cell_value ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	528
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	529 for (int i = 0; i < super_classes.numel (); i++)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	530 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	531 cdef_class cls = lookup_class (super_classes(i));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	532
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	533 if (cls.get_name () != "handle")
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	534 cls.delete_object (obj);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	535 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	536 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	537
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	538 octave_value_list
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	539 cdef_class::cdef_class_rep::meta_subsref (const std::string& type,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	540 const std::list<octave_value_list>& idx,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	541 int nargout)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	542 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	543 size_t skip = 1;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	544
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	545 octave_value_list retval;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	546
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	547 switch (type[0])
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	548 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	549 case '(':
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	550 // Constructor call
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	551
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	552 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	553 std::cerr << "constructor" << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	554 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	555
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	556 retval(0) = construct (idx.front ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	557 break;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	558
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	559 case '.':
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	560 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	561 // Static method, constant (or property?)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	562
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	563 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	564 std::cerr << "static method/property" << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	565 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	566
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	567 if (idx.front ().length () != 1)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	568 error ("invalid meta.class indexing");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	569
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	570 std::string nm = idx.front ()(0).xstring_value ("invalid meta.class indexing, expected a method or property name");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	571
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	572 cdef_method meth = find_method (nm);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	573
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	574 if (meth.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	575 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	576 if (! meth.is_static ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	577 error ("method `%s' is not static", nm.c_str ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	578
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	579 octave_value_list args;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	580
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	581 if (type.length () > 1 && idx.size () > 1 && type[1] == '(')
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	582 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	583 args = *(++(idx.begin ()));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	584 skip++;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	585 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	586
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	587 retval = meth.execute (args, (type.length () > skip
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	588 ? 1 : nargout), true,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	589 "meta.class");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	590 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	591 else
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	592 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	593 cdef_property prop = find_property (nm);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	594
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	595 if (! prop.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	596 error ("no such method or property `%s'", nm.c_str ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	597
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	598 if (! prop.is_constant ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	599 error ("property `%s' is not constant", nm.c_str ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	600
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	601 retval(0) = prop.get_value (true, "meta.class");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	602 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	603 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	604 break;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	605
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	606 default:
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	607 error ("invalid meta.class indexing");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	608 break;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	609 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	610
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	611 if (type.length () > skip && idx.size () > skip && ! retval.empty ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	612 retval = retval(0).next_subsref (nargout, type, idx, skip);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	613
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	614 return retval;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	615 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	616
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	617 void
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	618 cdef_class::cdef_class_rep::meta_release (void)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	619 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	620 cdef_manager& cdm
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	621 = octave::__get_cdef_manager__ ("cdef_class::cdef_class_rep::meta_release");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	622
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	623 cdm.unregister_class (wrap ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	624 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	625
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	626 void
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	627 cdef_class::cdef_class_rep::initialize_object (cdef_object& obj)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	628 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	629 // Populate the object with default property values
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	630
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	631 std::list<cdef_class> super_classes = lookup_classes (
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	632 get ("SuperClasses").cell_value ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	633
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	634 for (auto& cls : super_classes)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	635 cls.initialize_object (obj);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	636
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	637 for (const auto& pname_prop : property_map)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	638 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	639 if (! pname_prop.second.get ("Dependent").bool_value ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	640 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	641 octave_value pvalue = pname_prop.second.get ("DefaultValue");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	642
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	643 if (pvalue.is_defined ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	644 obj.put (pname_prop.first, pvalue);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	645 else
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	646 obj.put (pname_prop.first, octave_value (Matrix ()));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	647 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	648 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	649
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	650 refcount++;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	651 obj.mark_for_construction (cdef_class (this));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	652 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	653
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	654 void
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	655 cdef_class::cdef_class_rep::run_constructor (cdef_object& obj,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	656 const octave_value_list& args)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	657 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	658 octave_value_list empty_args;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	659
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	660 for (const auto& cls : implicit_ctor_list)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	661 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	662 cdef_class supcls = lookup_class (cls);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	663
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	664 supcls.run_constructor (obj, empty_args);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	665 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	666
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	667 std::string cls_name = get_name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	668 std::string ctor_name = get_base_name (cls_name);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	669
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	670 cdef_method ctor = find_method (ctor_name);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	671
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	672 if (ctor.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	673 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	674 octave_value_list ctor_args (args);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	675 octave_value_list ctor_retval;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	676
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	677 ctor_args.prepend (to_ov (obj));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	678 ctor_retval = ctor.execute (ctor_args, 1, true, "constructor");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	679
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	680 if (ctor_retval.length () != 1)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	681 error ("%s: invalid number of output arguments for classdef constructor",
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	682 ctor_name.c_str ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	683
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	684 obj = to_cdef (ctor_retval(0));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	685 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	686
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	687 obj.mark_as_constructed (wrap ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	688 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	689
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	690 octave_value
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	691 cdef_class::cdef_class_rep::construct (const octave_value_list& args)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	692 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	693 cdef_object obj = construct_object (args);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	694
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	695 if (obj.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	696 return to_ov (obj);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	697
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	698 return octave_value ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	699 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	700
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	701 cdef_object
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	702 cdef_class::cdef_class_rep::construct_object (const octave_value_list& args)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	703 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	704 if (is_abstract ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	705 error ("cannot instantiate object for abstract class `%s'",
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	706 get_name ().c_str ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	707
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	708 cdef_object obj;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	709
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	710 if (is_meta_class ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	711 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	712 // This code path is only used to create empty meta objects
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	713 // as filler for the empty values within a meta object array.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	714
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	715 cdef_class this_cls = wrap ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	716
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	717 static cdef_object empty_class;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	718
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	719 cdef_manager& cdm
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	720 = octave::__get_cdef_manager__ ("cdef_class::cdef_class_rep::construct_object");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	721
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	722 if (this_cls == cdm.meta_class ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	723 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	724 if (! empty_class.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	725 empty_class = cdm.make_class ("", std::list<cdef_class> ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	726 obj = empty_class;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	727 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	728 else if (this_cls == cdm.meta_property ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	729 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	730 static cdef_property empty_property;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	731
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	732 if (! empty_class.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	733 empty_class = cdm.make_class ("", std::list<cdef_class> ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	734 if (! empty_property.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	735 empty_property = cdm.make_property (empty_class, "");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	736 obj = empty_property;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	737 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	738 else if (this_cls == cdm.meta_method ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	739 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	740 static cdef_method empty_method;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	741
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	742 if (! empty_class.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	743 empty_class = cdm.make_class ("", std::list<cdef_class> ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	744 if (! empty_method.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	745 empty_method = cdm.make_method (empty_class, "", octave_value ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	746 obj = empty_method;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	747 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	748 else if (this_cls == cdm.meta_package ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	749 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	750 static cdef_package empty_package;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	751
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	752 if (! empty_package.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	753 empty_package = cdm.make_package ("");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	754 obj = empty_package;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	755 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	756 else
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	757 panic_impossible ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	758
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	759 return obj;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	760 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	761 else
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	762 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	763 if (is_handle_class ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	764 obj = cdef_object (new handle_cdef_object ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	765 else
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	766 obj = cdef_object (new value_cdef_object ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	767 obj.set_class (wrap ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	768
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	769 initialize_object (obj);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	770
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	771 run_constructor (obj, args);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	772
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	773 return obj;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	774 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	775
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	776 return cdef_object ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	777 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	778
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	779 static octave_value
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	780 compute_attribute_value (octave::tree_evaluator& tw,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	781 octave::tree_classdef_attribute *t)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	782 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	783 octave::tree_expression *expr = t->expression ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	784
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	785 if (expr)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	786 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	787 if (expr->is_identifier ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	788 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	789 std::string s = expr->name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	790
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	791 if (s == "public")
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	792 return std::string ("public");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	793 else if (s == "protected")
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	794 return std::string ("protected");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	795 else if (s == "private")
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	796 return std::string ("private");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	797 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	798
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	799 return tw.evaluate (expr);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	800 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	801 else
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	802 return octave_value (true);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	803 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	804
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	805 template <typename T>
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	806 static std::string
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	807 attribute_value_to_string (T *t, octave_value v)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	808 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	809 if (v.is_string ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	810 return v.string_value ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	811 else if (t->expression ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	812 return t->expression ()->original_text ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	813 else
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	814 return "true";
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	815 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	816
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	817 cdef_class
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	818 cdef_class::make_meta_class (octave::interpreter& interp,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	819 octave::tree_classdef *t, bool is_at_folder)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	820 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	821 cdef_class retval;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	822 std::string class_name, full_class_name;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	823
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	824 // Class creation
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	825
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	826 class_name = full_class_name = t->ident ()->name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	827 if (! t->package_name ().empty ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	828 full_class_name = t->package_name () + '.' + full_class_name;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	829
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	830 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	831 std::cerr << "class: " << full_class_name << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	832 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	833
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	834 std::list<cdef_class> slist;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	835
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	836 if (t->superclass_list ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	837 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	838 for (auto& scls : (*t->superclass_list ()))
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	839 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	840 std::string sclass_name = (scls)->class_name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	841
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	842 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	843 std::cerr << "superclass: " << sclass_name << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	844 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	845
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	846 cdef_class sclass = lookup_class (sclass_name);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	847
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	848 if (sclass.get ("Sealed").bool_value ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	849 error ("`%s' cannot inherit from `%s', because it is sealed",
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	850 full_class_name.c_str (), sclass_name.c_str ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	851
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	852 slist.push_back (sclass);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	853 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	854 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	855
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	856 cdef_manager& cdm
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	857 = octave::__get_cdef_manager__ ("cdef_class::make_meta_class");
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	858
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	859 retval = cdm.make_class (full_class_name, slist);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	860
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	861 // Package owning this class
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	862
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	863 if (! t->package_name ().empty ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	864 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	865 cdef_package pack = cdm.find_package (t->package_name ());
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	866
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	867 if (pack.ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	868 retval.put ("ContainingPackage", to_ov (pack));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	869 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	870
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	871 // Class attributes
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	872
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	873 octave::tree_evaluator& tw = interp.get_evaluator ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	874
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	875 if (t->attribute_list ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	876 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	877 for (const auto& attr : (*t->attribute_list ()))
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	878 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	879 std::string aname = attr->ident ()->name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	880 octave_value avalue = compute_attribute_value (tw, attr);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	881
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	882 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	883 std::cerr << "class attribute: " << aname << " = "
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	884 << attribute_value_to_string (attr, avalue) << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	885 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	886
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	887 retval.put (aname, avalue);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	888 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	889 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	890
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	891 octave::tree_classdef_body *b = t->body ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	892
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	893 if (b)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	894 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	895 // Keep track of the get/set accessor methods. They will be used
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	896 // later on when creating properties.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	897
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	898 std::map<std::string, octave_value> get_methods;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	899 std::map<std::string, octave_value> set_methods;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	900
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	901 // Method blocks
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	902
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	903 std::list<octave::tree_classdef_methods_block *> mb_list = b->methods_list ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	904
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	905 octave::load_path& lp = interp.get_load_path ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	906
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	907 for (auto& mb_p : mb_list)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	908 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	909 std::map<std::string, octave_value> amap;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	910
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	911 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	912 std::cerr << "method block" << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	913 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	914
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	915 // Method attributes
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	916
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	917 if (mb_p->attribute_list ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	918 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	919 for (auto& attr_p : *mb_p->attribute_list ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	920 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	921 std::string aname = attr_p->ident ()->name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	922 octave_value avalue = compute_attribute_value (tw, attr_p);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	923
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	924 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	925 std::cerr << "method attribute: " << aname << " = "
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	926 << attribute_value_to_string (attr_p, avalue)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	927 << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	928 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	929
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	930 amap[aname] = avalue;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	931 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	932 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	933
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	934 // Methods
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	935
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	936 if (mb_p->element_list ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	937 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	938 for (auto& mtd : *mb_p->element_list ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	939 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	940 std::string mname = mtd.function_value ()->name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	941 std::string mprefix = mname.substr (0, 4);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	942
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	943 if (mprefix == "get.")
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	944 get_methods[mname.substr (4)] =
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	945 make_fcn_handle (mtd, full_class_name + '>' + mname);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	946 else if (mprefix == "set.")
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	947 set_methods[mname.substr (4)] =
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	948 make_fcn_handle (mtd, full_class_name + '>' + mname);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	949 else
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	950 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	951 cdef_method meth = cdm.make_method (retval, mname, mtd);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	952
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	953 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	954 std::cerr << (mname == class_name ? "constructor"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	955 : "method")
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	956 << ": " << mname << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	957 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	958
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	959 for (auto& attrnm_val : amap)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	960 meth.put (attrnm_val.first, attrnm_val.second);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	961
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	962 retval.install_method (meth);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	963 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	964 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	965 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	966 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	967
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	968 if (is_at_folder)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	969 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	970 // Look for all external methods visible on octave path at the
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	971 // time of loading of the class.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	972 //
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	973 // FIXME: This is an "extension" to Matlab behavior, which only looks
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	974 // in the @-folder containing the original classdef file. However,
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	975 // this is easier to implement it that way at the moment.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	976
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	977 std::list<std::string> external_methods
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	978 = lp.methods (full_class_name);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	979
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	980 for (const auto& mtdnm : external_methods)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	981 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	982 // FIXME: should we issue a warning if the method is already
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	983 // defined in the classdef file?
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	984
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	985 if (mtdnm != class_name
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	986 && ! retval.find_method (mtdnm, true).ok ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	987 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	988 // Create a dummy method that is used until the actual
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	989 // method is loaded.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	990 octave_user_function *fcn = new octave_user_function ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	991
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	992 fcn->stash_function_name (mtdnm);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	993
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	994 cdef_method meth
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	995 = cdm.make_method (retval, mtdnm, octave_value (fcn));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	996
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	997 retval.install_method (meth);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	998 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	999 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1000 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1001
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1002 // Property blocks
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1003
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1004 // FIXME: default property expression should be able to call static
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1005 // methods of the class being constructed. A restricted CLASSNAME
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1006 // symbol should be added to the scope before evaluating default
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1007 // value expressions.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1008
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1009 std::list<octave::tree_classdef_properties_block *> pb_list
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1010 = b->properties_list ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1011
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1012 for (auto& pb_p : pb_list)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1013 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1014 std::map<std::string, octave_value> amap;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1015
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1016 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1017 std::cerr << "property block" << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1018 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1019
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1020 // Property attributes
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1021
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1022 if (pb_p->attribute_list ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1023 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1024 for (auto& attr_p : *pb_p->attribute_list ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1025 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1026 std::string aname = attr_p->ident ()->name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1027 octave_value avalue = compute_attribute_value (tw, attr_p);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1028
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1029 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1030 std::cerr << "property attribute: " << aname << " = "
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1031 << attribute_value_to_string (attr_p, avalue)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1032 << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1033 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1034
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1035 if (aname == "Access")
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1036 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1037 amap["GetAccess"] = avalue;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1038 amap["SetAccess"] = avalue;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1039 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1040 else
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1041 amap[aname] = avalue;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1042 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1043 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1044
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1045 // Properties
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1046
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1047 if (pb_p->element_list ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1048 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1049 for (auto& prop_p : *pb_p->element_list ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1050 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1051 std::string prop_name = prop_p->ident ()->name ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1052
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1053 cdef_property prop = cdm.make_property (retval, prop_name);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1054
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1055 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1056 std::cerr << "property: " << prop_p->ident ()->name ()
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1057 << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1058 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1059
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1060 octave::tree_expression *expr = prop_p->expression ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1061 if (expr)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1062 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1063 octave_value pvalue = tw.evaluate (expr);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1064
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1065 #if DEBUG_TRACE
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1066 std::cerr << "property default: "
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1067 << attribute_value_to_string (*pit, pvalue)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1068 << std::endl;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1069 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1070
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1071 prop.put ("DefaultValue", pvalue);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1072 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1073
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1074 // Install property attributes. This is done before assigning
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1075 // the property accessors so we can do validation by using
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1076 // cdef_property methods.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1077
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1078 for (auto& attrnm_val : amap)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1079 prop.put (attrnm_val.first, attrnm_val.second);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1080
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1081 // Install property access methods, if any. Remove the
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1082 // accessor methods from the temporary storage map, so we can
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1083 // detect which ones are invalid and do not correspond to a
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1084 // defined property.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1085
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1086 auto git = get_methods.find (prop_name);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1087
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1088 if (git != get_methods.end ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1089 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1090 make_function_of_class (retval, git->second);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1091 prop.put ("GetMethod", git->second);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1092 get_methods.erase (git);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1093 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1094
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1095 auto sit = set_methods.find (prop_name);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1096
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1097 if (sit != set_methods.end ())
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1098 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1099 make_function_of_class (retval, sit->second);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1100 prop.put ("SetMethod", sit->second);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1101 set_methods.erase (sit);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1102 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1103
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1104 retval.install_property (prop);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1105 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1106 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1107 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1108 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1109
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1110 return retval;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1111 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1112
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1113 octave_function*
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1114 cdef_class::get_method_function (const std::string& /* nm */)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1115 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1116 octave_classdef_meta p = new octave_classdef_meta (this);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1117
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1118 return p;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1119 }

Mercurial > octave

annotate libinterp/octave-value/cdef-class.cc @ 26773:a95887edd55e