Mercurial > octave-nkf

comparison libinterp/parse-tree/parse.h @ 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 bef822a80ffb
children 856cb7cba231 923ce8b42db2
comparison
equal deleted inserted replaced
16626:4adf3c4bd80b 16627:de91b1621260
134 : endfunction_found (false), 134 : endfunction_found (false),
135 autoloading (false), fcn_file_from_relative_lookup (false), 135 autoloading (false), fcn_file_from_relative_lookup (false),
136 parsing_subfunctions (false), max_fcn_depth (0), 136 parsing_subfunctions (false), max_fcn_depth (0),
137 curr_fcn_depth (0), primary_fcn_scope (-1), 137 curr_fcn_depth (0), primary_fcn_scope (-1),
138 curr_class_name (), function_scopes (), primary_fcn_ptr (0), 138 curr_class_name (), function_scopes (), primary_fcn_ptr (0),
139 stmt_list (0), 139 subfunction_names (), stmt_list (0),
140 lexer (lxr) 140 lexer (lxr)
141 { 141 {
142 init (); 142 init ();
143 } 143 }
144 144
268 octave_user_function * 268 octave_user_function *
269 start_function (tree_parameter_list *param_list, tree_statement_list *body, 269 start_function (tree_parameter_list *param_list, tree_statement_list *body,
270 tree_statement *end_function); 270 tree_statement *end_function);
271 271
272 // Create a no-op statement for end_function. 272 // Create a no-op statement for end_function.
273 tree_statement *make_end (const std::string& type, int l, int c); 273 tree_statement *make_end (const std::string& type, bool eof, int l, int c);
274 274
275 // Do most of the work for defining a function. 275 // Do most of the work for defining a function.
276 octave_user_function * 276 octave_user_function *
277 frob_function (const std::string& fname, octave_user_function *fcn); 277 frob_function (const std::string& fname, octave_user_function *fcn);
278 278
279 // Finish defining a function. 279 // Finish defining a function.
280 tree_function_def * 280 tree_function_def *
281 finish_function (tree_parameter_list *ret_list, 281 finish_function (tree_parameter_list *ret_list,
282 octave_user_function *fcn, octave_comment_list *lc); 282 octave_user_function *fcn, octave_comment_list *lc,
283 int l, int c);
283 284
284 // Reset state after parsing function. 285 // Reset state after parsing function.
285 void 286 void
286 recover_from_parsing_function (void); 287 recover_from_parsing_function (void);
287 288
375 std::vector<symbol_table::scope_id> function_scopes; 376 std::vector<symbol_table::scope_id> function_scopes;
376 377
377 // Pointer to the primary user function or user script function. 378 // Pointer to the primary user function or user script function.
378 octave_function *primary_fcn_ptr; 379 octave_function *primary_fcn_ptr;
379 380
381 // List of subfunction names, initially in the order they are
382 // installed in the symbol table, then ordered as they appear in the
383 // file. Eventually stashed in the primary function object.
384 std::list<std::string> subfunction_names;
385
380 // Result of parsing input. 386 // Result of parsing input.
381 tree_statement_list *stmt_list; 387 tree_statement_list *stmt_list;
382 388
383 // State of the lexer. 389 // State of the lexer.
384 octave_base_lexer& lexer; 390 octave_base_lexer& lexer;