Mercurial > octave-nkf
view libinterp/octave-value/ov-fcn.h @ 16627:de91b1621260
adjust location of eof marker for files with subfunctions but no explicit end statements
* ov-fcn.h (octave_function::maybe_relocate_end,
octave_function::has_subfunctions,
octave_function::stash_subfunction_names,
octave_function::subfunction_names): New virtual functions.
* ov-usr-fcn.h, ov-usr-fcn.cc (octave_user_function::end_location_line,
octave_user_function::end_location_column,
octave_user_function::subfcn_names): New member variables.
(octave_user_function::beginning_line,
octave_user_function::beginning_column,
octave_user_function::stash_fcn_end_location,
octave_user_function::ending_line,
octave_user_function::ending_column,
octave_user_function::has_subfunctions,
octave_user_function::subfunction_names,
octave_user_function::stash_subfunction_names,
octave_user_function::maybe_relocate_end_internal,
octave_user_function::maybe_relocate_end): New functions.
* oct-parse.in.yy (FCN): Declare as token with tok_val type.
(function_beg): Declare as tok_val type. Return FCN value.
(function): Move stash_comment here from function_beg. Pass line and
column info to parser.finish_function.
(octave_base_parser::subfunction_names): New data member.
(octave_base_parser::reset): Clear subfuntction_names.
(octave_base_parser::start_function): Call stash_fcn_end_location.
(octave_base_parser::frob_function): Don't call stash_fcn_location.
(octave_base_parser_::finish_function): Call stash_fcn_location.
Append name to subfunction_names.
Call maybe_relocate_end on constructed function.
(parse_fcn_file): Attach subfunction names to primary function.
* pt-stmt.h, pt-stmt.cc (tree_statement::set_location): New function.
* pt.h (tree::set_location): New function.
* pt-cmd.h, pt-cmd.cc (tree_no_op_command::tree_no_op_command): Use
EOF member variable to track auto-generated end statements that appear
at the end of file. Change all callers.
(tree_command::is_end_of_file): New function.
* pt-stmt.h, pt-stmt.cc (tree_statement::set_location,
tree_statement::is_end_of_file): New functions.
* base-list.h (octave_base_list::reverse_iterator,
octave_base_list::const_reverse_iterator): New typedefs.
(octave_base_list::rbegin, octave_base_list::rend): New functions.
* debug.h, debug.cc (bp_table::do_add_breakpoint):
Handle subfunctions.
(bp_table::do_remove_breakpoint_1): New function.
(bp_table::do_remove_breakpoint): Use it. Handle subfunctions.
(bp_table::do_remove_all_breakpoints_in_file_1): New function.
(bp_table::do_remove_all_breakpoints_in_file): Use it. Handle
subfunctions.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 07 May 2013 15:29:00 -0400 |
parents | 2fc554ffbc28 |
children | 856cb7cba231 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/>. */ #if !defined (octave_function_h) #define octave_function_h 1 #include <string> #include "oct-time.h" #include "str-vec.h" #include "oct-alloc.h" #include "oct-obj.h" #include "ov-base.h" #include "ov-typeinfo.h" #include "symtab.h" class tree_walker; // Functions. class OCTINTERP_API octave_function : public octave_base_value { public: octave_function (void) : relative (false), locked (false), private_function (false), xdispatch_class (), my_name (), my_dir_name (), doc () { } ~octave_function (void) { } octave_base_value *clone (void) const; octave_base_value *empty_clone (void) const; bool is_defined (void) const { return true; } bool is_function (void) const { return true; } virtual bool is_system_fcn_file (void) const { return false; } virtual std::string fcn_file_name (void) const { return std::string (); } virtual std::string src_file_name (void) const { return std::string (); } // The name to show in the profiler (also used as map-key). virtual std::string profiler_name (void) const { return name (); } virtual std::string parent_fcn_name (void) const { return std::string (); } virtual symbol_table::scope_id parent_fcn_scope (void) const { return -1; } virtual void mark_fcn_file_up_to_date (const octave_time&) { } virtual symbol_table::scope_id scope (void) { return -1; } virtual octave_time time_parsed (void) const { return octave_time (static_cast<time_t> (0)); } virtual octave_time time_checked (void) const { return octave_time (static_cast<time_t> (0)); } virtual bool is_subfunction (void) const { return false; } virtual bool is_class_constructor (const std::string& = std::string ()) const { return false; } virtual bool is_class_method (const std::string& = std::string ()) const { return false; } virtual bool takes_varargs (void) const { return false; } virtual bool takes_var_return (void) const { return false; } void stash_dispatch_class (const std::string& nm) { xdispatch_class = nm; } std::string dispatch_class (void) const { return xdispatch_class; } virtual void mark_as_private_function (const std::string& cname = std::string ()) { private_function = true; xdispatch_class = cname; } bool is_private_function (void) const { return private_function; } bool is_private_function_of_class (const std::string& nm) const { return private_function && xdispatch_class == nm; } virtual bool is_anonymous_function_of_class (const std::string& = std::string ()) const { return false; } std::string dir_name (void) const { return my_dir_name; } void stash_dir_name (const std::string& dir) { my_dir_name = dir; } void lock (void) { this->lock_subfunctions (); locked = true; } void unlock (void) { this->unlock_subfunctions (); locked = false; } bool islocked (void) const { return locked; } virtual void lock_subfunctions (void) { } virtual void unlock_subfunctions (void) { } virtual void maybe_relocate_end (void) { } // Not valid until after the function is completley parsed. virtual bool has_subfunctions (void) const { return false; } virtual void stash_subfunction_names (const std::list<std::string>&) { } virtual std::list<std::string> subfunction_names (void) const { return std::list<std::string> (); } void mark_relative (void) { relative = true; } bool is_relative (void) const { return relative; } std::string name (void) const { return my_name; } void document (const std::string& ds) { doc = ds; } std::string doc_string (void) const { return doc; } virtual void unload (void) { } virtual void accept (tree_walker&) { } protected: octave_function (const std::string& nm, const std::string& ds = std::string ()) : relative (false), locked (false), private_function (false), xdispatch_class (), my_name (nm), my_dir_name (), doc (ds) { } // TRUE if this function was found from a relative path element. bool relative; // TRUE if this function is tagged so that it can't be cleared. bool locked; // TRUE means this is a private function. bool private_function; // If this object is a class method or constructor, or a private // function inside a class directory, this is the name of the class // to which the method belongs. std::string xdispatch_class; // The name of this function. std::string my_name; // The name of the directory in the path where we found this // function. May be relative. std::string my_dir_name; // The help text for this function. std::string doc; private: // No copying! octave_function (const octave_function& f); octave_function& operator = (const octave_function& f); DECLARE_OCTAVE_ALLOCATOR }; #endif