view .dir-locals.el @ 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 7600200a54c8
children 9ff04de067ce
line wrap: on
line source

((nil .
      ((c-file-style . "gnu")
       (indent-tabs-mode . nil)
       (fill-column . 72)
       (eval . (when (string-match "\\.h\\'" (buffer-file-name))
                 (unless (string-match "/gnulib/" (buffer-file-name))
                   (c++-mode)
                   (c-set-style "gnu"))))))
 (change-log-mode . ((indent-tabs-mode . t)))
 (makefile-mode . ((indent-tabs-mode . t))))