Mercurial > octave-nkf
view libinterp/parse-tree/pt-colon.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 | 2fc554ffbc28 |
children | d63878346099 |
line wrap: on
line source
/* Copyright (C) 1996-2012 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "error.h" #include "oct-obj.h" #include "pager.h" #include "ov.h" #include "pt-bp.h" #include "pt-colon.h" #include "pt-walk.h" // Colon expressions. tree_colon_expression * tree_colon_expression::append (tree_expression *t) { tree_colon_expression *retval = 0; if (op_base) { if (op_limit) { if (op_increment) ::error ("invalid colon expression"); else { // Stupid syntax: // // base : limit // base : increment : limit op_increment = op_limit; op_limit = t; } } else op_limit = t; retval = this; } else ::error ("invalid colon expression"); return retval; } octave_value_list tree_colon_expression::rvalue (int nargout) { octave_value_list retval; if (nargout > 1) error ("invalid number of output arguments for colon expression"); else retval = rvalue1 (nargout); return retval; } octave_value tree_colon_expression::make_range (const Matrix& m_base, const Matrix& m_limit, const Matrix& m_increment, bool result_is_str, bool dq_str) const { octave_value retval; bool base_empty = m_base.is_empty (); bool limit_empty = m_limit.is_empty (); bool increment_empty = m_increment.is_empty (); if (base_empty || limit_empty || increment_empty) retval = Range (); else { retval = Range (m_base(0), m_limit(0), m_increment(0)); if (result_is_str) retval = retval.convert_to_str (false, true, dq_str ? '"' : '\''); } return retval; } octave_value tree_colon_expression::make_range (const octave_value& ov_base, const octave_value& ov_limit, const octave_value& ov_increment) const { octave_value retval; if (ov_base.is_object () || ov_limit.is_object () || ov_increment.is_object ()) { octave_value_list tmp1; tmp1(2) = ov_limit; tmp1(1) = ov_increment; tmp1(0) = ov_base; octave_value fcn = symbol_table::find_function ("colon", tmp1); if (fcn.is_defined ()) { octave_value_list tmp2 = fcn.do_multi_index_op (1, tmp1); if (! error_state) retval = tmp2 (0); } else ::error ("can not find overloaded colon function"); } else { bool result_is_str = (ov_base.is_string () && ov_limit.is_string ()); bool dq_str = (ov_base.is_dq_string () || ov_limit.is_dq_string ()); Matrix m_base = ov_base.matrix_value (true); if (error_state) eval_error ("invalid base value in colon expression"); else { Matrix m_limit = ov_limit.matrix_value (true); if (error_state) eval_error ("invalid limit value in colon expression"); else { Matrix m_increment = ov_increment.matrix_value (true); if (error_state) eval_error ("invalid increment value in colon expression"); else retval = make_range (m_base, m_limit, m_increment, result_is_str, dq_str); } } } return retval; } octave_value tree_colon_expression::rvalue1 (int) { octave_value retval; if (error_state || ! op_base || ! op_limit) return retval; octave_value ov_base = op_base->rvalue1 (); if (error_state || ov_base.is_undefined ()) eval_error ("invalid base value in colon expression"); else { octave_value ov_limit = op_limit->rvalue1 (); if (error_state || ov_limit.is_undefined ()) eval_error ("invalid limit value in colon expression"); else if (ov_base.is_object () || ov_limit.is_object ()) { octave_value_list tmp1; if (op_increment) { octave_value ov_increment = op_increment->rvalue1 (); if (error_state || ov_increment.is_undefined ()) eval_error ("invalid increment value in colon expression"); else { tmp1(2) = ov_limit; tmp1(1) = ov_increment; tmp1(0) = ov_base; } } else { tmp1(1) = ov_limit; tmp1(0) = ov_base; } if (!error_state) { octave_value fcn = symbol_table::find_function ("colon", tmp1); if (fcn.is_defined ()) { octave_value_list tmp2 = fcn.do_multi_index_op (1, tmp1); if (! error_state) retval = tmp2 (0); } else ::error ("can not find overloaded colon function"); } } else { octave_value ov_increment = 1.0; if (op_increment) { ov_increment = op_increment->rvalue1 (); if (error_state || ov_increment.is_undefined ()) eval_error ("invalid increment value in colon expression"); } if (! error_state) retval = make_range (ov_base, ov_limit, ov_increment); } } return retval; } void tree_colon_expression::eval_error (const std::string& s) const { ::error ("%s", s.c_str ()); } int tree_colon_expression::line (void) const { return (op_base ? op_base->line () : (op_increment ? op_increment->line () : (op_limit ? op_limit->line () : -1))); } int tree_colon_expression::column (void) const { return (op_base ? op_base->column () : (op_increment ? op_increment->column () : (op_limit ? op_limit->column () : -1))); } tree_expression * tree_colon_expression::dup (symbol_table::scope_id scope, symbol_table::context_id context) const { tree_colon_expression *new_ce = new tree_colon_expression (op_base ? op_base->dup (scope, context) : 0, op_limit ? op_limit->dup (scope, context) : 0, op_increment ? op_increment->dup (scope, context) : 0, line (), column ()); new_ce->copy_base (*new_ce); return new_ce; } void tree_colon_expression::accept (tree_walker& tw) { tw.visit_colon_expression (*this); }