Mercurial > hg > octave-nkf
view libinterp/octave-value/ov-usr-fcn.h @ 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 | 6823ad7a25b1 |
children | 2ed5bc680c71 |
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/>. */ #if !defined (octave_user_function_h) #define octave_user_function_h 1 #include <ctime> #include <string> #include <stack> #include "comment-list.h" #include "oct-obj.h" #include "ov-fcn.h" #include "ov-typeinfo.h" #include "symtab.h" #include "unwind-prot.h" class string_vector; class octave_value; class tree_parameter_list; class tree_statement_list; class tree_va_return_list; class tree_expression; class tree_walker; #ifdef HAVE_LLVM class jit_function_info; #endif class octave_user_code : public octave_function { public: octave_user_code (void) : octave_function () { } ~octave_user_code (void) { } bool is_user_code (void) const { return true; } virtual tree_statement_list *body (void) = 0; protected: octave_user_code (const std::string& nm, const std::string& ds = std::string ()) : octave_function (nm, ds) { } private: // No copying! octave_user_code (const octave_user_code& f); octave_user_code& operator = (const octave_user_code& f); }; // Scripts. class octave_user_script : public octave_user_code { public: octave_user_script (void); octave_user_script (const std::string& fnm, const std::string& nm, tree_statement_list *cmds, const std::string& ds = std::string ()); octave_user_script (const std::string& fnm, const std::string& nm, const std::string& ds = std::string ()); ~octave_user_script (void); octave_function *function_value (bool = false) { return this; } octave_user_script *user_script_value (bool = false) { return this; } octave_user_code *user_code_value (bool = false) { return this; } // Scripts and user functions are both considered "scripts" because // they are written in Octave's scripting language. bool is_user_script (void) const { return true; } void stash_fcn_file_name (const std::string& nm) { file_name = nm; } void mark_fcn_file_up_to_date (const octave_time& t) { t_checked = t; } void stash_fcn_file_time (const octave_time& t) { t_parsed = t; mark_fcn_file_up_to_date (t); } std::string fcn_file_name (void) const { return file_name; } octave_time time_parsed (void) const { return t_parsed; } octave_time time_checked (void) const { return t_checked; } octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx) { octave_value_list tmp = subsref (type, idx, 1); return tmp.length () > 0 ? tmp(0) : octave_value (); } octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout); octave_value_list do_multi_index_op (int nargout, const octave_value_list& args); tree_statement_list *body (void) { return cmd_list; } void accept (tree_walker& tw); private: // The list of commands that make up the body of this function. tree_statement_list *cmd_list; // The name of the file we parsed. std::string file_name; // The time the file was parsed. octave_time t_parsed; // The time the file was last checked to see if it needs to be // parsed again. octave_time t_checked; // Used to keep track of recursion depth. int call_depth; // No copying! octave_user_script (const octave_user_script& f); octave_user_script& operator = (const octave_user_script& f); DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; // User-defined functions. class octave_user_function : public octave_user_code { public: octave_user_function (symbol_table::scope_id sid = -1, tree_parameter_list *pl = 0, tree_parameter_list *rl = 0, tree_statement_list *cl = 0); ~octave_user_function (void); symbol_table::context_id active_context () const { return is_anonymous_function () ? 0 : static_cast<symbol_table::context_id>(call_depth); } octave_function *function_value (bool = false) { return this; } octave_user_function *user_function_value (bool = false) { return this; } octave_user_code *user_code_value (bool = false) { return this; } octave_user_function *define_param_list (tree_parameter_list *t); octave_user_function *define_ret_list (tree_parameter_list *t); void stash_fcn_file_name (const std::string& nm); void stash_fcn_location (int line, int col) { location_line = line; location_column = col; } void stash_parent_fcn_name (const std::string& p) { parent_name = p; } void stash_parent_fcn_scope (symbol_table::scope_id ps) { parent_scope = ps; } void stash_leading_comment (octave_comment_list *lc) { lead_comm = lc; } void stash_trailing_comment (octave_comment_list *tc) { trail_comm = tc; } void mark_fcn_file_up_to_date (const octave_time& t) { t_checked = t; } void stash_fcn_file_time (const octave_time& t) { t_parsed = t; mark_fcn_file_up_to_date (t); } std::string fcn_file_name (void) const { return file_name; } std::string profiler_name (void) const; std::string parent_fcn_name (void) const { return parent_name; } symbol_table::scope_id parent_fcn_scope (void) const { return parent_scope; } symbol_table::scope_id scope (void) { return local_scope; } octave_time time_parsed (void) const { return t_parsed; } octave_time time_checked (void) const { return t_checked; } void mark_as_system_fcn_file (void); bool is_system_fcn_file (void) const { return system_fcn_file; } bool is_user_function (void) const { return true; } void erase_subfunctions (void) { symbol_table::erase_subfunctions_in_scope (local_scope); } bool takes_varargs (void) const; bool takes_var_return (void) const; void mark_as_private_function (const std::string& cname = std::string ()) { symbol_table::mark_subfunctions_in_scope_as_private (local_scope, cname); octave_function::mark_as_private_function (cname); } void lock_subfunctions (void); void unlock_subfunctions (void); octave_value_list all_va_args (const octave_value_list& args); void stash_function_name (const std::string& s) { my_name = s; } void mark_as_subfunction (void) { subfunction = true; } bool is_subfunction (void) const { return subfunction; } void mark_as_inline_function (void) { inline_function = true; } bool is_inline_function (void) const { return inline_function; } void mark_as_anonymous_function (void) { anonymous_function = true; } bool is_anonymous_function (void) const { return anonymous_function; } bool is_anonymous_function_of_class (const std::string& cname = std::string ()) const { return anonymous_function ? (cname.empty () ? (! dispatch_class ().empty ()) : cname == dispatch_class ()) : false; } // If we are a special expression, then the function body consists of exactly // one expression. The expression's result is the return value of the // function. bool is_special_expr (void) const { return is_inline_function () || is_anonymous_function (); } bool is_nested_function (void) const { return nested_function; } void mark_as_nested_function (void) { nested_function = true; } void mark_as_class_constructor (void) { class_constructor = legacy; } void mark_as_classdef_constructor (void) { class_constructor = classdef; } bool is_class_constructor (const std::string& cname = std::string ()) const { return class_constructor == legacy ? (cname.empty () ? true : cname == dispatch_class ()) : false; } bool is_classdef_constructor (const std::string& cname = std::string ()) const { return class_constructor == classdef ? (cname.empty () ? true : cname == dispatch_class ()) : false; } void mark_as_class_method (void) { class_method = true; } bool is_class_method (const std::string& cname = std::string ()) const { return class_method ? (cname.empty () ? true : cname == dispatch_class ()) : false; } octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx) { octave_value_list tmp = subsref (type, idx, 1); return tmp.length () > 0 ? tmp(0) : octave_value (); } octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout); octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout, const std::list<octave_lvalue>* lvalue_list); octave_value_list do_multi_index_op (int nargout, const octave_value_list& args); octave_value_list do_multi_index_op (int nargout, const octave_value_list& args, const std::list<octave_lvalue>* lvalue_list); tree_parameter_list *parameter_list (void) { return param_list; } tree_parameter_list *return_list (void) { return ret_list; } tree_statement_list *body (void) { return cmd_list; } octave_comment_list *leading_comment (void) { return lead_comm; } octave_comment_list *trailing_comment (void) { return trail_comm; } // If is_special_expr is true, retrieve the sigular expression that forms the // body. May be null (even if is_special_expr is true). tree_expression *special_expr (void); bool subsasgn_optimization_ok (void); void accept (tree_walker& tw); template <class T> bool local_protect (T& variable) { if (curr_unwind_protect_frame) { curr_unwind_protect_frame->protect_var (variable); return true; } else return false; } #ifdef HAVE_LLVM jit_function_info *get_info (void) { return jit_info; } void stash_info (jit_function_info *info) { jit_info = info; } #endif #if 0 void print_symtab_info (std::ostream& os) const; #endif private: enum class_ctor_type { none, legacy, classdef }; // List of arguments for this function. These are local variables. tree_parameter_list *param_list; // List of parameters we return. These are also local variables in // this function. tree_parameter_list *ret_list; // The list of commands that make up the body of this function. tree_statement_list *cmd_list; // The comments preceding the FUNCTION token. octave_comment_list *lead_comm; // The comments preceding the ENDFUNCTION token. octave_comment_list *trail_comm; // The name of the file we parsed. std::string file_name; // Location where this function was defined. int location_line; int location_column; // The name of the parent function, if any. std::string parent_name; // The time the file was parsed. octave_time t_parsed; // The time the file was last checked to see if it needs to be // parsed again. octave_time t_checked; // True if this function came from a file that is considered to be a // system function. This affects whether we check the time stamp // on the file to see if it has changed. bool system_fcn_file; // Used to keep track of recursion depth. int call_depth; // The number of arguments that have names. int num_named_args; // TRUE means this subfunction of a primary function. bool subfunction; // TRUE means this is an inline function. bool inline_function; // TRUE means this is an anonymous function. bool anonymous_function; // TRUE means this is a nested function. (either a child or parent) bool nested_function; // Enum describing whether this function is the constructor for class object. class_ctor_type class_constructor; // TRUE means this function is a method for a class. bool class_method; // The scope of the parent function, if any. symbol_table::scope_id parent_scope; symbol_table::scope_id local_scope; // pointer to the current unwind_protect frame of this function. unwind_protect *curr_unwind_protect_frame; #ifdef HAVE_LLVM jit_function_info *jit_info; #endif #if 0 // The symbol record for argn in the local symbol table. octave_value& argn_varref; // The symbol record for nargin in the local symbol table. octave_value& nargin_varref; // The symbol record for nargout in the local symbol table. octave_value& nargout_varref; // The symbol record for varargin in the local symbol table. octave_value& varargin_varref; #endif void print_code_function_header (void); void print_code_function_trailer (void); void bind_automatic_vars (const string_vector& arg_names, int nargin, int nargout, const octave_value_list& va_args, const std::list<octave_lvalue> *lvalue_list); void restore_warning_states (void); // No copying! octave_user_function (const octave_user_function& fn); octave_user_function& operator = (const octave_user_function& fn); DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif