Mercurial > octave-nkf
view src/ov-fcn-handle.h @ 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 | 72c96de7a403 |
children |
line wrap: on
line source
/* Copyright (C) 2003-2012 John W. Eaton Copyright (C) 2009 VZLU Prague 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_fcn_handle_h) #define octave_fcn_handle_h 1 #include <iosfwd> #include <string> #include <memory> #include "oct-alloc.h" #include "ov-base.h" #include "ov-base-mat.h" #include "ov-fcn.h" #include "ov-typeinfo.h" // Function handles. class OCTINTERP_API octave_fcn_handle : public octave_base_value { private: typedef std::map<std::string, octave_value> str_ov_map; public: static const std::string anonymous; octave_fcn_handle (void) : fcn (), nm (), has_overloads (false), overloads () { } octave_fcn_handle (const std::string& n) : fcn (), nm (n), has_overloads (false), overloads () { } octave_fcn_handle (const octave_value& f, const std::string& n = anonymous); octave_fcn_handle (const octave_fcn_handle& fh) : octave_base_value (fh), fcn (fh.fcn), nm (fh.nm), has_overloads (fh.has_overloads), overloads () { for (int i = 0; i < btyp_num_types; i++) builtin_overloads[i] = fh.builtin_overloads[i]; overloads = fh.overloads; } ~octave_fcn_handle (void) { } octave_base_value *clone (void) const { return new octave_fcn_handle (*this); } octave_base_value *empty_clone (void) const { return new octave_fcn_handle (); } 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); bool is_defined (void) const { return true; } bool is_function_handle (void) const { return true; } builtin_type_t builtin_type (void) const { return btyp_func_handle; } bool is_overloaded (void) const { return has_overloads; } dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; } octave_function *function_value (bool = false) { return fcn.function_value (); } octave_user_function *user_function_value (bool = false) { return fcn.user_function_value (); } octave_fcn_handle *fcn_handle_value (bool = false) { return this; } octave_value fcn_val (void) const { return fcn; } std::string fcn_name (void) const { return nm; } void set_overload (builtin_type_t btyp, const octave_value& ov_fcn) { if (btyp != btyp_unknown) { has_overloads = true; builtin_overloads[btyp] = ov_fcn; } } void set_overload (const std::string& dispatch_type, const octave_value& ov_fcn) { has_overloads = true; overloads[dispatch_type] = ov_fcn; } bool is_equal_to (const octave_fcn_handle&) const; bool save_ascii (std::ostream& os); bool load_ascii (std::istream& is); bool save_binary (std::ostream& os, bool& save_as_floats); bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt); #if defined (HAVE_HDF5) bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); bool load_hdf5 (hid_t loc_id, const char *name); #endif void print (std::ostream& os, bool pr_as_read_syntax = false) const; void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; // Simple function handles are printed without a newline. bool print_as_scalar (void) const { return nm != anonymous; } private: bool set_fcn (const std::string &octaveroot, const std::string& fpath); DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA protected: // The function we are handling. octave_value fcn; // The name of the handle, including the "@". std::string nm; // Whether the function is overloaded at all. bool has_overloads; // Overloads for builtin types. We use array to make lookup faster. octave_value builtin_overloads[btyp_num_types]; // Overloads for other classes. str_ov_map overloads; friend octave_value make_fcn_handle (const std::string &, bool); }; extern octave_value make_fcn_handle (const std::string& nm, bool local_funcs = true); class OCTINTERP_API octave_fcn_binder : public octave_fcn_handle { private: // Private ctor. octave_fcn_binder (const octave_value& f, const octave_value& root, const octave_value_list& templ, const std::vector<int>& mask, int exp_nargin); public: // Factory method. static octave_fcn_handle *maybe_binder (const octave_value& f); 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); protected: octave_value root_handle; octave_value_list arg_template; std::vector<int> arg_mask; int expected_nargin; }; #endif