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

annotate libinterp/octave-value/ov-classdef.cc @ 15909:b8bff84022d6 classdef

Use strong reference between objects and their class. * libinterp/octave-value/ov-classdef.h (cdef_object_rep::cname): Remove member. (cdef_object_rep::cdef_object_rep (void), cdef_object_rep::cdef_object_rep (cdef_object_rep)): Do not initialize it. (cdef_object_rep::cdef_object_rep (std::string)): Remove constructor. (cdef_object_rep::set_class_name): Remove method. (cdef_object_rep::grip_invalid_object): New private method. (cdef_object_rep::set_class, cdef_object_rep::is_class, cdef_object_rep::is_property, cdef_object_rep::is_method, cdef_object_rep::is_package): New methods. (cdef_object_rep::map, cdef_object_rep::ctor_list): Move members to cdef_object_scalar. (cdef_object_rep::put, cdef_object_rep::get, cdef_object_rep::subsref, cdef_object_rep::subsasgn, cdef_object_rep::mark_for_construction, cdef_object_rep::is_constructed_for, cdef_object_rep::mark_as_constructed, cdef_object_rep::is_partially_constructed_for, cdef_object_rep::is_constructed): Move implementation to cdef_object_scalar. (cdef_object_rep::is_constructed_for, cdef_object_rep::mark_as_constructed, cdef_object_rep::is_partially_constructed_for): Change signature, use cdef_class argument instead of std::string. (cdef_object_rep::class_name): Use get_class () and move inline definition after cdef_class declaration. (cdef_object::set_class_name): Remove method. (cdef_object::is_class, cdef_object::is_property, cdef_object::is_method, cdef_object::is_package): New methods. (cdef_object::is_constructed_for, cdef_object::mark_as_constructed, cdef_object::is_partially_constructed_for): Change signature, use cdef_class instead of std::string. (class cdef_object_base, class cdef_object_scalar): New classes. (class handle_cdef_object, class value_cdef_object): Inherits from cdef_object_scalar. (handle_cdef_object::handle_cdef_object (std::string)): Remove constructor. (value_cdef_object::value_cdef_object (std::string)): Likewise. (value_cdef_object::value_cdef_object (value_cdef_object)): Implement copy constructor. (value_cdef_object::clone): Use it. (cdef_class::cdef_class_rep::cdef_class_rep): Remove first string argument. (cdef_class::cdef_class_rep::is_class, cdef_class::cdef_class_rep::set_name, cdef_class::cdef_class_rep::wrap): New methods. (cdef_class::cdef_class_rep::implicit_ctor_list): Change type to std::list<cdef_class>. (cdef_class::cdef_class (std::string): Remove constructor. (cdef_class::cdef_class (std::list<cdef_class>)): Use string argument as the class name. (cdef_class::cdef_class (cdef_object), cdef_class::operator= (cdef_object)): Use is_class method. (cdef_class::_meta_class, cdef_class::_meta_property, cdef_class::_meta_method, cdef_class::_meta_package): New static members. (cdef_class::meta_class, cdef_class::meta_property, cdef_class::meta_method, cdef_class::meta_package): New static methods. (operator< (cdef_cass, cdef_class)): New function. (cdef_property::cdef_property_rep::cdef_property_rep): Remove first argument string. (cdef_property::cdef_property_rep::is_property, cdef_property::cdef_property_rep::get_name, cdef_property::cdef_property_rep::set_name, cdef_property::cdef_property_rep::is_constant): New methods. (cdef_property::get_name, cdef_property::is_constant): Use them. (cdef_property::cdef_property (std::string)): Use string argument as property name. (cdef_property::cdef_property (cdef_object)): Use is_property method. (cdef_method::cdef_method_rep::cdef_method_rep): Remove first argument string. (cdef_method::cdef_method_rep::is_method, cdef_method::cdef_method_rep::get_name, cdef_method::cdef_method_rep::set_name, cdef_method::cdef_method_rep::is_static): New methods. (cdef_method::get_name, cdef_method::is_static): Use them. (cdef_method::cdef_method (std::string)): Use string argument as method name. (cdef_method::cdef_method (cdef_object)): Use is_method method. (cdef_package::cdef_package_rep::cdef_package_rep): Remove first argument string. (cdef_package::cdef_package_rep::is_package, cdef_package::cdef_package_rep::get_name, cdef_package::cdef_package_rep::set_name): New methods. (cdef_package::get_name): Likewise. (cdef_package::cdef_package (std::string)): Use string argument as package name. (cdef_package::cdef_package (cdef_object)): Use is_package method. (cdef_package::_meta): New static member. (cdef_package::meta): New static method. * libinterp/octave-value/ov-classdef.cc (lookup_class (cdef_class), lookup_class (octave_value)): New static function overloads. (lookup_classes): Change argument name to reflect the fact we're using now a list of cdef_class objects, not a list of names. (make_class, make_property, make_method, make_package): Use name as constructor argument. Set object class. (cdef_object_rep::get_class): Move implementation to header. (cdef_object_rep::subsref, cdef_object_rep::subsasgn, cdef_object_rep::mark_for_construction): Move implementation to cdef_object_scalar. (cdef_object_scalar::is_constructed_for, cdef_object_scalar::is_partially_constructed_for): Moved from cdef_object_rep. (handle_cdef_object::~handle_cdef_object, value_cdef_object::~value_cdef_object): Do not use cname. (cdef_class::cdef_class_rep::cdef_class_rep (std::list<cdef_class>)): Remove first string argument. Keep strong references to cdef_class superclass objects. (cdef_class::cdef_class_rep::find_method, cdef_class::cdef_class_rep::find_methods, cdef_class::cdef_class_rep::find_property, cdef_class::cdef_class_rep::find_properties, cdef_class::cdef_class_rep::find_names, cdef_class::cdef_class_rep::delete_object): Superclasses are now strong references for cdef_class objects. (ctor_analyzer::available_ctor_list): Remove member. (ctor_analyzer::ctor_analyzer): Do not use it. (ctor_analyzer::ctor_list): Change type to std::list<cdef_class>. (ctor_analyzer::visit_funcall): Use it. Do not produce any error. (cdef_class::cdef_class_rep::install_method): Use strong references to cdef_class superclass objects. (cdef_class::cdef_class_rep::run_constructor): Likewise. (cdef_class::cdef_class_rep::construct): Use strong reference to cdef_class object. (cdef_property::cdef_property_rep::get_value, cdef_property::cdef_property_rep::set_value): Likewise. (cdef_class::_meta_class, cdef_class::_meta_property, cdef_class::_meta_method, cdef_class::_meta_package): Initialize static members. (cdef_package::_meta): Likewise. (install_classdef): Bootstrap meta classes with strong references to cdef_class. Assign cdef_class and cdef_package static members.

author	Michael Goffioul <michael.goffioul@gmail.com>
date	Sun, 06 Jan 2013 12:19:16 -0500
parents	a413c6fe1726
children	dfd0dc594c4f

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
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	182 static cdef_class
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	183 lookup_class (const cdef_class& cls)
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	184 {
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	185 // FIXME: placeholder for the time being, the purpose
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	186 // is to centralized any class update activity here.
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	187
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	188 return cls;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	189 }
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	190
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	191 static cdef_class
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	192 lookup_class (const octave_value& ov)
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	193 {
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	194 if (ov.is_string())
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	195 return lookup_class (ov.string_value ());
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	196 else
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	197 {
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	198 cdef_class cls (to_cdef (ov));
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	199
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	200 if (! error_state)
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	201 return lookup_class (cls);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	202 }
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	203
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	204 return cdef_class ();
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	205 }
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	206
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	207 static std::list<cdef_class>
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	208 lookup_classes (const Cell& cls_list)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	209 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	210 std::list<cdef_class> retval;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	211
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	212 for (int i = 0; i < cls_list.numel (); i++)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	213 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	214 cdef_class c = lookup_class (cls_list(i));
15036 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 if (! error_state)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	217 retval.push_back (c);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	218 else
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	219 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	220 retval.clear ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	221 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	222 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	223 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	224
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	225 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	226 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	227
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	228 static octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	229 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	230 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	231 Cell cls (class_list.size (), 1);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	232 int i = 0;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	233
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	234 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	235 it != class_list.end (); ++it, ++i)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	236 cls(i) = to_ov (*it);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	237
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	238 return octave_value (cls);
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 static bool
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	242 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	243 bool allow_equal = true, int max_depth = -1)
15036 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 bool retval = false;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	246
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	247 if (allow_equal && clsa == clsb)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	248 retval = true;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	249 else if (max_depth != 0)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	250 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	251 Cell c = clsb.get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	252
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	253 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	254 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	255 cdef_class cls = lookup_class (c(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	256
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	257 if (! error_state)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	258 retval = is_superclass (clsa, cls, true,
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	259 max_depth < 0 ? max_depth : max_depth-1);
15036 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 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	262
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	263 return retval;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	264 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	265
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	266 inline bool
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	267 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	268 { return is_superclass (clsa, clsb, false); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	269
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	270 inline bool
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	271 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	272 { 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	273
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	274 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	275 class_get_properties (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	276 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	277 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	278
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	279 if (args.length () == 1 && args(0).type_name () == "object")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	280 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	281 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	282
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	283 retval(0) = cls.get_properties ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	284 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	285
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	286 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	287 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	288
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	289 static cdef_class
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	290 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	291 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	292 cdef_class cls;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	293
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	294 octave_function* fcn = octave_call_stack::current ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	295
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	296 in_constructor = false;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	297
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	298 if (fcn &&
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	299 (fcn->is_class_method ()
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	300 \|\| fcn->is_classdef_constructor ()
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	301 \|\| fcn->is_anonymous_function_of_class ()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	302 \|\| (fcn->is_private_function ()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	303 && ! fcn->dispatch_class ().empty ())))
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	304 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	305 cls = lookup_class (fcn->dispatch_class ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	306 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	307 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	308 name = fcn->name ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	309 in_constructor = fcn->is_classdef_constructor ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	310 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	311 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	312
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	313 return cls;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	314 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	315
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	316 inline cdef_class
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	317 get_class_context (void)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	318 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	319 std::string dummy_string;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	320 bool dummy_bool;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	321
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	322 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	323 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	324
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	325 static bool
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	326 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	327 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	328 if (acc.is_string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	329 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	330 std::string acc_s = acc.string_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	331
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	332 if (acc_s == "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	333 return true;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	334
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	335 cdef_class ctx = get_class_context ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	336
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	337 // 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	338 // valid class context.
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	339
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	340 if (! error_state && ctx.ok ())
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 (acc_s == "private")
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	343 return (ctx == cls);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	344 else if (acc_s == "protected")
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	345 return is_superclass (cls, ctx);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	346 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	347 panic_impossible ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	348 }
15869 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 if (acc.is_cell ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	351 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	352 Cell acc_c = acc.cell_value ();
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 cdef_class ctx = get_class_context ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	355
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	356 // 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	357
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	358 if (! error_state && ctx.ok ())
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	359 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	360 if (ctx == cls)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	361 return true;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	362
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	363 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	364 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	365 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	366
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	367 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	368 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	369 if (is_superclass (acc_cls, ctx))
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	370 return true;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	371 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	372 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	373 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	374 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	375 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	376 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	377 cls.get_name ().c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	378
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	379 return false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	380 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	381
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	382 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	383 class_get_methods (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	384 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	385 octave_value_list retval;
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 if (args.length () == 1 && args(0).type_name () == "object")
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 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	390
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	391 retval(0) = cls.get_methods ();
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	394 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	395 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	396
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	397 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	398 class_get_superclasses (const octave_value_list& args, int /* nargout */)
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 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	401
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	402 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	403 && args(0).class_name () == "meta.class")
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 cdef_class cls (to_cdef (args(0)));
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 Cell classes = cls.get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	408
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	409 retval(0) = to_ov (lookup_classes (classes));
15036 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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	412 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	413 }
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 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	416 class_get_inferiorclasses (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	417 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	418 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	419
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	420 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	421 && args(0).class_name () == "meta.class")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	422 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	423 cdef_class cls (to_cdef (args(0)));
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 Cell classes = cls.get ("InferiorClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	426
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	427 retval(0) = to_ov (lookup_classes (classes));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	428 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	429
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	430 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	431 }
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 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	434 class_fromName (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	435 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	436 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	437
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	438 if (args.length () == 1)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	439 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	440 std::string name = args(0).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	441
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	442 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	443 retval(0) = to_ov (lookup_class (name));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	444 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	445 error ("fromName: invalid class name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	446 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	447 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	448 error ("fromName: invalid number of parameters");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	449
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	450 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	451 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	452
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	453 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	454 class_fevalStatic (const octave_value_list& args, int nargout)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	455 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	456 octave_value_list retval;
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 if (args.length () > 1 && args(0).type_name () == "object")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	459 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	460 cdef_class cls (to_cdef (args(0)));
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 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	463 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	464 std::string meth_name = args(1).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	465
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	466 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	467 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	468 cdef_method meth = cls.find_method (meth_name);
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 if (meth.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	471 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	472 if (meth.check_access ())
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	473 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	474 if (meth.is_static ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	475 retval = meth.execute (args.splice (0, 2), nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	476 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	477 error ("fevalStatic: method `%s' is not static",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	478 meth_name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	479 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	480 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	481 gripe_method_access ("fevalStatic", meth);
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 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	484 error ("fevalStatic: method not found: %s",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	485 meth_name.c_str ());
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 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	488 error ("fevalStatic: invalid method name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	489 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	490 error ("fevalStatic: invalid object, expected a meta.class object");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	491 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	492 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	493 error ("fevalStatic: invalid arguments");
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 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	496 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	497
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	498 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	499 class_getConstant (const octave_value_list& args, int /* nargout */)
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 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	502
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	503 if (args.length () == 2 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	504 && args(0).class_name () == "meta.class")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	505 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	506 cdef_class cls = to_cdef (args(0));
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 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	509 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	510 std::string prop_name = args(1).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	511
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	512 if (! error_state)
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 cdef_property prop = cls.find_property (prop_name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	515
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	516 if (prop.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	517 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	518 if (prop.check_get_access ())
15036 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 if (prop.is_constant ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	521 retval(0) = prop.get_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	522 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	523 error ("getConstant: property `%s' is not constant",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	524 prop_name.c_str ());
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 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	527 gripe_property_access ("getConstant", prop);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	528 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	529 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	530 error ("getConstant: property not found: %s",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	531 prop_name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	532 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	533 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	534 error ("getConstant: invalid property name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	535 }
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 ("getConstant: invalid object, expected a meta.class object");
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 ("getConstant: 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 #define META_CLASS_CMP(OP, CLSA, CLSB, FUN) \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	546 static octave_value_list \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	547 class_ ## OP (const octave_value_list& args, int /* nargout */) \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	548 { \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	549 octave_value_list retval; \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	550 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	551 if (args.length () == 2 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	552 && args(0).type_name () == "object" && args(1).type_name () == "object" \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	553 && 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	554 { \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	555 cdef_class clsa = to_cdef (args(0)); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	556 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	557 cdef_class clsb = to_cdef (args(1)); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	558 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	559 if (! error_state) \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	560 retval(0) = FUN (CLSA, CLSB); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	561 else \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	562 error (#OP ": invalid objects, expected meta.class objects"); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	563 } \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	564 else \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	565 error (#OP ": invalid arguments"); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	566 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	567 return retval; \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	568 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	569
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	570 META_CLASS_CMP (lt, clsb, clsa, is_strict_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	571 META_CLASS_CMP (le, clsb, clsa, is_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	572 META_CLASS_CMP (gt, clsa, clsb, is_strict_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	573 META_CLASS_CMP (ge, clsa, clsb, is_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	574 META_CLASS_CMP (eq, clsa, clsb, operator==)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	575 META_CLASS_CMP (ne, clsa, clsb, operator!=)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	576
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	577 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	578 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	579 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	580 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	581
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	582 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	583 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	584 cdef_property prop (to_cdef (args(0)));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	585
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	586 retval(0) = prop.get ("DefaultValue");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	587
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	588 if (! retval(0).is_defined ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	589 error_with_id ("Octave:class:NotDefaultDefined",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	590 "no default value for property `%s'",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	591 prop.get_name ().c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	592 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	593
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	594 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	595 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	596
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	597 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	598 handle_delete (const octave_value_list& /* args /, int / nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	599 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	600 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	601
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	602 // FIXME: implement this
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	603
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	604 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	605 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	606
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	607 static cdef_class
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	608 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	609 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	610 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	611 cdef_class cls (name, super_list);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	612
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	613 cls.set_class (cdef_class::meta_class ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	614 cls.put ("ConstructOnLoad", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	615 cls.put ("ContainingPackage", Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	616 cls.put ("Description", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	617 cls.put ("DetailedDescription", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	618 cls.put ("Events", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	619 cls.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	620 cls.put ("InferiorClasses", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	621 cls.put ("Methods", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	622 cls.put ("Properties", Cell ());
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	623 cls.put ("Sealed", false);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	624
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	625 if (name == "handle")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	626 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	627 cls.put ("HandleCompatible", true);
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 else if (super_list.empty ())
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 cls.put ("HandleCompatible", false);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	633 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	634 else
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	635 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	636 bool all_handle_compatible = true;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	637 bool has_handle_class = false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	638
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	639 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	640 it != super_list.end (); ++it)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	641 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	642 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	643 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	644 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	645
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	646 if (has_handle_class && ! all_handle_compatible)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	647 ::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	648 name.c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	649 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	650 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	651 cls.put ("HandleCompatible", all_handle_compatible);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	652 if (has_handle_class)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	653 cls.mark_as_handle_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	654 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	655 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	656
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	657 if (error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	658 return cdef_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	659
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	660 all_classes[name] = cls;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	661
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	662 return cls;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	663 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	664
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	665 static cdef_class
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	666 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	667 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	668 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	669 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	670
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	671 static cdef_property
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	672 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	673 const octave_value& get_method = Matrix (),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	674 const std::string& get_access = "public",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	675 const octave_value& set_method = Matrix (),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	676 const std::string& set_access = "public")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	677 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	678 // FIXME: what about default value?
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	679
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	680 cdef_property prop (name);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	681
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	682 prop.set_class (cdef_class::meta_property ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	683 prop.put ("Description", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	684 prop.put ("DetailedDescription", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	685 prop.put ("Abstract", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	686 prop.put ("Constant", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	687 prop.put ("GetAccess", get_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	688 prop.put ("SetAccess", set_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	689 prop.put ("Dependent", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	690 prop.put ("Transient", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	691 prop.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	692 prop.put ("GetObservable", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	693 prop.put ("SetObservable", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	694 prop.put ("GetMethod", get_method);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	695 prop.put ("SetMethod", set_method);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	696 prop.put ("DefiningClass", to_ov (cls));
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	697 prop.put ("DefaultValue", octave_value ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	698 prop.put ("HasDefault", false);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	699
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	700 std::string class_name = cls.get_name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	701
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	702 if (! get_method.is_empty ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	703 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	704 if (! set_method.is_empty ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	705 make_function_of_class (class_name, set_method);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	706
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	707 return prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	708 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	709
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	710 inline cdef_property
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	711 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	712 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	713 return make_property (cls, name, Matrix (), "public", Matrix (), "private");
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	716 static cdef_method
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	717 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	718 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	719 bool is_static = false)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	720 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	721 cdef_method meth (name);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	722
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	723 meth.set_class (cdef_class::meta_method ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	724 meth.put ("Abstract", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	725 meth.put ("Access", m_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	726 meth.put ("DefiningClass", to_ov (cls));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	727 meth.put ("Description", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	728 meth.put ("DetailedDescription", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	729 meth.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	730 meth.put ("Sealed", true);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	731 meth.put ("Static", is_static);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	732
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	733 make_function_of_class (cls, fcn);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	734
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	735 meth.set_function (fcn);
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 return meth;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	738 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	739
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	740 inline cdef_method
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	741 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	742 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	743 bool is_static = false)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	744 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	745 octave_value fcn (new octave_builtin (ff, name));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	746
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	747 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	748 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	749
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	750 static cdef_package
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	751 make_package (const std::string& nm,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	752 const std::string& parent = std::string ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	753 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	754 cdef_package pack ("meta.package");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	755
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	756 pack.set_class (cdef_class::meta_package ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	757 pack.put ("Name", nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	758 pack.put ("ContainingPackage", to_ov (all_packages[parent]));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	759
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	760 all_packages[nm] = pack;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	761
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	762 return pack;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	763 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	764
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	765 //----------------------------------------------------------------------------
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	766
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	767 DEFINE_OCTAVE_ALLOCATOR (octave_classdef);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	768
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	769 int octave_classdef::t_id (-1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	770
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	771 const std::string octave_classdef::t_name ("object");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	772
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	773 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	774 octave_classdef::register_type (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	775 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	776 t_id = octave_value_typeinfo::register_type
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	777 (octave_classdef::t_name, "<unknown>", octave_value (new octave_classdef ()));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	778 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	779
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	780 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	781 octave_classdef::subsref (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	782 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	783 int nargout)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	784 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	785 size_t skip = 0;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	786 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	787
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	788 // FIXME: should check "subsref" method first
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	789
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	790 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	791
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	792 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	793 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	794 if (type.length () > skip && idx.size () > skip)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	795 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	796 }
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 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	799 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	800
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	801 octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	802 octave_classdef::subsasgn (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	803 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	804 const octave_value& rhs)
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 object.subsasgn (type, idx, rhs);
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 //----------------------------------------------------------------------------
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	810
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	811 class octave_classdef_proxy : public octave_function
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 public:
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	814 octave_classdef_proxy (const cdef_class& _klass)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	815 : klass (_klass) { }
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 ~octave_classdef_proxy (void) { }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	818
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	819 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	820 subsref (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	821 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	822 int nargout)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	823 { return klass.subsref_meta (type, idx, nargout); }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	824
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	825 octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	826 subsref (const std::string& type,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	827 const std::list<octave_value_list>& idx)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	828 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	829 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	830
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	831 retval = subsref (type, idx, 1);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	832
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	833 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	834 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	835
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	836 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	837 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	838 { return to_ov (klass); }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	839
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	840 private:
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	841 cdef_class klass;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	842 };
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	843
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	844 //----------------------------------------------------------------------------
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	845
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	846 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	847 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	848 public:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	849 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	850 : octave_function (), args (a) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	851
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	852 ~octave_classdef_superclass_ref (void) { }
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 octave_value_list
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	855 subsref (const std::string& type,
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	856 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	857 int nargout)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	858 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	859 size_t skip = 0;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	860 octave_value_list retval;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	861
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	862 switch (type[0])
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	863 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	864 case '(':
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	865 skip = 1;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	866 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	867 idx.front ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	868 break;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	869 default:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	870 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	871 break;
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
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	874 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	875 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	876 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	877 && retval.length () > 0)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	878 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	879 }
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 return retval;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	882 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	883
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	884 octave_value
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	885 subsref (const std::string& type,
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	886 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	887 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	888 octave_value_list retval;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	889
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	890 retval = subsref (type, idx, 1);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	891
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	892 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	893 }
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 octave_value_list
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	896 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	897 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	898 octave_value_list retval;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	899
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	900 std::string meth_name;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	901 bool in_constructor;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	902 cdef_class ctx;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	903
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	904 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	905
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	906 if (! error_state && ctx.ok ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	907 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	908 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	909 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	910 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	911
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	912 std::string cls_name = (pname.empty () ?
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	913 cname : pname + "." + cname);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	914 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	915
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	916 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	917 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	918 if (in_constructor)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	919 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	920 if (is_direct_superclass (cls, ctx))
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	921 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	922 if (is_constructed_object (mname))
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	923 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	924 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	925
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	926 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	927
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	928 retval(0) = sym;
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 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	931 ::error ("cannot call superclass constructor with "
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	932 "variable `%s'", mname.c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	933 }
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 ::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	936 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	937 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	938 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	939 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	940 if (mname == meth_name)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	941 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	942 if (is_strict_superclass (cls, ctx))
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	943 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	944 // I see 2 possible implementations here:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	945 // 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	946 // context; this avoids duplicating codem but
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	947 // 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	948 // 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	949 // 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	950 // 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	951 // assumption of 1)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	952 // 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	953 // 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	954
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	955 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	956
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	957 if (meth.ok ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	958 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	959 if (meth.check_access ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	960 retval = meth.execute (idx, nargout);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	961 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	962 gripe_method_access (meth_name, meth);
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 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	965 ::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	966 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	967 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	968 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	969 ::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	970 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	971 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	972 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	973 ::error ("method name mismatch (`%s' != `%s')",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	974 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	975 }
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 else if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	979 ::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	980
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	981 return retval;
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
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	984 private:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	985 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	986 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	987 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	988
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	989 if (of->is_classdef_constructor ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	990 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	991 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	992
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	993 if (uf)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	994 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	995 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	996
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	997 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	998 return (ret_list->front ()->name () == nm);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	999 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1000 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1001
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1002 return false;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1003 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1004
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1005 private:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1006 octave_value_list args;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1007 };
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1008
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1009 //----------------------------------------------------------------------------
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1010
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1011 string_vector
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1012 cdef_object_rep::map_keys (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1013 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1014 cdef_class cls = get_class ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1015
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1016 if (cls.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1017 return cls.get_names ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1018
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1019 return string_vector ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1020 }
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 octave_value_list
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1023 cdef_object_scalar::subsref (const std::string& type,
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1024 const std::list<octave_value_list>& idx,
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1025 int nargout, size_t& skip,
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1026 const cdef_class& context)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1027 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1028 skip = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1029
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1030 cdef_class cls = (context.ok () ? context : get_class ());
15036 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 retval;
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 if (! cls.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1035 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1036
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1037 switch (type[0])
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1038 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1039 case '.':
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1040 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1041 std::string name = (idx.front ())(0).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1042
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1043 cdef_method meth = cls.find_method (name);
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.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1046 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1047 if (meth.check_access ())
15036 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 int _nargout = (type.length () > 2 ? 1 : nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1050
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1051 octave_value_list args;
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 skip = 1;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1054
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1055 if (type.length () > 1 && type[1] == '(')
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 std::list<octave_value_list>::const_iterator it = idx.begin ();
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 args = *++it;
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 skip++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1062 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1063
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1064 if (meth.is_static ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1065 retval = meth.execute (args, _nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1066 else
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 refcount++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1069 retval = meth.execute (cdef_object (this), args, _nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1070 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1071 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1072 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1073 gripe_method_access ("subsref", meth);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1074 }
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 if (skip == 0 && ! error_state)
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 cdef_property prop = cls.find_property (name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1079
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1080 if (prop.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1081 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1082 if (prop.check_get_access ())
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1083 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1084 refcount++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1085 retval(0) = prop.get_value (cdef_object (this));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1086
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1087 skip = 1;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1088 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1089 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1090 gripe_property_access ("subsref", prop);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1091 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1092 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1093 error ("subsref: unknown method or property: %s", name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1094 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1095 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1096 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1097 default:
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1098 error ("object cannot be indexed with `%c'", type[0]);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1099 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1100 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1101
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1102 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1103 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1104
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1105 octave_value
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1106 cdef_object_scalar::subsasgn (const std::string& type,
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1107 const std::list<octave_value_list>& idx,
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1108 const octave_value& rhs)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1109 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1110 octave_value retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1111
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1112 cdef_class cls = get_class ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1113
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1114 switch (type[0])
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1115 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1116 case '.':
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1117 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1118 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	1119
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1120 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1121 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1122 cdef_property prop = cls.find_property (name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1123
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1124 if (prop.ok ())
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 if (type.length () == 1)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1127 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1128 if (prop.check_set_access ())
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 refcount++;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1131
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1132 cdef_object obj (this);
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 prop.set_value (obj, rhs);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1135
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1136 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1137 retval = to_ov (obj);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1138 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1139 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1140 gripe_property_access ("subsasgn", prop, true);
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 else
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 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1145
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1146 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1147 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1148 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1149 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1150 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1151 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	1152 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1153 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1154 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1155
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1156 default:
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1157 panic_impossible ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1158 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1159 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1160
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1161 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1162 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1163
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1164 void
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1165 cdef_object_scalar::mark_for_construction (const cdef_class& cls)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1166 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1167 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	1168
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1169 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	1170
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1171 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1172 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1173 std::list<cdef_class> supcls_list = lookup_classes (supcls);
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1174
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1175 if (! error_state)
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1176 ctor_list[cls] = supcls_list;
15896 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 }
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1179
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1180 bool cdef_object_scalar::is_constructed_for (const cdef_class& cls) const
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1181 {
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1182 return (is_constructed ()
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1183 \|\| ctor_list.find (cls) == ctor_list.end ());
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1184 }
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1185
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1186 bool cdef_object_scalar::is_partially_constructed_for (const cdef_class& cls) const
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1187 {
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1188 std::map< cdef_class, std::list<cdef_class> >::const_iterator it;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1189
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1190 if (is_constructed ())
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1191 return true;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1192 else if ((it = ctor_list.find (cls)) == ctor_list.end ()
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1193 \|\| it->second.empty ())
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1194 return true;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1195
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1196 for (std::list<cdef_class>::const_iterator lit = it->second.begin ();
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1197 lit != it->second.end (); ++lit)
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1198 if (! is_constructed_for (*lit))
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1199 return false;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1200
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1201 return true;
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1202 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1203
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1204 handle_cdef_object::~handle_cdef_object (void)
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1205 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1206 gnulib::printf ("deleting %s object (handle)\n",
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1207 get_class ().get_name ().c_str ());
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1208 }
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1209
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1210 value_cdef_object::~value_cdef_object (void)
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1211 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1212 gnulib::printf ("deleting %s object (value)\n",
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1213 get_class ().get_name ().c_str ());
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1214 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1215
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1216 cdef_class::cdef_class_rep::cdef_class_rep (const std::list<cdef_class>& superclasses)
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1217 : handle_cdef_object (), handle_class (false)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1218 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1219 put ("SuperClasses", to_ov (superclasses));
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1220 implicit_ctor_list = superclasses;
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1221 }
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1222
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1223 cdef_method
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1224 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	1225 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1226 method_iterator it = method_map.find (nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1227
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1228 if (it == method_map.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1229 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1230 // FIXME: look into class directory
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1231 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1232 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1233 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1234 cdef_method& meth = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1235
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1236 // FIXME: check if method reload needed
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1237
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1238 if (meth.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1239 return meth;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1240 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1241
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1242 if (! local)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1243 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1244 // Look into superclasses
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1245
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1246 Cell super_classes = get ("SuperClasses").cell_value ();
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1247
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1248 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	1249 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1250 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1251
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1252 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1253 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1254 cdef_method meth = cls.find_method (nm);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1255
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1256 if (meth.ok ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1257 return meth;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1258 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1259 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1260 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1261
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1262 return cdef_method ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1263 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1264
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1265 class ctor_analyzer : public tree_walker
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1266 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1267 public:
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1268 ctor_analyzer (const std::string& ctor, const std::string& obj)
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1269 : tree_walker (), who (ctor), obj_name (obj) { }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1270
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1271 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	1272 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1273 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	1274 ! error_state && it != t.end (); ++it)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1275 (it)->accept (this);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1276 }
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 void visit_statement (tree_statement& t)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1279 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1280 if (t.is_expression ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1281 t.expression ()->accept (*this);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1282 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1283
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1284 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	1285 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1286 t.right_hand_side ()->accept (*this);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1287 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1288
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1289 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	1290 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1291 t.right_hand_side ()->accept (*this);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1292 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1293
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1294 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	1295 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1296 t.expression ()->accept (*this);
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 void visit_funcall (tree_funcall& t)
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 octave_value fcn = t.function ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1302
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1303 if (fcn.is_function ())
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 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	1306
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1307 if (of)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1308 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1309 if (of->name () == "__superclass_reference__")
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1310 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1311 octave_value_list args = t.arguments ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1312
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1313 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	1314 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1315 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	1316 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	1317
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1318 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	1319 ? class_name
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1320 : package_name + "." + class_name);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1321
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1322 cdef_class cls = lookup_class (ctor_name, false);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1323
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1324 if (cls.ok ())
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1325 ctor_list.push_back (cls);
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1326 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1327 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1328 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1329 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1330 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1331
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1332 std::list<cdef_class> get_constructor_list (void) const
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1333 { return ctor_list; }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1334
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1335 // NO-OP
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1336 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	1337 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	1338 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	1339 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	1340 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	1341 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	1342 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	1343 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	1344 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	1345 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	1346 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	1347 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	1348 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	1349 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	1350 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	1351 void visit_identifier (tree_identifier&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1352 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	1353 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	1354 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	1355 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	1356 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	1357 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	1358 void visit_matrix (tree_matrix&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1359 void visit_cell (tree_cell&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1360 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	1361 void visit_constant (tree_constant&) { }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1362 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	1363 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	1364 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	1365 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	1366 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	1367 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	1368 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	1369 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	1370 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	1371 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	1372
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1373 private:
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1374 /* 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	1375 std::string who;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1376
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1377 /* 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	1378 std::string obj_name;
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 /* The list of superclass constructors that are explicitly called */
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1381 std::list<cdef_class> ctor_list;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1382 };
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1383
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1384 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1385 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	1386 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1387 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	1388
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1389 if (meth.is_constructor ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1390 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1391 // 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	1392 // constructors are called explicitly.
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1393
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1394 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	1395
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1396 if (of)
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 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	1399
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1400 if (uf)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1401 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1402 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	1403 tree_statement_list *body = uf->body ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1404
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1405 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	1406 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1407 std::string obj_name = ret_list->front ()->name ();
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1408 ctor_analyzer a (meth.get_name (), obj_name);
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1409
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1410 body->accept (a);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1411 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1412 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1413 std::list<cdef_class> explicit_ctor_list
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1414 = a.get_constructor_list ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1415
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1416 for (std::list<cdef_class>::const_iterator it = explicit_ctor_list.begin ();
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1417 ! 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	1418 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1419 gnulib::printf ("explicit superclass constructor: %s\n",
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1420 it->get_name ().c_str ());
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1421 implicit_ctor_list.remove (*it);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1422 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1423 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1424 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1425 else
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1426 ::error ("%s: invalid constructor output arguments",
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1427 meth.get_name ().c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1428 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1429 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1430 }
15036 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 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1434 cdef_class::cdef_class_rep::load_all_methods (void)
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 // FIXME: re-scan class directory
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1437 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1438
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1439 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1440 cdef_class::cdef_class_rep::get_methods (void)
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 std::map<std::string,cdef_method> meths;
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 find_methods (meths, false);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1445
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1446 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1447 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1448 Cell c (meths.size (), 1);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1449
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1450 int idx = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1451
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1452 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	1453 it != meths.end (); ++it, ++idx)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1454 c (idx, 0) = to_ov (it->second);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1455
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1456 return c;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1457 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1458
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1459 return Cell ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1460 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1461
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1462 void
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1463 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	1464 bool only_inherited)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1465 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1466 load_all_methods ();
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 method_const_iterator it;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1469
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1470 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	1471
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1472 for (it = method_map.begin (); it != method_map.end (); ++it)
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 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1475
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1476 if (nm != cls_name)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1477 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1478 if (meths.find (nm) == meths.end ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1479 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1480 if (only_inherited)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1481 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1482 octave_value acc = it->second.get ("Access");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1483
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1484 if (! acc.is_string ()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1485 \|\| acc.string_value () == "private")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1486 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1487 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1488
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1489 meths[nm] = it->second;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1490 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1491 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1492 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1493
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1494 // Look into superclasses
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 Cell super_classes = get ("SuperClasses").cell_value ();
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 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1499 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1500 cdef_class cls = lookup_class (super_classes(i));
15036 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 if (! error_state)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1503 cls.get_rep ()->find_methods (meths, true);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1504 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1505 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1506 }
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1509 cdef_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1510 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	1511 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1512 property_iterator it = property_map.find (nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1513
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1514 if (it != property_map.end ())
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 cdef_property& prop = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1517
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1518 if (prop.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1519 return 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 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1523
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1524 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1525
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1526 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1527 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1528 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1529
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1530 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1531 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1532 cdef_property prop = cls.find_property (nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1533
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1534 if (prop.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1535 return prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1536 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1537 }
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 cdef_property ();
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 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1543 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	1544 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1545 property_map[prop.get_name ()] = prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1546 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1547
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1548 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1549 cdef_class::cdef_class_rep::get_properties (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1550 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1551 std::map<std::string,cdef_property> props;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1552
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1553 find_properties (props, false);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1554
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1555 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1556 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1557 Cell c (props.size (), 1);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1558
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1559 int idx = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1560
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1561 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	1562 it != props.end (); ++it, ++idx)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1563 c (idx, 0) = to_ov (it->second);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1564
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1565 return c;
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1568 return Cell ();
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 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1572 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	1573 bool only_inherited)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1574 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1575 property_const_iterator it;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1576
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1577 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	1578 ++it)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1579 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1580 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1581
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1582 if (props.find (nm) == props.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1583 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1584 if (only_inherited)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1585 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1586 octave_value acc = it->second.get ("GetAccess");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1587
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1588 if (! acc.is_string ()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1589 \|\| acc.string_value () == "private")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1590 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1591 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1592
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1593 props[nm] = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1594 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1595 }
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 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1598
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1599 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1600
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1601 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	1602 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1603 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1604
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1605 if (! error_state)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1606 cls.get_rep ()->find_properties (props, true);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1607 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1608 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1609 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1610 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1611
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1612 void
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1613 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	1614 bool all)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1615 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1616 load_all_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1617
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1618 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	1619
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1620 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	1621 ! error_state && it != method_map.end(); ++it)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1622 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1623 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1624
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1625 if (nm != cls_name)
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 if (! all)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1628 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1629 octave_value acc = it->second.get ("Access");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1630
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1631 if (! acc.is_string()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1632 \|\| acc.string_value () != "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1633 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1634 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1635
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1636 names.insert (nm);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1637 }
15036 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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1640 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	1641 ! error_state && it != property_map.end (); ++it)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1642 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1643 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1644
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1645 if (! all)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1646 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1647 octave_value acc = it->second.get ("GetAccess");
15036 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 if (! acc.is_string()
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1650 \|\| acc.string_value () != "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1651 continue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1652 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1653
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1654 names.insert (nm);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1655 }
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 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1658
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1659 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1660
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1661 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	1662 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1663 cdef_class cls = lookup_class (super_classes(i));
15036 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 if (! error_state)
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1666 cls.get_rep ()->find_names (names, all);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1667 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1668 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1669 }
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1672 string_vector
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1673 cdef_class::cdef_class_rep::get_names (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1674 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1675 std::set<std::string> names;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1676
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1677 find_names (names, false);
15036 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 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1680 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1681 string_vector v (names.size ());
15036 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 int idx = 0;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1684 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	1685 it != names.end (); ++it, ++idx)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1686 v[idx] = *it;
15036 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 return v.sort (true);
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1691 return string_vector ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1692 }
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 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1695 cdef_class::cdef_class_rep::delete_object (cdef_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 method_iterator it = method_map.find ("delete");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1698
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1699 if (it != method_map.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1700 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1701 cdef_class cls = obj.get_class ();
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1702
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1703 obj.set_class (wrap ());
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1704
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1705 it->second.execute (obj, octave_value_list (), 0);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1706
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1707 obj.set_class (cls);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1708 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1709
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1710 // FIXME: should we destroy corresponding properties here?
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1711
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1712 // Call "delete" in super classes
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1713
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1714 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1715
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1716 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1717 {
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1718 cdef_class cls = lookup_class (super_classes(i));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1719
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1720 if (!error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1721 cls.delete_object (obj);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1722 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1723 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1724
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1725 octave_value_list
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1726 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	1727 const std::list<octave_value_list>& idx,
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1728 int nargout)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1729 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1730 octave_value_list retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1731
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1732 switch (type[0])
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1733 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1734 case '(':
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1735 // Constructor call
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1736 gnulib::printf ("constructor\n");
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1737 retval(0) = construct (idx.front ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1738 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1739 case '.':
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1740 // Static method, constant (or property?)
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1741 gnulib::printf ("static method\n");
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1742 break;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1743 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1744
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1745 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1746 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1747 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	1748 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	1749 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1750
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1751 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1752 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1753
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1754 void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1755 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	1756 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1757 // Populate the object with default property values
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1758
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1759 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	1760
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1761 if (! error_state)
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 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	1764 ! error_state && it != super_classes.end (); ++it)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1765 it->initialize_object (obj);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1766
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1767 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1768 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1769 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	1770 ! error_state && it != property_map.end (); ++it)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1771 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1772 if (! it->second.get ("Dependent").bool_value ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1773 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1774 octave_value pvalue = it->second.get ("DefaultValue");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1775
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1776 if (pvalue.is_defined ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1777 obj.put (it->first, pvalue);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1778 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1779 obj.put (it->first, octave_value (Matrix ()));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1780 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1781 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1782
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1783 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1784 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1785 refcount++;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1786 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	1787 }
15869 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 }
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
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1792 void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1793 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	1794 const octave_value_list& args)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1795 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1796 octave_value_list empty_args;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1797
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1798 for (std::list<cdef_class>::const_iterator it = implicit_ctor_list.begin ();
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1799 ! 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	1800 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1801 cdef_class supcls = lookup_class (*it);
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 if (! error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1804 supcls.run_constructor (obj, empty_args);
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1805 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1806
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1807 if (error_state)
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1808 return;
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 std::string cls_name = get_name ();
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1811 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	1812
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1813 cdef_method ctor = find_method (ctor_name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1814
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1815 if (ctor.ok ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1816 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1817 octave_value_list ctor_args (args);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1818 octave_value_list ctor_retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1819
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1820 ctor_args.prepend (to_ov (obj));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1821 ctor_retval = ctor.execute (ctor_args, 1);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1822
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1823 if (! error_state)
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1824 {
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1825 if (ctor_retval.length () == 1)
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1826 obj = to_cdef (ctor_retval(0));
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1827 else
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1828 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1829 ::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	1830 ctor_name.c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1831 return;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1832 }
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1833 }
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1834 }
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1835
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1836 obj.mark_as_constructed (wrap ());
15869 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
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1839 octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1840 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	1841 {
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1842 cdef_object_rep *r;
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1843
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1844 if (is_handle_class ())
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1845 r = new handle_cdef_object ();
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1846 else
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1847 r = new value_cdef_object ();
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	1848 r->set_class (wrap ());
15870 2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1849
2b6fe094e615 Implement embryonic value-class semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15869 diff changeset	1850 cdef_object obj (r);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1851
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1852 initialize_object (obj);
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 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1855 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1856 run_constructor (obj, args);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1857
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1858 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1859 return to_ov (obj);
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
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1862 return octave_value();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1863 }
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 static octave_value
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1866 compute_attribute_value (tree_classdef_attribute* t)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1867 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1868 if (t->expression ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1869 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1870 if (t->expression ()->is_identifier ())
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 std::string s = t->expression ()->name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1873
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1874 if (s == "public")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1875 return std::string ("public");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1876 else if (s == "protected")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1877 return std::string ("protected");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1878 else if (s == "private")
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1879 return std::string ("private");
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
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1882 return t->expression ()->rvalue1 ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1883 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1884 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1885 return octave_value (true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1886 }
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 template<class T>
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1889 static std::string
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1890 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	1891 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1892 if (v.is_string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1893 return v.string_value ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1894 else if (t->expression ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1895 return t->expression ()->original_text ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1896 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1897 return std::string ("true");
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
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1900 cdef_class
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1901 cdef_class::make_meta_class (tree_classdef* t)
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1902 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1903 cdef_class retval;
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1904 std::string class_name;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1905
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1906 // Class creation
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1907
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1908 class_name = t->ident ()->name ();
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1909 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	1910
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1911 std::list<cdef_class> slist;
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 if (t->superclass_list ())
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 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	1916 ! 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	1917 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1918 std::string sclass_name =
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1919 ((it)->package () ? (it)->package ()->name () + "." : std::string ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1920 + (*it)->ident ()->name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1921
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1922 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	1923
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1924 cdef_class sclass = lookup_class (sclass_name);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1925
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1926 if (! error_state)
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 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	1929 slist.push_back (sclass);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1930 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1931 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1932 ::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	1933 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	1934 return retval;
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 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1938 return retval;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1939
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 }
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 retval = ::make_class (class_name, slist);
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 if (error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1946 return cdef_class ();
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 // Class attributes
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1949
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1950 if (t->attribute_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1951 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1952 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	1953 it != t->attribute_list ()->end (); ++it)
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 std::string aname = (*it)->ident ()->name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1956 octave_value avalue = compute_attribute_value (*it);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1957
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1958 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	1959 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	1960 retval.put (aname, avalue);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1961 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1962 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1963
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1964 tree_classdef_body* b = t->body ();
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 if (b)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1967 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1968 // Method blocks
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1969
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1970 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	1971
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1972 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	1973 it != mb_list.end (); ++it)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1974 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1975 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	1976 gnulib::printf ("method block\n");
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1977
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1978 // Method attributes
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1979
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1980 if ((*it)->attribute_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1981 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1982 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	1983 ait != (*it)->attribute_list ()->end (); ++ait)
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 std::string aname = (*ait)->ident ()->name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1986 octave_value avalue = compute_attribute_value (*ait);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1987
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	1988 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	1989 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	1990 amap[aname] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1991 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1992 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1993
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1994 // Methods
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1995
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1996 if ((*it)->element_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1997 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	1998 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	1999 mit != (*it)->element_list ()->end (); ++mit)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2000 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2001 std::string mname = mit->function_value ()->name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2002 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	2003
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2004 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	2005 mname.c_str ());
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2006 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	2007 ait != amap.end (); ++ait)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2008 meth.put (ait->first, ait->second);
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 retval.install_method (meth);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2011 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2012 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2013 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2014
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2015 // Property blocks
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 // 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	2018 // 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	2019 // 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	2020 // value expressions.
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2021
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2022 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	2023
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2024 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	2025 it != pb_list.end (); ++it)
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 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	2028 gnulib::printf ("property block\n");
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2029
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2030 // Property attributes
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 if ((*it)->attribute_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2033 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2034 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	2035 ait != (*it)->attribute_list ()->end (); ++ait)
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 std::string aname = (*ait)->ident ()->name ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2038 octave_value avalue = compute_attribute_value (*ait);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2039
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2040 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	2041 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	2042 if (aname == "Access")
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 amap["GetAccess"] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2045 amap["SetAccess"] = avalue;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2046 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2047 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2048 amap[aname] = avalue;
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 // Properties
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2053
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2054 if ((*it)->element_list ())
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2055 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2056 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	2057 pit != (*it)->element_list ()->end (); ++pit)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2058 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2059 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	2060
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2061 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	2062 if ((*pit)->expression ())
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 octave_value pvalue = (*pit)->expression ()->rvalue1 ();
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2065
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2066 gnulib::printf ("property default: %s\n",
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2067 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	2068 prop.put ("DefaultValue", pvalue);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2069 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2070
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2071 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	2072 ait != amap.end (); ++ait)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2073 prop.put (ait->first, ait->second);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2074
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2075 retval.install_property (prop);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2076 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2077 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2078 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2079 }
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2080
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2081 return retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2082 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2083
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2084 octave_function*
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2085 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	2086 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2087 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	2088
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2089 return p;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2090 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2091
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2092 octave_value
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2093 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	2094 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2095 octave_value retval;
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2096
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2097 if (! obj.is_constructed ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2098 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2099 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	2100
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2101 if (! obj.is_partially_constructed_for (cls))
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2102 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2103 ::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	2104 cls.get_name ().c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2105 return retval;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2106 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2107 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2108
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2109 octave_value get_fcn = get ("GetMethod");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2110
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2111 // 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	2112
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2113 if (get_fcn.is_empty ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2114 retval = obj.get (get ("Name").string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2115 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2116 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2117 octave_value_list args;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2118
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2119 args(0) = to_ov (obj);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2120
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2121 args = execute_ov (get_fcn, args, 1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2122
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2123 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2124 retval = args(0);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2125 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2126
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2127 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2128 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2129
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2130 bool
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2131 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	2132 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2133 // FIXME: implement
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2134 return false;
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
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2137 void
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2138 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	2139 const octave_value& val)
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2140 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2141 if (! obj.is_constructed ())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2142 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2143 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	2144
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2145 if (! obj.is_partially_constructed_for (cls))
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2146 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2147 ::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	2148 cls.get_name ().c_str ());
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2149 return;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2150 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2151 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2152
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2153 octave_value set_fcn = get ("SetMethod");
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2154
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2155 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	2156 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2157 obj.put (get ("Name").string_value (), val);
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 else
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2160 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2161 octave_value_list args;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2162
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2163 args(0) = to_ov (obj);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2164 args(1) = val;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2165
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2166 args = execute_ov (set_fcn, args, 1);
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 if (! error_state)
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 (args.length() > 0)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2171 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2172 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	2173
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2174 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2175 obj = new_obj;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2176 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2177 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2178 }
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2179 }
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 bool
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2182 cdef_property::check_get_access (void) const
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2183 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2184 cdef_class cls (to_cdef (get ("DefiningClass")));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2185
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2186 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2187 return ::check_access (cls, get ("GetAccess"));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2188
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2189 return false;
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2190 }
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2191
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2192 bool
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2193 cdef_property::check_set_access (void) const
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2194 {
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2195 cdef_class cls (to_cdef (get ("DefiningClass")));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2196
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2197 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2198 return ::check_access (cls, get ("SetAccess"));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2199
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2200 return false;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2201 }
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 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2204 cdef_method::cdef_method_rep::check_method (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2205 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2206 // FIXME: check whether re-load is needed
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2207 }
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2210 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	2211 int nargout)
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 octave_value_list retval;
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 if (! get ("Abstract").bool_value ())
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 check_method ();
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 if (function.is_defined ())
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 retval = execute_ov (function, args, nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2222 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2223 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2224 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2225 error ("%s: cannot execute abstract method",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2226 get ("Name").string_value ().c_str ());
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 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2229 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2230
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2231 octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2232 cdef_method::cdef_method_rep::execute (const cdef_object& obj,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2233 const octave_value_list& args,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2234 int nargout)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2235 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2236 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2237
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2238 if (! get ("Abstract").bool_value ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2239 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2240 check_method ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2241
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2242 octave_value_list new_args;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2243
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2244 if (function.is_defined ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2245 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2246 new_args.resize (args.length () + 1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2247
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2248 new_args(0) = to_ov (obj);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2249 for (int i = 0; i < args.length (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2250 new_args(i+1) = args(i);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2251
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2252 retval = execute_ov (function, new_args, nargout);
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 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2256 error ("%s: cannot execute abstract method",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2257 get ("Name").string_value ().c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2258
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2259 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2260 }
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 bool
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2263 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	2264 {
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2265 if (function.is_function())
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2266 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	2267
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2268 return false;
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2269 }
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2270
57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2271 bool
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2272 cdef_method::check_access (void) const
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2273 {
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2274 cdef_class cls (to_cdef (get ("DefiningClass")));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2275
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2276 if (! error_state)
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2277 return ::check_access (cls, get ("Access"));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2278
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2279 return false;
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2280 }
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 static cdef_package
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2283 lookup_package (const std::string& name)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2284 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2285 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	2286
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2287 if (it != all_packages.end ())
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 cdef_package pack = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2290
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2291 if (pack.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2292 return pack;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2293 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2294 error ("invalid package: %s", name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2295 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2296 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2297 error ("package not found: %s", name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2298
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2299 return cdef_package ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2300 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2301
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2302 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2303 package_fromName (const octave_value_list& args, int /* nargout */)
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 octave_value_list retval;
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 if (args.length () == 1)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2308 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2309 std::string name = args(0).string_value ();
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 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2312 retval(0) = to_ov (lookup_package (name));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2313 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2314 error ("fromName: invalid package name, expected a string value");
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 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2317 error ("fromName: invalid number of parameters");
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 return retval;
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2322 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2323 package_get_classes (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2324 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2325 octave_value_list retval (1, Matrix ());
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 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2328 && args(0).class_name () == "meta.package")
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 cdef_package pack (to_cdef (args(0)));
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 retval(0) = pack.get_classes ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2333 }
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 return retval;
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2338 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2339 package_get_functions (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2340 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2341 octave_value_list retval (1, Matrix ());
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 if (args.length () == 0 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2344 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2345 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2346 cdef_package pack (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2347
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2348 retval(0) = pack.get_functions ();
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2351 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2352 }
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 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2355 package_get_packages (const octave_value_list& args, int /* nargout */)
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 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2358
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2359 if (args.length () == 0 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2360 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2361 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2362 cdef_package pack (to_cdef (args(0)));
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 retval(0) = pack.get_packages ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2365 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2366
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2367 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2368 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2369
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2370 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2371 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	2372 const std::string& nm)
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 class_map[nm] = cls;
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 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2378 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	2379 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2380 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2381 function_map[nm] = fcn;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2382 }
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 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2385 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	2386 const std::string& nm)
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 package_map[nm] = pack;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2389 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2390
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2391 template<class T1, class T2>
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2392 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2393 map2Cell (const std::map<T1, T2>& m)
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 Cell retval (1, m.size ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2396 int i = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2397
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2398 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	2399 it != m.end (); ++it, ++i)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2400 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2401 retval(i) = to_ov (it->second);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2402 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2403
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2404 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2405 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2406
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2407 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2408 cdef_package::cdef_package_rep::get_classes (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2409 { return map2Cell (class_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2410
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2411 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2412 cdef_package::cdef_package_rep::get_functions (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2413 { return map2Cell (function_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2414
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2415 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2416 cdef_package::cdef_package_rep::get_packages (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2417 { return map2Cell (package_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2418
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2419 cdef_class cdef_class::_meta_class = cdef_class ();
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2420 cdef_class cdef_class::_meta_property = cdef_class ();
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2421 cdef_class cdef_class::_meta_method = cdef_class ();
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2422 cdef_class cdef_class::_meta_package = cdef_class ();
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2423
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2424 cdef_package cdef_package::_meta = cdef_package ();
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2425
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2426 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2427 install_classdef (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2428 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2429 octave_classdef::register_type ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2430
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2431 /* bootstrap */
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2432 cdef_class handle = make_class ("handle");
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2433 cdef_class meta_class = cdef_class::_meta_class = make_class ("meta.class", handle);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2434 handle.set_class (meta_class);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2435 meta_class.set_class (meta_class);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2436
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2437 /* meta classes */
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2438 cdef_class meta_property = cdef_class::_meta_property = make_class ("meta.property", handle);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2439 cdef_class meta_method = cdef_class::_meta_method = make_class ("meta.method", handle);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2440 cdef_class meta_package = cdef_class::_meta_package = make_class ("meta.package", handle);
b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2441
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2442 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	2443 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	2444
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2445 /* meta classes are all sealed */
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2446 meta_class.put ("Sealed", true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2447 meta_property.put ("Sealed", true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2448 meta_method.put ("Sealed", true);
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2449 meta_package.put ("Sealed", true);
15869 5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2450 meta_event.put ("Sealed", true);
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2451 meta_dynproperty.put ("Sealed", true);
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2452
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2453 /* meta.class properties */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2454 meta_class.install_property (make_attribute (meta_class, "ConstructOnLoad"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2455 meta_class.install_property (make_property (meta_class, "ContainingPackage"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2456 meta_class.install_property (make_property (meta_class, "Description"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2457 meta_class.install_property (make_property (meta_class, "DetailedDescription"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2458 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	2459 meta_class.install_property (make_attribute (meta_class, "HandleCompatible"));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2460 meta_class.install_property (make_attribute (meta_class, "Hidden"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2461 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2462 (make_property (meta_class, "InferiorClasses",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2463 make_fcn_handle (class_get_inferiorclasses, "meta.class>get.InferiorClasses"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2464 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2465 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2466 (make_property (meta_class, "Methods",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2467 make_fcn_handle (class_get_methods, "meta.class>get.Methods"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2468 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2469 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2470 (make_property (meta_class, "MethodList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2471 make_fcn_handle (class_get_methods, "meta.class>get.MethodList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2472 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2473 meta_class.install_property (make_attribute (meta_class, "Name"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2474 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2475 (make_property (meta_class, "Properties",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2476 make_fcn_handle (class_get_properties, "meta.class>get.Properties"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2477 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2478 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2479 (make_property (meta_class, "PropertyList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2480 make_fcn_handle (class_get_properties, "meta.class>get.PropertyList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2481 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2482 meta_class.install_property (make_attribute (meta_class, "Sealed"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2483 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2484 (make_property (meta_class, "SuperClasses",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2485 make_fcn_handle (class_get_superclasses, "meta.class>get.SuperClasses"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2486 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2487 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2488 (make_property (meta_class, "SuperClassList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2489 make_fcn_handle (class_get_superclasses, "meta.class>get.SuperClassList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2490 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2491 /* meta.class methods */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2492 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	2493 "public", true));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2494 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	2495 "public", false));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2496 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	2497 "public", false));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2498 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	2499 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	2500 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	2501 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	2502 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	2503 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	2504
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2505 /* meta.method properties */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2506 meta_method.install_property (make_attribute (meta_method, "Abstract"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2507 meta_method.install_property (make_attribute (meta_method, "Access"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2508 meta_method.install_property (make_attribute (meta_method, "DefiningClass"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2509 meta_method.install_property (make_attribute (meta_method, "Description"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2510 meta_method.install_property (make_attribute (meta_method, "DetailedDescription"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2511 meta_method.install_property (make_attribute (meta_method, "Hidden"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2512 meta_method.install_property (make_attribute (meta_method, "Name"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2513 meta_method.install_property (make_attribute (meta_method, "Sealed"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2514 meta_method.install_property (make_attribute (meta_method, "Static"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2515
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2516 /* meta.property properties */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2517 meta_property.install_property (make_attribute (meta_property, "Name"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2518 meta_property.install_property (make_attribute (meta_property, "Description"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2519 meta_property.install_property (make_attribute (meta_property, "DetailedDescription"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2520 meta_property.install_property (make_attribute (meta_property, "Abstract"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2521 meta_property.install_property (make_attribute (meta_property, "Constant"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2522 meta_property.install_property (make_attribute (meta_property, "GetAccess"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2523 meta_property.install_property (make_attribute (meta_property, "SetAccess"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2524 meta_property.install_property (make_attribute (meta_property, "Dependent"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2525 meta_property.install_property (make_attribute (meta_property, "Transient"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2526 meta_property.install_property (make_attribute (meta_property, "Hidden"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2527 meta_property.install_property (make_attribute (meta_property, "GetObservable"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2528 meta_property.install_property (make_attribute (meta_property, "SetObservable"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2529 meta_property.install_property (make_attribute (meta_property, "GetMethod"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2530 meta_property.install_property (make_attribute (meta_property, "SetMethod"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2531 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	2532 meta_property.install_property
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2533 (make_property (meta_property, "DefaultValue",
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2534 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	2535 "public", Matrix (), "private"));
5e5705b3e505 Implement some embryonic handle-classdef semantic. Michael Goffioul <michael.goffioul@gmail.com> parents: 15841 diff changeset	2536 meta_property.install_property (make_attribute (meta_property, "HasDefault"));
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2537 /* meta.property events */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2538 // FIXME: add events
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2539
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2540 /* handle methods */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2541 handle.install_method (make_method (handle, "delete", handle_delete));
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 /* meta.package properties */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2544 meta_package.install_property (make_attribute (meta_package, "Name"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2545 meta_package.install_property (make_property (meta_package, "ContainingPackage"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2546 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2547 (make_property (meta_package, "ClassList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2548 make_fcn_handle (package_get_classes, "meta.package>get.ClassList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2549 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2550 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2551 (make_property (meta_package, "Classes",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2552 make_fcn_handle (package_get_classes, "meta.package>get.Classes"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2553 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2554 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2555 (make_property (meta_package, "FunctionList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2556 make_fcn_handle (package_get_functions, "meta.package>get.FunctionList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2557 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2558 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2559 (make_property (meta_package, "Functions",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2560 make_fcn_handle (package_get_functions, "meta.package>get.Functions"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2561 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2562 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2563 (make_property (meta_package, "PackageList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2564 make_fcn_handle (package_get_packages, "meta.package>get.PackageList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2565 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2566 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2567 (make_property (meta_package, "Packages",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2568 make_fcn_handle (package_get_packages, "meta.package>get.Packages"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2569 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2570 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	2571 "public", true));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2572
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2573 /* create "meta" package */
15909 b8bff84022d6 Use strong reference between objects and their class. Michael Goffioul <michael.goffioul@gmail.com> parents: 15897 diff changeset	2574 cdef_package package_meta = cdef_package::_meta = make_package ("meta");
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2575 package_meta.install_class (meta_class, "class");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2576 package_meta.install_class (meta_property, "property");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2577 package_meta.install_class (meta_method, "method");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2578 package_meta.install_class (meta_package, "package");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2579 package_meta.install_class (meta_event, "event");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2580 package_meta.install_class (meta_dynproperty, "dynproperty");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2581 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2582
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2583 DEFUN (__meta_get_package__, args, , "")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2584 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2585 octave_value retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2586
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2587 if (args.length () == 1)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2588 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2589 std::string cname = args(0).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2590
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2591 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2592 retval = to_ov (lookup_package (cname));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2593 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2594 error ("invalid package name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2595 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2596 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2597 print_usage ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2598
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2599 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2600 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2601
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2602 DEFUN (__superclass_reference__, args, /* nargout */,
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2603 "-- texinfo --\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2604 @deftypefn {Built-in Function} {} __superclass_reference__ ()\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2605 Undocumented internal function.\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2606 @end deftypefn")
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2607 {
15896 57be060d7672 Implement full object construction and superclass references. Michael Goffioul <michael.goffioul@gmail.com> parents: 15870 diff changeset	2608 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	2609 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2610
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2611 DEFUN (__meta_class_query__, args, /* nargout */,
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2612 "-- texinfo --\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2613 @deftypefn {Built-in Function} {} __meta_class_query__ ()\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2614 Undocumented internal function.\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2615 @end deftypefn")
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2616 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2617 octave_value retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2618
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2619 std::cerr << "__meta_class_query__ ("
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2620 << args(0).string_value () << ", "
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2621 << args(1).string_value () << ")"
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2622 << std::endl;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2623
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2624 if (args.length () == 2)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2625 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2626 std::string pkg = args(0).string_value ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2627 std::string cls = args(1).string_value ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2628
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2629 if (! pkg.empty ())
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2630 cls = pkg + "." + cls;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2631
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2632 if (! error_state)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2633 retval = to_ov (lookup_class (cls));
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2634 else
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2635 error ("invalid class name, expected a string value");
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2636 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2637 else
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2638 print_usage ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2639
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2640 return retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2641 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	2642
15897 a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2643 DEFUN (metaclass, args, /* nargout */,
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2644 "-- texinfo --\n\
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2645 @deftypefn {Built-in Function} {} metaclass (obj)\n\
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2646 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	2647 @end deftypefn")
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2648 {
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2649 octave_value retval;
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2650
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2651 if (args.length () == 1)
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2652 {
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2653 cdef_object obj = to_cdef (args(0));
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2654
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2655 if (! error_state)
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2656 retval = to_ov (obj.get_class ());
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2657 else
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2658 print_usage ();
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2659 }
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2660 else
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2661 print_usage ();
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2662
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2663 return retval;
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2664 }
a413c6fe1726 Add metaclass function. Michael Goffioul <michael.goffioul@gmail.com> parents: 15896 diff changeset	2665
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2666 /*
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2667 ;;; Local Variables: ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2668 ;;; mode: C++ ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2669 ;;; End: ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2670 */

Mercurial > octave-nkf

annotate libinterp/octave-value/ov-classdef.cc @ 15909:b8bff84022d6 classdef