Mercurial > octave-nkf
comparison libinterp/octave-value/ov-usr-fcn.cc @ 15869:5e5705b3e505 classdef
Implement some embryonic handle-classdef semantic.
* libinterp/octave-value/ov-classdef.h (cdef_object_rep::subsasgn,
handle_cdef_object::subsasgn, octave_classdef::subsasgn): New method
declarations.
(handle_cdef_object::~handle_cdef_object): New destructor declaration.
(cdef_class::cdef_class_rep::handle_class): New boolean field.
(cdef_class::cdef_class_rep::cdef_class_rep): Initialize it.
(cdef_class::cdef_class_rep::mark_as_handle_class,
cdef_class::cdef_class_rep::is_handle_class, cdef_class::mark_as_handle_class,
cdef_class::is_handle_class): Manipulate it.
(cdef_class::cdef_class_rep::get_name): New method.
(cdef_class::get_name): Use it.
(cdef_class::cdef_class_rep::initialize_object,
cdef_class::cdef_class_rep::subsref_meta,
cdef_class::cdef_class_rep::run_constructor,
cdef_class::cdef_class_rep::construct, cdef_class:initialize_object,
cdef_class::subsref_meta, cdef_class::run_constructor, cdef_class::construct):
New methods.
(cdef_class::cdef_class_rep::find_method, cdef_class::find_method):
Add "local" argument.
(cdef_class::cdef_class_rep::find_names, cdef_class::find_names): Change
signature to use std::set and a boolean flag.
(cdef_class::cdef_class_rep::find_methods, cdef_class::find_methods): Change
signature to use a boolean flag as second argument.
(cdef_class::make_meta_class): New static method.
(cdef_class::get_method_function, cdef_class::get_constructor_function): New
methods.
(cdef_property::cdef_property_rep::set_value, cdef_property::set_value):
Make cdef_object argument non const.
(cdef_property::cder_property_rep::is_relative_set): New method.
(cdef_property::get_get_access, cdef_property::get_set_access): Delete methods.
(cdef_property::check_get_access, cdef_property::check_set_access):
Remove string argument.
(cdef_method::get_access): Delete method.
(cdef_method::check_access): Remove string argument.
* libinterp/octave-value/ov-classdef.cc (gripe_method_access,
gripe_property_access): Support access specified as cell array of classes.
(make_function_of_class): New static function(s).
(check_access (std::string, std::string), superclass_access): Remove static
functions.
(lookup_class): Use symbol_table when class hasn't been loaded yet.
(lookup_classes): Returns std::list<cdef_class> instead of Cell.
(class_get_superclasses, class_get_inferiorclasses): Use it.
(to_ov (const std::list<cdef_class>&)): New static function.
(get_class_context, check_access (const cdef_class&, const octave_value&)):
Likewise.
(handle_cdef_object::subsref): Use new signature of access check methods.
(property_get_defaultvalue): New built-in property accessor.
(make_class): Change signature to support multiple inheritance. Set "Sealed" to
false by default. Determine value for HandleCompatible property and handle-class
representation.
(make_property): Take cdef_class as first argument. Add DefaultValue and
HasDefault properties. Call make_function_of_class for property accessors.
(make_attribute): Take cdef_class as first argument.
(make_method): Likewise. Call make_function_of_class.
(make_method (octave_builtin::fcn)): Do no construct a function handle object.
(octave_classdef::subsasgn, handle_cdef_object::subsasgn): New method.
(class octave_classdef_proxy): New class.
(cdef_class::get_method_function): Use it, new method.
(handle_cdef_object::~handle_cdef_object): New destructor.
(cdef_class_rep::find_method): New boolean "local" argument. When true, only
look into the current class, not in superclasses.
(cdef_class_rep::find_methods): New signature.
(cdef_class_rep::get_methods): Use it.
(cdef_class_rep::find_properties): New signature.
(cdef_class_rep::get_properties): Use it.
(cdef_class_rep::find_names): New signature.
(cdef_class_rep::get_names): Use it.
(cdef_class_rep::subsref_meta, cdef_class_rep::initialize_object,
cdef_class_rep::run_constructor, cdef_class_rep::construct): New methods.
(compute_attribute_value, attribute_to_string): New static functions.
(cdef_class::make_meta_class): Change signature, non const argument.
Implement it.
(cdef_property_rep::get_value): Do not check access here.
(cdef_property_rep::set_value, cdef_property_rep::is_recursive_set): New method.
(cdef_property_rep::check_get_access, cdef_property_rep::check_set_access,
cdef_method_rep::check_access): Use static check_access utility function.
(install_classdef): Adapt to change of signature of make_class. Mark meta
classes as sealed. Add HandleCompatible property to meta.class. Add
DefaultValue and HasDefault properties to meta.property.
* libinterp/parse-tree/pt-classdef.h (tree_classdef::make_meta_class):
Change return type to (octave_function *).
* libinterp/parse-tree/pt-classdef.cc (tree_classdef::make_meta_class):
Likewise. Call cdef_class::get_constructor_function.
* libinterp/parse-tree/oct-parse.yy (parse_fcn_file): Adapt to new
signature of tree_classdef::make_meta_class.
* libinterp/octave-value/ov-fcn.h (octave_function::is_classdef_constructor):
New virtual method.
* libinterp/octave-value/ov-usr-fcn.h
(octave_user_function::class_ctor_type): New private enum.
(octave_user_function::mark_as_class_constructor,
octave_user_function::is_class_constructor): Use it.
(octave_user_function::mark_as_classdef_constructor,
octave_user_function::is_classdef_constructor): New methods.
(octave_user_function::class_constructor): Turn into class_ctor_type.
* libinterp/octave-value/of-usr-fcn.cc
(octave_user_function::octave_user_function): Initialize class_constructor.
(octave_user_function::do_multi_index_op): When function is a classdef
constructor, extract the first argument and use it to populate the first
output argument.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Tue, 01 Jan 2013 19:42:17 -0500 |
parents | 52df2e7baabe |
children | 0259254a3ccc |
comparison
equal
deleted
inserted
replaced
15843:622f3f794162 | 15869:5e5705b3e505 |
---|---|
189 t_checked (static_cast<time_t> (0)), | 189 t_checked (static_cast<time_t> (0)), |
190 system_fcn_file (false), call_depth (-1), | 190 system_fcn_file (false), call_depth (-1), |
191 num_named_args (param_list ? param_list->length () : 0), | 191 num_named_args (param_list ? param_list->length () : 0), |
192 subfunction (false), inline_function (false), | 192 subfunction (false), inline_function (false), |
193 anonymous_function (false), nested_function (false), | 193 anonymous_function (false), nested_function (false), |
194 class_constructor (false), class_method (false), | 194 class_constructor (none), class_method (false), |
195 parent_scope (-1), local_scope (sid), | 195 parent_scope (-1), local_scope (sid), |
196 curr_unwind_protect_frame (0) | 196 curr_unwind_protect_frame (0) |
197 #ifdef HAVE_LLVM | 197 #ifdef HAVE_LLVM |
198 , jit_info (0) | 198 , jit_info (0) |
199 #endif | 199 #endif |
368 return do_multi_index_op (nargout, args, 0); | 368 return do_multi_index_op (nargout, args, 0); |
369 } | 369 } |
370 | 370 |
371 octave_value_list | 371 octave_value_list |
372 octave_user_function::do_multi_index_op (int nargout, | 372 octave_user_function::do_multi_index_op (int nargout, |
373 const octave_value_list& args, | 373 const octave_value_list& _args, |
374 const std::list<octave_lvalue>* lvalue_list) | 374 const std::list<octave_lvalue>* lvalue_list) |
375 { | 375 { |
376 octave_value_list retval; | 376 octave_value_list retval; |
377 | 377 |
378 if (error_state) | 378 if (error_state) |
379 return retval; | 379 return retval; |
380 | 380 |
381 if (! cmd_list) | 381 if (! cmd_list) |
382 return retval; | 382 return retval; |
383 | |
384 // If this function is a classdef constructor, extract the first input | |
385 // argument, which must be the partially constructed object instance. | |
386 | |
387 octave_value_list args (_args); | |
388 octave_value_list ret_args; | |
389 | |
390 if (is_classdef_constructor ()) | |
391 { | |
392 if (args.length () > 0) | |
393 { | |
394 ret_args = args.slice (0, 1, true); | |
395 args = args.slice (1, args.length () - 1, true); | |
396 } | |
397 else | |
398 panic_impossible (); | |
399 } | |
383 | 400 |
384 #ifdef HAVE_LLVM | 401 #ifdef HAVE_LLVM |
385 if (is_special_expr () | 402 if (is_special_expr () |
386 && tree_jit::execute (*this, args, retval)) | 403 && tree_jit::execute (*this, args, retval)) |
387 return retval; | 404 return retval; |
420 if (param_list && ! param_list->varargs_only ()) | 437 if (param_list && ! param_list->varargs_only ()) |
421 { | 438 { |
422 param_list->define_from_arg_vector (args); | 439 param_list->define_from_arg_vector (args); |
423 if (error_state) | 440 if (error_state) |
424 return retval; | 441 return retval; |
442 } | |
443 | |
444 // For classdef constructor, pre-populate the output arguments | |
445 // with the pre-initialized object instance, extracted above. | |
446 | |
447 if (is_classdef_constructor ()) | |
448 { | |
449 if (ret_list) | |
450 { | |
451 ret_list->define_from_arg_vector (ret_args); | |
452 if (error_state) | |
453 return retval; | |
454 } | |
455 else | |
456 { | |
457 ::error ("%s: invalid classdef constructor, no output argument defined", | |
458 dispatch_class ().c_str ()); | |
459 return retval; | |
460 } | |
425 } | 461 } |
426 | 462 |
427 // Force parameter list to be undefined when this function exits. | 463 // Force parameter list to be undefined when this function exits. |
428 // Doing so decrements the reference counts on the values of local | 464 // Doing so decrements the reference counts on the values of local |
429 // variables that are also named function parameters. | 465 // variables that are also named function parameters. |