octave: libinterp/parse-tree/pt-stmt.cc annotate

annotate libinterp/parse-tree/pt-stmt.cc @ 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	f3a63fdbd725
children	d63878346099

rev	line source
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	1 /*
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	2
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	3 Copyright (C) 1996-2012 John W. Eaton
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	4
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	6
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6253 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6253 diff changeset	10 option) any later version.
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	11
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	15 for more details.
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	16
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6253 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6253 diff changeset	19 <http://www.gnu.org/licenses/>.
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	20
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	21 */
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	22
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	23 #ifdef HAVE_CONFIG_H
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	24 #include <config.h>
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	25 #endif
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	26
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	27 #include <typeinfo>
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	28
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4066 diff changeset	29 #include "quit.h"
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4066 diff changeset	30
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	31 #include "defun.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	32 #include "error.h"
8011 3100283874d7 improve backtrace error messages John W. Eaton <jwe@octave.org> parents: 7890 diff changeset	33 #include "gripes.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	34 #include "ov.h"
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	35 #include "octave-link.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	36 #include "oct-lvalue.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	37 #include "input.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	38 #include "pager.h"
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	39 #include "pt-bp.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	40 #include "pt-cmd.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	41 #include "pt-id.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	42 #include "pt-idx.h"
2985 aa9d0c0e0458 [project @ 1997-05-16 06:54:18 by jwe] jwe parents: 2982 diff changeset	43 #include "pt-jump.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	44 #include "pt-pr-code.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	45 #include "pt-stmt.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	46 #include "pt-walk.h"
3707 58140935c812 [project @ 2000-07-28 09:40:52 by jwe] jwe parents: 3665 diff changeset	47 #include "unwind-prot.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	48 #include "utils.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	49 #include "variables.h"
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	50
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	51 // A list of commands to be executed.
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	52
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	53 tree_statement::~tree_statement (void)
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	54 {
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	55 delete cmd;
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	56 delete expr;
3665 0689afb1d001 [project @ 2000-05-11 19:07:56 by jwe] jwe parents: 3373 diff changeset	57 delete comm;
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	58 }
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	59
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	60 void
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	61 tree_statement::set_print_flag (bool print_flag)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	62 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	63 if (expr)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	64 expr->set_print_flag (print_flag);
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	65 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	66
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	67 bool
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	68 tree_statement::print_result (void)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	69 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	70 return expr && expr->print_result ();
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	71 }
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	72
8843 b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	73 void
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	74 tree_statement::set_breakpoint (void)
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	75 {
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	76 if (cmd)
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	77 cmd->set_breakpoint ();
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	78 else if (expr)
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	79 expr->set_breakpoint ();
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	80 }
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	81
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	82 void
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	83 tree_statement::delete_breakpoint (void)
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	84 {
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	85 if (cmd)
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	86 cmd->delete_breakpoint ();
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	87 else if (expr)
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	88 expr->delete_breakpoint ();
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	89 }
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	90
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	91 bool
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	92 tree_statement::is_breakpoint (void) const
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	93 {
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	94 return cmd ? cmd->is_breakpoint () : (expr ? expr->is_breakpoint () : false);
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	95 }
b9ce57a309a3 don't store breakpoint info in tree_statement object John W. Eaton <jwe@octave.org> parents: 8669 diff changeset	96
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	97 int
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	98 tree_statement::line (void) const
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	99 {
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	100 return cmd ? cmd->line () : (expr ? expr->line () : -1);
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	101 }
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	102
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	103 int
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	104 tree_statement::column (void) const
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	105 {
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	106 return cmd ? cmd->column () : (expr ? expr->column () : -1);
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	107 }
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	108
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	109 void
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	110 tree_statement::set_location (int l, int c)
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	111 {
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	112 if (cmd)
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	113 cmd->set_location (l, c);
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	114 else if (expr)
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	115 expr->set_location (l, c);
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	116 }
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	117
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	118 void
8669 33783e94fb16 line number fixes and other evaluator tweaks John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	119 tree_statement::echo_code (void)
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	120 {
8669 33783e94fb16 line number fixes and other evaluator tweaks John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	121 tree_print_code tpc (octave_stdout, VPS4);
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	122
8669 33783e94fb16 line number fixes and other evaluator tweaks John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	123 accept (tpc);
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	124 }
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	125
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	126 bool
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	127 tree_statement::is_end_of_fcn_or_script (void) const
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	128 {
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	129 bool retval = false;
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	130
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	131 if (cmd)
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	132 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	133 tree_no_op_command *no_op_cmd
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	134 = dynamic_cast<tree_no_op_command *> (cmd);
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	135
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	136 if (no_op_cmd)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	137 retval = no_op_cmd->is_end_of_fcn_or_script ();
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	138 }
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	139
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	140 return retval;
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	141 }
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	142
16627 de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	143 bool
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	144 tree_statement::is_end_of_file (void) const
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	145 {
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	146 bool retval = false;
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	147
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	148 if (cmd)
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	149 {
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	150 tree_no_op_command *no_op_cmd
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	151 = dynamic_cast<tree_no_op_command *> (cmd);
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	152
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	153 if (no_op_cmd)
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	154 retval = no_op_cmd->is_end_of_file ();
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	155 }
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	156
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	157 return retval;
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	158 }
de91b1621260 adjust location of eof marker for files with subfunctions but no explicit end statements John W. Eaton <jwe@octave.org> parents: 16531 diff changeset	159
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	160 tree_statement *
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	161 tree_statement::dup (symbol_table::scope_id scope,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	162 symbol_table::context_id context) const
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	163 {
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	164 tree_statement *new_stmt = new tree_statement ();
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	165
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	166 new_stmt->cmd = cmd ? cmd->dup (scope, context) : 0;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	167
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	168 new_stmt->expr = expr ? expr->dup (scope, context) : 0;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	169
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8637 diff changeset	170 new_stmt->comm = comm ? comm->dup () : 0;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	171
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	172 return new_stmt;
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	173 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	174
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	175 void
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	176 tree_statement::accept (tree_walker& tw)
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	177 {
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	178 tw.visit_statement (*this);
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	179 }
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	180
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	181 int
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	182 tree_statement_list::set_breakpoint (int line)
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	183 {
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	184 tree_breakpoint tbp (line, tree_breakpoint::set);
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	185 accept (tbp);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	186
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	187 return tbp.get_line ();
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	188 }
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	189
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	190 void
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	191 tree_statement_list::delete_breakpoint (int line)
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	192 {
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	193 if (line < 0)
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	194 {
4212 8ad52ec4f374 [project @ 2002-12-04 03:50:45 by jwe] jwe parents: 4207 diff changeset	195 octave_value_list bp_lst = list_breakpoints ();
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	196
4212 8ad52ec4f374 [project @ 2002-12-04 03:50:45 by jwe] jwe parents: 4207 diff changeset	197 int len = bp_lst.length ();
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	198
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4219 diff changeset	199 for (int i = 0; i < len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	200 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	201 tree_breakpoint tbp (i, tree_breakpoint::clear);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	202 accept (tbp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	203 }
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	204 }
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	205 else
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	206 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	207 tree_breakpoint tbp (line, tree_breakpoint::clear);
3895 d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	208 accept (tbp);
d38c7538b954 [project @ 2002-04-10 19:18:39 by jwe] jwe parents: 3770 diff changeset	209 }
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	210 }
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	211
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	212 octave_value_list
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	213 tree_statement_list::list_breakpoints (void)
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	214 {
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	215 tree_breakpoint tbp (0, tree_breakpoint::list);
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	216 accept (tbp);
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	217
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	218 return tbp.get_list ();
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	219 }
bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3708 diff changeset	220
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	221 bp_table::intmap
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	222 tree_statement_list::add_breakpoint (const std::string& file,
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	223 const bp_table::intmap& line)
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	224 {
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	225 bp_table::intmap retval;
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	226
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	227 octave_idx_type len = line.size ();
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	228
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	229 for (int i = 0; i < len; i++)
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	230 {
16531 f3a63fdbd725 finish botched changeset 7ca7e7d5eb91 John W. Eaton <jwe@octave.org> parents: 16530 diff changeset	231 bp_table::const_intmap_iterator p = line.find (i);
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	232
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	233 if (p != line.end ())
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	234 {
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	235 int lineno = p->second;
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	236
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	237 retval[i] = set_breakpoint (lineno);
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	238
16531 f3a63fdbd725 finish botched changeset 7ca7e7d5eb91 John W. Eaton <jwe@octave.org> parents: 16530 diff changeset	239 if (retval[i] != 0 && ! file.empty ())
f3a63fdbd725 finish botched changeset 7ca7e7d5eb91 John W. Eaton <jwe@octave.org> parents: 16530 diff changeset	240 octave_link::update_breakpoint (true, file, retval[i]);
16530 7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	241 }
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	242 }
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	243
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	244 return retval;
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	245 }
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	246
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	247 bp_table::intmap
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	248 tree_statement_list::remove_all_breakpoints (const std::string& file)
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	249 {
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	250 bp_table::intmap retval;
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	251
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	252 octave_value_list bkpts = list_breakpoints ();
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	253
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	254 for (int i = 0; i < bkpts.length (); i++)
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	255 {
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	256 int lineno = static_cast<int> (bkpts(i).int_value ());
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	257
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	258 delete_breakpoint (lineno);
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	259
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	260 retval[i] = lineno;
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	261
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	262 if (! file.empty ())
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	263 octave_link::update_breakpoint (false, file, lineno);
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	264 }
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	265
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	266 return retval;
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	267 }
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	268
7ca7e7d5eb91 remove breakpoints when clearing function John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	269
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	270 tree_statement_list *
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	271 tree_statement_list::dup (symbol_table::scope_id scope,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	272 symbol_table::context_id context) const
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	273 {
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	274 tree_statement_list *new_list = new tree_statement_list ();
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	275
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	276 new_list->function_body = function_body;
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	277
8913 35cd375d4bb3 make tree::dup functions const John W. Eaton <jwe@octave.org> parents: 8844 diff changeset	278 for (const_iterator p = begin (); p != end (); p++)
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	279 {
8913 35cd375d4bb3 make tree::dup functions const John W. Eaton <jwe@octave.org> parents: 8844 diff changeset	280 const tree_statement elt = p;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	281
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	282 new_list->append (elt ? elt->dup (scope, context) : 0);
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	283 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	284
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	285 return new_list;
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	286 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5858 diff changeset	287
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	288 void
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	289 tree_statement_list::accept (tree_walker& tw)
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	290 {
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	291 tw.visit_statement_list (*this);
20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: diff changeset	292 }

Mercurial > octave

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