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.

--- a/libinterp/parse-tree/parse.h	Mon May 06 20:02:08 2013 -0400
+++ b/libinterp/parse-tree/parse.h	Tue May 07 15:29:00 2013 -0400
@@ -136,7 +136,7 @@
       parsing_subfunctions (false), max_fcn_depth (0),
       curr_fcn_depth (0), primary_fcn_scope (-1),
       curr_class_name (), function_scopes (), primary_fcn_ptr (0),
-      stmt_list (0),
+      subfunction_names (), stmt_list (0),
       lexer (lxr)
   {
     init ();
@@ -270,7 +270,7 @@
                   tree_statement *end_function);
 
   // Create a no-op statement for end_function.
-  tree_statement *make_end (const std::string& type, int l, int c);
+  tree_statement *make_end (const std::string& type, bool eof, int l, int c);
 
   // Do most of the work for defining a function.
   octave_user_function *
@@ -279,7 +279,8 @@
   // Finish defining a function.
   tree_function_def *
   finish_function (tree_parameter_list *ret_list,
-                   octave_user_function *fcn, octave_comment_list *lc);
+                   octave_user_function *fcn, octave_comment_list *lc,
+                   int l, int c);
 
   // Reset state after parsing function.
   void
@@ -377,6 +378,11 @@
   // Pointer to the primary user function or user script function.
   octave_function *primary_fcn_ptr;
 
+  // List of subfunction names, initially in the order they are
+  // installed in the symbol table, then ordered as they appear in the
+  // file.  Eventually stashed in the primary function object.
+  std::list<std::string> subfunction_names;
+
   // Result of parsing input.
   tree_statement_list *stmt_list;