octave-nkf: src/ov-classdef.cc annotate

annotate src/ov-classdef.cc @ 15037:56b8eb7c9c04 classdef

improvements in parsing classdef * liboctave/base-list.h (octave_base_list::octave_base_list (void), octave_base_list::octave_base_list (const std::list<elt_type>&), octave_base_list::operator = (const octave_base_list&), octave_base_list::~octave_base_list (void)): Now public. * pt-classdef.h, pt-classdef.cc: New files. * src/Makefile.am (PT_INCLUDES): Add pt-classdef.h to the list. (PT_SRC): Add pt-classdef.cc to the list. * pt-all.h: Include pt-classdef.h. * ov.cc: Include ov-classdef.h. * ov-classdef.cc: Include pt-classdef.h. (cdef_class:make_meta_class): New method. (F__meta_get_class__): Delete. (F__superclass_reference__, F__meta_class_query__): New functions. * pt-id.h: Include oct-lvalue.h. * pt-walk.h (tree_walker::visit_classdef (tree_classdef&), tree_walker::visit_classdef_attribute (tree_classdef_attribute&), tree_walker::visit_classdef_attribute_list (tree_classdef_attribute_list&), tree_walker::visit_classdef_superclass (tree_classdef_superclass&), tree_walker::visit_classdef_superclass_list (tree_classdef_superclass_list&), tree_walker::visit_classdef_property (tree_classdef_property&), tree_walker::visit_classdef_property_list (tree_classdef_property_list&), tree_walker::visit_classdef_properties_block (tree_classdef_properties_block&), tree_walker::visit_classdef_methods_list (tree_classdef_methods_list&), tree_walker::visit_classdef_methods_block (tree_classdef_methods_block&), tree_walker::visit_classdef_event (tree_classdef_event&), tree_walker::visit_classdef_events_list (tree_classdef_events_list&), tree_walker::visit_classdef_events_block (tree_classdef_events_block&), tree_walker::visit_classdef_enum (tree_classdef_enum&), tree_walker::visit_classdef_enum_list (tree_classdef_enum_list&), tree_walker::visit_classdef_enum_block (tree_classdef_enum_block&), tree_walker::visit_classdef_body (tree_classdef_body&)): New virtual functions. * token.h, token.cc (token::sc::mr, token::sc::cr, token::sc::pr, token::mc::mr, token::mc::pr): Delete. (token::sc::method_name, token::sc::package_name, token::sc::class_name, token::mc::package_name, token::mc::class_name): New member variables. (token::method_rec, token::class_rec, token::package_rec, token::meta_class_rec, token::meta_package_rec): Delete. (token::superclass_method_name, token::superclass_package_name, token::superclass_class_name, token::meta_package_name, token::meta_class_name): New methods. (token::token (symbol_table::symbol_record*, int, int), token::token (symbol_table::symbol_record*, symbol_table::symbol_record*, int, int), token::token (symbol_table::symbol_record*, symbol_table::symbol_record*, symbol_table::symbol_record*, int, int)): Delete. (token::token (const std::string&, const std::string&, int, int), token::token (const std::string&, const std::string&, const std::string&, int, int)): New constructors. (token::scls_rec_token, token::meta_rec_token): Delete enum values. (token::scls_name_token, token::meta_rec_token): New enum values. (token::~token): Delete sc and mc struct memebers. * lex.ll, lex.h (lexical_feedback::parsing_classdef_get_method, lexical_feedback::parsing_classdef_set_method)): New data members. (lexical_feedback::lexical_feedback, lexical_feedback::init): Initialize new data members. (prep_lexer_for_classdef_file): New function. (CLASSDEF_FILE_BEGIN): New exclusive start state. (handle_superclass_identifier, handle_meta_identifier): Split identifier here and create token with character strings. (display_token): Handle CLASSDEF_FILE. (display_state): Handle CLASSDEF_FILE_BEGIN. * oct-parse.yy: Include ov-classdef.h and pt-funcall.h. (classdef_object): New static variable. (make_superclass_ref, make_meta_class_query, make_classdef, make_classdef_properties_block, make_classdef_methods_block, make_classdef_events_block, make_classdef_enum_block)): New functions. (dummy_type): Delete unused nonterminal type. (tok_type, tree_funcall_type, tree_function_def_type, tree_classdef_type, tree_classdef_attribute_type, tree_classdef_attribute_list_type, tree_classdef_superclass_type, tree_classdef_superclass_list_type, tree_classdef_body_type, tree_classdef_property_type, tree_classdef_property_list_type, tree_classdef_properties_block_type, tree_classdef_methods_list_type, tree_classdef_methods_block_type, tree_classdef_event_type, tree_classdef_events_list_type, tree_classdef_events_block_type, tree_classdef_enum_type, tree_classdef_enum_list_type, tree_classdef_enum_block_type): New types for nonterminals. (CLASSDEF): Declare to have a tok_val token value. (CLASSDEF_FILE): New token. (classdef_end, properties_beg, methods_beg, events_beg, enum_beg, classdef1): Delete nonterminals. (property_list): Rename from properties_list. (attr, class_event, class_enum, class_property, property_list, properties_block, methods_list, methods_block, opt_attr_list, attr_list, events_list, events_blcok, enum_list, enum_block, class_body, classdef): Declare with specific types. Create parse tree objects for these nonterminals. (classdef_file): New nonterminal. (parse_fcn_file): Handle classdef files. Don't treat classdef files as scripts. (command): Don't handle classdef here. (input): Accept classdef_file here. (fcn_name): If GET, set lexer_flags.parsing_classdef_get_method. If SET, set lexer_flags.parsing_classdef_set_method.

