Mercurial > octave-nkf

comparison libinterp/parse-tree/pt-stmt.cc @ 16627:de91b1621260

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f3a63fdbd725
children d63878346099
comparison
equal deleted inserted replaced
16626:4adf3c4bd80b 16627:de91b1621260
105 { 105 {
106 return cmd ? cmd->column () : (expr ? expr->column () : -1); 106 return cmd ? cmd->column () : (expr ? expr->column () : -1);
107 } 107 }
108 108
109 void 109 void
110 tree_statement::set_location (int l, int c)
111 {
112 if (cmd)
113 cmd->set_location (l, c);
114 else if (expr)
115 expr->set_location (l, c);
116 }
117
118 void
110 tree_statement::echo_code (void) 119 tree_statement::echo_code (void)
111 { 120 {
112 tree_print_code tpc (octave_stdout, VPS4); 121 tree_print_code tpc (octave_stdout, VPS4);
113 122
114 accept (tpc); 123 accept (tpc);
124 tree_no_op_command *no_op_cmd 133 tree_no_op_command *no_op_cmd
125 = dynamic_cast<tree_no_op_command *> (cmd); 134 = dynamic_cast<tree_no_op_command *> (cmd);
126 135
127 if (no_op_cmd) 136 if (no_op_cmd)
128 retval = no_op_cmd->is_end_of_fcn_or_script (); 137 retval = no_op_cmd->is_end_of_fcn_or_script ();
138 }
139
140 return retval;
141 }
142
143 bool
144 tree_statement::is_end_of_file (void) const
145 {
146 bool retval = false;
147
148 if (cmd)
149 {
150 tree_no_op_command *no_op_cmd
151 = dynamic_cast<tree_no_op_command *> (cmd);
152
153 if (no_op_cmd)
154 retval = no_op_cmd->is_end_of_file ();
129 } 155 }
130 156
131 return retval; 157 return retval;
132 } 158 }
133 159