octave-nkf: libinterp/octave-value/ov-classdef.cc annotate

annotate libinterp/octave-value/ov-classdef.cc @ 15897:a413c6fe1726 classdef

Add metaclass function. * libinterp/octave-value/ov-classdef.cc (Fmetaclass): New function.

author	Michael Goffioul <michael.goffioul@gmail.com>
date	Fri, 04 Jan 2013 14:29:13 -0500
parents	57be060d7672
children	b8bff84022d6

rev	line source
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1 /*
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3 Copyright (C) 2012 Michael Goffioul
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	4
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	5 This file is part of Octave.
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	6
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	10 option) any later version.
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	11
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	15 for more details.
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	16
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	17 You should have received a copy of the GNU General Public License
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	20
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	21 */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	22
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	23 #ifdef HAVE_CONFIG_H
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	24 #include <config.h>
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	25 #endif
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	26
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	27 #include <algorithm>
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	28 #include <map>
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	29
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	30 #include "defun.h"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	31 #include "ov-builtin.h"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	32 #include "ov-classdef.h"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	33 #include "ov-fcn-handle.h"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	34 #include "ov-typeinfo.h"
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	35 #include "pt-assign.h"
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	36 #include "pt-classdef.h"
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	37 #include "pt-funcall.h"
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	38 #include "pt-misc.h"
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	39 #include "pt-stmt.h"
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	40 #include "pt-walk.h"
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	41 #include "symtab.h"
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	42 #include "toplev.h"
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	43
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	44 static std::map<std::string, cdef_class> all_classes;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	45 static std::map<std::string, cdef_package> all_packages;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	46
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	47 static void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	48 gripe_method_access (const std::string& from, const cdef_method& meth)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	49 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	50 octave_value acc = meth.get ("Access");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	51 std::string acc_s;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	52
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	53 if (acc.is_string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	54 acc_s = acc.string_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	55 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	56 acc_s = "class-restricted";
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	57
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	58 error ("%s: method `%s' has %s access and cannot be run in this context",
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	59 from.c_str (), meth.get_name ().c_str (), acc_s.c_str ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	60 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	61
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	62 static void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	63 gripe_property_access (const std::string& from, const cdef_property& prop,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	64 bool is_set = false)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	65 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	66 octave_value acc = prop.get (is_set ? "SetAccess" : "GetAccess");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	67 std::string acc_s;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	68
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	69 if (acc.is_string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	70 acc_s = acc.string_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	71 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	72 acc_s = "class-restricted";
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	73
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	74 if (is_set)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	75 error ("%s: property `%s' has %s access and cannot be set in this context",
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	76 from.c_str (), prop.get_name ().c_str (), acc_s.c_str ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	77 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	78 error ("%s: property `%s' has %s access and cannot be obtained in this context",
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	79 from.c_str (), prop.get_name ().c_str (), acc_s.c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	80 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	81
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	82 static std::string
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	83 get_base_name (const std::string& nm)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	84 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	85 std::string::size_type pos = nm.find_last_of ('.');
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	86
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	87 if (pos != std::string::npos)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	88 return nm.substr (pos + 1);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	89
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	90 return nm;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	91 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	92
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	93 static void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	94 make_function_of_class (const std::string& class_name,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	95 const octave_value& fcn)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	96 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	97 octave_function *of = fcn.function_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	98
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	99 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	100 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	101 of->stash_dispatch_class (class_name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	102
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	103 octave_user_function *uf = of->user_function_value (true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	104
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	105 if (! error_state && uf)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	106 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	107 if (get_base_name (class_name) == uf->name ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	108 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	109 uf->mark_as_class_constructor ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	110 uf->mark_as_classdef_constructor ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	111 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	112 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	113 uf->mark_as_class_method ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	114 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	115 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	116 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	117
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	118 static void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	119 make_function_of_class (const cdef_class& cls, const octave_value& fcn)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	120 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	121 make_function_of_class (cls.get_name (), fcn);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	122 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	123
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	124 static octave_value
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	125 make_fcn_handle (octave_builtin::fcn ff, const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	126 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	127 octave_value fcn (new octave_builtin (ff, nm));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	128
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	129 octave_value fcn_handle (new octave_fcn_handle (fcn, nm));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	130
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	131 return fcn_handle;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	132 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	133
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	134 inline octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	135 execute_ov (octave_value val, const octave_value_list& args, int nargout)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	136 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	137 std::list<octave_value_list> idx (1, args);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	138
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	139 std::string type ("(");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	140
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	141 return val.subsref (type, idx, nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	142 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	143
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	144 static cdef_class
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	145 lookup_class (const std::string& name, bool error_if_not_found = true)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	146 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	147 std::map<std::string, cdef_class>::iterator it = all_classes.find (name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	148
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	149 if (it == all_classes.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	150 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	151 // FIXME: implement this properly
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	152
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	153 octave_value ov_cls = symbol_table::find (name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	154
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	155 if (ov_cls.is_defined ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	156 it = all_classes.find (name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	157 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	158
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	159 if (it == all_classes.end ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	160 {
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	161 if (error_if_not_found)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	162 error ("class not found: %s", name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	163 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	164 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	165 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	166 cdef_class& cls = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	167
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	168 if (! cls.is_builtin ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	169 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	170 // FIXME: check whether a class reload is needed
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	171 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	172
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	173 if (cls.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	174 return cls;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	175 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	176 all_classes.erase (it);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	177 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	178
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	179 return cdef_class ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	180 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	181
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	182 static std::list<cdef_class>
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	183 lookup_classes (const Cell& cls_names)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	184 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	185 std::list<cdef_class> retval;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	186
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	187 for (int i = 0; i < cls_names.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	188 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	189 cdef_class c = lookup_class (cls_names(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	190
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	191 if (! error_state)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	192 retval.push_back (c);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	193 else
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	194 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	195 retval.clear ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	196 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	197 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	198 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	199
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	200 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	201 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	202
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	203 static octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	204 to_ov (const std::list<cdef_class>& class_list)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	205 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	206 Cell cls (class_list.size (), 1);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	207 int i = 0;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	208
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	209 for (std::list<cdef_class>::const_iterator it = class_list.begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	210 it != class_list.end (); ++it, ++i)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	211 cls(i) = to_ov (*it);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	212
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	213 return octave_value (cls);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	214 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	215
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	216 static bool
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	217 is_superclass (const cdef_class& clsa, const cdef_class& clsb,
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	218 bool allow_equal = true, int max_depth = -1)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	219 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	220 bool retval = false;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	221
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	222 if (allow_equal && clsa == clsb)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	223 retval = true;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	224 else if (max_depth != 0)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	225 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	226 Cell c = clsb.get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	227
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	228 for (int i = 0; ! error_state && ! retval && i < c.numel (); i++)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	229 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	230 cdef_class cls = lookup_class (c(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	231
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	232 if (! error_state)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	233 retval = is_superclass (clsa, cls, true,
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	234 max_depth < 0 ? max_depth : max_depth-1);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	235 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	236 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	237
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	238 return retval;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	239 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	240
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	241 inline bool
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	242 is_strict_superclass (const cdef_class& clsa, const cdef_class& clsb)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	243 { return is_superclass (clsa, clsb, false); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	244
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	245 inline bool
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	246 is_direct_superclass (const cdef_class& clsa, const cdef_class& clsb)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	247 { return is_superclass (clsa, clsb, false, 1); }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	248
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	249 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	250 class_get_properties (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	251 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	252 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	253
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	254 if (args.length () == 1 && args(0).type_name () == "object")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	255 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	256 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	257
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	258 retval(0) = cls.get_properties ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	259 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	260
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	261 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	262 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	263
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	264 static cdef_class
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	265 get_class_context (std::string& name, bool& in_constructor)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	266 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	267 cdef_class cls;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	268
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	269 octave_function* fcn = octave_call_stack::current ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	270
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	271 in_constructor = false;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	272
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	273 if (fcn &&
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	274 (fcn->is_class_method ()
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	275 \|\| fcn->is_classdef_constructor ()
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	276 \|\| fcn->is_anonymous_function_of_class ()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	277 \|\| (fcn->is_private_function ()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	278 && ! fcn->dispatch_class ().empty ())))
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	279 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	280 cls = lookup_class (fcn->dispatch_class ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	281 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	282 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	283 name = fcn->name ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	284 in_constructor = fcn->is_classdef_constructor ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	285 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	286 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	287
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	288 return cls;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	289 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	290
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	291 inline cdef_class
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	292 get_class_context (void)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	293 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	294 std::string dummy_string;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	295 bool dummy_bool;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	296
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	297 return get_class_context (dummy_string, dummy_bool);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	298 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	299
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	300 static bool
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	301 check_access (const cdef_class& cls, const octave_value& acc)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	302 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	303 if (acc.is_string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	304 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	305 std::string acc_s = acc.string_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	306
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	307 if (acc_s == "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	308 return true;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	309
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	310 cdef_class ctx = get_class_context ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	311
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	312 // The access is private or protected, this requires a
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	313 // valid class context.
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	314
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	315 if (! error_state && ctx.ok ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	316 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	317 if (acc_s == "private")
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	318 return (ctx == cls);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	319 else if (acc_s == "protected")
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	320 return is_superclass (cls, ctx);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	321 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	322 panic_impossible ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	323 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	324 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	325 else if (acc.is_cell ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	326 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	327 Cell acc_c = acc.cell_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	328
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	329 cdef_class ctx = get_class_context ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	330
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	331 // At this point, a class context is always required.
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	332
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	333 if (! error_state && ctx.ok ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	334 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	335 if (ctx == cls)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	336 return true;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	337
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	338 for (int i = 0; ! error_state && i < acc.numel (); i++)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	339 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	340 cdef_class acc_cls (to_cdef (acc_c(i)));
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	341
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	342 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	343 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	344 if (is_superclass (acc_cls, ctx))
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	345 return true;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	346 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	347 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	348 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	349 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	350 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	351 error ("invalid property/method access in class `%s'",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	352 cls.get_name ().c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	353
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	354 return false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	355 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	356
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	357 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	358 class_get_methods (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	359 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	360 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	361
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	362 if (args.length () == 1 && args(0).type_name () == "object")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	363 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	364 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	365
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	366 retval(0) = cls.get_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	367 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	368
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	369 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	370 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	371
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	372 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	373 class_get_superclasses (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	374 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	375 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	376
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	377 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	378 && args(0).class_name () == "meta.class")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	379 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	380 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	381
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	382 Cell classes = cls.get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	383
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	384 retval(0) = to_ov (lookup_classes (classes));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	385 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	386
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	387 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	388 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	389
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	390 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	391 class_get_inferiorclasses (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	392 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	393 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	394
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	395 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	396 && args(0).class_name () == "meta.class")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	397 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	398 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	399
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	400 Cell classes = cls.get ("InferiorClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	401
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	402 retval(0) = to_ov (lookup_classes (classes));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	403 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	404
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	405 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	406 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	407
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	408 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	409 class_fromName (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	410 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	411 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	412
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	413 if (args.length () == 1)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	414 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	415 std::string name = args(0).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	416
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	417 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	418 retval(0) = to_ov (lookup_class (name));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	419 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	420 error ("fromName: invalid class name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	421 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	422 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	423 error ("fromName: invalid number of parameters");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	424
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	425 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	426 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	427
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	428 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	429 class_fevalStatic (const octave_value_list& args, int nargout)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	430 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	431 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	432
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	433 if (args.length () > 1 && args(0).type_name () == "object")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	434 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	435 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	436
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	437 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	438 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	439 std::string meth_name = args(1).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	440
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	441 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	442 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	443 cdef_method meth = cls.find_method (meth_name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	444
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	445 if (meth.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	446 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	447 if (meth.check_access ())
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	448 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	449 if (meth.is_static ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	450 retval = meth.execute (args.splice (0, 2), nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	451 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	452 error ("fevalStatic: method `%s' is not static",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	453 meth_name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	454 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	455 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	456 gripe_method_access ("fevalStatic", meth);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	457 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	458 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	459 error ("fevalStatic: method not found: %s",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	460 meth_name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	461 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	462 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	463 error ("fevalStatic: invalid method name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	464 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	465 error ("fevalStatic: invalid object, expected a meta.class object");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	466 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	467 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	468 error ("fevalStatic: invalid arguments");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	469
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	470 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	471 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	472
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	473 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	474 class_getConstant (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	475 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	476 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	477
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	478 if (args.length () == 2 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	479 && args(0).class_name () == "meta.class")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	480 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	481 cdef_class cls = to_cdef (args(0));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	482
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	483 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	484 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	485 std::string prop_name = args(1).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	486
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	487 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	488 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	489 cdef_property prop = cls.find_property (prop_name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	490
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	491 if (prop.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	492 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	493 if (prop.check_get_access ())
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	494 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	495 if (prop.is_constant ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	496 retval(0) = prop.get_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	497 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	498 error ("getConstant: property `%s' is not constant",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	499 prop_name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	500 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	501 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	502 gripe_property_access ("getConstant", prop);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	503 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	504 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	505 error ("getConstant: property not found: %s",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	506 prop_name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	507 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	508 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	509 error ("getConstant: invalid property name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	510 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	511 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	512 error ("getConstant: invalid object, expected a meta.class object");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	513 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	514 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	515 error ("getConstant: invalid arguments");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	516
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	517 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	518 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	519
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	520 #define META_CLASS_CMP(OP, CLSA, CLSB, FUN) \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	521 static octave_value_list \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	522 class_ ## OP (const octave_value_list& args, int /* nargout */) \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	523 { \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	524 octave_value_list retval; \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	525 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	526 if (args.length () == 2 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	527 && args(0).type_name () == "object" && args(1).type_name () == "object" \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	528 && args(0).class_name () == "meta.class" && args(1).class_name () == "meta.class") \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	529 { \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	530 cdef_class clsa = to_cdef (args(0)); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	531 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	532 cdef_class clsb = to_cdef (args(1)); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	533 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	534 if (! error_state) \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	535 retval(0) = FUN (CLSA, CLSB); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	536 else \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	537 error (#OP ": invalid objects, expected meta.class objects"); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	538 } \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	539 else \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	540 error (#OP ": invalid arguments"); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	541 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	542 return retval; \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	543 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	544
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	545 META_CLASS_CMP (lt, clsb, clsa, is_strict_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	546 META_CLASS_CMP (le, clsb, clsa, is_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	547 META_CLASS_CMP (gt, clsa, clsb, is_strict_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	548 META_CLASS_CMP (ge, clsa, clsb, is_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	549 META_CLASS_CMP (eq, clsa, clsb, operator==)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	550 META_CLASS_CMP (ne, clsa, clsb, operator!=)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	551
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	552 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	553 property_get_defaultvalue (const octave_value_list& args, int /* nargout */)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	554 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	555 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	556
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	557 if (args.length () == 1 && args(0).type_name () == "object")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	558 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	559 cdef_property prop (to_cdef (args(0)));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	560
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	561 retval(0) = prop.get ("DefaultValue");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	562
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	563 if (! retval(0).is_defined ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	564 error_with_id ("Octave:class:NotDefaultDefined",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	565 "no default value for property `%s'",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	566 prop.get_name ().c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	567 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	568
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	569 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	570 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	571
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	572 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	573 handle_delete (const octave_value_list& /* args /, int / nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	574 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	575 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	576
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	577 // FIXME: implement this
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	578
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	579 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	580 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	581
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	582 static cdef_class
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	583 make_class (const std::string& name,
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	584 const std::list<cdef_class>& super_list = std::list<cdef_class> ())
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	585 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	586 cdef_class cls ("meta.class", super_list);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	587
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	588 cls.put ("ConstructOnLoad", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	589 cls.put ("ContainingPackage", Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	590 cls.put ("Description", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	591 cls.put ("DetailedDescription", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	592 cls.put ("Events", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	593 cls.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	594 cls.put ("InferiorClasses", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	595 cls.put ("Methods", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	596 cls.put ("Name", name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	597 cls.put ("Properties", Cell ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	598 cls.put ("Sealed", false);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	599
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	600 if (name == "handle")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	601 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	602 cls.put ("HandleCompatible", true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	603 cls.mark_as_handle_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	604 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	605 else if (super_list.empty ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	606 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	607 cls.put ("HandleCompatible", false);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	608 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	609 else
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	610 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	611 bool all_handle_compatible = true;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	612 bool has_handle_class = false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	613
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	614 for (std::list<cdef_class>::const_iterator it = super_list.begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	615 it != super_list.end (); ++it)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	616 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	617 all_handle_compatible = all_handle_compatible && it->get ("HandleCompatible").bool_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	618 has_handle_class = has_handle_class \|\| it->is_handle_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	619 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	620
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	621 if (has_handle_class && ! all_handle_compatible)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	622 ::error ("%s: cannot mix handle and non-HandleCompatible classes",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	623 name.c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	624 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	625 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	626 cls.put ("HandleCompatible", all_handle_compatible);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	627 if (has_handle_class)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	628 cls.mark_as_handle_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	629 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	630 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	631
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	632 if (error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	633 return cdef_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	634
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	635 all_classes[name] = cls;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	636
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	637 return cls;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	638 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	639
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	640 static cdef_class
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	641 make_class (const std::string& name, const cdef_class& super)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	642 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	643 return make_class (name, std::list<cdef_class> (1, super));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	644 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	645
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	646 static cdef_property
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	647 make_property (const cdef_class& cls, const std::string& name,
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	648 const octave_value& get_method = Matrix (),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	649 const std::string& get_access = "public",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	650 const octave_value& set_method = Matrix (),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	651 const std::string& set_access = "public")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	652 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	653 // FIXME: what about default value?
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	654
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	655 cdef_property prop ("meta.property");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	656
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	657 prop.put ("Name", name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	658 prop.put ("Description", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	659 prop.put ("DetailedDescription", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	660 prop.put ("Abstract", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	661 prop.put ("Constant", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	662 prop.put ("GetAccess", get_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	663 prop.put ("SetAccess", set_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	664 prop.put ("Dependent", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	665 prop.put ("Transient", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	666 prop.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	667 prop.put ("GetObservable", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	668 prop.put ("SetObservable", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	669 prop.put ("GetMethod", get_method);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	670 prop.put ("SetMethod", set_method);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	671 prop.put ("DefiningClass", to_ov (cls));
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	672 prop.put ("DefaultValue", octave_value ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	673 prop.put ("HasDefault", false);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	674
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	675 std::string class_name = cls.get_name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	676
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	677 if (! get_method.is_empty ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	678 make_function_of_class (class_name, get_method);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	679 if (! set_method.is_empty ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	680 make_function_of_class (class_name, set_method);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	681
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	682 return prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	683 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	684
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	685 inline cdef_property
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	686 make_attribute (const cdef_class& cls, const std::string& name)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	687 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	688 return make_property (cls, name, Matrix (), "public", Matrix (), "private");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	689 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	690
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	691 static cdef_method
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	692 make_method (const cdef_class& cls, const std::string& name,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	693 const octave_value& fcn,const std::string& m_access = "public",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	694 bool is_static = false)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	695 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	696 cdef_method meth ("meta.method");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	697
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	698 meth.put ("Abstract", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	699 meth.put ("Access", m_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	700 meth.put ("DefiningClass", to_ov (cls));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	701 meth.put ("Description", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	702 meth.put ("DetailedDescription", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	703 meth.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	704 meth.put ("Name", name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	705 meth.put ("Sealed", true);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	706 meth.put ("Static", is_static);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	707
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	708 make_function_of_class (cls, fcn);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	709
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	710 meth.set_function (fcn);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	711
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	712 return meth;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	713 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	714
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	715 inline cdef_method
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	716 make_method (const cdef_class& cls, const std::string& name,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	717 octave_builtin::fcn ff, const std::string& m_access = "public",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	718 bool is_static = false)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	719 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	720 octave_value fcn (new octave_builtin (ff, name));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	721
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	722 return make_method (cls, name, fcn, m_access, is_static);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	723 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	724
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	725 static cdef_package
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	726 make_package (const std::string& nm,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	727 const std::string& parent = std::string ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	728 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	729 cdef_package pack ("meta.package");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	730
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	731 all_packages[nm] = pack;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	732 pack.put ("Name", nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	733 pack.put ("ContainingPackage", to_ov (all_packages[parent]));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	734
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	735 return pack;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	736 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	737
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	738 //----------------------------------------------------------------------------
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	739
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	740 DEFINE_OCTAVE_ALLOCATOR (octave_classdef);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	741
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	742 int octave_classdef::t_id (-1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	743
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	744 const std::string octave_classdef::t_name ("object");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	745
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	746 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	747 octave_classdef::register_type (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	748 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	749 t_id = octave_value_typeinfo::register_type
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	750 (octave_classdef::t_name, "<unknown>", octave_value (new octave_classdef ()));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	751 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	752
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	753 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	754 octave_classdef::subsref (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	755 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	756 int nargout)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	757 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	758 size_t skip = 0;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	759 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	760
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	761 // FIXME: should check "subsref" method first
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	762
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	763 retval = object.subsref (type, idx, nargout, skip, cdef_class ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	764
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	765 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	766 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	767 if (type.length () > skip && idx.size () > skip)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	768 retval = retval(0).next_subsref (nargout, type, idx, skip);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	769 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	770
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	771 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	772 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	773
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	774 octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	775 octave_classdef::subsasgn (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	776 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	777 const octave_value& rhs)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	778 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	779 return object.subsasgn (type, idx, rhs);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	780 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	781
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	782 //----------------------------------------------------------------------------
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	783
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	784 class octave_classdef_proxy : public octave_function
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	785 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	786 public:
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	787 octave_classdef_proxy (const cdef_class& _klass)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	788 : klass (_klass) { }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	789
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	790 ~octave_classdef_proxy (void) { }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	791
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	792 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	793 subsref (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	794 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	795 int nargout)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	796 { return klass.subsref_meta (type, idx, nargout); }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	797
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	798 octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	799 subsref (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	800 const std::list<octave_value_list>& idx)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	801 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	802 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	803
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	804 retval = subsref (type, idx, 1);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	805
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	806 return (retval.length () > 0 ? retval(0) : octave_value ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	807 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	808
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	809 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	810 do_multi_index_op (int /* nargout /, const octave_value_list& / idx */)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	811 { return to_ov (klass); }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	812
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	813 private:
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	814 cdef_class klass;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	815 };
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	816
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	817 //----------------------------------------------------------------------------
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	818
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	819 class octave_classdef_superclass_ref : public octave_function
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	820 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	821 public:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	822 octave_classdef_superclass_ref (const octave_value_list& a)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	823 : octave_function (), args (a) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	824
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	825 ~octave_classdef_superclass_ref (void) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	826
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	827 octave_value_list
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	828 subsref (const std::string& type,
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	829 const std::list<octave_value_list>& idx,
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	830 int nargout)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	831 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	832 size_t skip = 0;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	833 octave_value_list retval;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	834
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	835 switch (type[0])
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	836 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	837 case '(':
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	838 skip = 1;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	839 retval = do_multi_index_op (type.length () > 1 ? 1 : nargout,
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	840 idx.front ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	841 break;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	842 default:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	843 retval = do_multi_index_op (1, octave_value_list ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	844 break;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	845 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	846
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	847 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	848 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	849 if (type.length () > skip && idx.size () > skip
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	850 && retval.length () > 0)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	851 retval = retval(0).next_subsref (nargout, type, idx, skip);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	852 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	853
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	854 return retval;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	855 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	856
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	857 octave_value
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	858 subsref (const std::string& type,
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	859 const std::list<octave_value_list>& idx)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	860 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	861 octave_value_list retval;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	862
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	863 retval = subsref (type, idx, 1);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	864
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	865 return (retval.length () > 0 ? retval(0) : octave_value ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	866 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	867
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	868 octave_value_list
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	869 do_multi_index_op (int nargout, const octave_value_list& idx)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	870 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	871 octave_value_list retval;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	872
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	873 std::string meth_name;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	874 bool in_constructor;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	875 cdef_class ctx;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	876
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	877 ctx = get_class_context (meth_name, in_constructor);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	878
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	879 if (! error_state && ctx.ok ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	880 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	881 std::string mname = args(0).string_value ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	882 std::string pname = args(1).string_value ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	883 std::string cname = args(2).string_value ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	884
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	885 std::string cls_name = (pname.empty () ?
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	886 cname : pname + "." + cname);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	887 cdef_class cls = lookup_class (cls_name);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	888
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	889 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	890 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	891 if (in_constructor)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	892 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	893 if (is_direct_superclass (cls, ctx))
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	894 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	895 if (is_constructed_object (mname))
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	896 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	897 octave_value& sym = symbol_table::varref (mname);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	898
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	899 cls.run_constructor (to_cdef_ref (sym), idx);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	900
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	901 retval(0) = sym;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	902 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	903 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	904 ::error ("cannot call superclass constructor with "
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	905 "variable `%s'", mname.c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	906 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	907 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	908 ::error ("`%s' is not a direct superclass of `%s'",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	909 cls_name.c_str (), ctx.get_name ().c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	910 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	911 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	912 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	913 if (mname == meth_name)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	914 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	915 if (is_strict_superclass (cls, ctx))
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	916 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	917 // I see 2 possible implementations here:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	918 // 1) use cdef_object::subsref with a different class
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	919 // context; this avoids duplicating codem but
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	920 // assumes the object is always the first argument
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	921 // 2) lookup the method manually and call
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	922 // cdef_method::execute; this duplicates part of
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	923 // logic in cdef_object::subsref, but avoid the
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	924 // assumption of 1)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	925 // Not being sure about the assumption of 1), I
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	926 // go with option 2) for the time being.
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	927
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	928 cdef_method meth = cls.find_method (meth_name, false);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	929
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	930 if (meth.ok ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	931 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	932 if (meth.check_access ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	933 retval = meth.execute (idx, nargout);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	934 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	935 gripe_method_access (meth_name, meth);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	936 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	937 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	938 ::error ("no method `%s' found in superclass `%s'",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	939 meth_name.c_str (), cls_name.c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	940 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	941 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	942 ::error ("`%s' is not a superclass of `%s'",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	943 cls_name.c_str (), ctx.get_name ().c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	944 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	945 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	946 ::error ("method name mismatch (`%s' != `%s')",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	947 mname.c_str (), meth_name.c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	948 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	949 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	950 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	951 else if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	952 ::error ("superclass calls can only occur in methods or constructors");
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	953
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	954 return retval;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	955 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	956
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	957 private:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	958 bool is_constructed_object (const std::string nm)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	959 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	960 octave_function *of = octave_call_stack::current ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	961
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	962 if (of->is_classdef_constructor ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	963 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	964 octave_user_function *uf = of->user_function_value (true);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	965
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	966 if (uf)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	967 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	968 tree_parameter_list *ret_list = uf->return_list ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	969
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	970 if (ret_list && ret_list->length () == 1)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	971 return (ret_list->front ()->name () == nm);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	972 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	973 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	974
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	975 return false;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	976 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	977
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	978 private:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	979 octave_value_list args;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	980 };
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	981
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	982 //----------------------------------------------------------------------------
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	983
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	984 cdef_class
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	985 cdef_object_rep::get_class (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	986 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	987 cdef_class cls = lookup_class (class_name ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	988
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	989 return cls;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	990 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	991
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	992 string_vector
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	993 cdef_object_rep::map_keys (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	994 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	995 cdef_class cls = get_class ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	996
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	997 if (cls.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	998 return cls.get_names ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	999
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1000 return string_vector ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1001 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1002
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1003 octave_value_list
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1004 cdef_object_rep::subsref (const std::string& type,
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1005 const std::list<octave_value_list>& idx,
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1006 int nargout, size_t& skip,
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1007 const cdef_class& context)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1008 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1009 skip = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1010
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1011 cdef_class cls = (context.ok () ? context : get_class ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1012
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1013 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1014
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1015 if (! cls.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1016 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1017
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1018 switch (type[0])
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1019 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1020 case '.':
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1021 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1022 std::string name = (idx.front ())(0).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1023
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1024 cdef_method meth = cls.find_method (name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1025
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1026 if (meth.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1027 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1028 if (meth.check_access ())
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1029 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1030 int _nargout = (type.length () > 2 ? 1 : nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1031
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1032 octave_value_list args;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1033
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1034 skip = 1;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1035
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1036 if (type.length () > 1 && type[1] == '(')
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1037 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1038 std::list<octave_value_list>::const_iterator it = idx.begin ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1039
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1040 args = *++it;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1041
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1042 skip++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1043 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1044
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1045 if (meth.is_static ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1046 retval = meth.execute (args, _nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1047 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1048 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1049 refcount++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1050 retval = meth.execute (cdef_object (this), args, _nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1051 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1052 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1053 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1054 gripe_method_access ("subsref", meth);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1055 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1056
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1057 if (skip == 0 && ! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1058 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1059 cdef_property prop = cls.find_property (name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1060
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1061 if (prop.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1062 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1063 if (prop.check_get_access ())
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1064 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1065 refcount++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1066 retval(0) = prop.get_value (cdef_object (this));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1067
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1068 skip = 1;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1069 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1070 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1071 gripe_property_access ("subsref", prop);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1072 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1073 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1074 error ("subsref: unknown method or property: %s", name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1075 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1076 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1077 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1078 default:
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1079 error ("object cannot be indexed with `%c'", type[0]);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1080 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1081 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1082
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1083 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1084 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1085
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1086 octave_value
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1087 cdef_object_rep::subsasgn (const std::string& type,
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1088 const std::list<octave_value_list>& idx,
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1089 const octave_value& rhs)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1090 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1091 octave_value retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1092
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1093 cdef_class cls = get_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1094
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1095 switch (type[0])
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1096 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1097 case '.':
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1098 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1099 std::string name = (idx.front ())(0).string_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1100
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1101 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1102 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1103 cdef_property prop = cls.find_property (name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1104
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1105 if (prop.ok ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1106 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1107 if (type.length () == 1)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1108 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1109 if (prop.check_set_access ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1110 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1111 refcount++;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1112
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1113 cdef_object obj (this);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1114
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1115 prop.set_value (obj, rhs);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1116
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1117 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1118 retval = to_ov (obj);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1119 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1120 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1121 gripe_property_access ("subsasgn", prop, true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1122 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1123 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1124 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1125 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1126
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1127 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1128 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1129 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1130 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1131 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1132 error ("subsasgn: unknown property: %s", name.c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1133 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1134 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1135 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1136
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1137 default:
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1138 panic_impossible ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1139 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1140 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1141
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1142 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1143 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1144
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1145 void
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1146 cdef_object_rep::mark_for_construction (const cdef_class& cls)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1147 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1148 std::string cls_name = cls.get_name ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1149
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1150 Cell supcls = cls.get ("SuperClasses").cell_value ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1151
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1152 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1153 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1154 std::list<std::string> supcls_names;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1155
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1156 for (int i = 0; ! error_state && i < supcls.numel (); i++)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1157 supcls_names.push_back (supcls(i).string_value ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1158
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1159 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1160 ctor_list[cls_name] = supcls_names;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1161 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1162 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1163
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1164 handle_cdef_object::~handle_cdef_object (void)
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1165 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1166 gnulib::printf ("deleting %s object (handle)\n", cname.c_str ());
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1167 }
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1168
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1169 value_cdef_object::~value_cdef_object (void)
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1170 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1171 gnulib::printf ("deleting %s object (value)\n", cname.c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1172 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1173
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1174 cdef_class::cdef_class_rep::cdef_class_rep (const std::string& nm,
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1175 const std::list<cdef_class>& superclasses)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1176 : handle_cdef_object (nm), handle_class (false)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1177 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1178 for (std::list<cdef_class>::const_iterator it = superclasses.begin ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1179 it != superclasses.end (); ++it)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1180 implicit_ctor_list.push_back (it->get_name ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1181
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1182 put ("SuperClasses", Cell (implicit_ctor_list));
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1183 }
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1184
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1185 cdef_method
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1186 cdef_class::cdef_class_rep::find_method (const std::string& nm, bool local)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1187 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1188 method_iterator it = method_map.find (nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1189
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1190 if (it == method_map.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1191 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1192 // FIXME: look into class directory
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1193 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1194 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1195 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1196 cdef_method& meth = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1197
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1198 // FIXME: check if method reload needed
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1199
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1200 if (meth.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1201 return meth;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1202 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1203
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1204 if (! local)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1205 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1206 // Look into superclasses
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1207
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1208 Cell super_classes = get ("SuperClasses").cell_value ();
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1209
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1210 for (int i = 0; i < super_classes.numel (); i++)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1211 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1212 cdef_class cls = lookup_class (super_classes(i).string_value ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1213
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1214 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1215 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1216 cdef_method meth = cls.find_method (nm);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1217
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1218 if (meth.ok ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1219 return meth;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1220 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1221 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1222 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1223
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1224 return cdef_method ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1225 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1226
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1227 class ctor_analyzer : public tree_walker
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1228 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1229 public:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1230 ctor_analyzer (const std::string& ctor, const std::string& obj,
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1231 const std::list<std::string>& l)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1232 : tree_walker (), who (ctor), obj_name (obj), available_ctor_list (l) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1233
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1234 void visit_statement_list (tree_statement_list& t)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1235 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1236 for (tree_statement_list::const_iterator it = t.begin ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1237 ! error_state && it != t.end (); ++it)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1238 (it)->accept (this);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1239 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1240
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1241 void visit_statement (tree_statement& t)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1242 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1243 if (t.is_expression ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1244 t.expression ()->accept (*this);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1245 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1246
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1247 void visit_simple_assignment (tree_simple_assignment& t)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1248 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1249 t.right_hand_side ()->accept (*this);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1250 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1251
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1252 void visit_multi_assignment (tree_multi_assignment& t)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1253 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1254 t.right_hand_side ()->accept (*this);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1255 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1256
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1257 void visit_index_expression (tree_index_expression& t)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1258 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1259 t.expression ()->accept (*this);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1260 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1261
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1262 void visit_funcall (tree_funcall& t)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1263 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1264 octave_value fcn = t.function ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1265
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1266 if (fcn.is_function ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1267 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1268 octave_function *of = fcn.function_value (true);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1269
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1270 if (of)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1271 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1272 if (of->name () == "__superclass_reference__")
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1273 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1274 octave_value_list args = t.arguments ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1275
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1276 if (args(0).string_value () == obj_name)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1277 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1278 std::string package_name = args(1).string_value ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1279 std::string class_name = args(2).string_value ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1280
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1281 std::string ctor_name = (package_name.empty ()
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1282 ? class_name
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1283 : package_name + "." + class_name);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1284
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1285 if (std::find (available_ctor_list.begin (),
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1286 available_ctor_list.end (), ctor_name)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1287 == available_ctor_list.end ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1288 ::error ("`%s' is not a direct superclass of `%s'",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1289 ctor_name.c_str (), who.c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1290 else if (std::find (ctor_list.begin (), ctor_list.end (),
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1291 ctor_name) != ctor_list.end ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1292 ::error ("calling constructor `%s' more than once",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1293 ctor_name.c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1294
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1295 ctor_list.push_back (ctor_name);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1296 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1297 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1298 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1299 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1300 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1301
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1302 std::list<std::string> get_constructor_list (void) const
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1303 { return ctor_list; }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1304
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1305 // NO-OP
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1306 void visit_anon_fcn_handle (tree_anon_fcn_handle&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1307 void visit_argument_list (tree_argument_list&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1308 void visit_binary_expression (tree_binary_expression&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1309 void visit_break_command (tree_break_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1310 void visit_colon_expression (tree_colon_expression&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1311 void visit_continue_command (tree_continue_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1312 void visit_global_command (tree_global_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1313 void visit_persistent_command (tree_persistent_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1314 void visit_decl_elt (tree_decl_elt&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1315 void visit_decl_init_list (tree_decl_init_list&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1316 void visit_simple_for_command (tree_simple_for_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1317 void visit_complex_for_command (tree_complex_for_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1318 void visit_octave_user_script (octave_user_script&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1319 void visit_octave_user_function (octave_user_function&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1320 void visit_function_def (tree_function_def&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1321 void visit_identifier (tree_identifier&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1322 void visit_if_clause (tree_if_clause&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1323 void visit_if_command (tree_if_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1324 void visit_if_command_list (tree_if_command_list&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1325 void visit_switch_case (tree_switch_case&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1326 void visit_switch_case_list (tree_switch_case_list&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1327 void visit_switch_command (tree_switch_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1328 void visit_matrix (tree_matrix&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1329 void visit_cell (tree_cell&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1330 void visit_no_op_command (tree_no_op_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1331 void visit_constant (tree_constant&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1332 void visit_fcn_handle (tree_fcn_handle&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1333 void visit_parameter_list (tree_parameter_list&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1334 void visit_postfix_expression (tree_postfix_expression&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1335 void visit_prefix_expression (tree_prefix_expression&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1336 void visit_return_command (tree_return_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1337 void visit_return_list (tree_return_list&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1338 void visit_try_catch_command (tree_try_catch_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1339 void visit_unwind_protect_command (tree_unwind_protect_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1340 void visit_while_command (tree_while_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1341 void visit_do_until_command (tree_do_until_command&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1342
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1343 private:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1344 /* The name of the constructor being analyzed */
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1345 std::string who;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1346
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1347 /* The name of the first output argument of the constructor */
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1348 std::string obj_name;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1349
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1350 /* The list of superclass constructors that are explicitly called */
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1351 std::list<std::string> ctor_list;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1352
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1353 /* The list of possible superclass constructors */
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1354 std::list<std::string> available_ctor_list;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1355 };
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1356
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1357 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1358 cdef_class::cdef_class_rep::install_method (const cdef_method& meth)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1359 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1360 method_map[meth.get_name ()] = meth;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1361
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1362 if (meth.is_constructor ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1363 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1364 // Analyze the constructor code to determine what superclass
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1365 // constructors are called explicitly.
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1366
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1367 octave_function *of = meth.get_function ().function_value (true);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1368
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1369 if (of)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1370 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1371 octave_user_function *uf = of->user_function_value (true);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1372
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1373 if (uf)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1374 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1375 tree_parameter_list *ret_list = uf->return_list ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1376 tree_statement_list *body = uf->body ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1377
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1378 if (ret_list && ret_list->size () == 1)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1379 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1380 std::string obj_name = ret_list->front ()->name ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1381 ctor_analyzer a (meth.get_name (), obj_name,
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1382 implicit_ctor_list);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1383
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1384 body->accept (a);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1385 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1386 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1387 std::list<std::string> explicit_ctor_list
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1388 = a.get_constructor_list ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1389
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1390 for (std::list<std::string>::const_iterator it = explicit_ctor_list.begin ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1391 ! error_state && it != explicit_ctor_list.end (); ++it)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1392 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1393 gnulib::printf ("explicit superclass constructor: %s\n",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1394 it->c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1395 implicit_ctor_list.remove (*it);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1396 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1397 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1398 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1399 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1400 ::error ("%s: invalid constructor output arguments",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1401 meth.get_name ().c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1402 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1403 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1404 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1405 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1406
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1407 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1408 cdef_class::cdef_class_rep::load_all_methods (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1409 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1410 // FIXME: re-scan class directory
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1411 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1412
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1413 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1414 cdef_class::cdef_class_rep::get_methods (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1415 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1416 std::map<std::string,cdef_method> meths;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1417
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1418 find_methods (meths, false);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1419
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1420 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1421 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1422 Cell c (meths.size (), 1);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1423
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1424 int idx = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1425
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1426 for (std::map<std::string,cdef_method>::const_iterator it = meths.begin ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1427 it != meths.end (); ++it, ++idx)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1428 c (idx, 0) = to_ov (it->second);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1429
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1430 return c;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1431 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1432
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1433 return Cell ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1434 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1435
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1436 void
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1437 cdef_class::cdef_class_rep::find_methods (std::map<std::string, cdef_method>& meths,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1438 bool only_inherited)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1439 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1440 load_all_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1441
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1442 method_const_iterator it;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1443
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1444 std::string cls_name = get_base_name (get_name ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1445
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1446 for (it = method_map.begin (); it != method_map.end (); ++it)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1447 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1448 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1449
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1450 if (nm != cls_name)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1451 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1452 if (meths.find (nm) == meths.end ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1453 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1454 if (only_inherited)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1455 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1456 octave_value acc = it->second.get ("Access");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1457
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1458 if (! acc.is_string ()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1459 \|\| acc.string_value () == "private")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1460 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1461 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1462
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1463 meths[nm] = it->second;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1464 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1465 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1466 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1467
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1468 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1469
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1470 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1471
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1472 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1473 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1474 cdef_class cls = lookup_class (super_classes(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1475
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1476 if (! error_state)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1477 cls.get_rep ()->find_methods (meths, true);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1478 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1479 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1480 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1481 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1482
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1483 cdef_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1484 cdef_class::cdef_class_rep::find_property (const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1485 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1486 property_iterator it = property_map.find (nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1487
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1488 if (it != property_map.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1489 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1490 cdef_property& prop = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1491
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1492 if (prop.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1493 return prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1494 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1495
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1496 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1497
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1498 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1499
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1500 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1501 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1502 cdef_class cls = lookup_class (super_classes(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1503
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1504 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1505 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1506 cdef_property prop = cls.find_property (nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1507
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1508 if (prop.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1509 return prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1510 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1511 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1512
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1513 return cdef_property ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1514 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1515
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1516 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1517 cdef_class::cdef_class_rep::install_property (const cdef_property& prop)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1518 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1519 property_map[prop.get_name ()] = prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1520 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1521
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1522 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1523 cdef_class::cdef_class_rep::get_properties (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1524 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1525 std::map<std::string,cdef_property> props;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1526
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1527 find_properties (props, false);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1528
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1529 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1530 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1531 Cell c (props.size (), 1);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1532
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1533 int idx = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1534
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1535 for (std::map<std::string,cdef_property>::const_iterator it = props.begin ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1536 it != props.end (); ++it, ++idx)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1537 c (idx, 0) = to_ov (it->second);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1538
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1539 return c;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1540 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1541
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1542 return Cell ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1543 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1544
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1545 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1546 cdef_class::cdef_class_rep::find_properties (std::map<std::string,cdef_property>& props,
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1547 bool only_inherited)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1548 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1549 property_const_iterator it;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1550
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1551 for (it = property_map.begin (); ! error_state && it != property_map.end ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1552 ++it)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1553 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1554 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1555
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1556 if (props.find (nm) == props.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1557 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1558 if (only_inherited)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1559 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1560 octave_value acc = it->second.get ("GetAccess");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1561
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1562 if (! acc.is_string ()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1563 \|\| acc.string_value () == "private")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1564 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1565 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1566
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1567 props[nm] = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1568 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1569 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1570
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1571 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1572
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1573 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1574
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1575 for (int i = 0; ! error_state && i < super_classes.numel (); i++)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1576 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1577 cdef_class cls = lookup_class (super_classes(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1578
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1579 if (! error_state)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1580 cls.get_rep ()->find_properties (props, true);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1581 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1582 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1583 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1584 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1585
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1586 void
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1587 cdef_class::cdef_class_rep::find_names (std::set<std::string>& names,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1588 bool all)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1589 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1590 load_all_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1591
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1592 std::string cls_name = get_base_name (get_name ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1593
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1594 for (method_const_iterator it = method_map.begin ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1595 ! error_state && it != method_map.end(); ++it)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1596 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1597 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1598
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1599 if (nm != cls_name)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1600 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1601 if (! all)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1602 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1603 octave_value acc = it->second.get ("Access");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1604
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1605 if (! acc.is_string()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1606 \|\| acc.string_value () != "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1607 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1608 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1609
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1610 names.insert (nm);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1611 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1612 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1613
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1614 for (property_const_iterator it = property_map.begin ();
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1615 ! error_state && it != property_map.end (); ++it)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1616 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1617 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1618
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1619 if (! all)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1620 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1621 octave_value acc = it->second.get ("GetAccess");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1622
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1623 if (! acc.is_string()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1624 \|\| acc.string_value () != "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1625 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1626 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1627
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1628 names.insert (nm);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1629 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1630
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1631 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1632
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1633 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1634
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1635 for (int i = 0; ! error_state && i < super_classes.numel (); i++)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1636 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1637 cdef_class cls = lookup_class (super_classes(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1638
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1639 if (! error_state)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1640 cls.get_rep ()->find_names (names, all);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1641 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1642 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1643 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1644 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1645
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1646 string_vector
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1647 cdef_class::cdef_class_rep::get_names (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1648 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1649 std::set<std::string> names;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1650
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1651 find_names (names, false);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1652
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1653 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1654 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1655 string_vector v (names.size ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1656
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1657 int idx = 0;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1658 for (std::set<std::string>::const_iterator it = names.begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1659 it != names.end (); ++it, ++idx)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1660 v[idx] = *it;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1661
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1662 return v.sort (true);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1663 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1664
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1665 return string_vector ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1666 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1667
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1668 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1669 cdef_class::cdef_class_rep::delete_object (cdef_object obj)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1670 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1671 method_iterator it = method_map.find ("delete");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1672
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1673 if (it != method_map.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1674 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1675 std::string cls_name = obj.class_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1676
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1677 obj.set_class_name (get ("Name").string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1678
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1679 it->second.execute (obj, octave_value_list (), 0);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1680
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1681 obj.set_class_name (cls_name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1682 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1683
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1684 // FIXME: should we destroy corresponding properties here?
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1685
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1686 // Call "delete" in super classes
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1687
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1688 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1689
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1690 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1691 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1692 cdef_class cls = lookup_class (super_classes(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1693
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1694 if (!error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1695 cls.delete_object (obj);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1696 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1697 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1698
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1699 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1700 cdef_class::cdef_class_rep::subsref_meta (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1701 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1702 int nargout)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1703 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1704 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1705
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1706 switch (type[0])
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1707 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1708 case '(':
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1709 // Constructor call
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1710 gnulib::printf ("constructor\n");
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1711 retval(0) = construct (idx.front ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1712 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1713 case '.':
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1714 // Static method, constant (or property?)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1715 gnulib::printf ("static method\n");
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1716 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1717 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1718
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1719 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1720 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1721 if (type.length () > 1 && idx.size () > 1 && ! retval.empty ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1722 retval = retval(0).next_subsref (nargout, type, idx);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1723 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1724
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1725 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1726 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1727
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1728 void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1729 cdef_class::cdef_class_rep::initialize_object (cdef_object& obj)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1730 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1731 // Populate the object with default property values
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1732
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1733 std::list<cdef_class> super_classes = lookup_classes (get ("SuperClasses").cell_value ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1734
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1735 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1736 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1737 for (std::list<cdef_class>::iterator it = super_classes.begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1738 ! error_state && it != super_classes.end (); ++it)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1739 it->initialize_object (obj);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1740
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1741 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1742 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1743 for (property_const_iterator it = property_map.begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1744 ! error_state && it != property_map.end (); ++it)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1745 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1746 if (! it->second.get ("Dependent").bool_value ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1747 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1748 octave_value pvalue = it->second.get ("DefaultValue");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1749
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1750 if (pvalue.is_defined ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1751 obj.put (it->first, pvalue);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1752 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1753 obj.put (it->first, octave_value (Matrix ()));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1754 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1755 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1756
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1757 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1758 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1759 refcount++;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1760 obj.mark_for_construction (cdef_class (this));
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1761 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1762 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1763 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1764 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1765
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1766 void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1767 cdef_class::cdef_class_rep::run_constructor (cdef_object& obj,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1768 const octave_value_list& args)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1769 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1770 octave_value_list empty_args;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1771
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1772 for (std::list<std::string>::const_iterator it = implicit_ctor_list.begin ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1773 ! error_state && it != implicit_ctor_list.end (); ++it)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1774 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1775 cdef_class supcls = lookup_class (*it);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1776
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1777 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1778 supcls.run_constructor (obj, empty_args);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1779 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1780
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1781 if (error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1782 return;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1783
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1784 std::string cls_name = get_name ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1785 std::string ctor_name = get_base_name (cls_name);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1786
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1787 cdef_method ctor = find_method (ctor_name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1788
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1789 if (ctor.ok ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1790 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1791 octave_value_list ctor_args (args);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1792 octave_value_list ctor_retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1793
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1794 ctor_args.prepend (to_ov (obj));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1795 ctor_retval = ctor.execute (ctor_args, 1);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1796
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1797 if (! error_state)
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1798 {
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1799 if (ctor_retval.length () == 1)
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1800 obj = to_cdef (ctor_retval(0));
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1801 else
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1802 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1803 ::error ("%s: invalid number of output arguments for classdef constructor",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1804 ctor_name.c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1805 return;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1806 }
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1807 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1808 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1809
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1810 obj.mark_as_constructed (cls_name);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1811 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1812
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1813 octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1814 cdef_class::cdef_class_rep::construct (const octave_value_list& args)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1815 {
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1816 cdef_object_rep *r;
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1817
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1818 if (is_handle_class ())
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1819 r = new handle_cdef_object (get_name ());
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1820 else
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1821 r = new value_cdef_object (get_name ());
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1822
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1823 cdef_object obj (r);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1824
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1825 initialize_object (obj);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1826
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1827 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1828 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1829 run_constructor (obj, args);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1830
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1831 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1832 return to_ov (obj);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1833 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1834
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1835 return octave_value();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1836 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1837
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1838 static octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1839 compute_attribute_value (tree_classdef_attribute* t)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1840 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1841 if (t->expression ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1842 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1843 if (t->expression ()->is_identifier ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1844 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1845 std::string s = t->expression ()->name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1846
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1847 if (s == "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1848 return std::string ("public");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1849 else if (s == "protected")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1850 return std::string ("protected");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1851 else if (s == "private")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1852 return std::string ("private");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1853 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1854
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1855 return t->expression ()->rvalue1 ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1856 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1857 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1858 return octave_value (true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1859 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1860
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1861 template<class T>
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1862 static std::string
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1863 attribute_value_to_string (T* t, octave_value v)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1864 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1865 if (v.is_string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1866 return v.string_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1867 else if (t->expression ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1868 return t->expression ()->original_text ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1869 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1870 return std::string ("true");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1871 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1872
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1873 cdef_class
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1874 cdef_class::make_meta_class (tree_classdef* t)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1875 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1876 cdef_class retval;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1877 std::string class_name;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1878
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1879 // Class creation
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1880
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1881 class_name = t->ident ()->name ();
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1882 gnulib::printf ("class: %s\n", class_name.c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1883
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1884 std::list<cdef_class> slist;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1885
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1886 if (t->superclass_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1887 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1888 for (tree_classdef_superclass_list::iterator it = t->superclass_list ()->begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1889 ! error_state && it != t->superclass_list ()->end (); ++it)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1890 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1891 std::string sclass_name =
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1892 ((it)->package () ? (it)->package ()->name () + "." : std::string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1893 + (*it)->ident ()->name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1894
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1895 gnulib::printf ("superclass: %s\n", sclass_name.c_str ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1896
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1897 cdef_class sclass = lookup_class (sclass_name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1898
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1899 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1900 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1901 if (! sclass.get ("Sealed").bool_value ())
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1902 slist.push_back (sclass);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1903 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1904 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1905 ::error ("`%s' cannot inherit from `%s', because it is sealed",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1906 class_name.c_str (), sclass_name.c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1907 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1908 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1909 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1910 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1911 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1912
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1913 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1914 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1915
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1916 retval = ::make_class (class_name, slist);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1917
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1918 if (error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1919 return cdef_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1920
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1921 // Class attributes
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1922
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1923 if (t->attribute_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1924 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1925 for (tree_classdef_attribute_list::iterator it = t->attribute_list ()->begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1926 it != t->attribute_list ()->end (); ++it)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1927 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1928 std::string aname = (*it)->ident ()->name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1929 octave_value avalue = compute_attribute_value (*it);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1930
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1931 gnulib::printf ("class attribute: %s = %s\n", aname.c_str (),
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1932 attribute_value_to_string (*it, avalue).c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1933 retval.put (aname, avalue);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1934 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1935 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1936
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1937 tree_classdef_body* b = t->body ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1938
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1939 if (b)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1940 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1941 // Method blocks
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1942
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1943 std::list<tree_classdef_methods_block *> mb_list = b->methods_list ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1944
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1945 for (tree_classdef_body::methods_list_iterator it = mb_list.begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1946 it != mb_list.end (); ++it)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1947 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1948 std::map<std::string, octave_value> amap;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1949 gnulib::printf ("method block\n");
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1950
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1951 // Method attributes
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1952
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1953 if ((*it)->attribute_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1954 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1955 for (tree_classdef_attribute_list::iterator ait = (*it)->attribute_list ()->begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1956 ait != (*it)->attribute_list ()->end (); ++ait)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1957 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1958 std::string aname = (*ait)->ident ()->name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1959 octave_value avalue = compute_attribute_value (*ait);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1960
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1961 gnulib::printf ("method attribute: %s = %s\n", aname.c_str (),
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1962 attribute_value_to_string (*ait, avalue).c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1963 amap[aname] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1964 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1965 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1966
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1967 // Methods
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1968
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1969 if ((*it)->element_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1970 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1971 for (tree_classdef_methods_list::iterator mit = (*it)->element_list ()->begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1972 mit != (*it)->element_list ()->end (); ++mit)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1973 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1974 std::string mname = mit->function_value ()->name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1975 cdef_method meth = make_method (retval, mname, *mit);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1976
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1977 gnulib::printf ("%s: %s\n", (mname == class_name ? "constructor" : "method"),
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1978 mname.c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1979 for (std::map<std::string, octave_value>::iterator ait = amap.begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1980 ait != amap.end (); ++ait)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1981 meth.put (ait->first, ait->second);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1982
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1983 retval.install_method (meth);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1984 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1985 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1986 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1987
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1988 // Property blocks
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1989
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1990 // FIXME: default property expression should be able to call static
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1991 // methods of the class being constructed. A restricted CLASSNAME
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1992 // symbol should be added to the scope before evaluating default
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1993 // value expressions.
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1994
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1995 std::list<tree_classdef_properties_block *> pb_list = b->properties_list ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1996
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1997 for (tree_classdef_body::properties_list_iterator it = pb_list.begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1998 it != pb_list.end (); ++it)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1999 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2000 std::map<std::string, octave_value> amap;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2001 gnulib::printf ("property block\n");
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2002
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2003 // Property attributes
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2004
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2005 if ((*it)->attribute_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2006 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2007 for (tree_classdef_attribute_list::iterator ait = (*it)->attribute_list ()->begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2008 ait != (*it)->attribute_list ()->end (); ++ait)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2009 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2010 std::string aname = (*ait)->ident ()->name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2011 octave_value avalue = compute_attribute_value (*ait);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2012
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2013 gnulib::printf ("property attribute: %s = %s\n", aname.c_str (),
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2014 attribute_value_to_string (*ait, avalue).c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2015 if (aname == "Access")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2016 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2017 amap["GetAccess"] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2018 amap["SetAccess"] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2019 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2020 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2021 amap[aname] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2022 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2023 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2024
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2025 // Properties
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2026
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2027 if ((*it)->element_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2028 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2029 for (tree_classdef_property_list::iterator pit = (*it)->element_list ()->begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2030 pit != (*it)->element_list ()->end (); ++pit)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2031 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2032 cdef_property prop = ::make_property (retval, (*pit)->ident ()->name ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2033
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2034 gnulib::printf ("property: %s\n", (*pit)->ident ()->name ().c_str ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2035 if ((*pit)->expression ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2036 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2037 octave_value pvalue = (*pit)->expression ()->rvalue1 ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2038
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2039 gnulib::printf ("property default: %s\n",
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2040 attribute_value_to_string (*pit, pvalue).c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2041 prop.put ("DefaultValue", pvalue);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2042 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2043
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2044 for (std::map<std::string, octave_value>::iterator ait = amap.begin ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2045 ait != amap.end (); ++ait)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2046 prop.put (ait->first, ait->second);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2047
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2048 retval.install_property (prop);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2049 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2050 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2051 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2052 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2053
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2054 return retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2055 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2056
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2057 octave_function*
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2058 cdef_class::get_method_function (const std::string& /* nm */)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2059 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2060 octave_classdef_proxy* p = new octave_classdef_proxy (*this);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2061
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2062 return p;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2063 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2064
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2065 octave_value
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2066 cdef_property::cdef_property_rep::get_value (const cdef_object& obj)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2067 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2068 octave_value retval;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2069
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2070 if (! obj.is_constructed ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2071 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2072 cdef_class cls (to_cdef (get ("DefiningClass")));
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2073
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2074 if (! obj.is_partially_constructed_for (cls.get_name ()))
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2075 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2076 ::error ("cannot reference properties of class `%s' for non-constructed object",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2077 cls.get_name ().c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2078 return retval;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2079 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2080 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2081
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2082 octave_value get_fcn = get ("GetMethod");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2083
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2084 // FIXME: should check whether we're already in get accessor method
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2085
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2086 if (get_fcn.is_empty ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2087 retval = obj.get (get ("Name").string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2088 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2089 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2090 octave_value_list args;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2091
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2092 args(0) = to_ov (obj);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2093
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2094 args = execute_ov (get_fcn, args, 1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2095
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2096 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2097 retval = args(0);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2098 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2099
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2100 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2101 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2102
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2103 bool
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2104 cdef_property::cdef_property_rep::is_recursive_set (const cdef_object& /* obj */) const
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2105 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2106 // FIXME: implement
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2107 return false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2108 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2109
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2110 void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2111 cdef_property::cdef_property_rep::set_value (cdef_object& obj,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2112 const octave_value& val)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2113 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2114 if (! obj.is_constructed ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2115 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2116 cdef_class cls (to_cdef (get ("DefiningClass")));
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2117
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2118 if (! obj.is_partially_constructed_for (cls.get_name ()))
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2119 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2120 ::error ("cannot reference properties of class `%s' for non-constructed object",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2121 cls.get_name ().c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2122 return;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2123 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2124 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2125
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2126 octave_value set_fcn = get ("SetMethod");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2127
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2128 if (set_fcn.is_empty () \|\| is_recursive_set (obj))
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2129 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2130 obj.put (get ("Name").string_value (), val);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2131 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2132 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2133 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2134 octave_value_list args;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2135
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2136 args(0) = to_ov (obj);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2137 args(1) = val;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2138
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2139 args = execute_ov (set_fcn, args, 1);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2140
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2141 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2142 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2143 if (args.length() > 0)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2144 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2145 cdef_object new_obj = to_cdef (args(0));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2146
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2147 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2148 obj = new_obj;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2149 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2150 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2151 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2152 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2153
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2154 bool
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2155 cdef_property::check_get_access (void) const
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2156 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2157 cdef_class cls (to_cdef (get ("DefiningClass")));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2158
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2159 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2160 return ::check_access (cls, get ("GetAccess"));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2161
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2162 return false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2163 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2164
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2165 bool
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2166 cdef_property::check_set_access (void) const
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2167 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2168 cdef_class cls (to_cdef (get ("DefiningClass")));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2169
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2170 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2171 return ::check_access (cls, get ("SetAccess"));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2172
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2173 return false;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2174 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2175
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2176 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2177 cdef_method::cdef_method_rep::check_method (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2178 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2179 // FIXME: check whether re-load is needed
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2180 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2181
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2182 octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2183 cdef_method::cdef_method_rep::execute (const octave_value_list& args,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2184 int nargout)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2185 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2186 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2187
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2188 if (! get ("Abstract").bool_value ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2189 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2190 check_method ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2191
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2192 if (function.is_defined ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2193 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2194 retval = execute_ov (function, args, nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2195 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2196 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2197 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2198 error ("%s: cannot execute abstract method",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2199 get ("Name").string_value ().c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2200
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2201 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2202 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2203
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2204 octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2205 cdef_method::cdef_method_rep::execute (const cdef_object& obj,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2206 const octave_value_list& args,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2207 int nargout)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2208 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2209 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2210
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2211 if (! get ("Abstract").bool_value ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2212 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2213 check_method ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2214
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2215 octave_value_list new_args;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2216
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2217 if (function.is_defined ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2218 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2219 new_args.resize (args.length () + 1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2220
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2221 new_args(0) = to_ov (obj);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2222 for (int i = 0; i < args.length (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2223 new_args(i+1) = args(i);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2224
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2225 retval = execute_ov (function, new_args, nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2226 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2227 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2228 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2229 error ("%s: cannot execute abstract method",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2230 get ("Name").string_value ().c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2231
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2232 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2233 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2234
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2235 bool
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2236 cdef_method::cdef_method_rep::is_constructor (void) const
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2237 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2238 if (function.is_function())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2239 return function.function_value ()->is_classdef_constructor ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2240
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2241 return false;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2242 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2243
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2244 bool
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2245 cdef_method::check_access (void) const
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2246 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2247 cdef_class cls (to_cdef (get ("DefiningClass")));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2248
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2249 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2250 return ::check_access (cls, get ("Access"));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2251
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2252 return false;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2253 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2254
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2255 static cdef_package
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2256 lookup_package (const std::string& name)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2257 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2258 std::map<std::string, cdef_package>::const_iterator it = all_packages.find (name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2259
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2260 if (it != all_packages.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2261 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2262 cdef_package pack = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2263
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2264 if (pack.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2265 return pack;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2266 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2267 error ("invalid package: %s", name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2268 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2269 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2270 error ("package not found: %s", name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2271
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2272 return cdef_package ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2273 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2274
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2275 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2276 package_fromName (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2277 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2278 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2279
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2280 if (args.length () == 1)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2281 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2282 std::string name = args(0).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2283
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2284 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2285 retval(0) = to_ov (lookup_package (name));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2286 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2287 error ("fromName: invalid package name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2288 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2289 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2290 error ("fromName: invalid number of parameters");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2291
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2292 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2293 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2294
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2295 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2296 package_get_classes (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2297 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2298 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2299
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2300 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2301 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2302 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2303 cdef_package pack (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2304
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2305 retval(0) = pack.get_classes ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2306 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2307
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2308 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2309 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2310
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2311 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2312 package_get_functions (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2313 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2314 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2315
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2316 if (args.length () == 0 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2317 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2318 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2319 cdef_package pack (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2320
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2321 retval(0) = pack.get_functions ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2322 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2323
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2324 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2325 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2326
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2327 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2328 package_get_packages (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2329 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2330 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2331
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2332 if (args.length () == 0 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2333 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2334 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2335 cdef_package pack (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2336
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2337 retval(0) = pack.get_packages ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2338 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2339
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2340 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2341 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2342
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2343 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2344 cdef_package::cdef_package_rep::install_class (const cdef_class& cls,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2345 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2346 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2347 class_map[nm] = cls;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2348 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2349
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2350 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2351 cdef_package::cdef_package_rep::install_function (const octave_value& fcn,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2352 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2353 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2354 function_map[nm] = fcn;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2355 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2356
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2357 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2358 cdef_package::cdef_package_rep::install_package (const cdef_package& pack,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2359 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2360 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2361 package_map[nm] = pack;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2362 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2363
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2364 template<class T1, class T2>
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2365 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2366 map2Cell (const std::map<T1, T2>& m)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2367 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2368 Cell retval (1, m.size ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2369 int i = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2370
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2371 for (typename std::map<T1, T2>::const_iterator it = m.begin ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2372 it != m.end (); ++it, ++i)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2373 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2374 retval(i) = to_ov (it->second);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2375 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2376
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2377 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2378 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2379
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2380 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2381 cdef_package::cdef_package_rep::get_classes (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2382 { return map2Cell (class_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2383
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2384 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2385 cdef_package::cdef_package_rep::get_functions (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2386 { return map2Cell (function_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2387
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2388 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2389 cdef_package::cdef_package_rep::get_packages (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2390 { return map2Cell (package_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2391
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2392 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2393 install_classdef (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2394 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2395 octave_classdef::register_type ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2396
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2397 /* meta classes */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2398 cdef_class handle = make_class ("handle");
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2399 cdef_class meta_class = make_class ("meta.class", handle);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2400 cdef_class meta_property = make_class ("meta.property", handle);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2401 cdef_class meta_method = make_class ("meta.method", handle);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2402 cdef_class meta_event = make_class ("meta.event", handle);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2403 cdef_class meta_package = make_class ("meta.package", handle);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2404 cdef_class meta_dynproperty = make_class ("meta.dynamicproperty", handle);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2405
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2406 /* meta classes are all sealed */
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2407 meta_class.put ("Sealed", true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2408 meta_property.put ("Sealed", true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2409 meta_method.put ("Sealed", true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2410 meta_event.put ("Sealed", true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2411 meta_package.put ("Sealed", true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2412 meta_dynproperty.put ("Sealed", true);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2413
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2414 /* meta.class properties */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2415 meta_class.install_property (make_attribute (meta_class, "ConstructOnLoad"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2416 meta_class.install_property (make_property (meta_class, "ContainingPackage"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2417 meta_class.install_property (make_property (meta_class, "Description"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2418 meta_class.install_property (make_property (meta_class, "DetailedDescription"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2419 meta_class.install_property (make_property (meta_class, "Events"));
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2420 meta_class.install_property (make_attribute (meta_class, "HandleCompatible"));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2421 meta_class.install_property (make_attribute (meta_class, "Hidden"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2422 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2423 (make_property (meta_class, "InferiorClasses",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2424 make_fcn_handle (class_get_inferiorclasses, "meta.class>get.InferiorClasses"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2425 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2426 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2427 (make_property (meta_class, "Methods",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2428 make_fcn_handle (class_get_methods, "meta.class>get.Methods"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2429 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2430 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2431 (make_property (meta_class, "MethodList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2432 make_fcn_handle (class_get_methods, "meta.class>get.MethodList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2433 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2434 meta_class.install_property (make_attribute (meta_class, "Name"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2435 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2436 (make_property (meta_class, "Properties",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2437 make_fcn_handle (class_get_properties, "meta.class>get.Properties"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2438 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2439 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2440 (make_property (meta_class, "PropertyList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2441 make_fcn_handle (class_get_properties, "meta.class>get.PropertyList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2442 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2443 meta_class.install_property (make_attribute (meta_class, "Sealed"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2444 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2445 (make_property (meta_class, "SuperClasses",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2446 make_fcn_handle (class_get_superclasses, "meta.class>get.SuperClasses"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2447 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2448 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2449 (make_property (meta_class, "SuperClassList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2450 make_fcn_handle (class_get_superclasses, "meta.class>get.SuperClassList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2451 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2452 /* meta.class methods */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2453 meta_class.install_method (make_method (meta_class, "fromName", class_fromName,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2454 "public", true));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2455 meta_class.install_method (make_method (meta_class, "fevalStatic", class_fevalStatic,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2456 "public", false));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2457 meta_class.install_method (make_method (meta_class, "getConstant", class_getConstant,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2458 "public", false));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2459 meta_class.install_method (make_method (meta_class, "eq", class_eq));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2460 meta_class.install_method (make_method (meta_class, "ne", class_ne));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2461 meta_class.install_method (make_method (meta_class, "lt", class_lt));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2462 meta_class.install_method (make_method (meta_class, "le", class_le));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2463 meta_class.install_method (make_method (meta_class, "gt", class_gt));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2464 meta_class.install_method (make_method (meta_class, "ge", class_ge));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2465
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2466 /* meta.method properties */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2467 meta_method.install_property (make_attribute (meta_method, "Abstract"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2468 meta_method.install_property (make_attribute (meta_method, "Access"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2469 meta_method.install_property (make_attribute (meta_method, "DefiningClass"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2470 meta_method.install_property (make_attribute (meta_method, "Description"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2471 meta_method.install_property (make_attribute (meta_method, "DetailedDescription"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2472 meta_method.install_property (make_attribute (meta_method, "Hidden"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2473 meta_method.install_property (make_attribute (meta_method, "Name"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2474 meta_method.install_property (make_attribute (meta_method, "Sealed"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2475 meta_method.install_property (make_attribute (meta_method, "Static"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2476
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2477 /* meta.property properties */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2478 meta_property.install_property (make_attribute (meta_property, "Name"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2479 meta_property.install_property (make_attribute (meta_property, "Description"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2480 meta_property.install_property (make_attribute (meta_property, "DetailedDescription"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2481 meta_property.install_property (make_attribute (meta_property, "Abstract"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2482 meta_property.install_property (make_attribute (meta_property, "Constant"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2483 meta_property.install_property (make_attribute (meta_property, "GetAccess"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2484 meta_property.install_property (make_attribute (meta_property, "SetAccess"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2485 meta_property.install_property (make_attribute (meta_property, "Dependent"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2486 meta_property.install_property (make_attribute (meta_property, "Transient"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2487 meta_property.install_property (make_attribute (meta_property, "Hidden"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2488 meta_property.install_property (make_attribute (meta_property, "GetObservable"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2489 meta_property.install_property (make_attribute (meta_property, "SetObservable"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2490 meta_property.install_property (make_attribute (meta_property, "GetMethod"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2491 meta_property.install_property (make_attribute (meta_property, "SetMethod"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2492 meta_property.install_property (make_attribute (meta_property, "DefiningClass"));
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2493 meta_property.install_property
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2494 (make_property (meta_property, "DefaultValue",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2495 make_fcn_handle (property_get_defaultvalue, "meta.property>get.DefaultValue"),
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2496 "public", Matrix (), "private"));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2497 meta_property.install_property (make_attribute (meta_property, "HasDefault"));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2498 /* meta.property events */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2499 // FIXME: add events
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2500
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2501 /* handle methods */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2502 handle.install_method (make_method (handle, "delete", handle_delete));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2503
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2504 /* meta.package properties */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2505 meta_package.install_property (make_attribute (meta_package, "Name"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2506 meta_package.install_property (make_property (meta_package, "ContainingPackage"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2507 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2508 (make_property (meta_package, "ClassList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2509 make_fcn_handle (package_get_classes, "meta.package>get.ClassList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2510 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2511 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2512 (make_property (meta_package, "Classes",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2513 make_fcn_handle (package_get_classes, "meta.package>get.Classes"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2514 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2515 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2516 (make_property (meta_package, "FunctionList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2517 make_fcn_handle (package_get_functions, "meta.package>get.FunctionList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2518 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2519 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2520 (make_property (meta_package, "Functions",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2521 make_fcn_handle (package_get_functions, "meta.package>get.Functions"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2522 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2523 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2524 (make_property (meta_package, "PackageList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2525 make_fcn_handle (package_get_packages, "meta.package>get.PackageList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2526 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2527 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2528 (make_property (meta_package, "Packages",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2529 make_fcn_handle (package_get_packages, "meta.package>get.Packages"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2530 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2531 meta_package.install_method (make_method (meta_package, "fromName", package_fromName,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2532 "public", true));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2533
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2534 /* create "meta" package */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2535 cdef_package package_meta = make_package ("meta");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2536 package_meta.install_class (meta_class, "class");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2537 package_meta.install_class (meta_property, "property");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2538 package_meta.install_class (meta_method, "method");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2539 package_meta.install_class (meta_package, "package");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2540 package_meta.install_class (meta_event, "event");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2541 package_meta.install_class (meta_dynproperty, "dynproperty");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2542 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2543
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2544 DEFUN (__meta_get_package__, args, , "")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2545 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2546 octave_value retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2547
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2548 if (args.length () == 1)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2549 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2550 std::string cname = args(0).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2551
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2552 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2553 retval = to_ov (lookup_package (cname));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2554 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2555 error ("invalid package name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2556 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2557 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2558 print_usage ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2559
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2560 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2561 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2562
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2563 DEFUN (__superclass_reference__, args, /* nargout */,
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2564 "-- texinfo --\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2565 @deftypefn {Built-in Function} {} __superclass_reference__ ()\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2566 Undocumented internal function.\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2567 @end deftypefn")
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2568 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2569 return octave_value (new octave_classdef_superclass_ref (args));
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2570 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2571
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2572 DEFUN (__meta_class_query__, args, /* nargout */,
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2573 "-- texinfo --\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2574 @deftypefn {Built-in Function} {} __meta_class_query__ ()\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2575 Undocumented internal function.\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2576 @end deftypefn")
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2577 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2578 octave_value retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2579
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2580 std::cerr << "__meta_class_query__ ("
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2581 << args(0).string_value () << ", "
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2582 << args(1).string_value () << ")"
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2583 << std::endl;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2584
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2585 if (args.length () == 2)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2586 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2587 std::string pkg = args(0).string_value ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2588 std::string cls = args(1).string_value ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2589
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2590 if (! pkg.empty ())
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2591 cls = pkg + "." + cls;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2592
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2593 if (! error_state)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2594 retval = to_ov (lookup_class (cls));
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2595 else
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2596 error ("invalid class name, expected a string value");
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2597 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2598 else
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2599 print_usage ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2600
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2601 return retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2602 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2603
15897 a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2604 DEFUN (metaclass, args, /* nargout */,
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2605 "-- texinfo --\n\
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2606 @deftypefn {Built-in Function} {} metaclass (obj)\n\
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2607 Returns the meta.class object corresponding to the class of @var{obj}.\n\
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2608 @end deftypefn")
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2609 {
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2610 octave_value retval;
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2611
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2612 if (args.length () == 1)
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2613 {
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2614 cdef_object obj = to_cdef (args(0));
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2615
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2616 if (! error_state)
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2617 retval = to_ov (obj.get_class ());
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2618 else
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2619 print_usage ();
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2620 }
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2621 else
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2622 print_usage ();
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2623
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2624 return retval;
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2625 }
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2626
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2627 /*
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2628 ;;; Local Variables: ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2629 ;;; mode: C++ ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2630 ;;; End: ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2631 */

Mercurial > octave-nkf

annotate libinterp/octave-value/ov-classdef.cc @ 15897:a413c6fe1726 classdef