author	John W. Eaton <jwe@octave.org>
date	Fri, 27 Jul 2012 17:10:25 -0400
parents	aa1f9e479c6e
children

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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	27 #include <map>
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	28
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	29 #include "defun.h"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	30 #include "ov-builtin.h"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	31 #include "ov-classdef.h"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	32 #include "ov-fcn-handle.h"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	33 #include "ov-typeinfo.h"
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	34 #include "pt-classdef.h"
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	35
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	36 static std::map<std::string, cdef_class> all_classes;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	37 static std::map<std::string, cdef_package> all_packages;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	38
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	39 static void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	40 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	41 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	42 error ("%s: method `%s' has %s access and cannot be run in this context",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	43 from.c_str (), meth.get_name ().c_str (),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	44 meth.get_access ().c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	45 }
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_property_access (const std::string& from, const cdef_property& prop,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	49 bool is_set = false)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	50 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	51 if (is_set)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	52 error ("%s: property `%s' has %s access and cannot be set in this context",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	53 from.c_str (), prop.get_name ().c_str (),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	54 prop.get_set_access ().c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	55 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	56 error ("%s: property `%s' has %s access and cannot be obtained in this context",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	57 from.c_str (), prop.get_name ().c_str (),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	58 prop.get_get_access ().c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	59 }
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 static octave_value
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	62 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	63 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	64 octave_value fcn (new octave_builtin (ff, nm));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	65
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	66 octave_value fcn_handle (new octave_fcn_handle (fcn, nm));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	67
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	68 return fcn_handle;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	69 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	70
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	71 inline octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	72 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	73 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	74 std::list<octave_value_list> idx (1, args);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	75
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	76 std::string type ("(");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	77
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	78 return val.subsref (type, idx, nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	79 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	80
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	81 static bool
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	82 check_access (const std::string& req, const std::string& acc)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	83 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	84 if (req == "private")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	85 return true;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	86 else if (req == "protected")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	87 return (acc != "private");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	88 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	89 return (acc == "public");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	90 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	91
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	92 static std::string
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	93 get_base_name (const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	94 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	95 std::string::size_type pos = nm.find_last_of ('.');
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	96
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	97 if (pos != std::string::npos)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	98 return nm.substr (pos + 1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	99
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	100 return nm;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	101 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	102
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	103 static std::string
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	104 superclass_access (const std::string& acc)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	105 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	106 if (acc == "public")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	107 return acc;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	108 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	109 return "protected";
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	110 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	111
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	112 static cdef_class
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	113 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	114 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	115 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	116
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	117 if (it == all_classes.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	118 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	119 // FIXME: should look into load-path
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	120 if (error_if_not_found)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	121 error ("class not found: %s", name.c_str ());
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 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	124 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	125 cdef_class& cls = it->second;
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 if (! cls.is_builtin ())
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 // FIXME: check whether a class reload is needed
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	132 if (cls.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	133 return cls;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	134 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	135 all_classes.erase (it);
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	138 return cdef_class ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	139 }
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 static Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	142 lookup_classes (const Cell& cls_names)
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 Cell cls (cls_names.numel (), 1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	145
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	146 for (int i = 0; i < cls_names.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	147 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	148 cdef_class c = lookup_class (cls_names(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	149
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	150 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	151 cls(i) = to_ov (c);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	152 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	153 return Cell ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	154 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	155
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	156 return cls;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	157 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	158
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	159 static bool
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	160 is_superclass (const cdef_class& clsa, const cdef_class& clsb,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	161 bool allow_equal = true)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	162 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	163 if (allow_equal && clsa == clsb)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	164 return true;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	165 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	166 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	167 Cell c = clsb.get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	168
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	169 bool retval = false;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	170
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	171 for (int i = 0; ! retval && i < c.numel (); i++)
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 cdef_class cls = lookup_class (c(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	174
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	175 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	176 retval = is_superclass (clsa, cls, true);
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 retval;
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 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	182
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	183 inline bool
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	184 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	185 { return is_superclass (clsa, clsb, false); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	186
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	187 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	188 class_get_properties (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	189 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	190 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	191
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	192 if (args.length () == 1 && args(0).type_name () == "object")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	193 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	194 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	195
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	196 retval(0) = cls.get_properties ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	197 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	198
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	199 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	200 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	201
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	202 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	203 class_get_methods (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	204 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	205 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	206
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	207 if (args.length () == 1 && args(0).type_name () == "object")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	208 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	209 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	210
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	211 retval(0) = cls.get_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	212 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	213
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	214 return retval;
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	217 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	218 class_get_superclasses (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	219 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	220 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	221
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	222 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	223 && args(0).class_name () == "meta.class")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	224 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	225 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	226
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	227 Cell classes = cls.get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	228
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	229 retval(0) = lookup_classes (classes);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	230 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	231
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	232 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	233 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	234
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	235 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	236 class_get_inferiorclasses (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	237 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	238 octave_value_list retval;
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 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	241 && args(0).class_name () == "meta.class")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	242 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	243 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	244
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	245 Cell classes = cls.get ("InferiorClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	246
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	247 retval(0) = lookup_classes (classes);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	248 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	249
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	250 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	251 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	252
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	253 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	254 class_fromName (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	255 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	256 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	257
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	258 if (args.length () == 1)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	259 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	260 std::string name = args(0).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	261
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	262 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	263 retval(0) = to_ov (lookup_class (name));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	264 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	265 error ("fromName: invalid class name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	266 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	267 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	268 error ("fromName: invalid number of parameters");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	269
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	270 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	271 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	272
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	273 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	274 class_fevalStatic (const octave_value_list& args, int nargout)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	275 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	276 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	277
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	278 if (args.length () > 1 && args(0).type_name () == "object")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	279 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	280 cdef_class cls (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	281
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	282 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	283 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	284 std::string meth_name = args(1).string_value ();
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 if (! error_state)
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 cdef_method meth = cls.find_method (meth_name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	289
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	290 if (meth.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	291 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	292 // FIXME: can the context be something else?
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	293 if (meth.check_access ("public"))
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	294 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	295 if (meth.is_static ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	296 retval = meth.execute (args.splice (0, 2), nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	297 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	298 error ("fevalStatic: method `%s' is not static",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	299 meth_name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	300 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	301 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	302 gripe_method_access ("fevalStatic", meth);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	303 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	304 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	305 error ("fevalStatic: method not found: %s",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	306 meth_name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	307 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	308 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	309 error ("fevalStatic: invalid method name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	310 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	311 error ("fevalStatic: invalid object, expected a meta.class object");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	312 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	313 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	314 error ("fevalStatic: invalid arguments");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	315
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	316 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	317 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	318
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	319 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	320 class_getConstant (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	321 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	322 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	323
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	324 if (args.length () == 2 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	325 && args(0).class_name () == "meta.class")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	326 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	327 cdef_class cls = to_cdef (args(0));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	328
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	329 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	330 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	331 std::string prop_name = args(1).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	332
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	333 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	334 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	335 cdef_property prop = cls.find_property (prop_name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	336
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	337 if (prop.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	338 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	339 // FIXME: can the context be something else?
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	340 if (prop.check_get_access ("public"))
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	341 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	342 if (prop.is_constant ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	343 retval(0) = prop.get_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	344 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	345 error ("getConstant: property `%s' is not constant",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	346 prop_name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	347 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	348 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	349 gripe_property_access ("getConstant", prop);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	350 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	351 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	352 error ("getConstant: property not found: %s",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	353 prop_name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	354 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	355 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	356 error ("getConstant: invalid property name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	357 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	358 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	359 error ("getConstant: invalid object, expected a meta.class object");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	360 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	361 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	362 error ("getConstant: invalid arguments");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	363
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	364 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	365 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	366
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	367 #define META_CLASS_CMP(OP, CLSA, CLSB, FUN) \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	368 static octave_value_list \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	369 class_ ## OP (const octave_value_list& args, int /* nargout */) \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	370 { \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	371 octave_value_list retval; \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	372 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	373 if (args.length () == 2 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	374 && args(0).type_name () == "object" && args(1).type_name () == "object" \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	375 && 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	376 { \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	377 cdef_class clsa = to_cdef (args(0)); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	378 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	379 cdef_class clsb = to_cdef (args(1)); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	380 \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	381 if (! error_state) \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	382 retval(0) = FUN (CLSA, CLSB); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	383 else \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	384 error (#OP ": invalid objects, expected meta.class objects"); \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	385 } \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	386 else \
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	387 error (#OP ": invalid arguments"); \
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 return retval; \
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	392 META_CLASS_CMP (lt, clsb, clsa, is_strict_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	393 META_CLASS_CMP (le, clsb, clsa, is_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	394 META_CLASS_CMP (gt, clsa, clsb, is_strict_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	395 META_CLASS_CMP (ge, clsa, clsb, is_superclass)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	396 META_CLASS_CMP (eq, clsa, clsb, operator==)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	397 META_CLASS_CMP (ne, clsa, clsb, operator!=)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	398
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	399 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	400 handle_delete (const octave_value_list& /* args /, int / nargout */)
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 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	403
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	404 // FIXME: implement this
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	405
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	406 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	407 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	408
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	409 static cdef_class
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	410 make_class (const std::string& name, const std::string& super = std::string())
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 cdef_class cls ("meta.class");
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 all_classes[name] = cls;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	415 cls.put ("ConstructOnLoad", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	416 cls.put ("ContainingPackage", Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	417 cls.put ("Description", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	418 cls.put ("DetailedDescription", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	419 cls.put ("Events", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	420 cls.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	421 cls.put ("InferiorClasses", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	422 cls.put ("Methods", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	423 cls.put ("Name", name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	424 cls.put ("Properties", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	425 cls.put ("Sealed", true);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	426 if (super.empty ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	427 cls.put ("SuperClasses", Cell ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	428 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	429 cls.put ("SuperClasses", Cell (octave_value (super)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	430
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	431 return cls;
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	434 static cdef_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	435 make_property (const cdef_object& cls, const std::string& name,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	436 const octave_value& get_method = Matrix (),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	437 const std::string& get_access = "public",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	438 const octave_value& set_method = Matrix (),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	439 const std::string& set_access = "public")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	440 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	441 // FIXME: what about default value?
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	442
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	443 cdef_property prop ("meta.property");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	444
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	445 prop.put ("Name", name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	446 prop.put ("Description", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	447 prop.put ("DetailedDescription", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	448 prop.put ("Abstract", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	449 prop.put ("Constant", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	450 prop.put ("GetAccess", get_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	451 prop.put ("SetAccess", set_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	452 prop.put ("Dependent", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	453 prop.put ("Transient", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	454 prop.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	455 prop.put ("GetObservable", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	456 prop.put ("SetObservable", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	457 prop.put ("GetMethod", get_method);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	458 prop.put ("SetMethod", set_method);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	459 prop.put ("DefiningClass", to_ov (cls));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	460
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	461 return prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	462 }
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 inline cdef_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	465 make_attribute (const cdef_object& cls, const std::string& name)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	466 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	467 return make_property (cls, name, Matrix (), "public", Matrix (), "private");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	468 }
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 static cdef_method
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	471 make_method (const cdef_object& cls, const std::string& name, const octave_value& fcn,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	472 const std::string& m_access = "public", bool is_static = false)
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 cdef_method meth ("meta.method");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	475
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	476 meth.put ("Abstract", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	477 meth.put ("Access", m_access);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	478 meth.put ("DefiningClass", to_ov (cls));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	479 meth.put ("Description", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	480 meth.put ("DetailedDescription", std::string ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	481 meth.put ("Hidden", false);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	482 meth.put ("Name", name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	483 meth.put ("Sealed", true);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	484 meth.put ("Static", is_static);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	485
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	486 meth.set_function (fcn);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	487
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	488 return meth;
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	491 inline cdef_method
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	492 make_method (const cdef_object& cls, const std::string& name, octave_builtin::fcn ff,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	493 const std::string& m_access = "public", bool is_static = false)
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 octave_value fcn (new octave_builtin (ff, name));
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 octave_value fcn_handle (new octave_fcn_handle (fcn, name));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	498
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	499 return make_method (cls, name, fcn_handle, m_access, is_static);
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	502 static cdef_package
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	503 make_package (const std::string& nm,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	504 const std::string& parent = std::string ())
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_package pack ("meta.package");
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 all_packages[nm] = pack;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	509 pack.put ("Name", nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	510 pack.put ("ContainingPackage", to_ov (all_packages[parent]));
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 return pack;
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	515 DEFINE_OCTAVE_ALLOCATOR (octave_classdef);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	516
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	517 int octave_classdef::t_id (-1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	518
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	519 const std::string octave_classdef::t_name ("object");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	520
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	521 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	522 octave_classdef::register_type (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	523 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	524 t_id = octave_value_typeinfo::register_type
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	525 (octave_classdef::t_name, "<unknown>", octave_value (new octave_classdef ()));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	526 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	527
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	528 cdef_class
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	529 cdef_object_rep::get_class (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	530 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	531 cdef_class cls = lookup_class (class_name ());
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 return cls;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	534 }
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 string_vector
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	537 cdef_object_rep::map_keys (void) const
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 cdef_class cls = get_class ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	540
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	541 if (cls.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	542 return cls.get_names ();
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 return string_vector ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	545 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	546
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	547 octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	548 handle_cdef_object::subsref (const std::string& type,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	549 const std::list<octave_value_list>& idx,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	550 int nargout, int& skip)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	551 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	552 skip = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	553
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	554 cdef_class cls = get_class ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	555
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	556 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	557
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	558 if (! cls.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	559 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	560
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	561 switch (type[0])
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	562 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	563 case '.':
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	564 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	565 std::string name = (idx.front ())(0).string_value ();
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 // FIXME: get the right context; context should also
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	568 // be linked to the current executing class (if any)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	569 // such that protected/private methods found in inherited
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	570 // classes are correctly resolved.
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	571 std::string context = "public";
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	572
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	573 cdef_method meth = cls.find_method (name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	574
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	575 if (meth.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	576 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	577 if (meth.check_access (context))
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	578 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	579 int _nargout = (type.length () > 2 ? 1 : nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	580
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	581 octave_value_list args;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	582
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	583 skip = 1;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	584
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	585 if (type.length () > 1 && type[1] == '(')
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	586 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	587 std::list<octave_value_list>::const_iterator it = idx.begin ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	588
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	589 args = *++it;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	590
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	591 skip++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	592 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	593
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	594 if (meth.is_static ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	595 retval = meth.execute (args, _nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	596 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	597 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	598 refcount++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	599 retval = meth.execute (cdef_object (this), args, _nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	600 }
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 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	603 gripe_method_access ("subsref", meth);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	604 }
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 if (skip == 0 && ! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	607 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	608 cdef_property prop = cls.find_property (name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	609
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	610 if (prop.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	611 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	612 if (prop.check_get_access (context))
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	613 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	614 refcount++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	615 retval(0) = prop.get_value (cdef_object (this));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	616
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	617 skip = 1;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	618 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	619 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	620 gripe_property_access ("subsref", prop);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	621 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	622 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	623 error ("subsref: unknown method or property: %s", name.c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	624 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	625 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	626 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	627 default:
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	628 error ("object cannot be indexed with `%c'", type[0]);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	629 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	630 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	631
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	632 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	633 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	634
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	635 cdef_method
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	636 cdef_class::cdef_class_rep::find_method (const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	637 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	638 method_iterator it = method_map.find (nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	639
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	640 if (it == method_map.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	641 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	642 // FIXME: look into class directory
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	643 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	644 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	645 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	646 cdef_method& meth = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	647
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	648 // FIXME: check if method reload needed
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	649
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	650 if (meth.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	651 return meth;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	652 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	653
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	654 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	655
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	656 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	657
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	658 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	659 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	660 cdef_class cls = lookup_class (super_classes(i).string_value ());
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 if (! error_state)
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 cdef_method meth = cls.find_method (nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	665
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	666 if (meth.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	667 return meth;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	668 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	669 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	670
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	671 return cdef_method ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	672 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	673
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	674 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	675 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	676 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	677 method_map[meth.get_name ()] = meth;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	678 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	679
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	680 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	681 cdef_class::cdef_class_rep::load_all_methods (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	682 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	683 // FIXME: re-scan class directory
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	684 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	685
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	686 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	687 cdef_class::cdef_class_rep::get_methods (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	688 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	689 std::map<std::string,cdef_method> meths;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	690
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	691 std::map<std::string,int> count;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	692
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	693 count["public"] = count["protected"] = count["private"] = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	694
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	695 find_methods (meths, count);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	696
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	697 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	698 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	699 Cell c (count["public"] + count["protected"], 1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	700
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	701 int idx = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	702
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	703 for (std::map<std::string,cdef_method>::const_iterator it = meths.begin ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	704 it != meths.end (); ++it)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	705 if (::check_access ("protected", it->second.get_access ()))
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	706 c (idx++, 0) = to_ov (it->second);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	707
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	708 return c;
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	711 return Cell ();
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	714 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	715 cdef_class::cdef_class_rep::find_methods (std::map<std::string,cdef_method>& meths,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	716 std::map<std::string,int>& count)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	717 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	718 load_all_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	719
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	720 method_const_iterator it;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	721
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	722 for (it = method_map.begin (); it != method_map.end (); ++it)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	723 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	724 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	725
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	726 if (meths.find (nm) == meths.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	727 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	728 std::string acc = it->second.get_access ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	729
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	730 meths[nm] = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	731 count[acc]++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	732 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	733 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	734
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	735 // Look into superclasses
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 Cell super_classes = get ("SuperClasses").cell_value ();
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 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	740 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	741 cdef_class cls = lookup_class (super_classes(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	742
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	743 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	744 cls.get_rep ()->find_methods (meths, count);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	745 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	746 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	747 }
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 cdef_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	751 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	752 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	753 property_iterator it = property_map.find (nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	754
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	755 if (it != property_map.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	756 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	757 cdef_property& prop = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	758
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	759 if (prop.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	760 return prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	761 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	762
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	763 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	764
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	765 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	766
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	767 for (int i = 0; i < super_classes.numel (); i++)
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 cdef_class cls = lookup_class (super_classes(i).string_value ());
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 if (! error_state)
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 cdef_property prop = cls.find_property (nm);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	774
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	775 if (prop.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	776 return prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	777 }
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	780 return cdef_property ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	781 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	782
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	783 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	784 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	785 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	786 property_map[prop.get_name ()] = prop;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	787 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	788
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	789 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	790 cdef_class::cdef_class_rep::get_properties (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	791 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	792 std::map<std::string,cdef_property> props;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	793
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	794 std::map<std::string,int> count;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	795
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	796 count["public"] = count["protected"] = count["private"] = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	797
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	798 find_properties (props, count);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	799
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	800 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	801 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	802 Cell c (count["public"] + count["protected"], 1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	803
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	804 int idx = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	805
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	806 for (std::map<std::string,cdef_property>::const_iterator it = props.begin ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	807 it != props.end (); ++it)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	808 if (::check_access ("protected", it->second.get_get_access ()))
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	809 c (idx++, 0) = to_ov (it->second);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	810
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	811 return c;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	812 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	813
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	814 return Cell ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	815 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	816
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	817 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	818 cdef_class::cdef_class_rep::find_properties (std::map<std::string,cdef_property>& props,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	819 std::map<std::string,int>& count)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	820 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	821 property_const_iterator it;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	822
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	823 for (it = property_map.begin (); it != property_map.end (); ++it)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	824 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	825 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	826
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	827 if (props.find (nm) == props.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	828 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	829 std::string acc = it->second.get_get_access ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	830
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	831 props[nm] = it->second;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	832 count[acc]++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	833 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	834 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	835
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	836 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	837
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	838 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	839
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	840 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	841 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	842 cdef_class cls = lookup_class (super_classes(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	843
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	844 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	845 cls.get_rep ()->find_properties (props, count);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	846 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	847 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	848 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	849 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	850
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	851 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	852 cdef_class::cdef_class_rep::find_names (std::map<std::string,std::string>& names,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	853 std::map<std::string,int>& count)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	854 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	855 load_all_methods ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	856
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	857 for (method_const_iterator it = method_map.begin ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	858 it != method_map.end(); ++it)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	859 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	860 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	861
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	862 if (names.find (nm) == names.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	863 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	864 std::string acc = it->second.get_access ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	865
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	866 names[nm] = acc;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	867 count[acc]++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	868 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	869 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	870
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	871 for (property_const_iterator it = property_map.begin ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	872 it != property_map.end (); ++it)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	873 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	874 std::string nm = it->second.get_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	875
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	876 if (names.find (nm) == names.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	877 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	878 std::string acc = it->second.get_get_access ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	879
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	880 names[nm] = acc;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	881 count[acc]++;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	882 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	883 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	884
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	885 // Look into superclasses
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	886
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	887 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	888
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	889 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	890 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	891 cdef_class cls = lookup_class (super_classes(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	892
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	893 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	894 cls.get_rep ()->find_names (names, count);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	895 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	896 break;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	897 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	898 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	899
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	900 string_vector
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	901 cdef_class::cdef_class_rep::get_names (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	902 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	903 std::map<std::string,std::string> names;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	904
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	905 std::map<std::string,int> count;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	906
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	907 count["public"] = count["protected"] = count["private"] = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	908
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	909 find_names (names, count);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	910
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	911 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	912 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	913 string_vector v (count["public"]);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	914
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	915 int idx = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	916 for (std::map<std::string,std::string>::const_iterator it = names.begin ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	917 it != names.end (); ++it)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	918 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	919 if (it->second == "public")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	920 v[idx++] = it->first;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	921 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	922
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	923 return v.sort (true);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	924 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	925
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	926 return string_vector ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	927 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	928
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	929 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	930 cdef_class::cdef_class_rep::delete_object (cdef_object obj)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	931 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	932 method_iterator it = method_map.find ("delete");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	933
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	934 if (it != method_map.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	935 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	936 std::string cls_name = obj.class_name ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	937
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	938 obj.set_class_name (get ("Name").string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	939
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	940 it->second.execute (obj, octave_value_list (), 0);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	941
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	942 obj.set_class_name (cls_name);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	943 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	944
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	945 // FIXME: should we destroy corresponding properties here?
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	946
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	947 // Call "delete" in super classes
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	948
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	949 Cell super_classes = get ("SuperClasses").cell_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	950
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	951 for (int i = 0; i < super_classes.numel (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	952 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	953 cdef_class cls = lookup_class (super_classes(i).string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	954
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	955 if (!error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	956 cls.delete_object (obj);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	957 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	958 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	959
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	960 cdef_class
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	961 cdef_class::make_meta_class (const tree_classdef* t)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	962 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	963 cdef_class retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	964
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	965 return retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	966 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	967
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	968 octave_value
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	969 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	970 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	971 // FIXME: should check whether we're already in get accessor method
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	972
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	973 octave_value retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	974
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	975 octave_value get_fcn = get ("GetMethod");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	976
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	977 std::string get_access = get ("GetAccess").string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	978
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	979 if (get_access != "public")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	980 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	981 // FIXME: should check the current call stack
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	982 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	983
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	984 if (get_fcn.is_empty ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	985 retval = obj.get (get ("Name").string_value ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	986 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	987 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	988 octave_value_list args;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	989
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	990 args(0) = to_ov (obj);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	991
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	992 args = execute_ov (get_fcn, args, 1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	993
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	994 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	995 retval = args(0);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	996 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	997
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	998 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	999 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1000
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1001 bool
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1002 cdef_property::check_get_access (const std::string& req) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1003 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1004 return ::check_access (req, get_get_access ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1005 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1006
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1007 bool
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1008 cdef_property::check_set_access (const std::string& req) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1009 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1010 return ::check_access (req, get_set_access ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1011 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1012
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1013 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1014 cdef_method::cdef_method_rep::check_method (void)
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 // FIXME: check whether re-load is needed
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1017 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1018
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1019 octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1020 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	1021 int nargout)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1022 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1023 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1024
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1025 if (! get ("Abstract").bool_value ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1026 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1027 check_method ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1028
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1029 if (function.is_defined ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1030 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1031 retval = execute_ov (function, args, nargout);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1032 }
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 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1035 error ("%s: cannot execute abstract method",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1036 get ("Name").string_value ().c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1037
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1038 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1039 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1040
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1041 octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1042 cdef_method::cdef_method_rep::execute (const cdef_object& obj,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1043 const octave_value_list& args,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1044 int nargout)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1045 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1046 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1047
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1048 if (! get ("Abstract").bool_value ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1049 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1050 check_method ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1051
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1052 octave_value_list new_args;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1053
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1054 if (function.is_defined ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1055 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1056 new_args.resize (args.length () + 1);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1057
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1058 new_args(0) = to_ov (obj);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1059 for (int i = 0; i < args.length (); i++)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1060 new_args(i+1) = args(i);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1061
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1062 retval = execute_ov (function, new_args, nargout);
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 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1065 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1066 error ("%s: cannot execute abstract method",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1067 get ("Name").string_value ().c_str ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1068
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1069 return retval;
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 bool
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1073 cdef_method::check_access (const std::string& req) const
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 return ::check_access (req, get_access ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1076 }
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 static cdef_package
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1079 lookup_package (const std::string& name)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1080 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1081 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	1082
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1083 if (it != all_packages.end ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1084 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1085 cdef_package pack = it->second;
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 if (pack.ok ())
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1088 return pack;
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 error ("invalid package: %s", name.c_str ());
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 ("package not found: %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 return cdef_package ();
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
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1098 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1099 package_fromName (const octave_value_list& args, int /* nargout */)
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 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1102
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1103 if (args.length () == 1)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1104 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1105 std::string name = args(0).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1106
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1107 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1108 retval(0) = to_ov (lookup_package (name));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1109 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1110 error ("fromName: invalid package name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1111 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1112 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1113 error ("fromName: invalid number of parameters");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1114
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1115 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1116 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1117
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1118 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1119 package_get_classes (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1120 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1121 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1122
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1123 if (args.length () == 1 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1124 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1125 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1126 cdef_package pack (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1127
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1128 retval(0) = pack.get_classes ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1129 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1130
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1131 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1132 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1133
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1134 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1135 package_get_functions (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1136 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1137 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1138
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1139 if (args.length () == 0 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1140 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1141 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1142 cdef_package pack (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1143
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1144 retval(0) = pack.get_functions ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1145 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1146
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1147 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1148 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1149
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1150 static octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1151 package_get_packages (const octave_value_list& args, int /* nargout */)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1152 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1153 octave_value_list retval (1, Matrix ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1154
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1155 if (args.length () == 0 && args(0).type_name () == "object"
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1156 && args(0).class_name () == "meta.package")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1157 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1158 cdef_package pack (to_cdef (args(0)));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1159
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1160 retval(0) = pack.get_packages ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1161 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1162
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1163 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1164 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1165
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1166 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1167 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	1168 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1169 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1170 class_map[nm] = cls;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1171 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1172
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1173 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1174 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	1175 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1176 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1177 function_map[nm] = fcn;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1178 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1179
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1180 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1181 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	1182 const std::string& nm)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1183 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1184 package_map[nm] = pack;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1185 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1186
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1187 octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1188 cdef_package::cdef_package_rep::subsref (const std::string& type,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1189 const std::list<octave_value_list>& idx,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1190 int nargout, int& skip)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1191 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1192 return handle_cdef_object::subsref (type, idx, nargout, skip);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1193 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1194
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1195 template<class T1, class T2>
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1196 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1197 map2Cell (const std::map<T1, T2>& m)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1198 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1199 Cell retval (1, m.size ());
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1200 int i = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1201
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1202 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	1203 it != m.end (); ++it, ++i)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1204 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1205 retval(i) = to_ov (it->second);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1206 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1207
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1208 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1209 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1210
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1211 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1212 cdef_package::cdef_package_rep::get_classes (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1213 { return map2Cell (class_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1214
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1215 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1216 cdef_package::cdef_package_rep::get_functions (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1217 { return map2Cell (function_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1218
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1219 Cell
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1220 cdef_package::cdef_package_rep::get_packages (void) const
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1221 { return map2Cell (package_map); }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1222
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1223 octave_value_list
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1224 octave_classdef::subsref (const std::string& type,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1225 const std::list<octave_value_list>& idx,
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1226 int nargout)
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 int skip = 0;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1229 octave_value_list retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1230
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1231 // FIXME: should check "subsref" method first
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1232
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1233 retval = object.subsref (type, idx, nargout, skip);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1234
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1235 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1236 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1237 if (type.length () > skip && idx.size () > skip)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1238 retval = retval(0).next_subsref (nargout, type, idx, skip);
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1239 }
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 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1242 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1243
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1244 void
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1245 install_classdef (void)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1246 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1247 octave_classdef::register_type ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1248
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1249 /* meta classes */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1250 cdef_class handle = make_class ("handle");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1251 cdef_class meta_class = make_class ("meta.class", "handle");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1252 cdef_class meta_property = make_class ("meta.property", "handle");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1253 cdef_class meta_method = make_class ("meta.method", "handle");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1254 cdef_class meta_event = make_class ("meta.event", "handle");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1255 cdef_class meta_package = make_class ("meta.package", "handle");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1256 cdef_class meta_dynproperty = make_class ("meta.dynamicproperty", "handle");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1257
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1258 /* meta.class properties */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1259 meta_class.install_property (make_attribute (meta_class, "ConstructOnLoad"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1260 meta_class.install_property (make_property (meta_class, "ContainingPackage"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1261 meta_class.install_property (make_property (meta_class, "Description"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1262 meta_class.install_property (make_property (meta_class, "DetailedDescription"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1263 meta_class.install_property (make_property (meta_class, "Events"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1264 meta_class.install_property (make_attribute (meta_class, "Hidden"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1265 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1266 (make_property (meta_class, "InferiorClasses",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1267 make_fcn_handle (class_get_inferiorclasses, "meta.class>get.InferiorClasses"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1268 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1269 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1270 (make_property (meta_class, "Methods",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1271 make_fcn_handle (class_get_methods, "meta.class>get.Methods"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1272 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1273 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1274 (make_property (meta_class, "MethodList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1275 make_fcn_handle (class_get_methods, "meta.class>get.MethodList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1276 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1277 meta_class.install_property (make_attribute (meta_class, "Name"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1278 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1279 (make_property (meta_class, "Properties",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1280 make_fcn_handle (class_get_properties, "meta.class>get.Properties"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1281 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1282 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1283 (make_property (meta_class, "PropertyList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1284 make_fcn_handle (class_get_properties, "meta.class>get.PropertyList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1285 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1286 meta_class.install_property (make_attribute (meta_class, "Sealed"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1287 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1288 (make_property (meta_class, "SuperClasses",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1289 make_fcn_handle (class_get_superclasses, "meta.class>get.SuperClasses"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1290 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1291 meta_class.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1292 (make_property (meta_class, "SuperClassList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1293 make_fcn_handle (class_get_superclasses, "meta.class>get.SuperClassList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1294 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1295 /* meta.class methods */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1296 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	1297 "public", true));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1298 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	1299 "public", false));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1300 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	1301 "public", false));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1302 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	1303 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	1304 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	1305 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	1306 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	1307 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	1308
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1309 /* meta.method properties */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1310 meta_method.install_property (make_attribute (meta_method, "Abstract"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1311 meta_method.install_property (make_attribute (meta_method, "Access"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1312 meta_method.install_property (make_attribute (meta_method, "DefiningClass"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1313 meta_method.install_property (make_attribute (meta_method, "Description"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1314 meta_method.install_property (make_attribute (meta_method, "DetailedDescription"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1315 meta_method.install_property (make_attribute (meta_method, "Hidden"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1316 meta_method.install_property (make_attribute (meta_method, "Name"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1317 meta_method.install_property (make_attribute (meta_method, "Sealed"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1318 meta_method.install_property (make_attribute (meta_method, "Static"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1319
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1320 /* meta.property properties */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1321 meta_property.install_property (make_attribute (meta_property, "Name"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1322 meta_property.install_property (make_attribute (meta_property, "Description"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1323 meta_property.install_property (make_attribute (meta_property, "DetailedDescription"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1324 meta_property.install_property (make_attribute (meta_property, "Abstract"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1325 meta_property.install_property (make_attribute (meta_property, "Constant"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1326 meta_property.install_property (make_attribute (meta_property, "GetAccess"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1327 meta_property.install_property (make_attribute (meta_property, "SetAccess"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1328 meta_property.install_property (make_attribute (meta_property, "Dependent"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1329 meta_property.install_property (make_attribute (meta_property, "Transient"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1330 meta_property.install_property (make_attribute (meta_property, "Hidden"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1331 meta_property.install_property (make_attribute (meta_property, "GetObservable"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1332 meta_property.install_property (make_attribute (meta_property, "SetObservable"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1333 meta_property.install_property (make_attribute (meta_property, "GetMethod"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1334 meta_property.install_property (make_attribute (meta_property, "SetMethod"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1335 meta_property.install_property (make_attribute (meta_property, "DefiningClass"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1336 /* meta.property events */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1337 // FIXME: add events
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1338
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1339 /* handle methods */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1340 handle.install_method (make_method (handle, "delete", handle_delete));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1341
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1342 /* meta.package properties */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1343 meta_package.install_property (make_attribute (meta_package, "Name"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1344 meta_package.install_property (make_property (meta_package, "ContainingPackage"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1345 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1346 (make_property (meta_package, "ClassList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1347 make_fcn_handle (package_get_classes, "meta.package>get.ClassList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1348 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1349 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1350 (make_property (meta_package, "Classes",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1351 make_fcn_handle (package_get_classes, "meta.package>get.Classes"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1352 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1353 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1354 (make_property (meta_package, "FunctionList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1355 make_fcn_handle (package_get_functions, "meta.package>get.FunctionList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1356 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1357 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1358 (make_property (meta_package, "Functions",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1359 make_fcn_handle (package_get_functions, "meta.package>get.Functions"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1360 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1361 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1362 (make_property (meta_package, "PackageList",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1363 make_fcn_handle (package_get_packages, "meta.package>get.PackageList"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1364 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1365 meta_package.install_property
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1366 (make_property (meta_package, "Packages",
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1367 make_fcn_handle (package_get_packages, "meta.package>get.Packages"),
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1368 "public", Matrix (), "private"));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1369 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	1370 "public", true));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1371
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1372 /* create "meta" package */
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1373 cdef_package package_meta = make_package ("meta");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1374 package_meta.install_class (meta_class, "class");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1375 package_meta.install_class (meta_property, "property");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1376 package_meta.install_class (meta_method, "method");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1377 package_meta.install_class (meta_package, "package");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1378 package_meta.install_class (meta_event, "event");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1379 package_meta.install_class (meta_dynproperty, "dynproperty");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1380 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1381
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1382 DEFUN (__meta_get_package__, args, , "")
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1383 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1384 octave_value retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1385
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1386 if (args.length () == 1)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1387 {
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1388 std::string cname = args(0).string_value ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1389
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1390 if (! error_state)
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1391 retval = to_ov (lookup_package (cname));
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1392 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1393 error ("invalid package name, expected a string value");
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1394 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1395 else
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1396 print_usage ();
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1397
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1398 return retval;
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1399 }
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1400
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1401 DEFUN (__superclass_reference__, args, /* nargout */,
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1402 "-- texinfo --\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1403 @deftypefn {Built-in Function} {} __superclass_reference__ ()\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1404 Undocumented internal function.\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1405 @end deftypefn")
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1406 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1407 octave_value retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1408
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1409 std::cerr << "__superclass_reference__ ("
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1410 << args(0).string_value () << ", "
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1411 << args(1).string_value () << ", "
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1412 << args(2).string_value () << ")"
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1413 << std::endl;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1414
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1415 return retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1416 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1417
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1418 DEFUN (__meta_class_query__, args, /* nargout */,
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1419 "-- texinfo --\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1420 @deftypefn {Built-in Function} {} __meta_class_query__ ()\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1421 Undocumented internal function.\n\
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1422 @end deftypefn")
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1423 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1424 octave_value retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1425
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1426 std::cerr << "__meta_class_query__ ("
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1427 << args(0).string_value () << ", "
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1428 << args(1).string_value () << ")"
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1429 << std::endl;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1430
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1431 if (args.length () == 2)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1432 {
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1433 std::string pkg = args(0).string_value ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1434 std::string cls = args(1).string_value ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1435
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1436 if (! pkg.empty ())
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1437 cls = pkg + "." + cls;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1438
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1439 if (! error_state)
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1440 retval = to_ov (lookup_class (cls));
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1441 else
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1442 error ("invalid class name, expected a string value");
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1443 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1444 else
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1445 print_usage ();
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1446
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1447 return retval;
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1448 }
56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 15036 diff changeset	1449
15036 aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1450 /*
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1451 ;;; Local Variables: ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1452 ;;; mode: C++ ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1453 ;;; End: ***
aa1f9e479c6e octave_value classdef objects Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1454 */

Mercurial > octave-nkf

annotate src/ov-classdef.cc @ 15037:56b8eb7c9c04 classdef